Merge branch 'master' of git://projects.mako.cc:/latex_mako into groceryheist

diff --git a/paper_template/.gitignore b/paper_template/.gitignore
index 7599c732ad04af1c29d8147d121d9f3fe70ee86c..5504ab4b64f0476f77393d88b61806ab11a195a6 100644 (file)
--- a/paper_template/.gitignore
+++ b/paper_template/.gitignore
@@ -11,3 +11,5 @@
 /*.fdb_latexmk
 /*.fls
 /*.ttt
+/*.bcf
+/*.run.xml

diff --git a/paper_template/Makefile b/paper_template/Makefile
index 05b7746ee9c23498e008747df3c9daffdc3cc899..8e9b55415708759f0c8032df9fe8717db548a01b 100644 (file)
--- a/paper_template/Makefile
+++ b/paper_template/Makefile
@@ -7,19 +7,14 @@ all: $(patsubst %.tex,%.pdf,$(wildcard *.tex))
 # %.tex: %.Rnw
 #      Rscript -e "library(knitr); knit('$<')"
 
-refs-processed.bib: 
-       perl -p -e 's/©//' refs.bib > refs-processed.bib
-       perl -0pe 's/,\s+(file|abstract) = \{.*?\}(,\n|\n)/\2/sg' refs-processed.bib |sponge refs-processed.bib
-       recode -d u8..ltex < refs-processed.bib | sponge refs-processed.bib
-
-%.pdf: %.tex refs-processed.bib vc
+%.pdf: %.tex 
        latexmk -f -pdf $<
 
 clean: 
        latexmk -C *.tex
-       rm -f *.tmp
+       rm -f *.tmp *.run.xml
        rm -f vc
-       rm -f refs-processed.bib
+       rm -f *.bbl
        # the following lines are useful for Rnw/knitr
        # rm -rf cache/ figure/
        # rm -f *.tex
@@ -33,3 +28,4 @@ vc:
 pdf: all
 
 .PHONY: clean all
+# .PRECIOUS: %.tex

diff --git a/paper_template/mako-mem.sty b/paper_template/mako-mem.sty
index 5f80e40b8e63821d3888d7ae25fb8759a4b596c4..d8f9fd75ad6770055457b7d8d75140e99c1e877f 100644 (file)
--- a/paper_template/mako-mem.sty
+++ b/paper_template/mako-mem.sty
@@ -209,8 +209,8 @@
 \makepsmarks{mako-mem-git}{\@gitmarks}
 \makeevenhead{mako-mem-git}{}{}{\scshape\thepage}
 \makeoddhead{mako-mem-git}{}{}{\scshape\thepage}
-\makeevenfoot{mako-mem-git}{}{\texttt{\footnotesize{\textcolor{Blue}{git revision \VCRevision\ on \VCDateTEX}}}}{}
-\makeoddfoot{mako-mem-git}{}{\texttt{\footnotesize \textcolor{Blue}{git revision \VCRevision\ on \VCDateTEX}}}{}
+\makeevenfoot{mako-mem-git}{}{\texttt{\footnotesize{\textcolor{BrickRed}{git revision \VCRevision\ on \VCDateTEX}}}}{}
+\makeoddfoot{mako-mem-git}{}{\texttt{\footnotesize \textcolor{BrickRed}{git revision \VCRevision\ on \VCDateTEX}}}{}
 
 %% Create a command to make a note at the top of the first page describing the
 %% publication status of the paper. 

diff --git a/paper_template/text.tex b/paper_template/text.tex
index c3927cbb49b7f4a1fd1330ae8c311117a47abe55..ae03561be317a4a694b5a50f5b5bd145bb31cabb 100644 (file)
--- a/paper_template/text.tex
+++ b/paper_template/text.tex
@@ -8,8 +8,7 @@
 % with article-3 \chapterstyle, change to: \pagestyle{memo}
 \pagestyle{mako-mem}
 
-\usepackage{ucs}
-\usepackage[utf8x]{inputenc}
+\usepackage[utf8]{inputenc}
 
 \usepackage[T1]{fontenc}
 \usepackage{textcomp}
@@ -34,7 +33,19 @@
     urlcolor=Blue, unicode=true}
 
 % add bibliographic stuff 
-\usepackage[round]{natbib}
+% add bibliographic stuff 
+\usepackage[american]{babel}
+\usepackage{csquotes}
+\usepackage[natbib=true, style=apa, backend=biber]{biblatex}
+\addbibresource{refs.bib}
+\DeclareLanguageMapping{american}{american-apa}
+
+\defbibheading{secbib}[\bibname]{%
+  \section*{#1}%
+  \markboth{#1}{#1}%
+  \baselineskip 14.2pt%
+  \prebibhook}
+
 \def\citepos#1{\citeauthor{#1}'s (\citeyear{#1})}
 \def\citespos#1{\citeauthor{#1}' (\citeyear{#1})}
 
@@ -162,10 +173,8 @@ lazy dog.  The quick brown fox jumps over the lazy dog.  The quick brown
 fox jumps over the lazy dog \citep{989866}.
 
 % bibliography here
-\renewcommand{\bibsection}{\section{\bibname}\prebibhook}
-\baselineskip 14.2pt
-\bibliography{refs-processed}
-\bibliographystyle{apalike}
+\printbibliography[title = {References}, heading=secbib]
+
 
 \end{document}