From 7adee32016cbff00197721703fe3904c8cf0a63e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 29 May 2018 20:54:42 +0000 Subject: latex-make (29may18) git-svn-id: svn://tug.org/texlive/trunk@47869 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/support/latex-make/README | 2 +- .../texmf-dist/doc/support/latex-make/figlatex.pdf | Bin 223579 -> 225543 bytes .../doc/support/latex-make/latex-make.pdf | Bin 341373 -> 341990 bytes .../doc/support/latex-make/texdepends.pdf | Bin 261864 -> 262369 bytes Master/texmf-dist/scripts/latex-make/figdepth.py | 7 ++- Master/texmf-dist/scripts/latex-make/gensubfig.py | 20 +++---- .../source/support/latex-make/figlatex.dtx | 11 +++- .../source/support/latex-make/latex-make.dtx | 30 +++++----- .../source/support/latex-make/pdfswitch.dtx | 63 +++++++++++---------- .../source/support/latex-make/texdepends.dtx | 2 +- .../texmf-dist/tex/latex/latex-make/figlatex.cfg | 2 +- .../texmf-dist/tex/latex/latex-make/figlatex.sty | 3 +- .../texmf-dist/tex/latex/latex-make/pdfswitch.sty | 54 +++++++++++------- .../texmf-dist/tex/latex/latex-make/texdepends.sty | 2 +- .../tex/latex/latex-make/texgraphicx.sty | 2 +- 15 files changed, 113 insertions(+), 85 deletions(-) diff --git a/Master/texmf-dist/doc/support/latex-make/README b/Master/texmf-dist/doc/support/latex-make/README index 73ccc6fb47f..3d0a45c7d92 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.3 +VERSION: 2.2.4 DESCRIPTION =========== diff --git a/Master/texmf-dist/doc/support/latex-make/figlatex.pdf b/Master/texmf-dist/doc/support/latex-make/figlatex.pdf index d8839dbfb7d..1d7b2b0c225 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 61433d837c4..31c7947afbd 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 67cde9454d0..72750447a4c 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 diff --git a/Master/texmf-dist/scripts/latex-make/figdepth.py b/Master/texmf-dist/scripts/latex-make/figdepth.py index 7782d0b29e6..095e0f4a7d7 100755 --- a/Master/texmf-dist/scripts/latex-make/figdepth.py +++ b/Master/texmf-dist/scripts/latex-make/figdepth.py @@ -9,6 +9,7 @@ args : all depths we want to keep """ +from __future__ import print_function import optparse import os.path import sys @@ -25,7 +26,7 @@ def main(): display = True def show(depth, line): if depth in depths_to_keep: - print comment+line, + print(comment+line, end='') return True else: return False @@ -35,11 +36,11 @@ def main(): continue if line[0] in "\t ": if display: - print line + print(line) else: Fld = line.split(' ', 9999) if not Fld[0] or Fld[0] not in ('1', '2', '3', '4', '5'): - print comment+line + print(comment+line) display = True elif Fld[0] == '4': display = show(Fld[3], line) diff --git a/Master/texmf-dist/scripts/latex-make/gensubfig.py b/Master/texmf-dist/scripts/latex-make/gensubfig.py index a6fcd5d5677..0c5316d448a 100755 --- a/Master/texmf-dist/scripts/latex-make/gensubfig.py +++ b/Master/texmf-dist/scripts/latex-make/gensubfig.py @@ -13,6 +13,7 @@ Sortie standard : """ +from __future__ import print_function from optparse import OptionParser import os.path @@ -44,20 +45,19 @@ Makefile generating subfigures using figdepth.py or svgdepth.py') count = 1 for subfig in subfigs: - print "%s_%d%s: %s%s %s" % (root, count, ext, root, ext, sf_name) - print "\t%s %s" % (ds_name, subfig) - print "" + print("%s_%d%s: %s%s %s" % (root, count, ext, root, ext, sf_name)) + print("\t%s %s" % (ds_name, subfig)) + print("") count += 1 - print "%s := $(foreach n, " % varname, + print("%s := $(foreach n, " % varname, end='') count = 1 for subfig in subfigs: - print '%d ' % count, + print('%d ' % count, end='') count += 1 - print ", %s_$(n)%s)" % (root, ext) - print "FILES_TO_DISTCLEAN += $(%s)" % varname - print "FIGS2CREATE_LIST += $(%s)" % varname - print "$(TEMPORAIRE): $(%s)" % varname - print "$(TEMPORAIRE): $(%s)" % varname + print(", %s_$(n)%s)" % (root, ext)) + print("FILES_TO_DISTCLEAN += $(%s)" % varname) + print("FIGS2CREATE_LIST += $(%s)" % varname) + print("$(TEMPORAIRE): $(%s)" % varname) if __name__ == "__main__": main() diff --git a/Master/texmf-dist/source/support/latex-make/figlatex.dtx b/Master/texmf-dist/source/support/latex-make/figlatex.dtx index 94da37c08e0..6ced60986d9 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 @@ % \ProvidesPackage{texgraphicx}% % \fi % \ProvidesFile{figlatex.dtx} -[2017/01/08 v2.2.3 include fig and svg in LaTeX] +[2018/05/29 v2.2.4 fix python syntax] % \iffalse %<*driver> \documentclass{ltxdoc} @@ -100,12 +100,18 @@ % This package allows \LaTeX\space to load XFig and SVG figures (or % subfigures) with the |\includegraphics| command. % \end{abstract} -% \CheckSum{217} +% \CheckSum{218} % % \changes{v0.1.1}{2005/03/28}{Version 0.1.1 at last} % \changes{v0.1.2}{2005/03/29}{Manage index/glossary} % \changes{v0.1.3}{2008/01/28}{Better support for subfig with texdepends} % \changes{v0.1.4}{2011/09/25}{Support for svg with texdepends} +% \changes{v2.2.0}{2016/02/09}{No changes in figlatex.dtx} +% \changes{v2.2.1}{2016/02/09}{No changes in figlatex.dtx} +% \changes{v2.2.2}{2016/02/09}{No changes in figlatex.dtx} +% \changes{v2.2.3}{2017/01/08}{No changes in figlatex.dtx} +% \changes{v2.2.4}{2018/05/29}{Add missing required package 'ifthen'} +% \changes{v2.2.4}{2018/05/29}{Fix python syntax for python3} % % \makeatletter % \def\SpecialOptionIndex#1{\@bsphack @@ -269,6 +275,7 @@ % \end{macrocode} % and requires some packages % \begin{macrocode} +\RequirePackage{ifthen} \RequirePackage{ifpdf} \RequirePackage{graphicx} % \end{macrocode} 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 3b07ae5c60c..64657bf9fbe 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} -[2017/01/08 v2.2.3 Makefile for LaTeX] +[2018/05/29 v2.2.4 fix permissions on directories] % % \fi % \iffalse @@ -111,6 +111,7 @@ % \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} +% \changes{v2.2.4}{2018/05/29}{Fix directory permissions on install} % % \makeatletter % \def\SpecialOptionIndex#1{\@bsphack @@ -1719,6 +1720,7 @@ args : all depths we want to keep """ +from __future__ import print_function import optparse import os.path import sys @@ -1735,7 +1737,7 @@ def main(): display = True def show(depth, line): if depth in depths_to_keep: - print comment+line, + print(comment+line, end='') return True else: return False @@ -1745,11 +1747,11 @@ def main(): continue if line[0] in "\t ": if display: - print line + print(line) else: Fld = line.split(' ', 9999) if not Fld[0] or Fld[0] not in ('1', '2', '3', '4', '5'): - print comment+line + print(comment+line) display = True elif Fld[0] == '4': display = show(Fld[3], line) @@ -1779,6 +1781,7 @@ Sortie standard : """ +from __future__ import print_function from optparse import OptionParser import os.path @@ -1810,20 +1813,19 @@ Makefile generating subfigures using figdepth.py or svgdepth.py') count = 1 for subfig in subfigs: - print "%s_%d%s: %s%s %s" % (root, count, ext, root, ext, sf_name) - print "\t%s %s" % (ds_name, subfig) - print "" + print("%s_%d%s: %s%s %s" % (root, count, ext, root, ext, sf_name)) + print("\t%s %s" % (ds_name, subfig)) + print("") count += 1 - print "%s := $(foreach n, " % varname, + print("%s := $(foreach n, " % varname, end='') count = 1 for subfig in subfigs: - print '%d ' % count, + print('%d ' % count, end='') count += 1 - print ", %s_$(n)%s)" % (root, ext) - print "FILES_TO_DISTCLEAN += $(%s)" % varname - print "FIGS2CREATE_LIST += $(%s)" % varname - print "$(TEMPORAIRE): $(%s)" % varname - print "$(TEMPORAIRE): $(%s)" % varname + print(", %s_$(n)%s)" % (root, ext)) + print("FILES_TO_DISTCLEAN += $(%s)" % varname) + print("FIGS2CREATE_LIST += $(%s)" % varname) + print("$(TEMPORAIRE): $(%s)" % varname) if __name__ == "__main__": main() diff --git a/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx b/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx index 59795846a31..4a0ce30d7ba 100644 --- a/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx +++ b/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx @@ -26,16 +26,16 @@ %\ProvidesPackage{pdfswitch}% % \fi % \ProvidesFile{pdfswitch.dtx} -[2017/01/08 v2.2.3 Automatic switch between pdf and ps] +[2018/05/29 v2.2.4 better integration with other packages] %<*package> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % SWITCH FOR PDFLATEX or LATEX %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% \RequirePackage{ae,aeguill} -\RequirePackage{color} \RequirePackage{ifthen} \RequirePackage{ifpdf} +\RequirePackage{etoolbox} \newboolean{nocolor@pdfswitch} \setboolean{nocolor@pdfswitch}{false} @@ -55,18 +55,33 @@ \ProcessOptions -\definecolor{pdfurlcolor}{rgb}{0,0,0.6} -\definecolor{pdfcitecolor}{rgb}{0,0.6,0} -\definecolor{pdflinkcolor}{rgb}{0.6,0,0} - - %%%%%%%%%%%%%%%%%%%%%%%%% graphicx and thumbpdf %%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%% graphicx and thumbpdf %%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% differ the hyperref and (x)color package loading +\AtEndPreamble{% + \RequirePackage{hyperref}% + \@ifundefined{colorbox}{% + \IfFileExists{xcolor.sty}{\RequirePackage{xcolor}}% + {\RequirePackage{color}}% + }{}% + \definecolor{pdfurlcolor}{rgb}{0,0,0.6}% + \definecolor{pdfcitecolor}{rgb}{0,0.6,0}% + \definecolor{pdflinkcolor}{rgb}{0.6,0,0}% + % + \RequirePackage{graphicx}% +}% \ifpdf -\usepackage[pdftex]{graphicx} %%% graphics for pdfLaTeX -\DeclareGraphicsExtensions{.pdf} %%% standard extension for included graphics -\usepackage[pdftex]{thumbpdf} %%% thumbnails for pdflatex +\PassOptionsToPackage{pdftex}{graphicx} %%% graphics for pdfLaTeX +\PassOptionsToPackage{pdftex}{color} +\PassOptionsToPackage{pdftex}{thumbpdf} %%% thumbnails for pdflatex +\AtEndPreamble{% + \DeclareGraphicsExtensions{.pdf} %%% standard extension for included graphics + \RequirePackage{thumbpdf}% +}% \else -\usepackage[dvips]{graphicx} %%% graphics for dvips -\DeclareGraphicsExtensions{.eps} %%% standard extension for included graphics +\PassOptionsToPackage{dvips}{graphicx} %%% graphics for dvips +\AtEndPreamble{% + \DeclareGraphicsExtensions{.eps} %%% standard extension for included graphics +}% %\usepackage[ps2pdf]{thumbpdf} %%% thumbnails for ps2pdf \fi @@ -118,30 +133,20 @@ \edef\keys@pdfswitch{\keys@pdfswitch,pagebackref}% }{} -\usepackage[\keys@pdfswitch]{hyperref} +\PassOptionsToPackage{\keys@pdfswitch}{hyperref}% %%%%%%%%%%%%%%%%%%%%%%%%% HyperSetup %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ifpdf \AtBeginDocument{ + \ifpdf \hypersetup{ pdfauthor = {\@author}, pdftitle = {\@title}, pdfsubject = {\@ifundefined{@subject}{}{\@subject}}, - pdfkeywords = {\@ifundefined{@keywords}{}{\@keywords}} + pdfkeywords = {\@ifundefined{@keywords}{}{\@keywords}}, } + %%% pdfcreator, pdfproducer, and Creation Date are automatically set by pdflatex !!! + \pdfadjustspacing=1 %%% force LaTeX-like character spacing + \else% + \fi% } -%%% pdfcreator, pdfproducer, and Creation Date are automatically set by pdflatex !!! -\pdfadjustspacing=1 %%% force LaTeX-like character spacing -\else -\AtBeginDocument{ -% \hypersetup{ -% pdfauthor = {\@author}, -% pdftitle = {\@title}, -% pdfsubject = {\@ifundefined{@subject}{}{\@subject}}, -% pdfkeywords = {\@ifundefined{@keywords}{}{\@keywords}}, -% pdfcreator = {LaTeX with hyperref package}, -% pdfproducer = {dvips + ps2pdf} -% } -} -\fi % diff --git a/Master/texmf-dist/source/support/latex-make/texdepends.dtx b/Master/texmf-dist/source/support/latex-make/texdepends.dtx index 8adbfa8d548..f1e66e116d8 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 @@ %\ProvidesPackage{texdepends}% % \fi % \ProvidesFile{texdepends.dtx} -[2017/01/08 v2.2.3 Automatic depends generation] +[2018/05/29 v2.2.4 no change in this version] % \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 0bc77a2fafa..2058cf522d4 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}% -[2017/01/08 v2.2.3 include fig and svg in LaTeX] +[2018/05/29 v2.2.4 fix python syntax] %\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 9b8f707ae7a..3adffed4056 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}% -[2017/01/08 v2.2.3 include fig and svg in LaTeX] +[2018/05/29 v2.2.4 fix python syntax] \newif\ifFL@compatibility \DeclareOption{compatibility}{% %\PackageWarning{figlatex}{option compatibility}% @@ -67,6 +67,7 @@ } } \ProcessOptions +\RequirePackage{ifthen} \RequirePackage{ifpdf} \RequirePackage{graphicx} \RequirePackage{color} diff --git a/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty b/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty index 9e5e1e21043..d78200a8a32 100644 --- a/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty +++ b/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty @@ -41,14 +41,14 @@ %% \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{pdfswitch}% -[2017/01/08 v2.2.3 Automatic switch between pdf and ps] +[2018/05/29 v2.2.4 better integration with other packages] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% \RequirePackage{ae,aeguill} -\RequirePackage{color} \RequirePackage{ifthen} \RequirePackage{ifpdf} +\RequirePackage{etoolbox} \newboolean{nocolor@pdfswitch} \setboolean{nocolor@pdfswitch}{false} @@ -68,18 +68,32 @@ \ProcessOptions -\definecolor{pdfurlcolor}{rgb}{0,0,0.6} -\definecolor{pdfcitecolor}{rgb}{0,0.6,0} -\definecolor{pdflinkcolor}{rgb}{0.6,0,0} - - %%%%%%%%%%%%%%%%%%%%%%%%% graphicx and thumbpdf %%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%% graphicx and thumbpdf %%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\AtEndPreamble{% + \RequirePackage{hyperref}% + \@ifundefined{colorbox}{% + \IfFileExists{xcolor.sty}{\RequirePackage{xcolor}}% + {\RequirePackage{color}}% + }{}% + \definecolor{pdfurlcolor}{rgb}{0,0,0.6}% + \definecolor{pdfcitecolor}{rgb}{0,0.6,0}% + \definecolor{pdflinkcolor}{rgb}{0.6,0,0}% + % + \RequirePackage{graphicx}% +}% \ifpdf -\usepackage[pdftex]{graphicx} %%% graphics for pdfLaTeX -\DeclareGraphicsExtensions{.pdf} %%% standard extension for included graphics -\usepackage[pdftex]{thumbpdf} %%% thumbnails for pdflatex +\PassOptionsToPackage{pdftex}{graphicx} %%% graphics for pdfLaTeX +\PassOptionsToPackage{pdftex}{color} +\PassOptionsToPackage{pdftex}{thumbpdf} %%% thumbnails for pdflatex +\AtEndPreamble{% + \DeclareGraphicsExtensions{.pdf} %%% standard extension for included graphics + \RequirePackage{thumbpdf}% +}% \else -\usepackage[dvips]{graphicx} %%% graphics for dvips -\DeclareGraphicsExtensions{.eps} %%% standard extension for included graphics +\PassOptionsToPackage{dvips}{graphicx} %%% graphics for dvips +\AtEndPreamble{% + \DeclareGraphicsExtensions{.eps} %%% standard extension for included graphics +}% \fi %%%%%%%%%%%%%%%%%%%%%%%%% Basic options for hyperref %%%%%%%%%%%%%%%%%%%%%%%%% @@ -130,24 +144,22 @@ \edef\keys@pdfswitch{\keys@pdfswitch,pagebackref}% }{} -\usepackage[\keys@pdfswitch]{hyperref} +\PassOptionsToPackage{\keys@pdfswitch}{hyperref}% %%%%%%%%%%%%%%%%%%%%%%%%% HyperSetup %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ifpdf \AtBeginDocument{ + \ifpdf \hypersetup{ pdfauthor = {\@author}, pdftitle = {\@title}, pdfsubject = {\@ifundefined{@subject}{}{\@subject}}, - pdfkeywords = {\@ifundefined{@keywords}{}{\@keywords}} + pdfkeywords = {\@ifundefined{@keywords}{}{\@keywords}}, } + %%% pdfcreator, pdfproducer, and Creation Date are automatically set by pdflatex !!! + \pdfadjustspacing=1 %%% force LaTeX-like character spacing + \else% + \fi% } -%%% pdfcreator, pdfproducer, and Creation Date are automatically set by pdflatex !!! -\pdfadjustspacing=1 %%% force LaTeX-like character spacing -\else -\AtBeginDocument{ -} -\fi \endinput %% %% End of file `pdfswitch.sty'. diff --git a/Master/texmf-dist/tex/latex/latex-make/texdepends.sty b/Master/texmf-dist/tex/latex/latex-make/texdepends.sty index 63906b47d4e..f44f0c29b74 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}% -[2017/01/08 v2.2.3 Automatic depends generation] +[2018/05/29 v2.2.4 no change in this version] \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 4945edc1dfe..faf1fd1f5c7 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}% -[2017/01/08 v2.2.3 include fig and svg in LaTeX] +[2018/05/29 v2.2.4 fix python syntax] \PackageWarning{texgraphicx}{'texgraphicx' is now deprecated\MessageBreak% Please, consider switching to 'figlatex' -- cgit v1.2.3