From ad8cee08cfa75f1a15e5c60dc13e9fdd529d7265 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Oct 2019 21:17:47 +0000 Subject: svg (18oct19) git-svn-id: svn://tug.org/texlive/trunk@52430 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/svg/README.md | 5 +++- Master/texmf-dist/doc/latex/svg/svg.pdf | Bin 1024563 -> 1024496 bytes Master/texmf-dist/source/latex/svg/svg.dtx | 31 ++++++++++++++++++------ Master/texmf-dist/tex/latex/svg/svg-extract.sty | 2 +- Master/texmf-dist/tex/latex/svg/svg.sty | 19 ++++++++++++--- 5 files changed, 43 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/svg/README.md b/Master/texmf-dist/doc/latex/svg/README.md index cbc4e046370..fe8f917046a 100644 --- a/Master/texmf-dist/doc/latex/svg/README.md +++ b/Master/texmf-dist/doc/latex/svg/README.md @@ -5,7 +5,7 @@ Copyright (C) Philip Ilten , 2012-2016 Copyright (C) Falk Hanisch , 2017- - svg 2018/11/12 v2.02b + svg 2019/10/10 v2.02c ---------------------------------------------------------------------------- @@ -34,6 +34,9 @@ it is rendered within the LaTeX document using either ***ImageMagick*** or Versions -------- +**v2.02c** (2019/10/10) ++ fix bugs with current kernel (2019/10/01) regarding file name parsing + **v2.02b** (2018/11/12) + fix bug for package **tikzscale** which changes `includgraphics` globally diff --git a/Master/texmf-dist/doc/latex/svg/svg.pdf b/Master/texmf-dist/doc/latex/svg/svg.pdf index 03c3912ed57..f186e95d93a 100644 Binary files a/Master/texmf-dist/doc/latex/svg/svg.pdf and b/Master/texmf-dist/doc/latex/svg/svg.pdf differ diff --git a/Master/texmf-dist/source/latex/svg/svg.dtx b/Master/texmf-dist/source/latex/svg/svg.dtx index 5c0d749e15a..7715e968116 100644 --- a/Master/texmf-dist/source/latex/svg/svg.dtx +++ b/Master/texmf-dist/source/latex/svg/svg.dtx @@ -1,4 +1,4 @@ -% \CheckSum{3811} +% \CheckSum{3838} % \iffalse meta-comment % % svg and svg-extract -- Include and extract SVG pictures in LaTeX documents @@ -115,7 +115,7 @@ svg-extract -- Extract independent graphic files from SVG pictures %\ProvidesPackage{svg}[% %\ProvidesPackage{svg-extract}[% %<*driver|package&option> - 2018/11/12 v2.02b\space% + 2019/10/10 v2.02c\space% % (include SVG pictures)% % (extract independent graphics from SVG pictures)% ] @@ -257,6 +257,9 @@ svg-extract -- Extract independent graphic files from SVG pictures % fix bug for package \pkg{tikzscale} which changes \cs{includegraphics} % globally% % }^^A +% \changes{v2.02c}{2019/10/10}{% +% fix bugs with current kernel (2019/10/01) regarding file name parsing +% }^^A % \ToDo{Workaround for missing \cs{transparent} (Lua\TeX lacks support)}[v2.03] % % @@ -2383,7 +2386,8 @@ svg-extract -- Extract independent graphic files from SVG pictures % \begin{macrocode} \newcommand*\svg@extension@parse[1]{% \IfArgIsEmpty{#1}{}{% - \ifstr{#1}{\filename@ext}{}{% + \@expandtwoargs\ifstr% + {\detokenize\expandafter{\filename@ext}}{\detokenize\expandafter{#1}}{}{% \begingroup% % \end{macrocode} % Macro \cs{svg@tempa} is used to temporarily store anything before the @@ -2422,7 +2426,7 @@ svg-extract -- Extract independent graphic files from SVG pictures \def\svg@extension@@parse#1.#2\@nil#3\@nil{% \edef\svg@tempa{\svg@tempa.#1}% \IfArgIsEmpty{#2}{}{% - \ifstr{#2}{#3.}{% + \ifstr{\detokenize{#2}}{\detokenize{#3.}}{% % \end{macrocode} % If the trailing extension is found, \cs{svg@tempb} is definied. % \begin{macrocode} @@ -3143,12 +3147,23 @@ svg-extract -- Extract independent graphic files from SVG pictures }% \svg@tempa% % \end{macrocode} -% Afterwards \cs{svg@tempa} is defined with the file name itself within -% enclosing braces followed by the extension and \cs{svg@tempb} holds the -% original file name plus extension without enclosing braces. +% Afterwards \cs{svg@tempa} is defined with the file name within enclosing +% braces followed by the extension---only if the file name itself contains any +% dots--- and \cs{svg@tempb} holds the original file name plus extension +% without enclosing braces. % \begin{macrocode} \svg@remove@leadingchar.\svg@tempa% - \edef\svg@tempa{{\svg@tempa}.\svg@tempb}% + \begingroup% + \expandafter\filename@parse\expandafter{\svg@tempa}% + \edef\svg@tempa{% + \endgroup% + \ifx\filename@ext\relax% + \edef\noexpand\svg@tempa{\svg@tempa.\svg@tempb}% + \else% + \edef\noexpand\svg@tempa{{\svg@tempa}.\svg@tempb}% + \fi% + }% + \svg@tempa% \edef\svg@tempb{#2}% % \end{macrocode} % If the export with \app{Inkscape} was done with \LaTeX~support enabled, the diff --git a/Master/texmf-dist/tex/latex/svg/svg-extract.sty b/Master/texmf-dist/tex/latex/svg/svg-extract.sty index c174389e7ee..a248829e94f 100644 --- a/Master/texmf-dist/tex/latex/svg/svg-extract.sty +++ b/Master/texmf-dist/tex/latex/svg/svg-extract.sty @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{svg-extract}[% - 2018/11/12 v2.02b\space% + 2019/10/10 v2.02c\space% (extract independent graphics from SVG pictures)% ] \RequirePackage{svg}[2017/03/27] diff --git a/Master/texmf-dist/tex/latex/svg/svg.sty b/Master/texmf-dist/tex/latex/svg/svg.sty index 2e482789186..3499c533f69 100644 --- a/Master/texmf-dist/tex/latex/svg/svg.sty +++ b/Master/texmf-dist/tex/latex/svg/svg.sty @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{svg}[% - 2018/11/12 v2.02b\space% + 2019/10/10 v2.02c\space% (include SVG pictures)% ] \RequirePackage{scrbase}[2016/06/14] @@ -665,7 +665,8 @@ } \newcommand*\svg@extension@parse[1]{% \IfArgIsEmpty{#1}{}{% - \ifstr{#1}{\filename@ext}{}{% + \@expandtwoargs\ifstr% + {\detokenize\expandafter{\filename@ext}}{\detokenize\expandafter{#1}}{}{% \begingroup% \edef\svg@tempa{% \def\noexpand\svg@tempa{}% @@ -691,7 +692,7 @@ \def\svg@extension@@parse#1.#2\@nil#3\@nil{% \edef\svg@tempa{\svg@tempa.#1}% \IfArgIsEmpty{#2}{}{% - \ifstr{#2}{#3.}{% + \ifstr{\detokenize{#2}}{\detokenize{#3.}}{% \edef\svg@tempb{#3}% }{% \svg@extension@@parse#2\@nil#3\@nil% @@ -1081,7 +1082,17 @@ }% \svg@tempa% \svg@remove@leadingchar.\svg@tempa% - \edef\svg@tempa{{\svg@tempa}.\svg@tempb}% + \begingroup% + \expandafter\filename@parse\expandafter{\svg@tempa}% + \edef\svg@tempa{% + \endgroup% + \ifx\filename@ext\relax% + \edef\noexpand\svg@tempa{\svg@tempa.\svg@tempb}% + \else% + \edef\noexpand\svg@tempa{{\svg@tempa}.\svg@tempb}% + \fi% + }% + \svg@tempa% \edef\svg@tempb{#2}% \if@svg@ink@latex% \svg@patches{\svg@tempa}% -- cgit v1.2.3