texlive[52430] Master/texmf-dist: svg (18oct19)
commits+karl at tug.org
commits+karl at tug.org
Fri Oct 18 23:17:47 CEST 2019
Revision: 52430
http://tug.org/svn/texlive?view=revision&revision=52430
Author: karl
Date: 2019-10-18 23:17:47 +0200 (Fri, 18 Oct 2019)
Log Message:
-----------
svg (18oct19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/svg/README.md
trunk/Master/texmf-dist/doc/latex/svg/svg.pdf
trunk/Master/texmf-dist/source/latex/svg/svg.dtx
trunk/Master/texmf-dist/tex/latex/svg/svg-extract.sty
trunk/Master/texmf-dist/tex/latex/svg/svg.sty
Modified: trunk/Master/texmf-dist/doc/latex/svg/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/svg/README.md 2019-10-18 20:46:33 UTC (rev 52429)
+++ trunk/Master/texmf-dist/doc/latex/svg/README.md 2019-10-18 21:17:47 UTC (rev 52430)
@@ -5,7 +5,7 @@
Copyright (C) Philip Ilten <philten at cern.ch>, 2012-2016
Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2017-
- svg 2018/11/12 v2.02b
+ svg 2019/10/10 v2.02c
----------------------------------------------------------------------------
@@ -34,6 +34,9 @@
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
Modified: trunk/Master/texmf-dist/doc/latex/svg/svg.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/svg/svg.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/svg/svg.dtx 2019-10-18 20:46:33 UTC (rev 52429)
+++ trunk/Master/texmf-dist/source/latex/svg/svg.dtx 2019-10-18 21:17:47 UTC (rev 52430)
@@ -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 @@
%<package&option&base>\ProvidesPackage{svg}[%
%<package&option&extract>\ProvidesPackage{svg-extract}[%
%<*driver|package&option>
- 2018/11/12 v2.02b\space%
+ 2019/10/10 v2.02c\space%
%<package&option&base> (include SVG pictures)%
%<package&option&extract> (extract independent graphics from SVG pictures)%
]
@@ -257,6 +257,9 @@
% 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 @@
% \begin{macrocode}
\newcommand*\svg at extension@parse[1]{%
\IfArgIsEmpty{#1}{}{%
- \ifstr{#1}{\filename at ext}{}{%
+ \@expandtwoargs\ifstr%
+ {\detokenize\expandafter{\filename at ext}}{\detokenize\expandafter{#1}}{}{%
\begingroup%
% \end{macrocode}
% Macro \cs{svg at tempa} is used to temporarily store anything before the
@@ -2422,7 +2426,7 @@
\def\svg at extension@@parse#1.#2\@nil#3\@nil{%
\edef\svg at tempa{\svg at tempa.#1}%
\IfArgIsEmpty{#2}{}{%
- \ifstr{#2}{#3.}{%
+ \ifstr{\detokenize{#2}}{\detokenize{#3.}}{%
% \end{macrocode}
% If the trailing extension is found, \cs{svg at tempb} is definied.
% \begin{macrocode}
@@ -3143,12 +3147,23 @@
}%
\svg at tempa%
% \end{macrocode}
-% Afterwards \cs{svg at tempa} is defined with the file name itself within
-% enclosing braces followed by the extension and \cs{svg at tempb} holds the
-% original file name plus extension without enclosing braces.
+% Afterwards \cs{svg at 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 at tempb} holds the original file name plus extension
+% without enclosing braces.
% \begin{macrocode}
\svg at remove@leadingchar.\svg at tempa%
- \edef\svg at tempa{{\svg at tempa}.\svg at tempb}%
+ \begingroup%
+ \expandafter\filename at parse\expandafter{\svg at tempa}%
+ \edef\svg at tempa{%
+ \endgroup%
+ \ifx\filename at ext\relax%
+ \edef\noexpand\svg at tempa{\svg at tempa.\svg at tempb}%
+ \else%
+ \edef\noexpand\svg at tempa{{\svg at tempa}.\svg at tempb}%
+ \fi%
+ }%
+ \svg at tempa%
\edef\svg at tempb{#2}%
% \end{macrocode}
% If the export with \app{Inkscape} was done with \LaTeX~support enabled, the
Modified: trunk/Master/texmf-dist/tex/latex/svg/svg-extract.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/svg/svg-extract.sty 2019-10-18 20:46:33 UTC (rev 52429)
+++ trunk/Master/texmf-dist/tex/latex/svg/svg-extract.sty 2019-10-18 21:17:47 UTC (rev 52430)
@@ -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]
Modified: trunk/Master/texmf-dist/tex/latex/svg/svg.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/svg/svg.sty 2019-10-18 20:46:33 UTC (rev 52429)
+++ trunk/Master/texmf-dist/tex/latex/svg/svg.sty 2019-10-18 21:17:47 UTC (rev 52430)
@@ -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 at extension@parse[1]{%
\IfArgIsEmpty{#1}{}{%
- \ifstr{#1}{\filename at ext}{}{%
+ \@expandtwoargs\ifstr%
+ {\detokenize\expandafter{\filename at ext}}{\detokenize\expandafter{#1}}{}{%
\begingroup%
\edef\svg at tempa{%
\def\noexpand\svg at tempa{}%
@@ -691,7 +692,7 @@
\def\svg at extension@@parse#1.#2\@nil#3\@nil{%
\edef\svg at tempa{\svg at tempa.#1}%
\IfArgIsEmpty{#2}{}{%
- \ifstr{#2}{#3.}{%
+ \ifstr{\detokenize{#2}}{\detokenize{#3.}}{%
\edef\svg at tempb{#3}%
}{%
\svg at extension@@parse#2\@nil#3\@nil%
@@ -1081,7 +1082,17 @@
}%
\svg at tempa%
\svg at remove@leadingchar.\svg at tempa%
- \edef\svg at tempa{{\svg at tempa}.\svg at tempb}%
+ \begingroup%
+ \expandafter\filename at parse\expandafter{\svg at tempa}%
+ \edef\svg at tempa{%
+ \endgroup%
+ \ifx\filename at ext\relax%
+ \edef\noexpand\svg at tempa{\svg at tempa.\svg at tempb}%
+ \else%
+ \edef\noexpand\svg at tempa{{\svg at tempa}.\svg at tempb}%
+ \fi%
+ }%
+ \svg at tempa%
\edef\svg at tempb{#2}%
\if at svg@ink at latex%
\svg at patches{\svg at tempa}%
More information about the tex-live-commits
mailing list