From 2dabb156a1733ef1ecacc3c8e96925fa022e9804 Mon Sep 17 00:00:00 2001 From: Benjamin Mako Hill Date: Mon, 25 Jan 2016 08:58:09 -0800 Subject: [PATCH 1/3] make .tex files .PRECIOUS This is not necessary in the default arragement but it becomes important if/when we switch to having it be for Rnw/Rtex files. --- paper_template/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/paper_template/Makefile b/paper_template/Makefile index 05b7746..12f4232 100644 --- a/paper_template/Makefile +++ b/paper_template/Makefile @@ -33,3 +33,4 @@ vc: pdf: all .PHONY: clean all +# .PRECIOUS: %.tex From 31158d210fb825084dfdb15cc4e4798d4702dc93 Mon Sep 17 00:00:00 2001 From: Benjamin Mako Hill Date: Wed, 3 Feb 2016 11:28:58 -0800 Subject: [PATCH 2/3] updated color of git info to be red The previous blue was confusing because it looked like a hyperlink. --- paper_template/mako-mem.sty | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paper_template/mako-mem.sty b/paper_template/mako-mem.sty index 5f80e40..d8f9fd7 100644 --- 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. From 0e7100a49ee2a16878e527fee4e81d5a4b578723 Mon Sep 17 00:00:00 2001 From: Benjamin Mako Hill Date: Wed, 3 Aug 2016 15:53:11 -0400 Subject: [PATCH 3/3] updated to use biber/biblatex instead of bitex --- paper_template/.gitignore | 2 ++ paper_template/Makefile | 11 +++-------- paper_template/text.tex | 23 ++++++++++++++++------- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/paper_template/.gitignore b/paper_template/.gitignore index 7599c73..5504ab4 100644 --- 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 12f4232..8e9b554 100644 --- 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 diff --git a/paper_template/text.tex b/paper_template/text.tex index 2ae4f95..a59dfbd 100644 --- 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}