summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/svg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-18 21:17:47 +0000
committerKarl Berry <karl@freefriends.org>2019-10-18 21:17:47 +0000
commitad8cee08cfa75f1a15e5c60dc13e9fdd529d7265 (patch)
tree4c49026896453f3e909df2cf1e3703a13ac3ac19 /Master/texmf-dist/tex/latex/svg
parentf875e6cee66f6952a6c77fa109dbebc29514f7c5 (diff)
svg (18oct19)
git-svn-id: svn://tug.org/texlive/trunk@52430 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/svg')
-rw-r--r--Master/texmf-dist/tex/latex/svg/svg-extract.sty2
-rw-r--r--Master/texmf-dist/tex/latex/svg/svg.sty19
2 files changed, 16 insertions, 5 deletions
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}%