summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-06 21:53:10 +0000
committerKarl Berry <karl@freefriends.org>2017-06-06 21:53:10 +0000
commitd036e1b1dc4d59e9ce15b37af93ae0b55a50520c (patch)
treefed1cb3844410d28a9137ef55dc762443ccfb433 /Master/texmf-dist/tex
parentf9a711de58ce886e55f254d2a876714624dcdfb4 (diff)
svg (24may17)
git-svn-id: svn://tug.org/texlive/trunk@44503 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/svg/svg-extract.sty11
-rw-r--r--Master/texmf-dist/tex/latex/svg/svg.sty38
2 files changed, 30 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/svg/svg-extract.sty b/Master/texmf-dist/tex/latex/svg/svg-extract.sty
index 5f9a6812971..fb2a247af56 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}[%
- 2017/03/28 v2.00a\space%
+ 2017/05/23 v2.00b\space%
(extract independent graphics from SVG pictures)%
]
\RequirePackage{svg}[2017/03/27]
@@ -611,6 +611,13 @@
\fi%
}%
}
+\newcommand*\svgxdelayed[1]{
+ \scr@ifundefinedorrelax{AtEndPreamble}{%
+ \AtBeginDocument{#1}%
+ }{%
+ \AtEndPreamble{\AtBeginDocument{#1}}%
+ }%
+}
\newbox\svgx@box
\newcommand*\svgxsetbox[2][]{%
\csname @tud@x@standalone@croptrue\endcsname%
@@ -872,7 +879,7 @@
}{}%
\fi%
\immediate\write\svgx@stream@out{%
- \string\AtBeginDocument{\@percentchar^^J%
+ \string\svgxdelayed{\@percentchar^^J%
\space\space\svg@tempa\@percentchar^^J%
}^^J^^J%
\string\begin{document}^^J%
diff --git a/Master/texmf-dist/tex/latex/svg/svg.sty b/Master/texmf-dist/tex/latex/svg/svg.sty
index b56cd97d76f..9fa4dadd0c4 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}[%
- 2017/03/28 v2.00a\space%
+ 2017/05/23 v2.00b\space%
(include SVG pictures)%
]
\RequirePackage{scrbase}[2016/06/14]
@@ -178,6 +178,8 @@
}
\newif\if@svg@ink@latex
\FamilyBoolKey{SVG}{inkscapelatex}{@svg@ink@latex}
+\FamilyBoolKey{SVG}{latex}{@svg@ink@latex}
+\FamilyBoolKey{SVG}{tex}{@svg@ink@latex}
\newcommand*\svg@ink@area{}
\DefineFamilyKey{SVG}{inkscapearea}{%
\FamilySetNumerical{SVG}{inkscapearea}{svg@tempa}{%
@@ -409,26 +411,28 @@
}
\DefineFamilyMember[.dummy]{SVG}
\newcommand*\svg@dummy@key[2][]{%
- \IfArgIsEmpty{#1}{%
- \DefineFamilyKey[.dummy]{SVG}{#2}{%
- \PackageWarning{svg}{%
- The option key `#2' can only\MessageBreak%
- be used with package `svg-extract', but\MessageBreak%
- you didn't load it%
+ \@ifpackageloaded{svg-extract}{}{%
+ \IfArgIsEmpty{#1}{%
+ \DefineFamilyKey[.dummy]{SVG}{#2}{%
+ \PackageWarning{svg}{%
+ The option key `#2' can only\MessageBreak%
+ be used with package `svg-extract', but\MessageBreak%
+ you didn't load it%
+ }%
+ \FamilyKeyStateProcessed%
}%
- \FamilyKeyStateProcessed%
- }%
- }{%
- \DefineFamilyKey[.dummy]{SVG}{#2}[{#1}]{%
- \PackageWarning{svg}{%
- The option key `#2' can only\MessageBreak%
- be used with package `svg-extract', but\MessageBreak%
- you didn't load it%
+ }{%
+ \DefineFamilyKey[.dummy]{SVG}{#2}[{#1}]{%
+ \PackageWarning{svg}{%
+ The option key `#2' can only\MessageBreak%
+ be used with package `svg-extract', but\MessageBreak%
+ you didn't load it%
+ }%
+ \FamilyKeyStateProcessed%
}%
- \FamilyKeyStateProcessed%
}%
+ \AfterPackage{svg-extract}{\RelaxFamilyKey[.dummy]{SVG}{#2}}%
}%
- \BeforePackage{svg-extract}{\RelaxFamilyKey[.dummy]{SVG}{#2}}%
}
\svg@dummy@key[true]{extract}
\svg@dummy@key{extractformat}