17
0

Merged in changes from the other main branch.

This commit is contained in:
<mako@atdot.cc> 1147971117 -0400 0001-01-01 00:00:00 +00:00
commit a1eaca457d
2 changed files with 27 additions and 24 deletions

View File

@ -1,28 +1,24 @@
all: dvi #!/usr/bin/make
dvi: text.tex all: $(patsubst %.tex,%.pdf,$(wildcard *.tex))
cp text.tex backup.tex
latex text.tex
bibtex text
latex text.tex
latex text.tex
pdf: dvi
pdflatex text.tex %.pdf: %.png
png2pdf -p 1.4 -a $< $@
%.pdf: %.tex
rubber -fd $<
clean:
rubber -d --clean *.tex
rm -f *.tmp
rm -f figures/*.pdf
viewpdf: pdf viewpdf: pdf
evince text.pdf evince text.pdf
ps: dvi
dvips -f < text.dvi > text.ps
final: dvi
dvips -f < text.dvi > final.ps
spell: spell:
aspell -c -t --tex-check-comments -b text.tex aspell -c -t --tex-check-comments -b text.tex
clean:
cp text.tex backup.tex
rm -f text.{blg,bbl,aux,log,dvi,toc,tex.bak,txt,tex~,ps,pdf} warnings
.PHONY: clean all

View File

@ -4,6 +4,17 @@
\usepackage[letterpaper,left=1.3in,right=1.3in,top=1.3in,bottom=1.3in]{geometry} \usepackage[letterpaper,left=1.3in,right=1.3in,top=1.3in,bottom=1.3in]{geometry}
\usepackage{fancyhdr} \usepackage{fancyhdr}
\newcommand{\titleref}[1]{\textsl{#1}}
\newenvironment{narrow}[2]{%
\begin{list}{}{%
\setlength{\topsep}{0pt}%
\setlength{\leftmargin}{#1}%
\setlength{\rightmargin}{#2}%
\setlength{\listparindent}{0pt}%
\setlength{\itemindent}{0pt}%
\setlength{\parsep}{\parskip}}%
\item[]}{\end{list}}
\begin{document} \begin{document}
\pagestyle{fancy} \pagestyle{fancy}
@ -18,8 +29,7 @@
\baselineskip 17.5pt \baselineskip 17.5pt
\title{Title} \title{Title}
\author{Benjamin Mako Hill\\ \author{Benjamin Mako Hill}
mako@media.mit.edu}
\maketitle \maketitle
\section{Section} \section{Section}
@ -30,10 +40,7 @@ quick brown fox jumps over the lazy dog. The quick brown fox jumps over
the lazy dog. The quick brown fox jumps over the lazy dog. The quick the lazy dog. The quick brown fox jumps over the lazy dog. The quick
brown fox jumps over the lazy dog. The quick brown fox jumps over the brown fox jumps over the lazy dog. The quick brown fox jumps over the
lazy dog. The quick brown fox jumps over the lazy dog. The quick brown lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
fox jumps over the lazy dog.\cite{989866}. fox jumps over the lazy dog.
\bibliography{refs}
\bibliographystyle{apalike}
\end{document} \end{document}