diff options
15 files changed, 176 insertions, 63 deletions
diff --git a/Master/texmf-dist/doc/support/latex-make/LaTeX.mk b/Master/texmf-dist/doc/support/latex-make/LaTeX.mk index eb11e60e83d..243c06ad6db 100644 --- a/Master/texmf-dist/doc/support/latex-make/LaTeX.mk +++ b/Master/texmf-dist/doc/support/latex-make/LaTeX.mk @@ -37,14 +37,12 @@ endif ####[ Configuration ]################################################ -# For global site options --include LaTeX.mk.conf - # list of messages categories to display LU_SHOW ?= warning #info debug debug-vars # Select GNU/BSD/MACOSX utils (cp, rm, mv, ...) -LU_UTILS ?= GNU +LU_UTILS ?= $(shell ( /bin/cp --heelp > /dev/null 2>&1 && echo GNU ) || echo BSD ) +export LU_UTILS ####[ End of configuration ]################################################ # Modifying the remaining of this document may endanger you life!!! ;) @@ -522,9 +520,9 @@ $(eval $(call lu-addtovar-global,FLAVORS,PDF PS)) define _lu-do-latex # 1:master 2:flavor 3:source.tex 4:ext(.dvi/.pdf) exec 3>&1; \ run() { \ - echo -n "Running:" 1>&3 ; \ + printf "Running:" 1>&3 ; \ for arg; do \ - echo -n " '$$arg'" 1>&3 ; \ + printf "%s" " '$$arg'" 1>&3 ; \ done ; echo 1>&3 ; \ "$$@" ; \ }; \ @@ -919,3 +917,41 @@ endif %.bbl: %.aux $(COMMON_PREFIX)$(call lu-call-prog,BIBTEX) $* + +_LaTeX_Make_GROUPS=BIN TEX +_LaTeX_Make_BIN = figdepth.py gensubfig.py svg2dev.py svgdepth.py latexfilter.py +_LaTeX_Make_BINDIR=bin +_LaTeX_Make_BINORIGDIR= /FIXME_TDS_ROOT/scripts/latex-make +_LaTeX_Make_TEX = figlatex.sty pdfswitch.sty texdepends.sty texgraphicx.sty +_LaTeX_Make_TEXDIR=. +_LaTeX_Make_TEXORIGDIR= /FIXME_TDS_ROOT/tex/latex/latex-make + +.PHONY: LaTeX-Make-local-install LaTeX-Make-local-uninstall +.PHONY: _LaTeX-Make-local-install-done +_LaTeX-Make-local-install-done: + +LaTeX-Make-local-uninstall:: + $(foreach g,$(_LaTeX_Make_GROUPS),\ + $(foreach f,$(_LaTeX_Make_$(g)), \ + $(LU_RM) $(_LaTeX_Make_$(g)DIR)/$f && \ + ) (rmdir $(_LaTeX_Make_$(g)DIR) || true) && \ + ) $(LU_RM) LaTeX.mk + +LaTeX-Make-local-install:: _LaTeX-Make-local-install-done + $(foreach g,$(_LaTeX_Make_GROUPS),\ + mkdir -p $(_LaTeX_Make_$(g)DIR) && \ + $(foreach f,$(_LaTeX_Make_$(g)), \ + $(LU_CP) $(_LaTeX_Make_$(g)ORIGDIR)/$f $(_LaTeX_Make_$(g)DIR) && \ + )) $(LU_CP) $(_LaTeX_Make_BINORIGDIR)/LaTeX.mk . + @echo >> LaTeX.mk + @echo "_LaTeX-Make-local-install-done:" >> LaTeX.mk + @echo " @echo " >> LaTeX.mk + @echo " @echo 'You must remove (at least) the locally installed LaTeX.mk file if you wish to'" >> LaTeX.mk + @echo " @echo 'restart the installation.'" >> LaTeX.mk + @echo " @echo 'You can try \"make LaTeX-Make-local-uninstall\"'" >> LaTeX.mk + @echo " @echo " >> LaTeX.mk + @echo " @exit 1" >> LaTeX.mk + @echo + @echo "=> All LaTeX-Make files are locally copied" + @echo + diff --git a/Master/texmf-dist/doc/support/latex-make/LaTeX.mk.conf b/Master/texmf-dist/doc/support/latex-make/LaTeX.mk.conf index c6f3fa931d7..e69de29bb2d 100644 --- a/Master/texmf-dist/doc/support/latex-make/LaTeX.mk.conf +++ b/Master/texmf-dist/doc/support/latex-make/LaTeX.mk.conf @@ -1,3 +0,0 @@ -# Choose between GNU/BSD utilities (cp, rm, ...) -# LU_UTILS = GNU -# LU_UTILS = BSD diff --git a/Master/texmf-dist/doc/support/latex-make/README b/Master/texmf-dist/doc/support/latex-make/README index 57e43009a5e..a6be56377f6 100644 --- a/Master/texmf-dist/doc/support/latex-make/README +++ b/Master/texmf-dist/doc/support/latex-make/README @@ -1,8 +1,8 @@ +------------------------------+ - | The LaTeX-Make system | + | The LaTeX-Make system | +------------------------------+ -VERSION: 2.1.19.1 +VERSION: 2.2.2 DESCRIPTION =========== @@ -28,12 +28,6 @@ INSTALLATION: ============= Once generated, the following files need to be installed: -* LaTeX.mk: - This is the Makefile snipset to include into your main Makefile. - To avoid the need to hardcode the path of LaTeX.mk in the 'include' directive - of the Makefile, LaTeX.mk must be installed in a default search directory of - GNUMake such as PREFIX/include, /usr/local/include, /usr/include/, etc. - See your GNUMake documentation for the list of such search directories; * *.sty, *.cfg Main LaTeX package files. Should be installed into TEXMF/tex/latex/latex-make/ where TEXMF is a base of a TeX Directory @@ -41,6 +35,16 @@ Once generated, the following files need to be installed: * *.py Helper scripts used by LaTeX.mk. They should be installed into TEXMF/scripts/latex-make/ +* LaTeX.mk: + This is the Makefile snipset to include into your main Makefile. + To avoid the need to hardcode the path of LaTeX.mk in the 'include' directive + of the Makefile, LaTeX.mk must be installed in a default search directory of + GNUMake such as PREFIX/include, /usr/local/include, /usr/include/, etc. + See your GNUMake documentation for the list of such search directories; + In order to be able to also use the 'LaTeX-Make-local-install' target, + LaTeX.mk must also be installed into TEXMF/scripts/latex-make/ + *and* the two lines with "FIXME" at the end of this file must be updated + with the TEXMF installation path. * *.pdf Documentation that can be installed into TEXMF/doc/latex/latex-make/ 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 dadd499d909..06338a4b750 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 9d9c2ca5035..a09cb6806e2 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 400393dcad7..03e34655009 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 c389ed4b487..630ec9ac8b5 100644 --- a/Master/texmf-dist/source/support/latex-make/figlatex.dtx +++ b/Master/texmf-dist/source/support/latex-make/figlatex.dtx @@ -8,12 +8,12 @@ %% modify it under the terms of the GNU General Public License %% as published by the Free Software Foundation; either version 2 %% of the License, or (at your option) any later version. -%% +%% %% This program is distributed in the hope that it will be useful, %% but WITHOUT ANY WARRANTY; without even the implied warranty of %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the %% GNU General Public License for more details. -%% +%% %% You should have received a copy of the GNU General Public License %% along with this program; if not, write to the Free Software %% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -28,7 +28,7 @@ %<compat> \ProvidesPackage{texgraphicx}% % \fi % \ProvidesFile{figlatex.dtx} -[2011/09/25 v0.1.4 include fig and svg in LaTeX] +[2016/02/09 v2.2.2 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 24e32d0dd62..522c89f7ccf 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} -[2012/03/17 v2.1.2 Makefile for LaTeX] +[2016/02/09 v2.2.2 Makefile for LaTeX] %</dtx> % \fi % \iffalse @@ -101,7 +101,7 @@ % documents with the help of a Makefile. Dependencies are % automatically tracked with the help of the |texdepends.sty| package. % \end{abstract} -% \CheckSum{313} +% \CheckSum{323} % % \changes{v2.0.0}{2006/03/09}{First autocommented version} % \changes{v2.1.0}{2008/01/28}{That's the question} @@ -211,7 +211,22 @@ % you change |\include{first}| into |\include{second}|), you may have % to type |make distclean| before being able to recompile your % document. Else, |make| can fail, trying to build or found the old -% |first.tex| file. +% |first.tex| file. +% \paragraph{Shared work} +% If you work with other people that do not have installed (and do not +% want to install) \LaTeX-Make, you can use the +% |LaTeX-Make-local-install| target in |LaTeX.mk| to install required +% files locally in the current directory. You can them commit these +% files into your control version system so all co-authors will be +% able to use \LaTeX-Make without installing it. +% However, note that: +% \begin{itemize} +% \item you wont beneficit of an update of \LaTeX-Make in your system +% (you will continue to use the locally installed files) +% \item there is no support for upgrading locally installed files (but +% reexecuting the installation should do a correct upgrade most of +% the time) +% \end{itemize} % \subsection{Customization} % Of course, lots of things can be customized. Here are the most % useful ones. Look at the section \ref{sec:reference} for more detailed @@ -711,14 +726,12 @@ endif ####[ Configuration ]################################################ -# For global site options --include LaTeX.mk.conf - # list of messages categories to display LU_SHOW ?= warning #info debug debug-vars # Select GNU/BSD/MACOSX utils (cp, rm, mv, ...) -LU_UTILS ?= GNU +LU_UTILS ?= $(shell ( /bin/cp --heelp > /dev/null 2>&1 && echo GNU ) || echo BSD ) +export LU_UTILS ####[ End of configuration ]################################################ # Modifying the remaining of this document may endanger you life!!! ;) @@ -1201,9 +1214,9 @@ $(eval $(call lu-addtovar-global,FLAVORS,PDF PS)) define _lu-do-latex # 1:master 2:flavor 3:source.tex 4:ext(.dvi/.pdf) exec 3>&1; \ run() { \ - echo -n "Running:" 1>&3 ; \ + printf "Running:" 1>&3 ; \ for arg; do \ - echo -n " '$$arg'" 1>&3 ; \ + printf "%s" " '$$arg'" 1>&3 ; \ done ; echo 1>&3 ; \ "$$@" ; \ }; \ @@ -1621,16 +1634,46 @@ endif %.bbl: %.aux $(COMMON_PREFIX)$(call lu-call-prog,BIBTEX) $* %MAKEFILE + +_LaTeX_Make_GROUPS=BIN TEX +_LaTeX_Make_BIN = figdepth.py gensubfig.py svg2dev.py svgdepth.py latexfilter.py +_LaTeX_Make_BINDIR=bin +_LaTeX_Make_BINORIGDIR= /FIXME_TDS_ROOT/scripts/latex-make +_LaTeX_Make_TEX = figlatex.sty pdfswitch.sty texdepends.sty texgraphicx.sty +_LaTeX_Make_TEXDIR=. +_LaTeX_Make_TEXORIGDIR= /FIXME_TDS_ROOT/tex/latex/latex-make + +.PHONY: LaTeX-Make-local-install LaTeX-Make-local-uninstall +.PHONY: _LaTeX-Make-local-install-done +_LaTeX-Make-local-install-done: + +LaTeX-Make-local-uninstall:: + $(foreach g,$(_LaTeX_Make_GROUPS),\ + $(foreach f,$(_LaTeX_Make_$(g)), \ + $(LU_RM) $(_LaTeX_Make_$(g)DIR)/$f && \ + ) (rmdir $(_LaTeX_Make_$(g)DIR) || true) && \ + ) $(LU_RM) LaTeX.mk + +LaTeX-Make-local-install:: _LaTeX-Make-local-install-done + $(foreach g,$(_LaTeX_Make_GROUPS),\ + mkdir -p $(_LaTeX_Make_$(g)DIR) && \ + $(foreach f,$(_LaTeX_Make_$(g)), \ + $(LU_CP) $(_LaTeX_Make_$(g)ORIGDIR)/$f $(_LaTeX_Make_$(g)DIR) && \ + )) $(LU_CP) $(_LaTeX_Make_BINORIGDIR)/LaTeX.mk . + @echo >> LaTeX.mk + @echo "_LaTeX-Make-local-install-done:" >> LaTeX.mk + @echo " @echo " >> LaTeX.mk + @echo " @echo 'You must remove (at least) the locally installed LaTeX.mk file if you wish to'" >> LaTeX.mk + @echo " @echo 'restart the installation.'" >> LaTeX.mk + @echo " @echo 'You can try \"make LaTeX-Make-local-uninstall\"'" >> LaTeX.mk + @echo " @echo " >> LaTeX.mk + @echo " @exit 1" >> LaTeX.mk + @echo + @echo "=> All LaTeX-Make files are locally copied" + @echo + %</makefile> % \end{macrocode} -% \subsection{LaTeX.mk.conf} -% \begin{macrocode} -%<*makefile-config> -# Choose between GNU/BSD utilities (cp, rm, ...) -# LU_UTILS = GNU -# LU_UTILS = BSD -%</makefile-config> -% \end{macrocode} % \subsection{figdepth} % % \begin{macrocode} diff --git a/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx b/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx index ef63c39f5ed..f4a753950c1 100644 --- a/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx +++ b/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx @@ -1,17 +1,37 @@ +% \iffalse meta-comment +%% +%% File: pdfswitch.dtx Copyright (C) 2002--2016 V. Danjean, A. Legrand +%% Vincent.Danjean@ens-lyon.org +%% Arnaud.Legrand@ens-lyon.org +%% +%% This program is free software; you can redistribute it and/or +%% modify it under the terms of the GNU General Public License +%% as published by the Free Software Foundation; either version 2 +%% of the License, or (at your option) any later version. +%% +%% This program is distributed in the hope that it will be useful, +%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%% GNU General Public License for more details. +%% +%% You should have received a copy of the GNU General Public License +%% along with this program; if not, write to the Free Software +%% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +%% +% +%<*dtx> + \ProvidesFile{pdfswitch.dtx} +%</dtx> +%<package>\NeedsTeXFormat{LaTeX2e}% +%<package>\ProvidesPackage{pdfswitch}% +% \fi +% \ProvidesFile{pdfswitch.dtx} +[2016/02/09 v2.2.2 Automatic switch between pdf and ps] %<*package> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % SWITCH FOR PDFLATEX or LATEX %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% -\def\fileversion{0.0.2} -\def\filedate{2003/07/12} - -\NeedsTeXFormat{LaTeX2e} - -\ProvidesPackage% -{pdfswitch}% -[\filedate\space Automatic switch between pdf and ps. v\fileversion] - \RequirePackage{ae,aeguill} \RequirePackage{color} \RequirePackage{ifthen} @@ -124,4 +144,4 @@ % } } \fi -%</package>
\ No newline at end of file +%</package> diff --git a/Master/texmf-dist/source/support/latex-make/texdepends.dtx b/Master/texmf-dist/source/support/latex-make/texdepends.dtx index 0a9d0b645ad..ec497e16471 100644 --- a/Master/texmf-dist/source/support/latex-make/texdepends.dtx +++ b/Master/texmf-dist/source/support/latex-make/texdepends.dtx @@ -9,12 +9,12 @@ %% modify it under the terms of the GNU General Public License %% as published by the Free Software Foundation; either version 2 %% of the License, or (at your option) any later version. -%% +%% %% This program is distributed in the hope that it will be useful, %% but WITHOUT ANY WARRANTY; without even the implied warranty of %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the %% GNU General Public License for more details. -%% +%% %% You should have received a copy of the GNU General Public License %% along with this program; if not, write to the Free Software %% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -27,7 +27,7 @@ %<package>\ProvidesPackage{texdepends}% % \fi % \ProvidesFile{texdepends.dtx} -[2008/01/28\space Automatic depends generation. v1.2.0] +[2016/02/09 v2.2.2 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 bb139c3581f..ac9866fd96f 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}% -[2011/09/25 v0.1.4 include fig and svg in LaTeX] +[2016/02/09 v2.2.2 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 9efc78a077c..0e9ea3d8e2c 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}% -[2011/09/25 v0.1.4 include fig and svg in LaTeX] +[2016/02/09 v2.2.2 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 b103f8d54dd..e3e35803cf0 100644 --- a/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty +++ b/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty @@ -20,18 +20,31 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) +%% +%% File: pdfswitch.dtx Copyright (C) 2002--2016 V. Danjean, A. Legrand +%% Vincent.Danjean@ens-lyon.org +%% Arnaud.Legrand@ens-lyon.org +%% +%% This program is free software; you can redistribute it and/or +%% modify it under the terms of the GNU General Public License +%% as published by the Free Software Foundation; either version 2 +%% of the License, or (at your option) any later version. +%% +%% This program is distributed in the hope that it will be useful, +%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%% GNU General Public License for more details. +%% +%% You should have received a copy of the GNU General Public License +%% along with this program; if not, write to the Free Software +%% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +%% +\NeedsTeXFormat{LaTeX2e}% +\ProvidesPackage{pdfswitch}% +[2016/02/09 v2.2.2 Automatic switch between pdf and ps] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% -\def\fileversion{0.0.2} -\def\filedate{2003/07/12} - -\NeedsTeXFormat{LaTeX2e} - -\ProvidesPackage% -{pdfswitch}% -[\filedate\space Automatic switch between pdf and ps. v\fileversion] - \RequirePackage{ae,aeguill} \RequirePackage{color} \RequirePackage{ifthen} diff --git a/Master/texmf-dist/tex/latex/latex-make/texdepends.sty b/Master/texmf-dist/tex/latex/latex-make/texdepends.sty index e40de23c813..9fd514d6b82 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}% -[2008/01/28\space Automatic depends generation. v1.2.0] +[2016/02/09 v2.2.2 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 911070e7cdd..79cf1ad0bdd 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}% -[2011/09/25 v0.1.4 include fig and svg in LaTeX] +[2016/02/09 v2.2.2 include fig and svg in LaTeX] \PackageWarning{texgraphicx}{'texgraphicx' is now deprecated\MessageBreak% Please, consider switching to 'figlatex' |