svg (28mar17)

git-svn-id: svn://tug.org/texlive/trunk@43629 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 18 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 b3d1a728880..5f9a6812971 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/27 v2.00\space%
+  2017/03/28 v2.00a\space%
   (extract independent graphics from SVG pictures)%
 ]
 \RequirePackage{svg}[2017/03/27]
@@ -613,26 +613,26 @@
 }
 \newbox\svgx@box
 \newcommand*\svgxsetbox[2][]{%
-  \sbox\svgx@box{\svg@@input[{#1},draft=false]{#2}}%
   \csname @tud@x@standalone@croptrue\endcsname%
+  \sbox\svgx@box{\svg@@input[{#1},draft=false]{#2}}%
   \svgxsetpapersize%
 }
 \newcommand*\svgxsetpapersize{%
   \setlength\paperwidth{\the\wd\svgx@box}%
-  \ifx\stockwidth\@undefined\else%
+  \scr@ifundefinedorrelax{stockwidth}{}{%
     \setlength\stockwidth{\paperwidth}%
-  \fi%
-  \ifx\mediawidth\@undefined\else%
+  }%
+  \scr@ifundefinedorrelax{mediawidth}{}{%
     \setlength\mediawidth{\paperwidth}%
-  \fi%
+  }%
   \setlength\textwidth{\paperwidth}%
   \setlength\paperheight{\the\dimexpr\ht\svgx@box+\dp\svgx@box\relax}%
-  \ifx\stockheight\@undefined\else%
+  \scr@ifundefinedorrelax{stockheight}{}{%
     \setlength\stockheight{\paperheight}%
-  \fi%
-  \ifx\mediaheight\@undefined\else%
+  }%
+  \scr@ifundefinedorrelax{mediaheight}{}{%
     \setlength\mediaheight{\paperheight}%
-  \fi%
+  }%
   \setlength\textheight{\paperheight}%
   \hoffset=-1in%
   \oddsidemargin=\z@%
diff --git a/Master/texmf-dist/tex/latex/svg/svg.sty b/Master/texmf-dist/tex/latex/svg/svg.sty
index f0689b8e64f..b56cd97d76f 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/27 v2.00\space%
+  2017/03/28 v2.00a\space%
   (include SVG pictures)%
 ]
 \RequirePackage{scrbase}[2016/06/14]
@@ -56,7 +56,6 @@
 \newcommand*\svg@tempa{}
 \newcommand*\svg@tempb{}
 \newif\if@svg@tempswa
-\newcount\svg@tempcnt
 \newif\if@svg@use@xcolor
 \FamilyBoolKey{SVG}{usexcolor}{@svg@use@xcolor}
 \DeclareOption{noxcolor}{\FamilyOptions{SVG}{usexcolor=false}}
@@ -872,33 +871,33 @@
 \newcommand*\svg@get@lastpage[1]{%
   \ifstr{\svg@ink@format}{pdf}{%
     \begingroup%
-      \svg@tempcnt=\m@ne\relax%
+      \@tempcnta=\m@ne\relax%
       \ifx\XeTeXpdfpagecount\@undefined%
         \ifpdf%
           \ifx\pdfximage\@undefined%
             \ifx\saveimageresource\@undefined\else%
               \saveimageresource{#1}%
-              \svg@tempcnt=\lastsavedimageresourcepages\relax%
+              \@tempcnta=\lastsavedimageresourcepages\relax%
             \fi%
           \else%
             \pdfximage{#1}%
-            \svg@tempcnt=\pdflastximagepages\relax%
+            \@tempcnta=\pdflastximagepages\relax%
           \fi%
         \fi%
       \else%
-        \svg@tempcnt=\XeTeXpdfpagecount#1\relax%
+        \@tempcnta=\XeTeXpdfpagecount#1\relax%
       \fi%
-      \ifnum\svg@tempcnt=\m@ne\relax%
+      \ifnum\@tempcnta=\m@ne\relax%
         \PackageWarning{svg}{%
           It wasn't possible to detect the last page\MessageBreak%
           of `#1'%
         }%
       \else%
-        \PackageInfo{svg}{Last page of `#1' is \the\svg@tempcnt}%
+        \PackageInfo{svg}{Last page of `#1' is \the\@tempcnta}%
       \fi%
       \edef\svg@tempa{%
         \noexpand\endgroup%
-        \noexpand\FamilyOptions{SVG}{lastpage=\the\svg@tempcnt}%
+        \noexpand\FamilyOptions{SVG}{lastpage=\the\@tempcnta}%
       }%
     \svg@tempa%
   }{}%