diff options
author | Karl Berry <karl@freefriends.org> | 2017-01-09 22:09:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-01-09 22:09:20 +0000 |
commit | 3477c053a2032d429fe995f9a66b3e801dcd3812 (patch) | |
tree | 9c95652f4aa0a56325101f6d5fdd855ce1a7b4fa /Master | |
parent | 26195deb05135a4a0a01b5afdb302db2ead80657 (diff) |
latex-make (9jan17)
git-svn-id: svn://tug.org/texlive/trunk@42914 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/support/latex-make/LaTeX.mk | 20 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/latex-make/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/latex-make/figlatex.pdf | bin | 223519 -> 223579 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/latex-make/latex-make.pdf | bin | 340340 -> 341373 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/latex-make/texdepends.pdf | bin | 261812 -> 261864 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/support/latex-make/figlatex.dtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/support/latex-make/latex-make.dtx | 38 | ||||
-rw-r--r-- | Master/texmf-dist/source/support/latex-make/pdfswitch.dtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/support/latex-make/texdepends.dtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/latex-make/figlatex.cfg | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/latex-make/figlatex.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/latex-make/texdepends.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/latex-make/texgraphicx.sty | 2 |
14 files changed, 61 insertions, 15 deletions
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 Binary files differindex 06338a4b750..d8839dbfb7d 100644 --- a/Master/texmf-dist/doc/support/latex-make/figlatex.pdf +++ b/Master/texmf-dist/doc/support/latex-make/figlatex.pdf diff --git a/Master/texmf-dist/doc/support/latex-make/latex-make.pdf b/Master/texmf-dist/doc/support/latex-make/latex-make.pdf Binary files differindex a09cb6806e2..61433d837c4 100644 --- a/Master/texmf-dist/doc/support/latex-make/latex-make.pdf +++ b/Master/texmf-dist/doc/support/latex-make/latex-make.pdf diff --git a/Master/texmf-dist/doc/support/latex-make/texdepends.pdf b/Master/texmf-dist/doc/support/latex-make/texdepends.pdf Binary files differindex 03e34655009..67cde9454d0 100644 --- a/Master/texmf-dist/doc/support/latex-make/texdepends.pdf +++ b/Master/texmf-dist/doc/support/latex-make/texdepends.pdf diff --git a/Master/texmf-dist/source/support/latex-make/figlatex.dtx b/Master/texmf-dist/source/support/latex-make/figlatex.dtx index 630ec9ac8b5..94da37c08e0 100644 --- a/Master/texmf-dist/source/support/latex-make/figlatex.dtx +++ b/Master/texmf-dist/source/support/latex-make/figlatex.dtx @@ -28,7 +28,7 @@ %<compat> \ProvidesPackage{texgraphicx}% % \fi % \ProvidesFile{figlatex.dtx} -[2016/02/09 v2.2.2 include fig and svg in LaTeX] +[2017/01/08 v2.2.3 include fig and svg in LaTeX] % \iffalse %<*driver> \documentclass{ltxdoc} diff --git a/Master/texmf-dist/source/support/latex-make/latex-make.dtx b/Master/texmf-dist/source/support/latex-make/latex-make.dtx index 522c89f7ccf..3b07ae5c60c 100644 --- a/Master/texmf-dist/source/support/latex-make/latex-make.dtx +++ b/Master/texmf-dist/source/support/latex-make/latex-make.dtx @@ -2,7 +2,7 @@ % %<*dtx> \ProvidesFile{latex-make.dtx} -[2016/02/09 v2.2.2 Makefile for LaTeX] +[2017/01/08 v2.2.3 Makefile for LaTeX] %</dtx> % \fi % \iffalse @@ -101,12 +101,16 @@ % documents with the help of a Makefile. Dependencies are % automatically tracked with the help of the |texdepends.sty| package. % \end{abstract} -% \CheckSum{323} +% \CheckSum{332} % % \changes{v2.0.0}{2006/03/09}{First autocommented version} % \changes{v2.1.0}{2008/01/28}{That's the question} % \changes{v2.1.1}{2009/11/08}{Improve error message} % \changes{v2.1.2}{2012/03/17}{Switch from perl to python} +% \changes{v2.2.0}{2016/02/08}{Support to install LaTeX-Make locally} +% \changes{v2.2.1}{2016/02/09}{Improve configure} +% \changes{v2.2.2}{2016/02/09}{Fix bugs} +% \changes{v2.2.3}{2017/01/08}{Add LuaLaTeX support} % % \makeatletter % \def\SpecialOptionIndex#1{\@bsphack @@ -289,6 +293,8 @@ % \hline % PDF & & PDFLATEX & |.tex| $\Rightarrow$ |.pdf| \\ % \hline +% LUALATEX & & LUALATEX & |.tex| $\Rightarrow$ |.pdf| \\ +% \hline % DVIPDF & DVI & DVIPDFM & |.dvi| $\Rightarrow$ |.pdf| \\ % \hline % \end{tabular} @@ -422,6 +428,14 @@ % endef % \end{source} % +% \paragraph{LuaLaTeX flavor} +% \begin{source}[0.9\linewidth] +% define lu-define-flavor-LUALATEX\\ +% \hspace*{2ex}\$\$(eval \$\$(call lu-create-flavor,LUALATEX,tex,LUALATEX,.pdf,pdf,\textbackslash\\ +% \hspace*{4ex}.pdftex\_t .\$\$(\_LU\_PDFTEX\_EXT)))\\ +% endef +% \end{source} +% % \paragraph{PS flavor} % \begin{source}[0.9\linewidth] % define lu-define-flavor-PS\\ @@ -741,6 +755,7 @@ export LU_UTILS ifdef VERB MAK_VERB := $(VERB) else +#MAK_VERB := debug #MAK_VERB := verbose #MAK_VERB := normal MAK_VERB := quiet @@ -749,6 +764,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; @@ -777,6 +800,7 @@ SHOW_LATEX:= endif endif endif +endif #--------------------------------------------------------------------- # Old LaTeX have limitations @@ -1084,6 +1108,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)) @@ -1188,6 +1213,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 @@ -1238,7 +1268,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 "*************************************" ;\ @@ -1348,7 +1378,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/source/support/latex-make/pdfswitch.dtx b/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx index f4a753950c1..59795846a31 100644 --- a/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx +++ b/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx @@ -26,7 +26,7 @@ %<package>\ProvidesPackage{pdfswitch}% % \fi % \ProvidesFile{pdfswitch.dtx} -[2016/02/09 v2.2.2 Automatic switch between pdf and ps] +[2017/01/08 v2.2.3 Automatic switch between pdf and ps] %<*package> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % SWITCH FOR PDFLATEX or LATEX diff --git a/Master/texmf-dist/source/support/latex-make/texdepends.dtx b/Master/texmf-dist/source/support/latex-make/texdepends.dtx index ec497e16471..8adbfa8d548 100644 --- a/Master/texmf-dist/source/support/latex-make/texdepends.dtx +++ b/Master/texmf-dist/source/support/latex-make/texdepends.dtx @@ -27,7 +27,7 @@ %<package>\ProvidesPackage{texdepends}% % \fi % \ProvidesFile{texdepends.dtx} -[2016/02/09 v2.2.2 Automatic depends generation] +[2017/01/08 v2.2.3 Automatic depends generation] % \iffalse %<*driver> \documentclass{ltxdoc} diff --git a/Master/texmf-dist/tex/latex/latex-make/figlatex.cfg b/Master/texmf-dist/tex/latex/latex-make/figlatex.cfg index ac9866fd96f..0bc77a2fafa 100644 --- a/Master/texmf-dist/tex/latex/latex-make/figlatex.cfg +++ b/Master/texmf-dist/tex/latex/latex-make/figlatex.cfg @@ -40,7 +40,7 @@ %% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. %% \ProvidesFile{figlatex.cfg}% -[2016/02/09 v2.2.2 include fig and svg in LaTeX] +[2017/01/08 v2.2.3 include fig and svg in LaTeX] %\compatibility %\debug \endinput diff --git a/Master/texmf-dist/tex/latex/latex-make/figlatex.sty b/Master/texmf-dist/tex/latex/latex-make/figlatex.sty index 0e9ea3d8e2c..9b8f707ae7a 100644 --- a/Master/texmf-dist/tex/latex/latex-make/figlatex.sty +++ b/Master/texmf-dist/tex/latex/latex-make/figlatex.sty @@ -41,7 +41,7 @@ %% \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{figlatex}% -[2016/02/09 v2.2.2 include fig and svg in LaTeX] +[2017/01/08 v2.2.3 include fig and svg in LaTeX] \newif\ifFL@compatibility \DeclareOption{compatibility}{% %\PackageWarning{figlatex}{option compatibility}% diff --git a/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty b/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty index e3e35803cf0..9e5e1e21043 100644 --- a/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty +++ b/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty @@ -41,7 +41,7 @@ %% \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{pdfswitch}% -[2016/02/09 v2.2.2 Automatic switch between pdf and ps] +[2017/01/08 v2.2.3 Automatic switch between pdf and ps] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% diff --git a/Master/texmf-dist/tex/latex/latex-make/texdepends.sty b/Master/texmf-dist/tex/latex/latex-make/texdepends.sty index 9fd514d6b82..63906b47d4e 100644 --- a/Master/texmf-dist/tex/latex/latex-make/texdepends.sty +++ b/Master/texmf-dist/tex/latex/latex-make/texdepends.sty @@ -42,7 +42,7 @@ %% \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{texdepends}% -[2016/02/09 v2.2.2 Automatic depends generation] +[2017/01/08 v2.2.3 Automatic depends generation] \RequirePackage{ifthen} \newboolean{TD@debug} \newcommand{\TD@option@debug}[1][true]{% diff --git a/Master/texmf-dist/tex/latex/latex-make/texgraphicx.sty b/Master/texmf-dist/tex/latex/latex-make/texgraphicx.sty index 79cf1ad0bdd..4945edc1dfe 100644 --- a/Master/texmf-dist/tex/latex/latex-make/texgraphicx.sty +++ b/Master/texmf-dist/tex/latex/latex-make/texgraphicx.sty @@ -40,7 +40,7 @@ %% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. %% \ProvidesPackage{texgraphicx}% -[2016/02/09 v2.2.2 include fig and svg in LaTeX] +[2017/01/08 v2.2.3 include fig and svg in LaTeX] \PackageWarning{texgraphicx}{'texgraphicx' is now deprecated\MessageBreak% Please, consider switching to 'figlatex' |