From f2c3f8bf902d2b89cc798831463133ed51783b22 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 16 Jun 2016 15:13:59 +0000 Subject: [PATCH] tex.mk: Fix document class options replacement - Fix document class options replacement - Use -draftmode on first compilation runs Signed-off-by: Jan Lindemann --- make/tex.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/make/tex.mk b/make/tex.mk index 9d37ace2..ffd42610 100644 --- a/make/tex.mk +++ b/make/tex.mk @@ -153,11 +153,11 @@ DOCUMENT_CLASS = article endif ifeq ($(BEAMER_HANDOUT),true) -BEAMER_HANDOUT_OPTION += handout +DOCUMENT_CLASS_OPTIONS += ,handout endif ifneq ($(BEAMER_ASPECTRATIO),) -BEAMER_HANDOUT_OPTION += aspectratio=$(BEAMER_ASPECTRATIO) +DOCUMENT_CLASS_OPTIONS += ,aspectratio=$(BEAMER_ASPECTRATIO) endif define mangle_tmpl @@ -187,7 +187,8 @@ define mangle_tmpl s%__DOCUMENT_CLASS__%$(DOCUMENT_CLASS)%g; \ s%__UPLOAD_MODULE_PATH__%$(UPLOAD_MODULE_PATH)%g; \ s%__UPLOAD_TEST_PREFIX__%$(UPLOAD_TEST_PREFIX)%g; \ - s%__HANDOUT__%$(BEAMER_HANDOUT_OPTION)%g; \ + s%__DOCUMENT_CLASS_OPTIONS__%$(DOCUMENT_CLASS_OPTIONS)%g; \ + s%__ANIMATION_FRAMES__%$(BEAMER_ANIMATION_FRAMES)%g; \ s%ä%\\\\\"a%g; \ s%Ä%\\\\\"A%g; \ s%ö%\\\\\"o%g; \ @@ -373,7 +374,11 @@ $(OUT).html.zip: $(HTMLDIR) $(OUTPUT).pdf: $(GENERATED) @echo "-- creating pdf file" - @for i in $(COMPILATION_RUN_NAMES) ; do echo "================================================================== pass $$i: running $(PDFLATEX) $(MAIN).tex"; $(PDFLATEX) $(MAIN).tex || exit 1; done + @for i in $(COMPILATION_RUN_NAMES) ; do \ + if [ $$i != $(lastword $(COMPILATION_RUN_NAMES)) ]; then dm="-draftmode"; else dm=""; fi ;\ + echo ================================================================== pass $$i: running $(PDFLATEX) $$dm $(MAIN).tex ;\ + $(PDFLATEX) $$dm $(MAIN).tex || exit 1 ;\ + done @mv $(MAIN).pdf $(OUTPUT).pdf $(OUT).pdf.zip: $(OUTPUT).pdf