summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/latex-make
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-06-08 21:20:13 +0000
committerKarl Berry <karl@freefriends.org>2020-06-08 21:20:13 +0000
commitd25c2909171999d6094a1a8e5711cfe94502c943 (patch)
tree3b3252c497997a5a8ec3308962cd4832b804f849 /Master/texmf-dist/tex/latex/latex-make
parent323c05e60169fcb6fa9dc6a9d3db42de5c869f6c (diff)
latex-make (8jun20)
git-svn-id: svn://tug.org/texlive/trunk@55486 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/latex-make')
-rw-r--r--Master/texmf-dist/tex/latex/latex-make/figlatex.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/latex-make/figlatex.sty51
-rw-r--r--Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty2
-rw-r--r--Master/texmf-dist/tex/latex/latex-make/texdepends.sty2
-rw-r--r--Master/texmf-dist/tex/latex/latex-make/texgraphicx.sty11
5 files changed, 28 insertions, 41 deletions
diff --git a/Master/texmf-dist/tex/latex/latex-make/figlatex.cfg b/Master/texmf-dist/tex/latex/latex-make/figlatex.cfg
index de249cb0b56..d3e8a816820 100644
--- a/Master/texmf-dist/tex/latex/latex-make/figlatex.cfg
+++ b/Master/texmf-dist/tex/latex/latex-make/figlatex.cfg
@@ -40,8 +40,7 @@
%% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
%%
\ProvidesFile{figlatex.cfg}%
-[2018/10/17 v2.3.0 No changes in figlatex.dtx]
- %\compatibility
+[2020/06/01 v2.4.0 Fix support for new latex]
%\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 fb2326d8294..922be37af91 100644
--- a/Master/texmf-dist/tex/latex/latex-make/figlatex.sty
+++ b/Master/texmf-dist/tex/latex/latex-make/figlatex.sty
@@ -41,20 +41,12 @@
%%
\NeedsTeXFormat{LaTeX2e}%
\ProvidesPackage{figlatex}%
-[2018/10/17 v2.3.0 No changes in figlatex.dtx]
-\newif\ifFL@compatibility
-\DeclareOption{compatibility}{%
- %\PackageWarning{figlatex}{option compatibility}%
- \global\FL@compatibilitytrue%
-}
+[2020/06/01 v2.4.0 Fix support for new latex]
\newif\ifFL@debug
\DeclareOption{debug}{%
\global\FL@debugtrue%
}
{
- \def\compatibility{%
- \ExecuteOptions{compatibility}%
- }
\def\debug{%
\ExecuteOptions{debug}%
}
@@ -70,6 +62,7 @@
\RequirePackage{ifthen}
\RequirePackage{ifpdf}
\RequirePackage{graphicx}
+\RequirePackage{xstring}
\RequirePackage{color}
\RequirePackage{epstopdf}
\def\FL@dmessage#1{%
@@ -124,18 +117,9 @@
\def\FL@svgext{pdftex_t}%
\let\Gread@rawtex\Gread@pdf%
\DeclareGraphicsRule{.pdftex}{pdf}{*}{}%
- \ifFL@compatibility%
- \PackageWarningNoLine{figlatex}{Compatibility mode enabled
- for old LaTeX
- \MessageBreak Using .pdf extension for pdftex files}%
- \DeclareGraphicsRule{.pdftex_t}{rawtex}{.pdf}{}%
- \DeclareGraphicsRule{.fig}{figtex}{.pdf}{}%
- \DeclareGraphicsRule{.svg}{svgtex}{.pdf}{}%
- \else%
- \DeclareGraphicsRule{.pdftex_t}{rawtex}{.pdftex}{}%
- \DeclareGraphicsRule{.fig}{figtex}{.pdftex}{}%
- \DeclareGraphicsRule{.svg}{svgtex}{.pdftex}{}%
- \fi%
+ \DeclareGraphicsRule{.pdftex_t}{rawtex}{.pdftex}{}%
+ \DeclareGraphicsRule{.fig}{figtex}{.pdftex}{}%
+ \DeclareGraphicsRule{.svg}{svgtex}{.pdftex}{}%
\else
\def\FL@figext{pstex_t}%
\def\FL@svgext{pstex_t}%
@@ -151,22 +135,26 @@
\def\FL@exclamation{!}%
\let\FL@subfig@name\FL@exclamation%
\define@key{Gin}{subfig}{%
+ \typeout{using subfig #1}%
\def\FL@subfig@name{#1}%
}
\def\FL@sepdefault{_}%
\def\FL@subfig@check#1{%
}
\def\FL@Gin@getbase#1{%
+ \typeout{In getbase #1 with \FL@subfig@name / \FL@exclamation}%
\ifx\FL@subfig@name\FL@exclamation%
\else%
- \ifthenelse{\equal{#1}{.fig}}{%
+ \typeout{getbase lets go (\filename@area)(\filename@base)(#1)}%
+ \IfStrEq*{#1}{.fig}{%
% If we're including a subfig
\IfFileExists{\filename@area\filename@base#1}{%
% If the original .fig file exists, just change the name so that
- % it comprises the full path.
- \filename@parse{\@filef@und}%
- % Remove potential trailing spage at the end of the extension
- \def\filename@ext{fig}%
+ % it comprises the full path (file has been looked into
+ % texgraphics, etc.)
+ % Warning: the found filename is quoted :-(
+ \StrBetween[1,2]{\@filef@und}{"}{"}[\FL@filename@unquoted]
+ \filename@parse{\FL@filename@unquoted}%
% Check if the subfig file exists
\FL@subfig@check{\filename@area\filename@base.subfig}%
}{%
@@ -179,14 +167,15 @@
\edef\filename@base{\filename@base\FL@sepdefault\FL@subfig@name}%
}{%
}%
- \ifthenelse{\equal{#1}{.svg}}{%
+ \IfStrEq*{#1}{.svg}{%
% If we're including a subfig
\IfFileExists{\filename@area\filename@base#1}{%
% If the original .svg file exists, just change the name so that
- % it comprises the full path.
- \filename@parse{\@filef@und}%
- % Remove potential trailing spage at the end of the extension
- \def\filename@ext{svg}%
+ % it comprises the full path (file has been looked into
+ % texgraphics, etc.)
+ % Warning: the found filename is quoted :-(
+ \StrBetween[1,2]{\@filef@und}{"}{"}[\FL@filename@unquoted]
+ \filename@parse{\FL@filename@unquoted}%
% Check if the subfig file exists
\FL@subfig@check{\filename@area\filename@base.subfig}%
}{%
diff --git a/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty b/Master/texmf-dist/tex/latex/latex-make/pdfswitch.sty
index b468c08afdb..6fc7a0a9b45 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}%
-[2018/10/17 v2.3.0 No changes in pdfswitch.dtx]
+[2020/06/01 v2.4.0 No changes in pdfswitch.dtx]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%
diff --git a/Master/texmf-dist/tex/latex/latex-make/texdepends.sty b/Master/texmf-dist/tex/latex/latex-make/texdepends.sty
index 3d8224b313c..fcb08951f10 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}%
-[2018/09/04 v2.3.0 ignore comment.cut file from the comment package]
+[2020/06/01 v2.4.0 No changes in texdepends.dtx]
\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 3f54d36f4b3..af126a5f20d 100644
--- a/Master/texmf-dist/tex/latex/latex-make/texgraphicx.sty
+++ b/Master/texmf-dist/tex/latex/latex-make/texgraphicx.sty
@@ -40,12 +40,11 @@
%% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
%%
\ProvidesPackage{texgraphicx}%
-[2018/10/17 v2.3.0 No changes in figlatex.dtx]
-\PackageWarning{texgraphicx}{'texgraphicx' is now
- deprecated\MessageBreak%
- Please, consider switching to 'figlatex'
- package\MessageBreak}
-\RequirePackage{figlatex}
+[2020/06/01 v2.4.0 Fix support for new latex]
+\PackageError{texgraphicx}{'texgraphicx' is now
+ gone\MessageBreak%
+ Please, switching to 'figlatex'
+ package\MessageBreak}{}
\ProcessOptions
\endinput
%%