svg (13nov18)

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

5 files changed, 29 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/svg/README.md b/Master/texmf-dist/doc/latex/svg/README.md
index d6ebf09675f..cbc4e046370 100644
--- a/Master/texmf-dist/doc/latex/svg/README.md
+++ b/Master/texmf-dist/doc/latex/svg/README.md
@@ -5,7 +5,7 @@
  Copyright (C) Philip Ilten <philten@cern.ch>, 2012-2016  
  Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2017-
 
- svg 2018/10/17 v2.02a
+ svg 2018/11/12 v2.02b
 
 ----------------------------------------------------------------------------
 
@@ -34,8 +34,11 @@ it is rendered within the LaTeX document using either ***ImageMagick*** or
 Versions
 --------
 
+**v2.02b** (2018/11/12)
++ fix bug for package **tikzscale** which changes `includgraphics` globally
+
 **v2.02a** (2018/10/17)
-+ fix bug of package **polyglossia** which fakes **babel** poorly
++ fix bug for package **polyglossia** which fakes **babel** poorly
 
 **v2.02** (2018/09/08)
 + distortion of included and extracted graphics supported with options `distort` 
diff --git a/Master/texmf-dist/doc/latex/svg/svg.pdf b/Master/texmf-dist/doc/latex/svg/svg.pdf
index cbd743c83aa..03c3912ed57 100644
--- a/Master/texmf-dist/doc/latex/svg/svg.pdf
+++ b/Master/texmf-dist/doc/latex/svg/svg.pdf
diff --git a/Master/texmf-dist/source/latex/svg/svg.dtx b/Master/texmf-dist/source/latex/svg/svg.dtx
index 3f008e254d4..5c0d749e15a 100644
--- a/Master/texmf-dist/source/latex/svg/svg.dtx
+++ b/Master/texmf-dist/source/latex/svg/svg.dtx
@@ -115,7 +115,7 @@ svg-extract -- Extract independent graphic files from SVG pictures
 %<package&option&base>\ProvidesPackage{svg}[%
 %<package&option&extract>\ProvidesPackage{svg-extract}[%
 %<*driver|package&option>
-  2018/10/17 v2.02a\space%
+  2018/11/12 v2.02b\space%
 %<package&option&base>  (include SVG pictures)%
 %<package&option&extract>  (extract independent graphics from SVG pictures)%
 ]
@@ -251,7 +251,11 @@ svg-extract -- Extract independent graphic files from SVG pictures
 %   as well as rotation for extractions (\opt{extractangle})
 % }^^A
 % \changes{v2.02a}{2018/10/17}{%
-%   fix bug of package \pkg{polyglossia} which fakes \pkg{babel} poorly%
+%   fix bug for package \pkg{polyglossia} which fakes \pkg{babel} poorly%
+% }^^A
+% \changes{v2.02b}{2018/11/12}{%
+%   fix bug for package \pkg{tikzscale} which changes \cs{includegraphics} 
+%   globally%
 % }^^A
 % \ToDo{Workaround for missing \cs{transparent} (Lua\TeX lacks support)}[v2.03]
 %
@@ -3220,26 +3224,34 @@ svg-extract -- Extract independent graphic files from SVG pictures
 % \subsection{Patches}
 %
 % \begin{macro}{\svg@patches}
+% \changes{v2.02b}{2018/11/12}{%
+%   fix bug for package \pkg{tikzscale}: store original definitions of 
+%   \cs{picture} and \cs{includegraphics} right after loading package \pkg{svg}
+% }^^A
+% \begin{macro}{\svg@picture@saved}
+% \begin{macro}{\svg@includegraphics@saved}
 % For including the export results from \app{Inkscape} with \LaTeX~support 
 % enabled, there are some patches necessary for environment \env{picture} and 
 % \cs{includegraphics}. Those patches are done with \cs{svg@patches}.
 %    \begin{macrocode}
+\newcommand*\svg@picture@saved{}
+\let\svg@picture@saved\picture
+\newcommand*\svg@includegraphics@saved{}
+\let\svg@includegraphics@saved\includegraphics
 \newcommand*\svg@patches[1]{%
-  \let\svg@picture@saved\picture%
   \let\picture\svg@picture@patched%
-  \let\svg@includegraphics@saved\includegraphics%
   \let\includegraphics\svg@includegraphics@patched%
   \edef\svg@includegraphics@file{#1}%
 }
 %    \end{macrocode}
+% \end{macro}^^A \svg@includegraphics@saved
+% \end{macro}^^A \svg@picture@saved
 % \end{macro}^^A \svg@patches
-% \begin{macro}{\svg@picture@saved}
 % \begin{macro}{\svg@pictur@patched}
 % In order to provide the possibility specify the desired width of a graphic, 
 % the appropriate \cs{unitlength} is calculated at the beginning of the 
 % \env{picture}~environment.
 %    \begin{macrocode}
-\newcommand*\svg@picture@saved{}
 \newcommand*\svg@picture@patched{}
 \newcommand*\svg@pictur@patched{}
 \long\def\svg@picture@patched#1{\svg@pictur@patched@#1}
@@ -3279,8 +3291,6 @@ svg-extract -- Extract independent graphic files from SVG pictures
 }
 %    \end{macrocode}
 % \end{macro}^^A \svg@pictur@patched
-% \end{macro}^^A \svg@picture@saved
-% \begin{macro}{\svg@includegraphics@saved}
 % \begin{macro}{\svg@includegraphics@patched}
 % \begin{macro}{\svg@includegraphics@file}
 % The patch to \cs{includegraphics} is meant to dissolve the \app{Inkscape} bug 
@@ -3297,7 +3307,6 @@ svg-extract -- Extract independent graphic files from SVG pictures
 \FamilyCounterKey{SVGpatch}{page}{svg@param@currpage}
 \DefineFamilyKey{SVGpatch}{width}{\FamilyKeyStateProcessed}
 \newcommand*\svg@includegraphics@file{}
-\newcommand*\svg@includegraphics@saved{}
 \newcommand*\svg@includegraphics@patched[2][]{%
   \FamilyOptions{SVGpatch}{#1}%
 %    \end{macrocode}
@@ -3326,7 +3335,6 @@ svg-extract -- Extract independent graphic files from SVG pictures
 %    \end{macrocode}
 % \end{macro}^^A \svg@includegraphics@file
 % \end{macro}^^A \svg@includegraphics@patched
-% \end{macro}^^A \svg@includegraphics@saved
 %
 % \iffalse
 %</body>
diff --git a/Master/texmf-dist/tex/latex/svg/svg-extract.sty b/Master/texmf-dist/tex/latex/svg/svg-extract.sty
index 2a9e493ad3b..c174389e7ee 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/10/17 v2.02a\space%
+  2018/11/12 v2.02b\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 9840a435e26..2e482789186 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/10/17 v2.02a\space%
+  2018/11/12 v2.02b\space%
   (include SVG pictures)%
 ]
 \RequirePackage{scrbase}[2016/06/14]
@@ -1132,14 +1132,15 @@
     \expandafter\includegraphics\expandafter[\svg@tempb]{\svg@tempa}%
   \fi%
 }
+\newcommand*\svg@picture@saved{}
+\let\svg@picture@saved\picture
+\newcommand*\svg@includegraphics@saved{}
+\let\svg@includegraphics@saved\includegraphics
 \newcommand*\svg@patches[1]{%
-  \let\svg@picture@saved\picture%
   \let\picture\svg@picture@patched%
-  \let\svg@includegraphics@saved\includegraphics%
   \let\includegraphics\svg@includegraphics@patched%
   \edef\svg@includegraphics@file{#1}%
 }
-\newcommand*\svg@picture@saved{}
 \newcommand*\svg@picture@patched{}
 \newcommand*\svg@pictur@patched{}
 \long\def\svg@picture@patched#1{\svg@pictur@patched@#1}
@@ -1170,7 +1171,6 @@
 \FamilyCounterKey{SVGpatch}{page}{svg@param@currpage}
 \DefineFamilyKey{SVGpatch}{width}{\FamilyKeyStateProcessed}
 \newcommand*\svg@includegraphics@file{}
-\newcommand*\svg@includegraphics@saved{}
 \newcommand*\svg@includegraphics@patched[2][]{%
   \FamilyOptions{SVGpatch}{#1}%
   \ifnum\value{svg@param@lastpage}<\z@\relax%