From 3477c053a2032d429fe995f9a66b3e801dcd3812 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 Jan 2017 22:09:20 +0000 Subject: latex-make (9jan17) git-svn-id: svn://tug.org/texlive/trunk@42914 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/support/latex-make/LaTeX.mk | 20 ++++++++++++++++++-- Master/texmf-dist/doc/support/latex-make/README | 2 +- .../texmf-dist/doc/support/latex-make/figlatex.pdf | Bin 223519 -> 223579 bytes .../doc/support/latex-make/latex-make.pdf | Bin 340340 -> 341373 bytes .../doc/support/latex-make/texdepends.pdf | Bin 261812 -> 261864 bytes 5 files changed, 19 insertions(+), 3 deletions(-) (limited to 'Master/texmf-dist/doc/support/latex-make') diff --git a/Master/texmf-dist/doc/support/latex-make/LaTeX.mk b/Master/texmf-dist/doc/support/latex-make/LaTeX.mk index 243c06ad6db..ddd8310413b 100644 --- a/Master/texmf-dist/doc/support/latex-make/LaTeX.mk +++ b/Master/texmf-dist/doc/support/latex-make/LaTeX.mk @@ -52,6 +52,7 @@ export LU_UTILS ifdef VERB MAK_VERB := $(VERB) else +#MAK_VERB := debug #MAK_VERB := verbose #MAK_VERB := normal MAK_VERB := quiet @@ -60,6 +61,14 @@ endif #--------------------------------------------------------------------- # MAK_VERB -> verbosity +ifeq ($(MAK_VERB),debug) +COMMON_PREFIX = echo " ======> building " $@ "<======" ; \ + printf "%s $(@F) due to:$(foreach file,$?,\n * $(file))\n" $1; set -x; +# +COMMON_HIDE := set -x; +COMMON_CLEAN := set -x; +SHOW_LATEX:=true +else ifeq ($(MAK_VERB),verbose) COMMON_PREFIX = echo " ======> building " $@ "<======" ; \ printf "%s $(@F) due to:$(foreach file,$?,\n * $(file))\n" $1; @@ -88,6 +97,7 @@ SHOW_LATEX:= endif endif endif +endif #--------------------------------------------------------------------- # Old LaTeX have limitations @@ -390,6 +400,7 @@ endef # Globals variables $(eval $(call lu-setvar-global,LATEX,latex)) $(eval $(call lu-setvar-global,PDFLATEX,pdflatex)) +$(eval $(call lu-setvar-global,LUALATEX,lualatex)) $(eval $(call lu-setvar-global,DVIPS,dvips)) $(eval $(call lu-setvar-global,DVIPDFM,dvipdfm)) $(eval $(call lu-setvar-global,BIBTEX,bibtex)) @@ -494,6 +505,11 @@ define lu-define-flavor-PDF # .pdftex_t .$$(_LU_PDFTEX_EXT))) endef +define lu-define-flavor-LUALATEX # + $$(eval $$(call lu-create-flavor,LUALATEX,tex,LUALATEX,.pdf,pdf,\ + .pdftex_t .$$(_LU_PDFTEX_EXT))) +endef + define lu-define-flavor-PS # $$(eval $$(call lu-create-flavor,PS,dvi,DVIPS,.ps,ps,DVI)) endef @@ -544,7 +560,7 @@ define _lu-do-latex # 1:master 2:flavor 3:source.tex 4:ext(.dvi/.pdf) if [ ! -f "$(1)$(4).mk" ]; then \ NO_TEXDEPENDS_FILE=1 ;\ fi ;\ - sed -e 's,\\openout[0-9]* = `\(.*\)'"'.,TD_$(1)$(4)_OUTPUTS += \1,p;d" \ + sed -e 's,\\openout[0-9]* = \([^`].*\),TD_$(1)$(4)_OUTPUTS += \1,p;s,\\openout[0-9]* = `\(.*\)'"'.,TD_$(1)$(4)_OUTPUTS += \1,p;d" \ "$(1).log" >> "$(1)$(4).mk" ;\ if [ -f "$(1)$(4)_FAILED" ]; then \ echo "*************************************" ;\ @@ -654,7 +670,7 @@ define lu-master-texflavor-rules # MASTER FLAVOR ext(.dvi/.pdf) $$(warning *********************************) \ $$(warning *********************************) \ $$(warning Stopping generation of $$@) \ - $$(warning I got max recursion level $$(LU_$(1)_$(2)_MAX_REC)) \ + $$(warning I got max recursion level $$(call lu-getvalue,MAX_REC,$(1),$(2))) \ $$(warning Set LU_$(1)_$(2)_MAX_REC, LU_MAX_REC_$(1) or LU_MAX_REC if you need it) \ $$(warning *********************************) \ $$(warning *********************************) \ diff --git a/Master/texmf-dist/doc/support/latex-make/README b/Master/texmf-dist/doc/support/latex-make/README index a6be56377f6..73ccc6fb47f 100644 --- a/Master/texmf-dist/doc/support/latex-make/README +++ b/Master/texmf-dist/doc/support/latex-make/README @@ -2,7 +2,7 @@ | The LaTeX-Make system | +------------------------------+ -VERSION: 2.2.2 +VERSION: 2.2.3 DESCRIPTION =========== diff --git a/Master/texmf-dist/doc/support/latex-make/figlatex.pdf b/Master/texmf-dist/doc/support/latex-make/figlatex.pdf index 06338a4b750..d8839dbfb7d 100644 Binary files a/Master/texmf-dist/doc/support/latex-make/figlatex.pdf and b/Master/texmf-dist/doc/support/latex-make/figlatex.pdf differ diff --git a/Master/texmf-dist/doc/support/latex-make/latex-make.pdf b/Master/texmf-dist/doc/support/latex-make/latex-make.pdf index a09cb6806e2..61433d837c4 100644 Binary files a/Master/texmf-dist/doc/support/latex-make/latex-make.pdf and b/Master/texmf-dist/doc/support/latex-make/latex-make.pdf differ diff --git a/Master/texmf-dist/doc/support/latex-make/texdepends.pdf b/Master/texmf-dist/doc/support/latex-make/texdepends.pdf index 03e34655009..67cde9454d0 100644 Binary files a/Master/texmf-dist/doc/support/latex-make/texdepends.pdf and b/Master/texmf-dist/doc/support/latex-make/texdepends.pdf differ -- cgit v1.2.3