diff --git a/make-includes/build_lecture_rules.make b/make-includes/build_lecture_rules.make index 0911f64..5d3703e 100644 --- a/make-includes/build_lecture_rules.make +++ b/make-includes/build_lecture_rules.make @@ -84,6 +84,17 @@ ################################################################################ # +# Alternate LaTeXs for Unicode vs. non-Unicode provessing. +# +ifdef UNICODE +LATEXCMD:=$(XELATEX) +else +LATEXCMD:=$(PDFLATEX) +endif + + +################################################################################ +# # Build everything. # all: slides notes figures figures2up combined @@ -112,8 +123,8 @@ slides: $(SLIDES_PREREQS) $(SLIDES).pdf: $(SLIDES).tex $(SLIDE_IMAGES) $(SLIDE_BACKGROUNDS) $(SLIDE_FILES) - $(PDFLATEX) --jobname=$(SLIDES) '\documentclass[$(LATEX_OPTS)]{lectureslides}\input{$(SLIDES)}' - $(PDFLATEX) --jobname=$(SLIDES) '\documentclass[$(LATEX_OPTS)]{lectureslides}\input{$(SLIDES)}' + $(LATEXCMD) --jobname=$(SLIDES) '\documentclass[$(LATEX_OPTS)]{lectureslides}\input{$(SLIDES)}' + $(LATEXCMD) --jobname=$(SLIDES) '\documentclass[$(LATEX_OPTS)]{lectureslides}\input{$(SLIDES)}' else @@ -136,8 +147,8 @@ slides-notes: slides-notes.pdf slides-notes.pdf: $(SLIDES).tex $(SLIDE_IMAGES) $(SLIDE_BACKGROUNDS) $(SLIDE_FILES) - $(PDFLATEX) --jobname=slides-notes '\documentclass[$(LATEX_OPTS),notes=onlyslideswithnotes]{lectureslides}\input{$(SLIDES)}' - $(PDFLATEX) --jobname=slides-notes '\documentclass[$(LATEX_OPTS),notes=onlyslideswithnotes]{lectureslides}\input{$(SLIDES)}' + $(LATEXCMD) --jobname=slides-notes '\documentclass[$(LATEX_OPTS),notes=onlyslideswithnotes]{lectureslides}\input{$(SLIDES)}' + $(LATEXCMD) --jobname=slides-notes '\documentclass[$(LATEX_OPTS),notes=onlyslideswithnotes]{lectureslides}\input{$(SLIDES)}' # # Build the slides with notes, 6-up. @@ -145,8 +156,8 @@ notes: $(NOTES).pdf $(NOTES).pdf: $(NOTES).tex slides-notes.pdf - $(PDFLATEX) $< - $(PDFLATEX) $< + $(LATEXCMD) $< + $(LATEXCMD) $< else @@ -180,8 +191,8 @@ slides-combined: slides-combined.pdf slides-combined.pdf: $(SLIDES).tex $(SLIDE_IMAGES) $(SLIDE_BACKGROUNDS) - $(PDFLATEX) --jobname=slides-combined '\documentclass[$(LATEX_OPTS),handout]{lectureslides}\input{$(SLIDES)}' - $(PDFLATEX) --jobname=slides-combined '\documentclass[$(LATEX_OPTS),handout]{lectureslides}\input{$(SLIDES)}' + $(LATEXCMD) --jobname=slides-combined '\documentclass[$(LATEX_OPTS),handout]{lectureslides}\input{$(SLIDES)}' + $(LATEXCMD) --jobname=slides-combined '\documentclass[$(LATEX_OPTS),handout]{lectureslides}\input{$(SLIDES)}' # # Build the complete combined document. @@ -189,8 +200,8 @@ combined: $(COMBINED).pdf $(COMBINED).pdf: $(COMBINED_PREREQS) $(COMBI_IMAGES) $(COMBI_FILES) - $(PDFLATEX) $< - $(PDFLATEX) $< + $(LATEXCMD) $< + $(LATEXCMD) $< else @@ -210,8 +221,8 @@ figures: $(FIGURES).pdf $(FIGURES).pdf: $(FIGURES).tex $(FIG_IMAGES) $(FIG_FILES) - $(PDFLATEX) $< - $(PDFLATEX) $< + $(LATEXCMD) $< + $(LATEXCMD) $< figures2up: $(FIGURES)-reduced.pdf @@ -291,6 +302,7 @@ @$(ECHO) "FIG_FILES = [$(FIG_FILES)]" @$(ECHO) "TIDY_FILES = [$(TIDY_FILES)]" @$(ECHO) "CLEAN_FILES = [$(CLEAN_FILES)]" + @$(ECHO) "LATEXCMD = [$(LATEXCMD)]" @$(ECHO) "DRAFT = [$(DRAFT)]" @$(ECHO) "LATEX_OPTS = [$(LATEX_OPTS)]" @$(ECHO) "SLIDES = [$(SLIDES)]"