From 6780b92dd4448be18a2e162edba8246550bcfbec Mon Sep 17 00:00:00 2001 From: knarf Date: Mon, 2 Feb 2009 20:40:53 +0000 Subject: fix pdf for ThornGuide, for the moment ignoring internal page link warnings git-svn-id: http://svn.cactuscode.org/flesh/trunk@4536 17b73243-c579-4c4c-a9d2-2d5706c11dac --- doc/ThornGuide/Makefile | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) (limited to 'doc/ThornGuide') diff --git a/doc/ThornGuide/Makefile b/doc/ThornGuide/Makefile index 24f204ab..0d59b299 100644 --- a/doc/ThornGuide/Makefile +++ b/doc/ThornGuide/Makefile @@ -1,7 +1,5 @@ -# make (defaults to ThornGuide.ps) +# make (defaults to ThornGuide.pdf) # make ThornGuide.tex -# make ThornGuide.dvi -# make ThornGuide.ps # make ThornGuide.pdf # make THORNS="CactusWave/IDScalarWave,CactusWave/WaveToyF77" ARRANGEMENTS="CactusBase,CactusPUGHIO" @@ -33,33 +31,26 @@ ifeq ($(strip $(MASTER_FILE)), ) MASTER_FILE=ThornGuide endif -IMAGE_FILE=$(CCTK_HOME)/doc/UsersGuide/bincactus2.eps +IMAGE_FILE=$(CCTK_HOME)/doc/UsersGuide/bincactus2.pdf -include make.thornlist .PHONY: default -default : $(MASTER_FILE).ps +default : $(MASTER_FILE).pdf -$(MASTER_FILE).ps: $(MASTER_FILE).dvi - @echo " Converting $< to PostScript ...." - dvips -f $< 2> LOG_DVIPS_MSGS | $(CCTK_HOME)/lib/sbin/FixPageNumbersInPostscript.pl > $@ - if ! test -e "$@"; then \ - echo " Cannot find $@, an error must have occured."; \ - fi - -$(MASTER_FILE).dvi: $(MASTER_FILE).tex +$(MASTER_FILE).pdf: $(MASTER_FILE).tex @echo " LaTeXing $<...." # Fall through any latex errors so as to print sensible error message - -latex --interaction errorstopmode $< < /dev/null 2>&1 > LOG_LATEX_FULL_MSGS - -latex $< < /dev/null 2>&1 > LOG_LATEX_FULL_MSGS - -latex $< < /dev/null 2>&1 | tee LOG_LATEX_FULL_MSGS | grep -v Underfull | grep -v Overfull | grep -v OT1 > LOG_LATEX_MSGS + -pdflatex --interaction errorstopmode $< < /dev/null 2>&1 > LOG_LATEX_FULL_MSGS + -pdflatex $< < /dev/null 2>&1 > LOG_LATEX_FULL_MSGS + -pdflatex $< < /dev/null 2>&1 | tee LOG_LATEX_FULL_MSGS | grep -v Underfull | grep -v Overfull | grep -v OT1 > LOG_LATEX_MSGS if test -e "$@"; then \ - if grep "^\! " "LOG_LATEX_FULL_MSGS"; then \ + if grep "^\! " "LOG_LATEX_FULL_MSGS" | grep -v "destination with the same identifier"; then \ echo " Problem in $<. See $(DOCBUILDDIR)/LOG_LATEX_* ."; \ exit 1; \ - elif grep "^LaTeX Warning:" "LOG_LATEX_FULL_MSGS"; then \ + elif grep "^LaTeX Warning:" "LOG_LATEX_FULL_MSGS" | grep -v "destination with the same identifier"; then \ echo " Warnings in $<. See $(DOCBUILDDIR)/LOG_LATEX_* ."; \ exit 0; \ fi; \ @@ -67,14 +58,6 @@ $(MASTER_FILE).dvi: $(MASTER_FILE).tex echo " Cannot find $@, an error must have occured."; \ fi -$(MASTER_FILE).pdf: $(MASTER_FILE).dvi - @echo " Running dvipdf on $<...." - -dvipdf $< < /dev/null 2>&1 > LOG_DVIPDF_MSGS - if test ! -e "$@"; then \ - echo " Problem in $<. See doc/ThornGuide/build/LOG_DVIPDF_MSGS."; \ - exit 1; \ - fi - $(MASTER_FILE).tex: $(foreach thorn, $(THORN_DEPENDENCIES), $(thorn)/param.ccl $(thorn)/interface.ccl $(thorn)/schedule.ccl) $(THORNLIST) @echo " Gathering documentation from thorn ccl files" @echo " Processing...." @@ -86,7 +69,7 @@ $(MASTER_FILE).tex: $(foreach thorn, $(THORN_DEPENDENCIES), $(thorn)/param.ccl $(PERL) -s $(CCTK_HOME)/lib/sbin/SchedLatex.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -section > LOG_SCHEDLATEX_MSGS 2>&1 @echo " Creating $@...." $(PERL) -s $(CCTK_HOME)/lib/sbin/ThornGuide.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -outfile=$(MASTER_FILE).tex -tocdepth=$(TOCDEPTH) > LOG_THORNGUIDE_MSGS 2>&1 - if test -e $(IMAGE_FILE) && test ! -e "bincactus2.eps"; then \ + if test -e $(IMAGE_FILE) && test ! -e "bincactus2.pdf"; then \ cp $(IMAGE_FILE) .; \ fi -- cgit v1.2.3