From: <mako@atdot.cc>
Date: Thu, 18 May 2006 16:51:57 +0000 (-0400)
Subject: Merged in changes from the other main branch.
X-Git-Url: https://code.communitydata.science/cdsc_tex.git/commitdiff_plain/a1eaca457d4562c9413384e950a904e9533b2197?hp=04a022fc2646448d93505bace1c1ccee16ef9983

Merged in changes from the other main branch.
---

diff --git a/Makefile b/Makefile
index 9aefb24..990fa79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,24 @@
-all: dvi
+#!/usr/bin/make
 
-dvi: text.tex
-	cp text.tex backup.tex
-	latex text.tex
-	bibtex text 
-	latex text.tex
-	latex text.tex
+all: $(patsubst %.tex,%.pdf,$(wildcard *.tex)) 
 
-pdf: dvi
-	pdflatex text.tex
 
-viewpdf: pdf
-	evince text.pdf
+%.pdf: %.png
+	png2pdf -p 1.4 -a $< $@
+
+%.pdf: %.tex 
+	rubber -fd $<
 
-ps: dvi
-	dvips -f < text.dvi  > text.ps
+clean: 
+	rubber -d --clean *.tex
+	rm -f *.tmp
+	rm -f figures/*.pdf
 
-final: dvi
-	dvips -f < text.dvi > final.ps
+viewpdf: pdf
+	evince text.pdf
 
 spell:
 	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
diff --git a/text.tex b/text.tex
index 52a5b98..2a5b12b 100644
--- a/text.tex
+++ b/text.tex
@@ -4,6 +4,17 @@
 \usepackage[letterpaper,left=1.3in,right=1.3in,top=1.3in,bottom=1.3in]{geometry}
 \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}
 
 \pagestyle{fancy}
@@ -18,8 +29,7 @@
 \baselineskip 17.5pt
 
 \title{Title}
-\author{Benjamin Mako Hill\\
-mako@media.mit.edu}
+\author{Benjamin Mako Hill}
 \maketitle
 
 \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
 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
-fox jumps over the lazy dog.\cite{989866}.
-
-\bibliography{refs}
-\bibliographystyle{apalike}
+fox jumps over the lazy dog.
 
 \end{document}