From f28a23095459f58671af00499975753ca3ed3c6c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 23 Oct 2019 21:39:18 +0000 Subject: svg (23oct19) git-svn-id: svn://tug.org/texlive/trunk@52500 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/svg/svg-extract.sty | 4 +- Master/texmf-dist/tex/latex/svg/svg.sty | 49 ++++++++++++++++++------- 2 files changed, 37 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex/latex/svg') diff --git a/Master/texmf-dist/tex/latex/svg/svg-extract.sty b/Master/texmf-dist/tex/latex/svg/svg-extract.sty index a248829e94f..fd29bc5ad96 100644 --- a/Master/texmf-dist/tex/latex/svg/svg-extract.sty +++ b/Master/texmf-dist/tex/latex/svg/svg-extract.sty @@ -31,9 +31,9 @@ %% svg-example.svg, svg-preamble.tex and root.C (with derived file root.svg). %% %% -\NeedsTeXFormat{LaTeX2e} +\NeedsTeXFormat{LaTeX2e}[2019-10-01] \ProvidesPackage{svg-extract}[% - 2019/10/10 v2.02c\space% + 2019/10/22 v2.02d\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 3499c533f69..8d99cb9be7f 100644 --- a/Master/texmf-dist/tex/latex/svg/svg.sty +++ b/Master/texmf-dist/tex/latex/svg/svg.sty @@ -31,9 +31,9 @@ %% svg-example.svg, svg-preamble.tex and root.C (with derived file root.svg). %% %% -\NeedsTeXFormat{LaTeX2e} +\NeedsTeXFormat{LaTeX2e}[2019-10-01] \ProvidesPackage{svg}[% - 2019/10/10 v2.02c\space% + 2019/10/22 v2.02d\space% (include SVG pictures)% ] \RequirePackage{scrbase}[2016/06/14] @@ -611,6 +611,10 @@ \svg@set@input@path[{#3}]% \@svg@tempswafalse% \expandafter\IfFileExists\expandafter{\svg@tempa}{% + \expandafter\svg@quotes@check\expandafter{\svg@tempa}% + \if@svg@quotes@found\else% + \svg@quotes@remove{\@filef@und}% + \fi% \@svg@tempswatrue% \edef\@filef@und{\expandafter\trim@spaces\expandafter{\@filef@und}}% \svg@filename@parse[{#1}]{\@filef@und}% @@ -745,20 +749,37 @@ }{\svg@tempa}% \endgroup% } +\newcommand*\svg@iffilenewer[2]{\@gobbletwo} \ifx\pdf@filemoddate\@undefined - \newcommand*\svg@iffilenewer[2]{\@gobbletwo} + \ifx\filemoddate\@undefined\else + \ifx\strcmp\@undefined\else + \renewcommand*\svg@iffilenewer[2]{% + \begingroup% + \edef\svg@tempa{\filemoddate{#1}}% + \edef\svg@tempb{\filemoddate{#2}}% + \ifnum\strcmp{\svg@tempa}{\svg@tempb}>\z@\relax% + \aftergroup\@firstoftwo% + \else% + \aftergroup\@secondoftwo% + \fi% + \endgroup% + }% + \fi + \fi \else - \newcommand*\svg@iffilenewer[2]{% - \begingroup% - \edef\svg@tempa{\pdf@filemoddate{#1}}% - \edef\svg@tempb{\pdf@filemoddate{#2}}% - \ifnum\pdf@strcmp{\svg@tempa}{\svg@tempb}>\z@\relax% - \aftergroup\@firstoftwo% - \else% - \aftergroup\@secondoftwo% - \fi% - \endgroup% - } + \ifx\pdf@strcmp\@undefined\else + \renewcommand*\svg@iffilenewer[2]{% + \begingroup% + \edef\svg@tempa{\pdf@filemoddate{#1}}% + \edef\svg@tempb{\pdf@filemoddate{#2}}% + \ifnum\pdf@strcmp{\svg@tempa}{\svg@tempb}>\z@\relax% + \aftergroup\@firstoftwo% + \else% + \aftergroup\@secondoftwo% + \fi% + \endgroup% + }% + \fi \fi \newcommand*\svg@local@param@set[1]{% \svg@local@param@use% -- cgit v1.2.3