From 6c634330d8237f896bd34888cf362ba353b07d4c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 Jan 2020 21:24:53 +0000 Subject: svg (13jan20) git-svn-id: svn://tug.org/texlive/trunk@53389 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/svg/svg-extract.sty | 40 ++++++++++++------------- Master/texmf-dist/tex/latex/svg/svg.sty | 36 +++++++++++----------- 2 files changed, 37 insertions(+), 39 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/svg/svg-extract.sty b/Master/texmf-dist/tex/latex/svg/svg-extract.sty index fd29bc5ad96..6231ffa6329 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}[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@param@width{\z@}% \FamilyKeyStateProcessed% }{% - \ifstr{#1}{inherit}{% + \Ifstr{#1}{inherit}{% \renewcommand*\svgx@param@width{\svg@param@width}% \FamilyKeyStateProcessed% }{% @@ -427,7 +427,7 @@ \renewcommand*\svgx@param@height{\z@}% \FamilyKeyStateProcessed% }{% - \ifstr{#1}{inherit}{% + \Ifstr{#1}{inherit}{% \renewcommand*\svgx@param@height{\svg@param@height}% \FamilyKeyStateProcessed% }{% @@ -447,7 +447,7 @@ \@svgx@param@distortfalse% \FamilyKeyStateProcessed% }{% - \ifstr{#1}{inherit}{% + \Ifstr{#1}{inherit}{% \renewcommand*\if@svgx@param@distort{\if@svg@param@distort}% \FamilyKeyStateProcessed% }{% @@ -474,11 +474,11 @@ \renewcommand*\svgx@param@scale{1}% \FamilyKeyStateProcessed% }{% - \ifstr{#1}{inherit}{% + \Ifstr{#1}{inherit}{% \renewcommand*\svgx@param@scale{\svg@param@scale}% \FamilyKeyStateProcessed% }{% - \ifisdimension{#1\p@}{% + \Ifisdimension{#1\p@}{% \ifdim\dimexpr#1\p@\relax>\z@\relax% \renewcommand*\svgx@param@scale{#1}% \FamilyKeyStateProcessed% @@ -492,7 +492,7 @@ \svg@ifvalueisrelax{#1}{% \let\svgx@param@pretex\relax% }{% - \ifstr{#1}{inherit}{% + \Ifstr{#1}{inherit}{% \renewcommand*\svgx@param@pretex{\svg@param@pretex}% }{% \renewcommand*\svgx@param@pretex{#1}% @@ -505,7 +505,7 @@ \svg@ifvalueisrelax{#1}{% \let\svgx@param@apptex\relax% }{% - \ifstr{#1}{inherit}{% + \Ifstr{#1}{inherit}{% \renewcommand*\svgx@param@apptex{\svg@param@apptex}% }{% \renewcommand*\svgx@param@apptex{#1}% @@ -563,7 +563,7 @@ \newcommand*\svgx@onlywindows[1]{} \AfterPackage*{ifplatform}{\renewcommand*\svgx@onlywindows[1]{\ifwindows#1\fi}} \newcommand*\svgx@ifkeyandval[3]{% - \def\svg@tempa##1=##2=##3\@nil{\ifstr{##3}{=}{#2}{#3}}% + \def\svg@tempa##1=##2=##3\@nil{\Ifstr{##3}{=}{#2}{#3}}% \svg@tempa#1==\@nil% } \newcommand*\svgx@cnv@get@dpi[1]{% @@ -571,9 +571,9 @@ \def\svg@tempa##1dpi##2x##3dpi##4\@nil{% \edef\svg@tempa{##1}% \@svg@tempswafalse% - \ifnumber{##1}{% + \Ifnumber{##1}{% \IfArgIsEmpty{##3}{\@svg@tempswatrue}{% - \ifnumber{##3}{\edef\svg@tempa{##1x##3}}{}% + \Ifnumber{##3}{\edef\svg@tempa{##1x##3}}{}% }% }{}% \if@svg@tempswa\else% @@ -581,13 +581,13 @@ \fi% }% \def\svg@tempb##1x##2x##3\@nil{% - \ifstr{##3}{x}{% + \Ifstr{##3}{x}{% \@svg@tempswatrue% \IfArgIsEmpty{##1}{\@svg@tempswafalse}{% - \ifnumber{##1}{}{\@svg@tempswafalse}% + \Ifnumber{##1}{}{\@svg@tempswafalse}% }% \IfArgIsEmpty{##2}{\@svg@tempswafalse}{% - \ifnumber{##2}{}{\@svg@tempswafalse}% + \Ifnumber{##2}{}{\@svg@tempswafalse}% }% \if@svg@tempswa% \edef\svg@tempa{##1x##2}% @@ -727,11 +727,11 @@ \renewcommand*\svgx@param@angle{0}% \FamilyKeyStateProcessed% }{% - \ifstr{#1}{inherit}{% + \Ifstr{#1}{inherit}{% \renewcommand*\svgx@param@angle{\svg@param@angle}% \FamilyKeyStateProcessed% }{% - \ifisdimension{#1\p@}{% + \Ifisdimension{#1\p@}{% \renewcommand*\svgx@param@angle{#1}% \FamilyKeyStateProcessed% }{}% @@ -913,7 +913,7 @@ \fi% \let\svg@tempa\@empty% \if@svg@ink@latex% - \ifstr{\svg@ink@format}{pdf}{% + \Ifstr{\svg@ink@format}{pdf}{% \ifnum\value{svg@param@lastpage}>\z@\relax% \edef\svg@tempa{lastpage=\the\value{svg@param@lastpage}}% \else% @@ -952,7 +952,7 @@ }% \immediate\closeout\svgx@stream@out% \endgroup% - \ifstr{\svgx@format\svgx@cnv@format}{}{% + \Ifstr{\svgx@format\svgx@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@tempa##1{% \def\svg@tempa####1##1####2##1####3\@nil{% \IfArgIsEmpty{####3}{}{% - \ifstr{#2}{till}{% + \Ifstr{#2}{till}{% \IfArgIsEmpty{####1}{}{% \immediate\write\svgx@stream@out{####1}% }% \@svgx@preamble@writefalse% }{% - \ifstr{#2}{from}{% + \Ifstr{#2}{from}{% \IfArgIsEmpty{####2}{% \def\svgx@read@line{}% }{% diff --git a/Master/texmf-dist/tex/latex/svg/svg.sty b/Master/texmf-dist/tex/latex/svg/svg.sty index 8d99cb9be7f..02cbf11be31 100644 --- a/Master/texmf-dist/tex/latex/svg/svg.sty +++ b/Master/texmf-dist/tex/latex/svg/svg.sty @@ -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@tempa##1dpi##2\@nil{% - \ifstr{##2}{dpi}{\FamilyOptions{SVG}{inkscapedpi=##1}}{}% + \Ifstr{##2}{dpi}{\FamilyOptions{SVG}{inkscapedpi=##1}}{}% }% \lowercase{\expandafter\svg@tempa\svg@tempb dpi\@nil}% \ifx\FamilyKeyState\FamilyKeyStateProcessed\else% @@ -217,7 +215,7 @@ }{% \def\svg@tempa##1dpi##2\@nil{\def\svg@tempa{##1}}% \lowercase{\svg@tempa#1dpi\@nil}% - \ifnumber{\svg@tempa}{% + \Ifnumber{\svg@tempa}{% \edef\svg@ink@dpi{\svg@tempa}% \FamilyKeyStateProcessed% }{}% @@ -333,7 +331,7 @@ \renewcommand*\svg@param@scale{1}% \FamilyKeyStateProcessed% }{% - \ifisdimension{#1\p@}{% + \Ifisdimension{#1\p@}{% \ifdim\dimexpr#1\p@\relax>\z@\relax% \renewcommand*\svg@param@scale{#1}% \FamilyKeyStateProcessed% @@ -669,7 +667,7 @@ } \newcommand*\svg@extension@parse[1]{% \IfArgIsEmpty{#1}{}{% - \@expandtwoargs\ifstr% + \@expandtwoargs\Ifstr% {\detokenize\expandafter{\filename@ext}}{\detokenize\expandafter{#1}}{}{% \begingroup% \edef\svg@tempa{% @@ -696,7 +694,7 @@ \def\svg@extension@@parse#1.#2\@nil#3\@nil{% \edef\svg@tempa{\svg@tempa.#1}% \IfArgIsEmpty{#2}{}{% - \ifstr{\detokenize{#2}}{\detokenize{#3.}}{% + \Ifstr{\detokenize{#2}}{\detokenize{#3.}}{% \edef\svg@tempb{#3}% }{% \svg@extension@@parse#2\@nil#3\@nil% @@ -716,9 +714,9 @@ }% }{% \edef\filename@ext{#1}% - \ifstr{\filename@area}{./}{\let\filename@area\@empty}{}% + \Ifstr{\filename@area}{./}{\let\filename@area\@empty}{}% \edef\svg@tempb{#3}% - \ifstr{\svg@tempb}{./}{\let\svg@tempb\@empty}{}% + \Ifstr{\svg@tempb}{./}{\let\svg@tempb\@empty}{}% \ifx\svg@tempb\@empty% \svg@set@input@path% \else% @@ -784,7 +782,7 @@ \newcommand*\svg@local@param@set[1]{% \svg@local@param@use% \FamilyOptions{SVG}{#1}% - \ifstr{\svg@ink@format}{png}{\FamilyOptions{SVG}{inkscapelatex=false}}{}% + \Ifstr{\svg@ink@format}{png}{\FamilyOptions{SVG}{inkscapelatex=false}}{}% \@svg@tempswafalse% \ifdim\svg@param@width>\z@\relax\ifdim\svg@param@height>\z@\relax% \@svg@tempswatrue% @@ -852,7 +850,7 @@ \newcommand*\svg@param@angle{0} \svg@local@param@def{% \DefineFamilyKey[.param]{SVG}{angle}{% - \ifisdimension{#1\p@}{% + \Ifisdimension{#1\p@}{% \renewcommand*\svg@param@angle{#1}% \FamilyKeyStateProcessed% }{}% @@ -876,7 +874,7 @@ }% \def\svg@tempb##1_tex##2\@nil{% \IfArgIsEmpty{##1}{}{\def\filename@ext{##1}}% - \ifstr{##2}{_tex}{\@svg@tempswatrue}{\@svg@tempswafalse}% + \Ifstr{##2}{_tex}{\@svg@tempswatrue}{\@svg@tempswafalse}% }% \@svg@tempswafalse% \@tfor\svg@tempa:={pdf}{eps}{ps}{png}\do{% @@ -981,7 +979,7 @@ \if@svg@ink@run% \ifnum\pdf@shellescape=\@ne\relax% \ifx\svg@ink@dpi\relax% - \ifstr{\svg@ink@format}{png}{% + \Ifstr{\svg@ink@format}{png}{% \FamilyOptions{SVG}{inkscapedpi=300}% }{}% \fi% @@ -1032,7 +1030,7 @@ --export-\svg@ink@format="#2.\svg@ink@format"\space% } \newcommand*\svg@get@lastpage[1]{% - \ifstr{\svg@ink@format}{pdf}{% + \Ifstr{\svg@ink@format}{pdf}{% \begingroup% \@tempcnta=\m@ne\relax% \ifx\XeTeXpdfpagecount\@undefined% @@ -1246,8 +1244,8 @@ \begingroup% \svg@quotes@remove[{#1}]{\svg@tempa}% \@svg@tempswatrue% - \ifstr{\svg@tempa}{}{\@svg@tempswafalse}{% - \ifstr{\svg@tempa}{./}{\@svg@tempswafalse}{% + \Ifstr{\svg@tempa}{}{\@svg@tempswafalse}{% + \Ifstr{\svg@tempa}{./}{\@svg@tempswafalse}{% }}% \if@svg@tempswa% \ShellEscape{\svg@shell@@mkdir{\svg@tempa}}% -- cgit v1.2.3