texlive[42914] Master/texmf-dist: latex-make (9jan17)

commits+karl at tug.org commits+karl at tug.org
Mon Jan 9 23:09:20 CET 2017


Revision: 42914
          http://tug.org/svn/texlive?view=revision&revision=42914
Author:   karl
Date:     2017-01-09 23:09:20 +0100 (Mon, 09 Jan 2017)
Log Message:
-----------
latex-make (9jan17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/support/latex-make/LaTeX.mk
    trunk/Master/texmf-dist/doc/support/latex-make/README
    trunk/Master/texmf-dist/doc/support/latex-make/figlatex.pdf
    trunk/Master/texmf-dist/doc/support/latex-make/latex-make.pdf
    trunk/Master/texmf-dist/doc/support/latex-make/texdepends.pdf
    trunk/Master/texmf-dist/source/support/latex-make/figlatex.dtx
    trunk/Master/texmf-dist/source/support/latex-make/latex-make.dtx
    trunk/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx
    trunk/Master/texmf-dist/source/support/latex-make/texdepends.dtx
    trunk/Master/texmf-dist/tex/latex/latex-make/figlatex.cfg
    trunk/Master/texmf-dist/tex/latex/latex-make/figlatex.sty
    trunk/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty
    trunk/Master/texmf-dist/tex/latex/latex-make/texdepends.sty
    trunk/Master/texmf-dist/tex/latex/latex-make/texgraphicx.sty

Modified: trunk/Master/texmf-dist/doc/support/latex-make/LaTeX.mk
===================================================================
--- trunk/Master/texmf-dist/doc/support/latex-make/LaTeX.mk	2017-01-09 22:09:02 UTC (rev 42913)
+++ trunk/Master/texmf-dist/doc/support/latex-make/LaTeX.mk	2017-01-09 22:09:20 UTC (rev 42914)
@@ -52,6 +52,7 @@
 ifdef VERB
 MAK_VERB :=  $(VERB)
 else
+#MAK_VERB :=  debug
 #MAK_VERB :=  verbose
 #MAK_VERB :=  normal
 MAK_VERB :=  quiet
@@ -60,6 +61,14 @@
 
 #---------------------------------------------------------------------
 # 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 @@
 endif
 endif
 endif
+endif
 
 #---------------------------------------------------------------------
 # Old LaTeX have limitations
@@ -390,6 +400,7 @@
 # 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 @@
 	.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 @@
 	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 @@
 		$$(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 *********************************) \

Modified: trunk/Master/texmf-dist/doc/support/latex-make/README
===================================================================
--- trunk/Master/texmf-dist/doc/support/latex-make/README	2017-01-09 22:09:02 UTC (rev 42913)
+++ trunk/Master/texmf-dist/doc/support/latex-make/README	2017-01-09 22:09:20 UTC (rev 42914)
@@ -2,7 +2,7 @@
               |    The LaTeX-Make system     |
               +------------------------------+
 
-VERSION: 2.2.2
+VERSION: 2.2.3
 
 DESCRIPTION
 ===========

Modified: trunk/Master/texmf-dist/doc/support/latex-make/figlatex.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/support/latex-make/latex-make.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/support/latex-make/texdepends.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/support/latex-make/figlatex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/support/latex-make/figlatex.dtx	2017-01-09 22:09:02 UTC (rev 42913)
+++ trunk/Master/texmf-dist/source/support/latex-make/figlatex.dtx	2017-01-09 22:09:20 UTC (rev 42914)
@@ -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}

Modified: trunk/Master/texmf-dist/source/support/latex-make/latex-make.dtx
===================================================================
--- trunk/Master/texmf-dist/source/support/latex-make/latex-make.dtx	2017-01-09 22:09:02 UTC (rev 42913)
+++ trunk/Master/texmf-dist/source/support/latex-make/latex-make.dtx	2017-01-09 22:09:20 UTC (rev 42914)
@@ -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 @@
 ifdef VERB
 MAK_VERB :=  $(VERB)
 else
+#MAK_VERB :=  debug
 #MAK_VERB :=  verbose
 #MAK_VERB :=  normal
 MAK_VERB :=  quiet
@@ -749,6 +764,14 @@
 
 #---------------------------------------------------------------------
 # 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 @@
 endif
 endif
 endif
+endif
 
 #---------------------------------------------------------------------
 # Old LaTeX have limitations
@@ -1084,6 +1108,7 @@
 # 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 @@
 	.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 @@
 	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 @@
 		$$(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 *********************************) \

Modified: trunk/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx
===================================================================
--- trunk/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx	2017-01-09 22:09:02 UTC (rev 42913)
+++ trunk/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx	2017-01-09 22:09:20 UTC (rev 42914)
@@ -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

Modified: trunk/Master/texmf-dist/source/support/latex-make/texdepends.dtx
===================================================================
--- trunk/Master/texmf-dist/source/support/latex-make/texdepends.dtx	2017-01-09 22:09:02 UTC (rev 42913)
+++ trunk/Master/texmf-dist/source/support/latex-make/texdepends.dtx	2017-01-09 22:09:20 UTC (rev 42914)
@@ -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}

Modified: trunk/Master/texmf-dist/tex/latex/latex-make/figlatex.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/latex-make/figlatex.cfg	2017-01-09 22:09:02 UTC (rev 42913)
+++ trunk/Master/texmf-dist/tex/latex/latex-make/figlatex.cfg	2017-01-09 22:09:20 UTC (rev 42914)
@@ -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

Modified: trunk/Master/texmf-dist/tex/latex/latex-make/figlatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/latex-make/figlatex.sty	2017-01-09 22:09:02 UTC (rev 42913)
+++ trunk/Master/texmf-dist/tex/latex/latex-make/figlatex.sty	2017-01-09 22:09:20 UTC (rev 42914)
@@ -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 at compatibility
 \DeclareOption{compatibility}{%
   %\PackageWarning{figlatex}{option compatibility}%

Modified: trunk/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty	2017-01-09 22:09:02 UTC (rev 42913)
+++ trunk/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty	2017-01-09 22:09:20 UTC (rev 42914)
@@ -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]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%

Modified: trunk/Master/texmf-dist/tex/latex/latex-make/texdepends.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/latex-make/texdepends.sty	2017-01-09 22:09:02 UTC (rev 42913)
+++ trunk/Master/texmf-dist/tex/latex/latex-make/texdepends.sty	2017-01-09 22:09:20 UTC (rev 42914)
@@ -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 at debug}
 \newcommand{\TD at option@debug}[1][true]{%

Modified: trunk/Master/texmf-dist/tex/latex/latex-make/texgraphicx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/latex-make/texgraphicx.sty	2017-01-09 22:09:02 UTC (rev 42913)
+++ trunk/Master/texmf-dist/tex/latex/latex-make/texgraphicx.sty	2017-01-09 22:09:20 UTC (rev 42914)
@@ -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'



More information about the tex-live-commits mailing list