From a98cc6d7d7a321f5f050910fc27fdfa67f0d2fa6 Mon Sep 17 00:00:00 2001
From: Benjamin Mako Hill <mako@atdot.cc>
Date: Mon, 3 Oct 2011 14:47:14 -0400
Subject: [PATCH 1/1] changed remaining kjh notes to mako-mem

---
 paper_template/mako-mem.sty | 20 ++++++++++----------
 paper_template/text.tex     |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/paper_template/mako-mem.sty b/paper_template/mako-mem.sty
index da1f342..32df17b 100644
--- a/paper_template/mako-mem.sty
+++ b/paper_template/mako-mem.sty
@@ -1,7 +1,7 @@
 % Some article styles and page layout tweaks for the LaTeX Memoir class.
 %
-% Copyright 2008-2009 Kieran Healy <kjhealy@soc.duke.edu>
 % Copyright 2009 Benjamin Mako Hill <mako@atdot.cc>
+% Copyright 2008-2009 Kieran Healy <kjhealy@soc.duke.edu>
 
 % Distributed as free software under the GNU GPL v3
 
@@ -99,11 +99,11 @@
 %%% Custom styles for headers and footers
    
 %%% Basic 
-\makepagestyle{kjh}
-%\makeevenfoot{kjh}{\thepage}{}{}
-%\makeoddfoot{kjh}{}{}{\thepage}
-%\makeheadrule{kjh}{\textwidth}{\normalrulethickness}
-\newcommand{\@kjhmarks}{%
+\makepagestyle{mako-mem}
+%\makeevenfoot{mako-mem}{\thepage}{}{}
+%\makeoddfoot{mako-mem}{}{}{\thepage}
+%\makeheadrule{mako-mem}{\textwidth}{\normalrulethickness}
+\newcommand{\@makomarks}{%
   \let\@mkboth\markboth
   \def\chaptermark##1{%
     \markboth{%
@@ -116,10 +116,10 @@
   \def\sectionmark##1{%
     \markright{##1}}
 }
-\makepsmarks{kjh}{\@kjhmarks}
-\makepsmarks{kjh}{}
-\makeevenhead{kjh}{}{}{\scshape\thepage}
-\makeoddhead{kjh}{}{}{\scshape\thepage}
+\makepsmarks{mako-mem}{\@makomarks}
+\makepsmarks{mako-mem}{}
+\makeevenhead{mako-mem}{}{}{\scshape\thepage}
+\makeoddhead{mako-mem}{}{}{\scshape\thepage}
 
 %%% version control info in footers; requires vc package 
 % Make the style for vc-git revision control headers and footers
diff --git a/paper_template/text.tex b/paper_template/text.tex
index c720d08..21b74bf 100644
--- a/paper_template/text.tex
+++ b/paper_template/text.tex
@@ -3,7 +3,7 @@
 % based on kieran healy's memoir modifications
 \usepackage{mako-mem}
 \chapterstyle{article-2}
-\pagestyle{kjh}
+\pagestyle{mako-mem}
 
 \usepackage{ucs}
 \usepackage[utf8x]{inputenc}
@@ -25,7 +25,7 @@
 % \usepackage{dcolumn}
 % \usepackage{endfloat}
 
-% import and customize urls (kjh does this as well, it seems)
+% import and customize urls
 \usepackage[usenames,dvipsnames]{color}
 \usepackage[breaklinks]{hyperref}
 
-- 
2.39.5