texlive[53389] Master/texmf-dist: svg (13jan20)
commits+karl at tug.org
commits+karl at tug.org
Mon Jan 13 22:24:54 CET 2020
Revision: 53389
http://tug.org/svn/texlive?view=revision&revision=53389
Author: karl
Date: 2020-01-13 22:24:53 +0100 (Mon, 13 Jan 2020)
Log Message:
-----------
svg (13jan20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/svg/LICENSE.md
trunk/Master/texmf-dist/doc/latex/svg/README.md
trunk/Master/texmf-dist/doc/latex/svg/root.C
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/LICENSE.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/svg/LICENSE.md 2020-01-13 21:24:30 UTC (rev 53388)
+++ trunk/Master/texmf-dist/doc/latex/svg/LICENSE.md 2020-01-13 21:24:53 UTC (rev 53389)
@@ -1,8 +1,8 @@
- svg and svg-extract -- Include and extract SVG pictures in LaTeX documents
+ svg and svg-extract – Handling SVG pictures in LaTeX documents
----------------------------------------------------------------------------
- Copyright (C) Philip Ilten <philten at cern.ch>, 2012-2016
+ Copyright (C) Philip Ilten <philten at cern.ch>, 2012-2016<br>
Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2017-
----------------------------------------------------------------------------
Modified: trunk/Master/texmf-dist/doc/latex/svg/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/svg/README.md 2020-01-13 21:24:30 UTC (rev 53388)
+++ trunk/Master/texmf-dist/doc/latex/svg/README.md 2020-01-13 21:24:53 UTC (rev 53389)
@@ -5,7 +5,7 @@
Copyright (C) Philip Ilten <philten at cern.ch>, 2012-2016<br>
Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2017-
- svg 2019/10/22 v2.02d
+ **svg 2020/01/13 v2.02e**
----------------------------------------------------------------------------
@@ -39,6 +39,9 @@
Versions
--------
+**v2.02e** (2020/01/13)
++ fixes for new version of package **scrbase**
+
**v2.02d** (2019/10/22)
+ fix bugs with current kernel (2019/10/01) regarding file name parsing, see
https://github.com/mrpiggi/svg/issues/16
Modified: trunk/Master/texmf-dist/doc/latex/svg/root.C
===================================================================
--- trunk/Master/texmf-dist/doc/latex/svg/root.C 2020-01-13 21:24:30 UTC (rev 53388)
+++ trunk/Master/texmf-dist/doc/latex/svg/root.C 2020-01-13 21:24:53 UTC (rev 53389)
@@ -17,9 +17,9 @@
// Draw additional text.
TText *t = new TText(); t->SetTextAlign(31);
t->DrawText(0.7, 0.9, "\\larger[2]$z(x,y) = \\frac{1}{\\sigma_x\\sigma_y"
- "\\sqrt{4\\pi^2}}\\exp\\left(- \\left(\\frac{(x-\\mu_x)^2}"
- "{2\\sigma_x^2} + \\frac{(y-\\mu_y)^2}{2\\sigma_y^2} \\right)"
- "\\right)$");
+ "\\sqrt{4\\pi^2}}\\exp\\left(- \\left(\\frac{(x-\\mu_x)^2}"
+ "{2\\sigma_x^2} + \\frac{(y-\\mu_y)^2}{2\\sigma_y^2} \\right)"
+ "\\right)$");
// Print the plot.
gPad->Print("root.svg");
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 2020-01-13 21:24:30 UTC (rev 53388)
+++ trunk/Master/texmf-dist/source/latex/svg/svg.dtx 2020-01-13 21:24:53 UTC (rev 53389)
@@ -1,7 +1,7 @@
-% \CheckSum{3884}
+% \CheckSum{3882}
% \iffalse meta-comment
%
-% svg and svg-extract -- Include and extract SVG pictures in LaTeX documents
+% svg and svg-extract -- Handling SVG pictures in LaTeX documents
% ----------------------------------------------------------------------------
%
% Copyright (C) Philip Ilten <philten at cern.ch>, 2012-2016
@@ -107,15 +107,15 @@
% Right brace \} Tilde \~}
%
% \iffalse
+%<package&option>\NeedsTeXFormat{LaTeX2e}[2019-10-01]
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{svg.dtx}[%
%</driver>
-%<package&option>\NeedsTeXFormat{LaTeX2e}[2019-10-01]
%<package&option&base>\ProvidesPackage{svg}[%
%<package&option&extract>\ProvidesPackage{svg-extract}[%
%<*driver|package&option>
- 2019/10/22 v2.02d\space%
+ 2020/01/13 v2.02e\space%
%<package&option&base> (include SVG pictures)%
%<package&option&extract> (extract independent graphics from SVG pictures)%
]
@@ -301,10 +301,10 @@
% loaded by packages \pkg{svg} and \pkg{svg-extract} to provide the
% functionallity. These are:
% \begin{description}[parsep=.5\smallskipamount]
+% \item[\pkg{iftex}]
+% for flow control depending on the used \LaTeX~engine
% \item[\pkg{scrbase}]
% for the definition and handling of options in key-value-syntax
-% \item[\pkg{ifpdf}, \pkg{ifluatex}, \pkg{ifxetex}]
-% for flow control depending on the used \LaTeX~engine
% \item[\pkg{pdftexcmds}, \pkg{shellesc}]
% to allocate the same primitives independent of the used \LaTeX~engine
% \item[\pkg{ifplatform}]
@@ -313,7 +313,7 @@
% to remove unwanted spaces in file paths
% \item[\pkg{graphicx}]
% for including the graphic~files after the \app{Inkscape}~export
-% \item[\pkg{xcolor},\pkg{transparent}]
+% \item[\pkg{xcolor}, \pkg{transparent}]
% are possibly needed by the separate \LaTeX~files created by \app{Inkscape}
% \item[\pkg{xr}]
% is used by \pkg{svg-extract} in order to include labels within the
@@ -1301,20 +1301,17 @@
% \section{Initialization}
% \subsection{Packages}
%
-% The package \pkg{svg} requires \pkg{scrbase} for options processing, the
-% packages \pkg{ifluatex}, \pkg{ifpdf} and \pkg{ifxetex} for detecting the
-% used \LaTeX~engine, \pkg{pdftexcmds} for pdf\TeX{} primitives when using
-% Lua\TeX, \pkg{shellesc} and \pkg{ifplatform} for engine independent access to
-% systems commands and files as well as \pkg{graphicx} for the inclusion of
-% PDF~files. The usage of packages \pkg{xcolor} and \pkg{transparent}
-% can be switched of with the corresponding options. Package \pkg{svg-extract}
-% only needs package \pkg{svg} itself.
+% The package \pkg{svg} requires package \pkg{iftex} for detecting the used
+% \LaTeX~engine, \pkg{scrbase} for options processing, \pkg{pdftexcmds} for
+% pdf\TeX{} primitives when using Lua\TeX, \pkg{shellesc} and \pkg{ifplatform}
+% for engine independent access to systems commands and files as well as
+% \pkg{graphicx} for the inclusion of PDF~files. The usage of packages
+% \pkg{xcolor} and \pkg{transparent} can be switched of with the corresponding
+% options. Package \pkg{svg-extract} only needs package \pkg{svg} itself.
% \begin{macrocode}
%<*base>
-\RequirePackage{scrbase}[2016/06/14]
-\RequirePackage{ifpdf}[2016/05/14]
-\RequirePackage{ifluatex}[2016/05/16]
-\RequirePackage{ifxetex}[2010/09/12]
+\RequirePackage{iftex}[2019/11/07]
+\RequirePackage{scrbase}[2019/12/23]
\RequirePackage{pdftexcmds}[2016/05/21]
\RequirePackage{shellesc}[2016/06/07]
\RequirePackage{trimspaces}[2009/09/17]
@@ -1514,7 +1511,7 @@
% \begin{macrocode}
\else% dpi
\def\svg at tempa##1dpi##2\@nil{%
- \ifstr{##2}{dpi}{\FamilyOptions{SVG}{inkscapedpi=##1}}{}%
+ \Ifstr{##2}{dpi}{\FamilyOptions{SVG}{inkscapedpi=##1}}{}%
}%
\lowercase{\expandafter\svg at tempa\svg at tempb dpi\@nil}%
% \end{macrocode}
@@ -1671,7 +1668,7 @@
}{%
\def\svg at tempa##1dpi##2\@nil{\def\svg at tempa{##1}}%
\lowercase{\svg at tempa#1dpi\@nil}%
- \ifnumber{\svg at tempa}{%
+ \Ifnumber{\svg at tempa}{%
\edef\svg at ink@dpi{\svg at tempa}%
\FamilyKeyStateProcessed%
}{}%
@@ -1886,7 +1883,7 @@
\renewcommand*\svg at param@scale{1}%
\FamilyKeyStateProcessed%
}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\ifdim\dimexpr#1\p@\relax>\z@\relax%
\renewcommand*\svg at param@scale{#1}%
\FamilyKeyStateProcessed%
@@ -2387,7 +2384,7 @@
% \begin{macrocode}
\newcommand*\svg at extension@parse[1]{%
\IfArgIsEmpty{#1}{}{%
- \@expandtwoargs\ifstr%
+ \@expandtwoargs\Ifstr%
{\detokenize\expandafter{\filename at ext}}{\detokenize\expandafter{#1}}{}{%
\begingroup%
% \end{macrocode}
@@ -2427,7 +2424,7 @@
\def\svg at extension@@parse#1.#2\@nil#3\@nil{%
\edef\svg at tempa{\svg at tempa.#1}%
\IfArgIsEmpty{#2}{}{%
- \ifstr{\detokenize{#2}}{\detokenize{#3.}}{%
+ \Ifstr{\detokenize{#2}}{\detokenize{#3.}}{%
% \end{macrocode}
% If the trailing extension is found, \cs{svg at tempb} is definied.
% \begin{macrocode}
@@ -2458,12 +2455,12 @@
}%
}{%
\edef\filename at ext{#1}%
- \ifstr{\filename at area}{./}{\let\filename at area\@empty}{}%
+ \Ifstr{\filename at area}{./}{\let\filename at area\@empty}{}%
% \end{macrocode}
% Collecting all considered path for the error message.
% \begin{macrocode}
\edef\svg at tempb{#3}%
- \ifstr{\svg at tempb}{./}{\let\svg at tempb\@empty}{}%
+ \Ifstr{\svg at tempb}{./}{\let\svg at tempb\@empty}{}%
\ifx\svg at tempb\@empty%
\svg at set@input at path%
\else%
@@ -2564,7 +2561,7 @@
% to set \opt{inkscapelatex} to \val{false}, if the output format was set to
% \val{png} with option \opt{inkscapeformat}.
% \begin{macrocode}
- \ifstr{\svg at ink@format}{png}{\FamilyOptions{SVG}{inkscapelatex=false}}{}%
+ \Ifstr{\svg at ink@format}{png}{\FamilyOptions{SVG}{inkscapelatex=false}}{}%
% \end{macrocode}
% Using \opt{distort=true} is only reasonable, if \opt{height} and \opt{width}
% are given.
@@ -2770,7 +2767,7 @@
\newcommand*\svg at param@angle{0}
\svg at local@param at def{%
\DefineFamilyKey[.param]{SVG}{angle}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\renewcommand*\svg at param@angle{#1}%
\FamilyKeyStateProcessed%
}{}%
@@ -2812,7 +2809,7 @@
}%
\def\svg at tempb##1_tex##2\@nil{%
\IfArgIsEmpty{##1}{}{\def\filename at ext{##1}}%
- \ifstr{##2}{_tex}{\@svg at tempswatrue}{\@svg at tempswafalse}%
+ \Ifstr{##2}{_tex}{\@svg at tempswatrue}{\@svg at tempswafalse}%
}%
\@svg at tempswafalse%
\@tfor\svg at tempa:={pdf}{eps}{ps}{png}\do{%
@@ -3006,7 +3003,7 @@
% value was given.
% \begin{macrocode}
\ifx\svg at ink@dpi\relax%
- \ifstr{\svg at ink@format}{png}{%
+ \Ifstr{\svg at ink@format}{png}{%
\FamilyOptions{SVG}{inkscapedpi=300}%
}{}%
\fi%
@@ -3077,7 +3074,7 @@
% purpose, the total page number is read from the PDF~file.
% \begin{macrocode}
\newcommand*\svg at get@lastpage[1]{%
- \ifstr{\svg at ink@format}{pdf}{%
+ \Ifstr{\svg at ink@format}{pdf}{%
\begingroup%
\@tempcnta=\m at ne\relax%
\ifx\XeTeXpdfpagecount\@undefined%
@@ -4178,7 +4175,7 @@
\renewcommand*\svgx at param@width{\z@}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx at param@width{\svg at param@width}%
\FamilyKeyStateProcessed%
}{%
@@ -4198,7 +4195,7 @@
\renewcommand*\svgx at param@height{\z@}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx at param@height{\svg at param@height}%
\FamilyKeyStateProcessed%
}{%
@@ -4218,7 +4215,7 @@
\@svgx at param@distortfalse%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\if at svgx@param at distort{\if at svg@param at distort}%
\FamilyKeyStateProcessed%
}{%
@@ -4245,11 +4242,11 @@
\renewcommand*\svgx at param@scale{1}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx at param@scale{\svg at param@scale}%
\FamilyKeyStateProcessed%
}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\ifdim\dimexpr#1\p@\relax>\z@\relax%
\renewcommand*\svgx at param@scale{#1}%
\FamilyKeyStateProcessed%
@@ -4290,7 +4287,7 @@
\svg at ifvalueisrelax{#1}{%
\let\svgx at param@pretex\relax%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx at param@pretex{\svg at param@pretex}%
}{%
\renewcommand*\svgx at param@pretex{#1}%
@@ -4303,7 +4300,7 @@
\svg at ifvalueisrelax{#1}{%
\let\svgx at param@apptex\relax%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx at param@apptex{\svg at param@apptex}%
}{%
\renewcommand*\svgx at param@apptex{#1}%
@@ -4456,11 +4453,11 @@
\renewcommand*\svgx at param@angle{0}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx at param@angle{\svg at param@angle}%
\FamilyKeyStateProcessed%
}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\renewcommand*\svgx at param@angle{#1}%
\FamilyKeyStateProcessed%
}{}%
@@ -4822,7 +4819,7 @@
% \begin{macrocode}
\let\svg at tempa\@empty%
\if at svg@ink at latex%
- \ifstr{\svg at ink@format}{pdf}{%
+ \Ifstr{\svg at ink@format}{pdf}{%
\ifnum\value{svg at param@lastpage}>\z@\relax%
\edef\svg at tempa{lastpage=\the\value{svg at param@lastpage}}%
\else%
@@ -4879,7 +4876,7 @@
% After creating the separate auxiliary \LaTeX~file, the actual extraction and
% conversion can be done.
% \begin{macrocode}
- \ifstr{\svgx at format\svgx at cnv@format}{}{%
+ \Ifstr{\svgx at format\svgx at cnv@format}{}{%
\PackageWarning{svg-extract}{%
Both keys `extractformat' and `convertformat' are\MessageBreak%
empty, so nothing to do so far%
@@ -5119,7 +5116,7 @@
% Write everything which was found right before the macro which starts hiding
% area to the output stream and stop writing with \cs{if at svgx@preamble at write}.
% \begin{macrocode}
- \ifstr{#2}{till}{%
+ \Ifstr{#2}{till}{%
\IfArgIsEmpty{####1}{}{%
\immediate\write\svgx at stream@out{####1}%
}%
@@ -5129,7 +5126,7 @@
% Write everything which was found right after the macro which ends the hiding
% area and start writing again with \cs{if at svgx@preamble at write}.
% \begin{macrocode}
- \ifstr{#2}{from}{%
+ \Ifstr{#2}{from}{%
\IfArgIsEmpty{####2}{%
\def\svgx at read@line{}%
}{%
@@ -5311,7 +5308,7 @@
% like \val{\meta{key}=\{\meta{format}=\meta{value}\}}.
% \begin{macrocode}
\newcommand*\svgx at ifkeyandval[3]{%
- \def\svg at tempa##1=##2=##3\@nil{\ifstr{##3}{=}{#2}{#3}}%
+ \def\svg at tempa##1=##2=##3\@nil{\Ifstr{##3}{=}{#2}{#3}}%
\svg at tempa#1==\@nil%
}
% \end{macrocode}
@@ -5338,9 +5335,9 @@
% was given and there's nothing more to do. If the argument is something like
% \val{300dpix400dpi}, the third argument is the second number.
% \begin{macrocode}
- \ifnumber{##1}{%
+ \Ifnumber{##1}{%
\IfArgIsEmpty{##3}{\@svg at tempswatrue}{%
- \ifnumber{##3}{\edef\svg at tempa{##1x##3}}{}%
+ \Ifnumber{##3}{\edef\svg at tempa{##1x##3}}{}%
}%
}{}%
\if at svg@tempswa\else%
@@ -5352,13 +5349,13 @@
% \val{300x400} was given. If true, the value is stored in \cs{svg at tempa}.
% \begin{macrocode}
\def\svg at tempb##1x##2x##3\@nil{%
- \ifstr{##3}{x}{%
+ \Ifstr{##3}{x}{%
\@svg at tempswatrue%
\IfArgIsEmpty{##1}{\@svg at tempswafalse}{%
- \ifnumber{##1}{}{\@svg at tempswafalse}%
+ \Ifnumber{##1}{}{\@svg at tempswafalse}%
}%
\IfArgIsEmpty{##2}{\@svg at tempswafalse}{%
- \ifnumber{##2}{}{\@svg at tempswafalse}%
+ \Ifnumber{##2}{}{\@svg at tempswafalse}%
}%
\if at svg@tempswa%
\edef\svg at tempa{##1x##2}%
@@ -5637,8 +5634,8 @@
\begingroup%
\svg at quotes@remove[{#1}]{\svg at tempa}%
\@svg at tempswatrue%
- \ifstr{\svg at tempa}{}{\@svg at tempswafalse}{%
- \ifstr{\svg at tempa}{./}{\@svg at tempswafalse}{%
+ \Ifstr{\svg at tempa}{}{\@svg at tempswafalse}{%
+ \Ifstr{\svg at tempa}{./}{\@svg at tempswafalse}{%
}}%
\if at svg@tempswa%
\ShellEscape{\svg at shell@@mkdir{\svg at tempa}}%
Modified: trunk/Master/texmf-dist/tex/latex/svg/svg-extract.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/svg/svg-extract.sty 2020-01-13 21:24:30 UTC (rev 53388)
+++ trunk/Master/texmf-dist/tex/latex/svg/svg-extract.sty 2020-01-13 21:24:53 UTC (rev 53389)
@@ -33,7 +33,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2019-10-01]
\ProvidesPackage{svg-extract}[%
- 2019/10/22 v2.02d\space%
+ 2020/01/13 v2.02e\space%
(extract independent graphics from SVG pictures)%
]
\RequirePackage{svg}[2017/03/27]
@@ -407,7 +407,7 @@
\renewcommand*\svgx at param@width{\z@}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx at param@width{\svg at param@width}%
\FamilyKeyStateProcessed%
}{%
@@ -427,7 +427,7 @@
\renewcommand*\svgx at param@height{\z@}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx at param@height{\svg at param@height}%
\FamilyKeyStateProcessed%
}{%
@@ -447,7 +447,7 @@
\@svgx at param@distortfalse%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\if at svgx@param at distort{\if at svg@param at distort}%
\FamilyKeyStateProcessed%
}{%
@@ -474,11 +474,11 @@
\renewcommand*\svgx at param@scale{1}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx at param@scale{\svg at param@scale}%
\FamilyKeyStateProcessed%
}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\ifdim\dimexpr#1\p@\relax>\z@\relax%
\renewcommand*\svgx at param@scale{#1}%
\FamilyKeyStateProcessed%
@@ -492,7 +492,7 @@
\svg at ifvalueisrelax{#1}{%
\let\svgx at param@pretex\relax%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx at param@pretex{\svg at param@pretex}%
}{%
\renewcommand*\svgx at param@pretex{#1}%
@@ -505,7 +505,7 @@
\svg at ifvalueisrelax{#1}{%
\let\svgx at param@apptex\relax%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx at param@apptex{\svg at param@apptex}%
}{%
\renewcommand*\svgx at param@apptex{#1}%
@@ -563,7 +563,7 @@
\newcommand*\svgx at onlywindows[1]{}
\AfterPackage*{ifplatform}{\renewcommand*\svgx at onlywindows[1]{\ifwindows#1\fi}}
\newcommand*\svgx at ifkeyandval[3]{%
- \def\svg at tempa##1=##2=##3\@nil{\ifstr{##3}{=}{#2}{#3}}%
+ \def\svg at tempa##1=##2=##3\@nil{\Ifstr{##3}{=}{#2}{#3}}%
\svg at tempa#1==\@nil%
}
\newcommand*\svgx at cnv@get at dpi[1]{%
@@ -571,9 +571,9 @@
\def\svg at tempa##1dpi##2x##3dpi##4\@nil{%
\edef\svg at tempa{##1}%
\@svg at tempswafalse%
- \ifnumber{##1}{%
+ \Ifnumber{##1}{%
\IfArgIsEmpty{##3}{\@svg at tempswatrue}{%
- \ifnumber{##3}{\edef\svg at tempa{##1x##3}}{}%
+ \Ifnumber{##3}{\edef\svg at tempa{##1x##3}}{}%
}%
}{}%
\if at svg@tempswa\else%
@@ -581,13 +581,13 @@
\fi%
}%
\def\svg at tempb##1x##2x##3\@nil{%
- \ifstr{##3}{x}{%
+ \Ifstr{##3}{x}{%
\@svg at tempswatrue%
\IfArgIsEmpty{##1}{\@svg at tempswafalse}{%
- \ifnumber{##1}{}{\@svg at tempswafalse}%
+ \Ifnumber{##1}{}{\@svg at tempswafalse}%
}%
\IfArgIsEmpty{##2}{\@svg at tempswafalse}{%
- \ifnumber{##2}{}{\@svg at tempswafalse}%
+ \Ifnumber{##2}{}{\@svg at tempswafalse}%
}%
\if at svg@tempswa%
\edef\svg at tempa{##1x##2}%
@@ -727,11 +727,11 @@
\renewcommand*\svgx at param@angle{0}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx at param@angle{\svg at param@angle}%
\FamilyKeyStateProcessed%
}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\renewcommand*\svgx at param@angle{#1}%
\FamilyKeyStateProcessed%
}{}%
@@ -913,7 +913,7 @@
\fi%
\let\svg at tempa\@empty%
\if at svg@ink at latex%
- \ifstr{\svg at ink@format}{pdf}{%
+ \Ifstr{\svg at ink@format}{pdf}{%
\ifnum\value{svg at param@lastpage}>\z@\relax%
\edef\svg at tempa{lastpage=\the\value{svg at param@lastpage}}%
\else%
@@ -952,7 +952,7 @@
}%
\immediate\closeout\svgx at stream@out%
\endgroup%
- \ifstr{\svgx at format\svgx at cnv@format}{}{%
+ \Ifstr{\svgx at format\svgx at cnv@format}{}{%
\PackageWarning{svg-extract}{%
Both keys `extractformat' and `convertformat' are\MessageBreak%
empty, so nothing to do so far%
@@ -1102,13 +1102,13 @@
\def\svg at tempa##1{%
\def\svg at tempa####1##1####2##1####3\@nil{%
\IfArgIsEmpty{####3}{}{%
- \ifstr{#2}{till}{%
+ \Ifstr{#2}{till}{%
\IfArgIsEmpty{####1}{}{%
\immediate\write\svgx at stream@out{####1}%
}%
\@svgx at preamble@writefalse%
}{%
- \ifstr{#2}{from}{%
+ \Ifstr{#2}{from}{%
\IfArgIsEmpty{####2}{%
\def\svgx at read@line{}%
}{%
Modified: trunk/Master/texmf-dist/tex/latex/svg/svg.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/svg/svg.sty 2020-01-13 21:24:30 UTC (rev 53388)
+++ trunk/Master/texmf-dist/tex/latex/svg/svg.sty 2020-01-13 21:24:53 UTC (rev 53389)
@@ -33,13 +33,11 @@
%%
\NeedsTeXFormat{LaTeX2e}[2019-10-01]
\ProvidesPackage{svg}[%
- 2019/10/22 v2.02d\space%
+ 2020/01/13 v2.02e\space%
(include SVG pictures)%
]
-\RequirePackage{scrbase}[2016/06/14]
-\RequirePackage{ifpdf}[2016/05/14]
-\RequirePackage{ifluatex}[2016/05/16]
-\RequirePackage{ifxetex}[2010/09/12]
+\RequirePackage{iftex}[2019/11/07]
+\RequirePackage{scrbase}[2019/12/23]
\RequirePackage{pdftexcmds}[2016/05/21]
\RequirePackage{shellesc}[2016/06/07]
\RequirePackage{trimspaces}[2009/09/17]
@@ -124,7 +122,7 @@
\fi%
\else% dpi
\def\svg at tempa##1dpi##2\@nil{%
- \ifstr{##2}{dpi}{\FamilyOptions{SVG}{inkscapedpi=##1}}{}%
+ \Ifstr{##2}{dpi}{\FamilyOptions{SVG}{inkscapedpi=##1}}{}%
}%
\lowercase{\expandafter\svg at tempa\svg at tempb dpi\@nil}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed\else%
@@ -217,7 +215,7 @@
}{%
\def\svg at tempa##1dpi##2\@nil{\def\svg at tempa{##1}}%
\lowercase{\svg at tempa#1dpi\@nil}%
- \ifnumber{\svg at tempa}{%
+ \Ifnumber{\svg at tempa}{%
\edef\svg at ink@dpi{\svg at tempa}%
\FamilyKeyStateProcessed%
}{}%
@@ -333,7 +331,7 @@
\renewcommand*\svg at param@scale{1}%
\FamilyKeyStateProcessed%
}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\ifdim\dimexpr#1\p@\relax>\z@\relax%
\renewcommand*\svg at param@scale{#1}%
\FamilyKeyStateProcessed%
@@ -669,7 +667,7 @@
}
\newcommand*\svg at extension@parse[1]{%
\IfArgIsEmpty{#1}{}{%
- \@expandtwoargs\ifstr%
+ \@expandtwoargs\Ifstr%
{\detokenize\expandafter{\filename at ext}}{\detokenize\expandafter{#1}}{}{%
\begingroup%
\edef\svg at tempa{%
@@ -696,7 +694,7 @@
\def\svg at extension@@parse#1.#2\@nil#3\@nil{%
\edef\svg at tempa{\svg at tempa.#1}%
\IfArgIsEmpty{#2}{}{%
- \ifstr{\detokenize{#2}}{\detokenize{#3.}}{%
+ \Ifstr{\detokenize{#2}}{\detokenize{#3.}}{%
\edef\svg at tempb{#3}%
}{%
\svg at extension@@parse#2\@nil#3\@nil%
@@ -716,9 +714,9 @@
}%
}{%
\edef\filename at ext{#1}%
- \ifstr{\filename at area}{./}{\let\filename at area\@empty}{}%
+ \Ifstr{\filename at area}{./}{\let\filename at area\@empty}{}%
\edef\svg at tempb{#3}%
- \ifstr{\svg at tempb}{./}{\let\svg at tempb\@empty}{}%
+ \Ifstr{\svg at tempb}{./}{\let\svg at tempb\@empty}{}%
\ifx\svg at tempb\@empty%
\svg at set@input at path%
\else%
@@ -784,7 +782,7 @@
\newcommand*\svg at local@param at set[1]{%
\svg at local@param at use%
\FamilyOptions{SVG}{#1}%
- \ifstr{\svg at ink@format}{png}{\FamilyOptions{SVG}{inkscapelatex=false}}{}%
+ \Ifstr{\svg at ink@format}{png}{\FamilyOptions{SVG}{inkscapelatex=false}}{}%
\@svg at tempswafalse%
\ifdim\svg at param@width>\z@\relax\ifdim\svg at param@height>\z@\relax%
\@svg at tempswatrue%
@@ -852,7 +850,7 @@
\newcommand*\svg at param@angle{0}
\svg at local@param at def{%
\DefineFamilyKey[.param]{SVG}{angle}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\renewcommand*\svg at param@angle{#1}%
\FamilyKeyStateProcessed%
}{}%
@@ -876,7 +874,7 @@
}%
\def\svg at tempb##1_tex##2\@nil{%
\IfArgIsEmpty{##1}{}{\def\filename at ext{##1}}%
- \ifstr{##2}{_tex}{\@svg at tempswatrue}{\@svg at tempswafalse}%
+ \Ifstr{##2}{_tex}{\@svg at tempswatrue}{\@svg at tempswafalse}%
}%
\@svg at tempswafalse%
\@tfor\svg at tempa:={pdf}{eps}{ps}{png}\do{%
@@ -981,7 +979,7 @@
\if at svg@ink at run%
\ifnum\pdf at shellescape=\@ne\relax%
\ifx\svg at ink@dpi\relax%
- \ifstr{\svg at ink@format}{png}{%
+ \Ifstr{\svg at ink@format}{png}{%
\FamilyOptions{SVG}{inkscapedpi=300}%
}{}%
\fi%
@@ -1032,7 +1030,7 @@
--export-\svg at ink@format="#2.\svg at ink@format"\space%
}
\newcommand*\svg at get@lastpage[1]{%
- \ifstr{\svg at ink@format}{pdf}{%
+ \Ifstr{\svg at ink@format}{pdf}{%
\begingroup%
\@tempcnta=\m at ne\relax%
\ifx\XeTeXpdfpagecount\@undefined%
@@ -1246,8 +1244,8 @@
\begingroup%
\svg at quotes@remove[{#1}]{\svg at tempa}%
\@svg at tempswatrue%
- \ifstr{\svg at tempa}{}{\@svg at tempswafalse}{%
- \ifstr{\svg at tempa}{./}{\@svg at tempswafalse}{%
+ \Ifstr{\svg at tempa}{}{\@svg at tempswafalse}{%
+ \Ifstr{\svg at tempa}{./}{\@svg at tempswafalse}{%
}}%
\if at svg@tempswa%
\ShellEscape{\svg at shell@@mkdir{\svg at tempa}}%
More information about the tex-live-commits
mailing list