latex-make (29may18)

git-svn-id: svn://tug.org/texlive/trunk@47869 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 38 insertions, 25 deletions

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'