diff options
Diffstat (limited to 'Master/texmf-dist/source/support')
4 files changed, 66 insertions, 73 deletions
diff --git a/Master/texmf-dist/source/support/latex-make/figlatex.dtx b/Master/texmf-dist/source/support/latex-make/figlatex.dtx index bf0e727b513..313ef515f54 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 @@ %<compat> \ProvidesPackage{texgraphicx}% % \fi % \ProvidesFile{figlatex.dtx} -[2018/10/17 v2.3.0 No changes in figlatex.dtx] +[2020/06/01 v2.4.0 Fix support for new latex] % \iffalse %<*driver> \documentclass{ltxdoc} @@ -100,7 +100,7 @@ % This package allows \LaTeX\space to load XFig and SVG figures (or % subfigures) with the |\includegraphics| command. % \end{abstract} -% \CheckSum{218} +% \CheckSum{207} % % \changes{v0.1.1}{2005/03/28}{Version 0.1.1 at last} % \changes{v0.1.2}{2005/03/29}{Manage index/glossary} @@ -114,6 +114,8 @@ % \changes{v2.2.4}{2018/05/29}{Fix python syntax for python3} % \changes{v2.2.5}{2018/09/04}{No changes in figlatex.dtx} % \changes{v2.2.5}{2018/10/17}{No changes in figlatex.dtx} +% \changes{v2.4.0}{2020/06/01}{Fix path handling for subfig and new +% core LaTeX} % % \makeatletter % \def\SpecialOptionIndex#1{\@bsphack @@ -195,18 +197,13 @@ % Available options for this package: % \begin{description} % \item[debug~:] \DescribeOption{debug}more messages written while compiling -% \item[compatibility~:] \DescribeOption{compatibility}old versions of |pdflatex| do not allow -% to declare a PDF file with |\DeclareGraphicsRule| that has not the -% |.pdf| extension. In such cases, this package uses the extension -% |.pdf| instead of |.pdftex| for PDF created from XFig figures. % \end{description} % % \DescribeFile{figlatex.cfg} -% \DescribeMacro{\compatibility} % \DescribeMacro{\debug} % When the package is loaded, it tries to read a |figlatex.cfg| -% file. This file can contains |\compatibility| and/or |\debug| to -% enable theses options site wide. +% file. This file can contains |\debug| to +% enable this option site wide. % % \subsection{Subfigures} % @@ -224,15 +221,6 @@ % \end{macrocode} % % Options definitions -% \begin{option}{compatibility} -% \begin{macrocode} -\newif\ifFL@compatibility -\DeclareOption{compatibility}{% - %\PackageWarning{figlatex}{option compatibility}% - \global\FL@compatibilitytrue% -} -% \end{macrocode} -% \end{option} % \begin{option}{debug} % \begin{macrocode} \newif\ifFL@debug @@ -247,13 +235,6 @@ % \begin{macrocode} { % \end{macrocode} -% \begin{macro}{\compatibility} -% \begin{macrocode} - \def\compatibility{% - \ExecuteOptions{compatibility}% - } -% \end{macrocode} -% \end{macro} % \begin{macro}{\debug} % \begin{macrocode} \def\debug{% @@ -280,6 +261,7 @@ \RequirePackage{ifthen} \RequirePackage{ifpdf} \RequirePackage{graphicx} +\RequirePackage{xstring} % \end{macrocode} % XFig uses heavily the color package % \begin{macrocode} @@ -376,18 +358,9 @@ % \begin{macrocode} \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 % \end{macrocode} % DVI part @@ -418,6 +391,7 @@ \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{_}% @@ -433,16 +407,19 @@ % is used. % \begin{macrocode} \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}% }{% @@ -455,20 +432,21 @@ \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}% }{% % Else, write a warning (LaTeX will warn as well but it doesn't % hurt) - \PackageWarning{figlatex}{No file + \PackageWarning{figlatex}{No file '\filename@area\filename@base#1'}% } % Add the subfig suffix to the svg name. @@ -493,7 +471,6 @@ %<*config> % \end{macrocode} % \begin{macrocode} - %\compatibility %\debug % \end{macrocode} % \begin{macrocode} @@ -503,13 +480,13 @@ % \begin{macrocode} %<*compat> % \end{macrocode} -% |texgraphicx.sty| is only a wrapper arround |figlatex.sty|. +% |texgraphicx.sty| was only a wrapper arround |figlatex.sty|. Now, an +% error is generated. % \begin{macrocode} -\PackageWarning{texgraphicx}{'texgraphicx' is now - deprecated\MessageBreak% - Please, consider switching to 'figlatex' - package\MessageBreak} -\RequirePackage{figlatex} +\PackageError{texgraphicx}{'texgraphicx' is now + gone\MessageBreak% + Please, switching to 'figlatex' + package\MessageBreak}{} \ProcessOptions % \end{macrocode} % \begin{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 b7fa836658f..0aae87bd55b 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} -[2018/10/17 v2.3.0 handle TDS for local install] +[2020/06/01 v2.4.0 Fix bugs with new LaTeX core] %</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{344} +% \CheckSum{346} % % \changes{v2.0.0}{2006/03/09}{First autocommented version} % \changes{v2.1.0}{2008/01/28}{That's the question} @@ -115,6 +115,7 @@ % \changes{v2.2.5}{2018/09/04}{fix output format of figdepth.py} % \changes{v2.3.0}{2018/10/17}{Add DEPENDS-EXCLUDE, add doc and % support for local texmf tree} +% \changes{v2.4.0}{2020/06/01}{Support inkscape version >= 1.0} % % \makeatletter % \def\SpecialOptionIndex#1{\@bsphack @@ -1905,24 +1906,40 @@ if __name__ == "__main__": from optparse import OptionParser import shutil +import os import subprocess +svg2eps = 'inkscape %s -C --export-filename=%s.eps --export-type=eps --export-latex' +svg2pdf = 'inkscape %s -C --export-filename=%s.pdf --export-type=pdf --export-latex' -svg2eps = 'inkscape %s -z -C --export-eps=%s --export-latex' -svg2pdf = 'inkscape %s -z -C --export-pdf=%s --export-latex' +def create_image(input_filename, output_filename, mode, ext): + subprocess.Popen(mode % (input_filename, output_filename), + stdout=subprocess.PIPE, shell=True).communicate()[0] + o_ext = output_filename + '.' + ext + o = output_filename + o_ext_tex = output_filename + '.' + ext + '_tex' + o_t = output_filename + '_t' -def create_image(input_filename, output_filename, mode): - subprocess.Popen(mode % (input_filename, output_filename), - stdout=subprocess.PIPE, shell=True).communicate()[0] - n1 = output_filename + '_tex' - n2 = output_filename + '_t' - shutil.move(n1, n2) - + shutil.move(o_ext, o) + + fin = open(o_ext_tex, 'r') + fout = open(o_t, 'w') + + #\includegraphics[width=\unitlength,page=1]{logo.pdftex} + for line in fin: + # FIXME: be more conservative in the replacement + # (in case '{'+o_ext+'}' appeares somewhere else) + out = line.replace('{'+os.path.basename(o_ext)+'}', '{'+os.path.basename(o)+'}') + fout.write(out) + + fin.close() + fout.close() + os.remove(o_ext_tex) def main(): parser = OptionParser() - parser.add_option("-L", "--format", dest="outputFormat", + parser.add_option("-L", "--format", dest="outputFormat", metavar="FORMAT", help="output format", default="spstex") parser.add_option("-p", "--portrait", dest="portrait", help="dummy arg") (options, args) = parser.parse_args() @@ -1932,17 +1949,16 @@ def main(): portrait = options.portrait if fmt == 'eps': - create_image(input_filename, output_filename, svg2eps) + create_image(input_filename, output_filename, svg2eps, 'eps') elif fmt == 'spstex' or fmt == 'pstex': - create_image(input_filename, output_filename, svg2eps) + create_image(input_filename, output_filename, svg2eps, 'eps') elif fmt == 'spstex_t' or fmt == 'pstex_t': pass elif fmt == 'spdftex' or fmt == 'pdftex': - create_image(input_filename, output_filename, svg2pdf) + create_image(input_filename, output_filename, svg2pdf, 'pdf') elif fmt == 'spdftex_t' or fmt == 'pdftex_t': pass - 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 a5603a74b58..81e53eb43f1 100644 --- a/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx +++ b/Master/texmf-dist/source/support/latex-make/pdfswitch.dtx @@ -26,7 +26,7 @@ %<package>\ProvidesPackage{pdfswitch}% % \fi % \ProvidesFile{pdfswitch.dtx} -[2018/10/17 v2.3.0 No changes in pdfswitch.dtx] +[2020/06/01 v2.4.0 No changes in pdfswitch.dtx] %<*package> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % SWITCH FOR PDFLATEX or LATEX diff --git a/Master/texmf-dist/source/support/latex-make/texdepends.dtx b/Master/texmf-dist/source/support/latex-make/texdepends.dtx index 252d4230117..0b206a2ae60 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 @@ %<package>\ProvidesPackage{texdepends}% % \fi % \ProvidesFile{texdepends.dtx} -[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] % \iffalse %<*driver> \documentclass{ltxdoc} |