Merge branch 'groceryheist'

diff --git a/assignment_template/.gitignore b/assignment_template/.gitignore
new file mode 100644 (file)
index 0000000..5504ab4
--- /dev/null
+++ b/assignment_template/.gitignore
@@ -0,0 +1,15 @@
+/auto/
+/cache/
+/vc
+/refs-processed.bib
+/*.aux
+/*.bbl
+/*.blg
+/*.log
+/*.out
+/*.pdf
+/*.fdb_latexmk
+/*.fls
+/*.ttt
+/*.bcf
+/*.run.xml

diff --git a/assignment_template/HW1.tex b/assignment_template/HW1.tex
new file mode 100644 (file)
index 0000000..3f2ef6e
--- /dev/null
+++ b/assignment_template/HW1.tex
@@ -0,0 +1,67 @@
+\documentclass[12pt]{memoir}
+
+% article-1 and article-2 styles were originally based on kieran healy's
+% templates
+\usepackage{mako-mem}
+\chapterstyle{article-2}
+
+% with article-3 \chapterstyle, change to: \pagestyle{memo}
+\pagestyle{mako-mem}
+
+\usepackage[utf8]{inputenc}
+
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage[garamond]{mathdesign}
+
+\usepackage[letterpaper,left=1.65in,right=1.65in,top=1.3in,bottom=1.2in]{geometry}
+
+% packages i use in essentially every document
+\usepackage{graphicx}
+\usepackage{enumerate}
+
+% packages i use in many documents but leave off by default
+% \usepackage{amsmath, amsthm, amssymb}
+% \usepackage{dcolumn}
+% \usepackage{endfloat}
+
+% import and customize urls
+\usepackage[usenames,dvipsnames]{color}
+\usepackage[breaklinks]{hyperref}
+
+\hypersetup{colorlinks=true, linkcolor=Black, citecolor=Black, filecolor=Blue,
+    urlcolor=Blue, unicode=true}
+
+% add bibliographic stuff 
+% memoir function to take out of the space out of the whitespace lists
+\firmlists
+
+% LATEX NOTE: these lines will import vc stuff after running `make vc` which
+% will add version control information to the bottom of each page. This can be
+% useful for keeping track of which version of a document somebody has:
+% \input{vc}
+% \pagestyle{mako-mem-git}
+
+\begin{document}
+
+\setlength{\parskip}{4.5pt}
+% LATEX NOTE: Ideal linespacing is usually said to be between 120-140% the
+% typeface size. So, for 12pt (default in this document, we're looking for
+% somewhere between a 14.4-17.4pt \baselineskip.  Single; 1.5 lines; and Double
+% in MSWord are equivalent to ~117%, 175%, and 233%.
+
+\baselineskip 16pt
+
+\title{Title}
+\author{Nathan TeGrotenhuis\\
+        \href{mailto:nathante@uw.edu}{nathante@uw.edu}}
+\date{\today}
+
+\maketitle
+
+\section{Section}
+
+
+\end{document}
+
+%  LocalWords:  

diff --git a/assignment_template/Makefile b/assignment_template/Makefile
new file mode 100644 (file)
index 0000000..9d0527f
--- /dev/null
+++ b/assignment_template/Makefile
@@ -0,0 +1,28 @@
+#!/usr/bin/make
+
+all: $(patsubst %.tex,%.pdf,$(wildcard *.tex)) 
+
+# use the following section for Rnw/knitr documents
+# all: $(patsubst %.Rnw,%.pdf,$(wildcard *.Rnw))
+# %.tex: %.Rnw
+#      Rscript -e "library(knitr); knit('$<')"
+
+%.pdf: %.tex 
+       latexmk -f -pdf $<
+
+clean: 
+       latexmk -C *.tex
+       rm -f *.tmp *.run.xml
+       rm -f vc
+       rm -f *.bbl
+       # the following lines are useful for Rnw/knitr
+       # rm -rf cache/ figure/
+       # rm -f *.tex
+
+viewpdf: all
+       evince *.pdf
+
+pdf: all
+
+.PHONY: clean all
+# .PRECIOUS: %.tex

diff --git a/assignment_template/mako-mem.sty b/assignment_template/mako-mem.sty
new file mode 100644 (file)
index 0000000..d8f9fd7
--- /dev/null
+++ b/assignment_template/mako-mem.sty
@@ -0,0 +1,232 @@
+% Some article styles and page layout tweaks for the LaTeX Memoir class.
+%
+% 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
+
+% This file is heavily based on one by Kieran Healy
+% available here: http://github.com/kjhealy/latex-custom-kjh/
+
+\usepackage{lastpage}
+
+% blank footnote
+% Use \symbolfootnote[0]{Footnote text} for a blank footnote. 
+% Useful for initial acknowledgment note.
+\long\def\symbolfootnote[#1]#2{\begingroup%
+\def\thefootnote{\fnsymbol{footnote}}\footnote[#1]{#2}\endgroup}
+
+% put a period after the section numbers
+\setsecnumformat{\csname the#1\endcsname.\enspace}
+
+% >> article-1 << 
+\makechapterstyle{article-1}{
+ \renewcommand{\rmdefault}{ugm}
+ \renewcommand{\sfdefault}{phv}
+
+ \setsecheadstyle{\large\scshape}
+ \setsubsecheadstyle{\normalsize\itshape}
+ \renewcommand{\printchaptername}{}
+ \renewcommand{\chapternamenum}{}
+ \renewcommand{\chapnumfont}{\chaptitlefont}
+ \renewcommand{\printchapternum}{\chapnumfont \thechapter\space}
+ \renewcommand{\afterchapternum}{}
+ \renewcommand{\printchaptername}{\secheadstyle}
+ \renewcommand{\cftchapterfont}{\normalfont}
+ \renewcommand{\cftchapterpagefont}{\normalfont\scshape}
+ \renewcommand{\cftchapterpresnum}{\scshape}
+ \captiontitlefont{\small}
+ 
+ % turn off chapter numbering
+ \counterwithout{section}{chapter}
+ \counterwithout{figure}{chapter}
+ \counterwithout{table}{chapter}
+ 
+ % reduce skip after section heading
+ \setaftersecskip{1.2ex}
+ 
+ \pretitle{\newline\centering \LARGE\scshape \MakeLowercase }
+ \posttitle{\par\vskip 1em}
+ \predate{\footnotesize \centering}
+ \postdate{\par\vskip 1em}
+ 
+ % 'abstract' title, bigger skip from title
+ \renewcommand{\abstractname}{}
+ \abstractrunin
+
+% set name of bibliography to 'references'
+\renewcommand{\bibname}{References}
+}
+
+% >> article-2 <<
+\makechapterstyle{article-2}{
+ \renewcommand{\rmdefault}{ugm}
+ \renewcommand{\sfdefault}{phv}
+
+ \setsecheadstyle{\large\scshape} 
+ \setsubsecheadstyle{\normalsize\itshape} 
+ \setaftersubsubsecskip{-1em}
+ \setsubsubsecheadstyle{\bfseries}
+ \renewcommand{\printchaptername}{} 
+ \renewcommand{\chapternamenum}{} 
+ \renewcommand{\chapnumfont}{\chaptitlefont} 
+ \renewcommand{\printchapternum}{\chapnumfont \thechapter\space} 
+ \renewcommand{\afterchapternum}{} 
+ \renewcommand{\printchaptername}{\secheadstyle}
+ \renewcommand{\cftchapterfont}{\normalfont} 
+ \renewcommand{\cftchapterpagefont}{\normalfont\scshape} 
+ \renewcommand{\cftchapterpresnum}{\scshape} 
+ \captiontitlefont{\small}
+ 
+ % turn off chapter numbering
+ \counterwithout{section}{chapter}
+ \counterwithout{figure}{chapter}
+ \counterwithout{table}{chapter}
+ 
+ % supress chapter numbers 
+ \maxsecnumdepth{chapter} 
+ \setsecnumdepth{chapter}
+ 
+ % for numbered sections and subsections:
+ % (a) comment out the above stanza; (b) uncomment the one below
+ % \maxsecnumdepth{subsection} 
+ % \setsecnumdepth{subsection}
+
+ % reduce skip after section heading
+ \setaftersecskip{1.7ex}
+ 
+ % Title flush left
+ \pretitle{\flushleft\LARGE \itshape}
+ \posttitle{\par\vskip 0.5em}
+ \preauthor{\flushleft  \large \lineskip 1em}
+ \postauthor{\par\lineskip 1em}
+ \predate{\flushleft\footnotesize\vspace{0.65em}}
+ \postdate{\par\vskip 1em}
+ 
+ % 'abstract' title, bigger skip from title
+ \renewcommand{\abstractname}{Abstract:}
+ \renewcommand{\abstractnamefont}{\normalfont\small\bfseries}
+ \renewcommand{\abstracttextfont}{\normalfont\small}
+ \setlength{\absparindent}{0em}
+ \setlength{\abstitleskip}{-1.5em}
+ \abstractrunin
+
+ % set name of bibliography to 'references'
+ \renewcommand{\bibname}{References}
+}
+
+
+% >> article-3 <<
+\makechapterstyle{article-3}{
+ \renewcommand{\rmdefault}{ugm}
+ \renewcommand{\sfdefault}{phv}
+
+ \setsecheadstyle{\large\sffamily\bfseries\MakeUppercase} 
+ \setsubsecheadstyle{\normalsize\itshape} 
+ \setaftersubsubsecskip{-1em}
+ \setsubsubsecheadstyle{\small\bfseries}
+ \renewcommand{\printchaptername}{} 
+ \renewcommand{\chapternamenum}{} 
+ \renewcommand{\chapnumfont}{\chaptitlefont} 
+ \renewcommand{\printchapternum}{\chapnumfont \thechapter\space} 
+ \renewcommand{\afterchapternum}{} 
+ \renewcommand{\printchaptername}{\secheadstyle}
+ \renewcommand{\cftchapterfont}{\normalfont} 
+ \renewcommand{\cftchapterpagefont}{\normalfont\scshape} 
+ \renewcommand{\cftchapterpresnum}{\scshape} 
+ \captiontitlefont{\small}
+
+ % turn off chapter numbering
+ \counterwithout{section}{chapter}
+ \counterwithout{figure}{chapter}
+ \counterwithout{table}{chapter}
+ 
+ % supress chapter numbers 
+ \maxsecnumdepth{chapter} 
+ \setsecnumdepth{chapter}
+
+ % reduce skip after section heading
+ \setaftersecskip{1pt}
+ \setbeforesecskip{-1em}
+ 
+ % 'abstract' title, bigger skip from title
+ % \renewcommand{\maketitle}{\{\preauthor \theauthor\} \hfill \thetitle}
+ \renewcommand{\maketitle}{
+    {\Large\sffamily\bfseries\MakeUppercase\thetitle} \hfill
+    {\Large\sffamily\MakeUppercase\theauthor}
+    \vskip 0.7em}
+ \renewcommand{\abstractname}{\normalfont\scriptsize\noindent}
+ \renewcommand{\abstracttextfont}{\normalfont\scriptsize}
+ \abstractrunin
+
+ % set name of bibliography to 'references'
+ \renewcommand{\bibname}{References}
+
+ \parindent 0pt
+
+}
+
+%%% Custom styles for headers and footers
+%%% Basic 
+\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{%
+      \ifnum \c@secnumdepth >\m@ne
+        \if@mainmatter
+          \thechapter. \ %
+        \fi
+      \fi
+      ##1}{}}
+  \def\sectionmark##1{%
+    \markright{##1}}
+}
+\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
+\makepagestyle{mako-mem-git}
+\newcommand{\@gitmarks}{%
+  \let\@mkboth\markboth
+  \def\chaptermark##1{%
+    \markboth{%
+      \ifnum \c@secnumdepth >\m@ne
+        \if@mainmatter
+          \thechapter. \ %
+        \fi
+      \fi
+      ##1}{}}
+  \def\sectionmark##1{%
+    \markright{##1}}
+}
+\makepsmarks{mako-mem-git}{\@gitmarks}
+\makeevenhead{mako-mem-git}{}{}{\scshape\thepage}
+\makeoddhead{mako-mem-git}{}{}{\scshape\thepage}
+\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. 
+\newcommand{\published}[1]{% 
+   \gdef\puB{#1}} 
+   \newcommand{\puB}{} 
+   \renewcommand{\maketitlehooka}{% 
+       \par\noindent\footnotesize \puB} 
+
+\makepagestyle{memo}
+\makeevenhead{memo}{}{}{}
+\makeoddhead{memo}{}{}{}
+
+\makeevenfoot{memo}{}{\scshape \thepage/\pageref{LastPage}}{}
+\makeoddfoot{memo}{}{\scshape \thepage/\pageref{LastPage}}{}
+
+
+\endinput
+

diff --git a/assignment_template/text.tex b/assignment_template/text.tex
new file mode 100644 (file)
index 0000000..b8e6ea1
--- /dev/null
+++ b/assignment_template/text.tex
@@ -0,0 +1,67 @@
+\documentclass[12pt]{memoir}
+
+% article-1 and article-2 styles were originally based on kieran healy's
+% templates
+\usepackage{mako-mem}
+\chapterstyle{article-2}
+
+% with article-3 \chapterstyle, change to: \pagestyle{memo}
+\pagestyle{mako-mem}
+
+\usepackage[utf8]{inputenc}
+
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+\usepackage[garamond]{mathdesign}
+
+\usepackage[letterpaper,left=1.65in,right=1.65in,top=1.3in,bottom=1.2in]{geometry}
+
+% packages i use in essentially every document
+\usepackage{graphicx}
+\usepackage{enumerate}
+
+% packages i use in many documents but leave off by default
+% \usepackage{amsmath, amsthm, amssymb}
+% \usepackage{dcolumn}
+% \usepackage{endfloat}
+
+% import and customize urls
+\usepackage[usenames,dvipsnames]{color}
+\usepackage[breaklinks]{hyperref}
+
+\hypersetup{colorlinks=true, linkcolor=Black, citecolor=Black, filecolor=Blue,
+    urlcolor=Blue, unicode=true}
+
+% add bibliographic stuff 
+% memoir function to take out of the space out of the whitespace lists
+\firmlists
+
+% LATEX NOTE: these lines will import vc stuff after running `make vc` which
+% will add version control information to the bottom of each page. This can be
+% useful for keeping track of which version of a document somebody has:
+% \input{vc}
+% \pagestyle{mako-mem-git}
+
+\begin{document}
+
+\setlength{\parskip}{4.5pt}
+% LATEX NOTE: Ideal linespacing is usually said to be between 120-140% the
+% typeface size. So, for 12pt (default in this document, we're looking for
+% somewhere between a 14.4-17.4pt \baselineskip.  Single; 1.5 lines; and Double
+% in MSWord are equivalent to ~117%, 175%, and 233%.
+
+\baselineskip 16pt
+
+\title{Title}
+\author{Nathan TeBlunthuis\\
+        \href{mailto:nathante@uw.edu}{nathante@uw.edu}}
+\date{\today}
+
+\maketitle
+
+\section{Section}
+
+
+\end{document}
+
+%  LocalWords:  

diff --git a/new_tex_assignment b/new_tex_assignment
new file mode 100755 (executable)
index 0000000..e8858e1
--- /dev/null
+++ b/new_tex_assignment
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Helper script to export LaTeX templates for new documents
+# Copyright (c) 2009-2016 Benjamin Mako Hill <mako@atdot.cc>
+# Released under the GPLv3 or later.
+
+CURDIR=$(pwd)
+TMPDIR=$(mktemp -d)
+
+if test $1
+then
+    cd "$HOME/tex/latex_mako"
+    git archive --format=tar HEAD assignment_template|tar x --strip=1 -C "$TMPDIR"
+    cd "$CURDIR"
+
+    # get rid of paper_template subdir
+    mv "$TMPDIR" "$1"
+    cd "$1";
+    mv "text.tex" "$1.tex"
+else
+    echo "specifiy a directory where the template should go";
+fi

diff --git a/paper_template/Makefile b/paper_template/Makefile
index 8e9b55415708759f0c8032df9fe8717db548a01b..0bca5740262c882c4324015fee6d543b687f1a61 100644 (file)
--- a/paper_template/Makefile
+++ b/paper_template/Makefile
@@ -22,8 +22,7 @@ clean:
 viewpdf: all
        evince *.pdf
 
-vc:
-       resources/vc-git
+vc:    resources/vc-git
 
 pdf: all
 

diff --git a/paper_template/text.tex b/paper_template/text.tex
index e3f7f1d877ac8e0bfcb4a3c1e17520c6472addf8..ec7173d563c126bbbe89362a4987f0f6f6b06c98 100644 (file)
--- a/paper_template/text.tex
+++ b/paper_template/text.tex
@@ -9,7 +9,7 @@
 \pagestyle{mako-mem}
 
 \usepackage[utf8]{inputenc}
-
+\usepackage{wrapfig}
 \usepackage[T1]{fontenc}
 \usepackage{textcomp}
 \usepackage[garamond]{mathdesign}
@@ -80,8 +80,8 @@
 \baselineskip 16pt
 
 \title{Title}
-\author{Benjamin Mako Hill\\
-        \href{mailto:makohill@uw.edu}{makohill@uw.edu}}
+\author{Nathan TeBlunthuis\\
+        \href{mailto:nathante@uw.edu}{nathante@uw.edu}}
 \date{}
 
 \published{\textsc{\textcolor{BrickRed}{This document is an
@@ -184,6 +184,7 @@ lazy dog.  The quick brown fox jumps over the lazy dog.  The quick brown
 fox jumps over the lazy dog \citep{989866}.
 
 % bibliography here
+\setcounter{biburlnumpenalty}{9001}
 \printbibliography[title = {References}, heading=secbib]