updated makefile and .gitignore to us latexmk instead of rubber

[cdsc_tex.git] / paper_template / Makefile

diff --git a/paper_template/Makefile b/paper_template/Makefile
index b219b7283a5830c3bb8103e001bac6009333ba00..f03bafeb4af1994df459f7c44dba01a1ea1c972a 100644 (file)
--- a/paper_template/Makefile
+++ b/paper_template/Makefile
@@ -1,27 +1,35 @@
 #!/usr/bin/make
 
 all: $(patsubst %.tex,%.pdf,$(wildcard *.tex)) 
 #!/usr/bin/make
 
 all: $(patsubst %.tex,%.pdf,$(wildcard *.tex)) 

-pdf: all

 
 

-%.pdf: %.tex
-       perl -p -e 's/©//' refs.bib > refs-cleaned.bib
-       recode -d u8..ltex < refs-cleaned.bib > refs-processed.bib
-       rubber -fd $<
+# use the following section for Rnw/knitr documents
+# all: $(patsubst %.Rnw,%.pdf,$(wildcard *.Rnw))
+# %.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
+       latexmk -f -pdf $<

 
 clean: 
 
 clean: 

-       rubber -d --clean *.tex
+       latexmk -C *.tex

        rm -f *.tmp
        rm -f vc
        rm -f *.tmp
        rm -f vc

-       rm -f refs-cleaned.bib

        rm -f refs-processed.bib
        rm -f refs-processed.bib

+       # the following lines are useful for Rnw/knitr
+       # rm -rf cache/ figure/
+       # rm -f *.tex

 
 viewpdf: all
        evince *.pdf
 
 
 viewpdf: all
        evince *.pdf
 

-spell:
-       aspell -c -t --tex-check-comments -b text.tex
-

 vc:
        vc-git
 
 vc:
        vc-git
 

+pdf: all
+

 .PHONY: clean all
 .PHONY: clean all