texlive[43629] Master/texmf-dist: svg (28mar17)
commits+karl at tug.org
commits+karl at tug.org
Tue Mar 28 22:37:19 CEST 2017
Revision: 43629
http://tug.org/svn/texlive?view=revision&revision=43629
Author: karl
Date: 2017-03-28 22:37:19 +0200 (Tue, 28 Mar 2017)
Log Message:
-----------
svg (28mar17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/svg/LICENSE.md
trunk/Master/texmf-dist/doc/latex/svg/README.md
trunk/Master/texmf-dist/doc/latex/svg/svg.pdf
trunk/Master/texmf-dist/source/latex/svg/svg.dtx
trunk/Master/texmf-dist/tex/latex/svg/svg-extract.sty
trunk/Master/texmf-dist/tex/latex/svg/svg.sty
Modified: trunk/Master/texmf-dist/doc/latex/svg/LICENSE.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/svg/LICENSE.md 2017-03-28 17:55:13 UTC (rev 43628)
+++ trunk/Master/texmf-dist/doc/latex/svg/LICENSE.md 2017-03-28 20:37:19 UTC (rev 43629)
@@ -1,8 +1,6 @@
- svg -- Include SVG pictures in LaTeX documents using Inkscape
+ svg and svg-extract -- Include and extract SVG pictures in LaTeX documents
----------------------------------------------------------------------------
- svg-extract -- Extract independent graphic files from SVG pictures
-----------------------------------------------------------------------------
Copyright (C) Philip Ilten <philten at cern.ch>, 2012-2016
Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2017-
Modified: trunk/Master/texmf-dist/doc/latex/svg/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/svg/README.md 2017-03-28 17:55:13 UTC (rev 43628)
+++ trunk/Master/texmf-dist/doc/latex/svg/README.md 2017-03-28 20:37:19 UTC (rev 43629)
@@ -1,13 +1,11 @@
- svg -- Include SVG pictures in LaTeX documents using Inkscape
+ svg and svg-extract -- Include and extract SVG pictures in LaTeX documents
----------------------------------------------------------------------------
- svg-extract -- Extract independent graphic files from SVG pictures
-----------------------------------------------------------------------------
Copyright (C) Philip Ilten <philten at cern.ch>, 2012-2016
Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2017-
- svg 2017/03/27 v2.00
+ svg 2017/03/28 v2.00a
----------------------------------------------------------------------------
@@ -36,6 +34,9 @@
Versions
--------
+**v2.00a** (2017/03/28)
++ Bug fix for checking stock- and mediasizes
+
**v2.00** (2017/03/27)
+ New maintainer: Falk Hanisch
+ Re-implementation from scratch
@@ -50,6 +51,5 @@
naming exported graphics after their consecutive numbering can't be ensured
for all variants of subfigures, so it's neglected
-
**v1.0** (2016/10/10)
+ initial version by Philip Ilten
Modified: trunk/Master/texmf-dist/doc/latex/svg/svg.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/svg/svg.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/svg/svg.dtx 2017-03-28 17:55:13 UTC (rev 43628)
+++ trunk/Master/texmf-dist/source/latex/svg/svg.dtx 2017-03-28 20:37:19 UTC (rev 43629)
@@ -1,10 +1,8 @@
-% \CheckSum{3474}
+% \CheckSum{3456}
% \iffalse meta-comment
%
-% svg -- Include SVG pictures in LaTeX documents using Inkscape
+% svg and svg-extract -- Include and extract SVG pictures in LaTeX documents
% ----------------------------------------------------------------------------
-% svg-extract -- Extract independent graphic files from SVG pictures
-% ----------------------------------------------------------------------------
%
% Copyright (C) Philip Ilten <philten at cern.ch>, 2012-2016
% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2017-
@@ -117,7 +115,7 @@
%<package&option&base>\ProvidesPackage{svg}[%
%<package&option&extract>\ProvidesPackage{svg-extract}[%
%<*driver|package&option>
- 2017/03/27 v2.00\space%
+ 2017/03/28 v2.00a\space%
%<package&option&base> (include SVG pictures)%
%<package&option&extract> (extract independent graphics from SVG pictures)%
]
@@ -212,7 +210,7 @@
In addition, the package \pkg{svg-extract} allows the extraction of these
graphics into independent files in different graphic formats, exactly as it
is rendered within the document. For the creation of these graphics in the
- well\hbox{-}known formats PDF, EPS and~PS, \LaTeX and possibly conversion
+ well\hbox{-}known formats PDF, EPS and~PS, \LaTeX{} and possibly conversion
tools shipped with the distribution are used. If the graphics are required
in other file formats, either \app{ImageMagick} or \app{Ghostscript} can be
invoked.
@@ -223,16 +221,16 @@
%</driver>
% \fi
%
-% \changes{v1.0}{2004/11/05}{initial version by Philip Ilten}
-% \changes{v2.00}{2016/09/23}{new maintainer: Falk Hanisch}
-% \changes{v2.00}{2017/03/27}{re-implementation from scratch}
-% \changes{v2.00}{2017/03/27}{package \pkg{subfig} not required anymore}
+% \changes{v1.0}{2004/11/05}{initial version by Philip Ilten}^^A
+% \changes{v2.00}{2016/09/23}{new maintainer: Falk Hanisch}^^A
+% \changes{v2.00}{2017/03/27}{re-implementation from scratch}^^A
+% \changes{v2.00}{2017/03/27}{package \pkg{subfig} not required anymore}^^A
% \changes{v2.00}{2017/03/27}{%
% support of subfigures stopped due to the huge number of packages which deal
% with this topic and the large variety of implementing this functionality;
% naming exported graphics after their consecutive numbering can't be ensured
-% for all variants of subfigures, so it's neglected
-% }
+% for all variants of subfigures, so it's neglected.%
+% }^^A
%
%
%
@@ -1267,7 +1265,6 @@
% \begin{macro}{\svg at tempa}
% \begin{macro}{\svg at tempb}
% \begin{macro}{\if at svg@tempswa}
-% \begin{macro}{\svg at tempcnt}
% Internal temporary macros.
% \begin{macrocode}
%<*base>
@@ -1274,10 +1271,8 @@
\newcommand*\svg at tempa{}
\newcommand*\svg at tempb{}
\newif\if at svg@tempswa
-\newcount\svg at tempcnt
%</base>
% \end{macrocode}
-% \end{macro}^^A \svg at tempcnt
% \end{macro}^^A \if at svg@tempswa
% \end{macro}^^A \svg at tempb
% \end{macro}^^A \svg at tempa
@@ -1298,14 +1293,14 @@
% packages anyways.
%
% \begin{option}{usexcolor}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{option}{noxcolor}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{macro}{\if at svg@use at xcolor}
% \begin{option}{usetransparent}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{option}{notransparent}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{macro}{\if at svg@use at transparent}
% Options for preventing packages \pkg{xcolor} and \pkg{transparent} to be
% loaded.
@@ -1354,14 +1349,15 @@
% support of \LaTeX{} can optionally be used.
%
% \begin{option}{inkscape}
-% \changes{v2.00}{2017/02/17}{changed/extended}
+% \changes{v2.00}{2017/02/17}{changed/extended}^^A
% \begin{macro}{\svg at ink@mode}
% The intension of option \opt{inkscape} is to control the running behaviour of
-% \app{Inkscape}. It can be switched off at all or invoked only if necessarry
-% or the command line call can be forced with every \LaTeX~run. Additionally,
-% option \opt{inkscape} can be used as wrapper for options \opt{inkscapeformat},
-% \opt{inkscapelatex}, \opt{inkscapearea} and \opt{inkscapedpi}, which are
-% declared later.
+% \app{Inkscape}. It can be switched off at all (\opt{inkscape}|=|\val{false})
+% or invoked only if necessarry (\opt{inkscape}|=|\val{true}) or the command
+% line call can be forced with every \LaTeX~run (\opt{inkscape}|=|\val{forced}).
+% Additionally, option \opt{inkscape} can be used as wrapper for options
+% \opt{inkscapeformat}, \opt{inkscapelatex}, \opt{inkscapearea} and
+% \opt{inkscapedpi}, which are declared later.
% \begin{macrocode}
\newcommand*\svg at ink@mode{}
\DefineFamilyKey{SVG}{inkscape}[true]{%
@@ -1378,9 +1374,15 @@
{latexnoexport}{10},{raw}{10},{plain}{10},{simple}{10}%
}{\svg at tempa}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed%
+% \end{macrocode}
+% Setting the mode for invoking \app{Inkscape}\dots
+% \begin{macrocode}
\ifnum\svg at tempa<\thr@@\relax%
\let\svg at ink@mode\svg at tempa%
\else%
+% \end{macrocode}
+% \dots and the part as wrapper for different options.
+% \begin{macrocode}
\ifcase\svg at tempa\relax\or\or\or% pdf
\FamilyOptions{SVG}{inkscapeformat=pdf}%
\or% eps
@@ -1454,9 +1456,9 @@
% \end{macro}^^A \svg at ink@mode
% \end{option}^^A inkscape
% \begin{option}{on}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{option}{off}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% Package options which can be used to switch functionality on or off during
% the loading of package \pkg{svg}.
% \begin{macrocode}
@@ -1466,7 +1468,7 @@
% \end{option}^^A off
% \end{option}^^A on
% \begin{option}{inkscapeformat}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{macro}{\svg at ink@format}
% With option \opt{inkscapeformat} the output format of the \app{Inkscape}
% export function, which is called via \cs{ShellEscape}, can be configured.
@@ -1498,7 +1500,7 @@
% \end{macro}^^A \svg at ink@format
% \end{option}^^A inkscapeformat
% \begin{option}{inkscapelatex}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{macro}{\svg at ink@latex}
% This options controls whether the \app{Inkscape} export will be invoked with
% or without the generation of a seperate \LaTeX~file.
@@ -1509,7 +1511,7 @@
% \end{macro}^^A \svg at ink@latex
% \end{option}^^A inkscapelatex
% \begin{option}{inkscapearea}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{macro}{\svg at ink@area}
% The exported area for an \app{Inkscape} graphic can be set with this option.
% \begin{macrocode}
@@ -1531,7 +1533,7 @@
% \end{macro}^^A \svg at ink@area
% \end{option}^^A inkscapearea
% \begin{option}{inkscapedpi}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{option}{inkscapedensity}
% \begin{macro}{\svg at ink@dpi}
% A density can be chosen, which is used during export with \app{Inkscape} for
@@ -1559,10 +1561,10 @@
% \end{option}^^A inkscapedensity
% \end{option}^^A inkscapedpi
% \begin{option}{inkscapeexe}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{macro}{\svg at ink@exe}
% \begin{option}{inkscapeopt}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{macro}{\svg at ink@opt}
% With these options, the terminal command for invoking \app{Inkscape} as well
% as additional options can be defined.
@@ -1588,7 +1590,7 @@
% \subsubsection{Setting input folder}
%
% \begin{option}{svgpath}
-% \changes{v2.00}{2017/02/12}{deprecated}
+% \changes{v2.00}{2017/02/12}{deprecated}^^A
% In version~v1.0 setting the path to SVG~files was done via option. So
% this method is provided as well.
% \begin{macrocode}
@@ -1612,9 +1614,9 @@
% \subsubsection{Setting output folder}
%
% \begin{option}{inkscapepath}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{option}{inkscapename}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{macro}{\svg at out@path}
% \begin{macro}{\svg at out@name}
% \begin{macro}{\svg at out@base}
@@ -1669,10 +1671,10 @@
% \begin{option}{width}
% \begin{macro}{\svg at param@width}
% \begin{option}{height}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{macro}{\svg at param@width}
% \begin{option}{scale}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{macro}{\svg at param@scale}
% These options determine the size of the included graphics. The usage of
% \val{\cs{relax}} as value resets the respective option to the default
@@ -1731,7 +1733,7 @@
% \begin{option}{apptex}
% \begin{macro}{\svg at param@apptex}
% \begin{option}{postex}
-% \changes{v2.00}{2017/03/02}{deprecated}
+% \changes{v2.00}{2017/03/02}{deprecated}^^A
% For executing code right before or after the graphic inclusion, two hooks are
% defined.
% \begin{macrocode}
@@ -1765,7 +1767,7 @@
% \end{macro}^^A \svg at param@pretex
% \end{option}^^A pretex
% \begin{option}{lastpage}
-% \changes{v2.00}{2017/02/20}{new}
+% \changes{v2.00}{2017/02/20}{new}^^A
% \begin{counter}{svg at param@lastpage}
% For \app{Inkscape}~0.91 a bug concerning the \LaTeX~export has been reported
% (\url{https://bugs.launchpad.net/ubuntu/+source/inkscape/+bug/1417470}).
@@ -1792,7 +1794,7 @@
% \end{counter}^^A svg at param@lastpage
% \end{option}^^A lastpage
% \begin{option}{draft}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{macro}{\if at svg@draft}
% The option \opt{draft} has the same effect as the eponymous option of package
% \pkg{graphicx}.
@@ -2202,9 +2204,9 @@
% \subsection{User commands}
%
% \begin{macro}{\svgsetup}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{macro}{\setsvg}
-% \changes{v2.00}{2017/02/17}{deprecated}
+% \changes{v2.00}{2017/02/17}{deprecated}^^A
% The macro \cs{svgsetup} can be used to change options after loading the
% package \pkg{svg} both in preamble and the document body. For compatibility
% reasons, \cs{setsvg} is also defined.
@@ -2215,7 +2217,7 @@
% \end{macro}^^A \setsvg
% \end{macro}^^A \svgsetup
% \begin{macro}{\svgpath}
-% \changes{v2.00}{2017/02/12}{new}
+% \changes{v2.00}{2017/02/12}{new}^^A
% \begin{macro}{\svg at path}
% With \cs{svgpath} the user can give several root paths to SVG~files in the
% same way as \cs{graphicspath} is used. The only difference is that a missing
@@ -2239,7 +2241,7 @@
% \end{macro}^^A \svg at path
% \end{macro}^^A \svgpath
% \begin{macro}{\includesvg}
-% \changes{v2.00}{2017/02/17}{changes, especially to optional parameters}
+% \changes{v2.00}{2017/02/17}{changes, especially to optional parameters}^^A
% For the inclusion of SVG~files the command \cs{includesvg} is defined.
% \begin{macrocode}
\newcommand*{\includesvg}[2][]{%
@@ -2250,26 +2252,26 @@
\svg at deprecated@param%
% \end{macrocode}
% \begin{parameter}{inkscape}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{parameter}{inkscapeformat}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{parameter}{inkscapelatex}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{parameter}{inkscapearea}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{parameter}{inkscapedpi}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{parameter}{inkscapeopt}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{parameter}{width}
% \begin{parameter}{height}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{parameter}{scale}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{parameter}{pretex}
% \begin{parameter}{apptex}
% \begin{parameter}{draft}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{parameter}{extract}
% \begin{parameter}{extractpreamble}
% \begin{parameter}{extractformat}
@@ -2373,7 +2375,7 @@
}
% \end{macrocode}
% \begin{parameter}{lastpage}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% In addition to the automatic finding of the last page, which is included, it
% can also be given directly as parameter.
% \begin{macrocode}
@@ -2383,9 +2385,9 @@
% \end{macrocode}
% \end{parameter}^^A lastpage
% \begin{parameter}{angle}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% \begin{parameter}{origin}
-% \changes{v2.00}{2017/02/17}{new}
+% \changes{v2.00}{2017/02/17}{new}^^A
% The parameters \prm{angle} and \prm{origin} are definied as pendants to the
% keys provided by \cs{includegraphics}.
% \begin{macrocode}
@@ -2408,7 +2410,7 @@
% \end{parameter}^^A angle
% \end{macro}^^A \includesvg
% \begin{macro}{\includeinkscape}
-% \changes{v2.00}{2017/02/23}{new}
+% \changes{v2.00}{2017/02/23}{new}^^A
% The command \cs{includeinkscape} can be used for including the export results
% of \app{Inkscape}, if this part of the job was done in another way.
% \begin{macrocode}
@@ -2714,33 +2716,33 @@
\newcommand*\svg at get@lastpage[1]{%
\ifstr{\svg at ink@format}{pdf}{%
\begingroup%
- \svg at tempcnt=\m at ne\relax%
+ \@tempcnta=\m at ne\relax%
\ifx\XeTeXpdfpagecount\@undefined%
\ifpdf%
\ifx\pdfximage\@undefined%
\ifx\saveimageresource\@undefined\else%
\saveimageresource{#1}%
- \svg at tempcnt=\lastsavedimageresourcepages\relax%
+ \@tempcnta=\lastsavedimageresourcepages\relax%
\fi%
\else%
\pdfximage{#1}%
- \svg at tempcnt=\pdflastximagepages\relax%
+ \@tempcnta=\pdflastximagepages\relax%
\fi%
\fi%
\else%
- \svg at tempcnt=\XeTeXpdfpagecount#1\relax%
+ \@tempcnta=\XeTeXpdfpagecount#1\relax%
\fi%
- \ifnum\svg at tempcnt=\m at ne\relax%
+ \ifnum\@tempcnta=\m at 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 at tempcnt}%
+ \PackageInfo{svg}{Last page of `#1' is \the\@tempcnta}%
\fi%
\edef\svg at tempa{%
\noexpand\endgroup%
- \noexpand\FamilyOptions{SVG}{lastpage=\the\svg at tempcnt}%
+ \noexpand\FamilyOptions{SVG}{lastpage=\the\@tempcnta}%
}%
\svg at tempa%
}{}%
@@ -3014,7 +3016,7 @@
% \subsubsection{Controlling the extract process}
%
% \begin{option}{extract}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\if at svgx@run}
% With option \opt{extract} it can be controlled, if the extraction of
% independent graphic files should be done.
@@ -3051,9 +3053,9 @@
% \end{macro}^^A \if at svgx@run
% \end{option}^^A extract
% \begin{option}{on}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{option}{off}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% Package options which can be used to switch functionality on or off during
% the loading of package \pkg{svg-extract}.
% \begin{macrocode}
@@ -3065,12 +3067,12 @@
% \end{option}^^A off
% \end{option}^^A on
% \begin{option}{extractformat}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at format}
% \begin{option}{pdf}
-% \changes{v2.00}{2017/03/02}{deprecated}
+% \changes{v2.00}{2017/03/02}{deprecated}^^A
% \begin{option}{eps}
-% \changes{v2.00}{2017/03/02}{deprecated}
+% \changes{v2.00}{2017/03/02}{deprecated}^^A
% Option \opt{extractformat} controls the output format (\val{pdf/eps/ps}). It
% is set to \val{pdf} or, if dvi output could be detected, to \val{eps} during
% initialization.
@@ -3122,14 +3124,14 @@
% \end{macro}^^A \svgx at format
% \end{option}^^A extractformat
% \begin{option}{extractpreamble}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{option}{preamble}
-% \changes{v2.00}{2017/02/24}{deprecated}
+% \changes{v2.00}{2017/02/24}{deprecated}^^A
% \begin{macro}{\svgx at preamble}
% \begin{option}{extractpreambleend}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{option}{end}
-% \changes{v2.00}{2017/02/24}{deprecated}
+% \changes{v2.00}{2017/02/24}{deprecated}^^A
% \begin{macro}{\svgx at endpreamble}
% For the extraction process, a preamble is necessarry for a separate auxiliary
% \LaTeX~file. By default, the preamble of the main document is used, which end
@@ -3170,7 +3172,7 @@
% \end{option}^^A preamble
% \end{option}^^A extractpreamble
% \begin{option}{extractruns}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{counter}{svgx at runs}
% With this option, the number of \LaTeX~runs for the separate auxiliary file
% can be set.
@@ -3196,15 +3198,15 @@
% \end{counter}^^A svgx at runs
% \end{option}^^A extractruns
% \begin{option}{latexexe}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{option}{pdflatex}
-% \changes{v2.00}{2017/02/24}{deprecated}
+% \changes{v2.00}{2017/02/24}{deprecated}^^A
% \begin{macro}{\svgx at latex@exe}
% \begin{option}{latexext}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at latex@ext}
% \begin{option}{latexopt}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at latex@opt}
% The command and facultative options for the \LaTeX~call of the separate
% auxiliary file. The default is set according to the currently used compiler.
@@ -3256,27 +3258,27 @@
% \end{option}^^A latexexe
% \end{option}^^A pdflatexexe
% \begin{option}{dvipsopt}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at dvips@exe}
% \begin{macro}{\svgx at dvips@opt}
% \begin{option}{pstoepsopt}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at pstoeps@exe}
% \begin{macro}{\svgx at pstoeps@opt}
% \begin{option}{pstopdfopt}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at pstopdf@exe}
% \begin{macro}{\svgx at pstopdf@opt}
% \begin{option}{pdftoepsopt}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at pdftoeps@exe}
% \begin{macro}{\svgx at pdftoeps@opt}
% \begin{option}{pdftopsopt}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at pdftops@exe}
% \begin{macro}{\svgx at pdftops@opt}
% \begin{option}{pdftops}
-% \changes{v2.00}{2017/02/24}{deprecated}
+% \changes{v2.00}{2017/02/24}{deprecated}^^A
% Options and macros for calling convert commands, which are supplied by most
% \LaTeXe~distributions. These are used to generate all files, which are
% supported by option \opt{extractformat}, as they don't need an additional
@@ -3357,7 +3359,7 @@
% \app{ImageMagick} and \app{Ghostscript} can be used for converting graphics.
%
% \begin{option}{convert}
-% \changes{v2.00}{2017/02/24}{changed/extended}
+% \changes{v2.00}{2017/02/24}{changed/extended}^^A
% \begin{macro}{\if at svgx@cnv at run}
% \begin{macro}{\svgx at cnv@cmd}
% The option \opt{convert} can be used to define, which of both applications
@@ -3452,10 +3454,10 @@
% \end{macro}^^A \if at svgx@cnv at run
% \end{option}^^A convert
% \begin{option}{convertformat}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at cnv@format}
% \begin{option}{png}
-% \changes{v2.00}{2017/03/02}{deprecated}
+% \changes{v2.00}{2017/03/02}{deprecated}^^A
% Option \opt{convertformat} controls the output format for converted files. It
% is set to \val{png} by default.
% \begin{macrocode}
@@ -3491,7 +3493,7 @@
% \end{macro}^^A \svgx at cnv@format
% \end{option}^^A convertformat
% \begin{option}{convertdpi}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{option}{convertdensity}
% \begin{macro}{\svgx at cnv@dpi}
% The option \opt{convertdpi} is meant to define the used density during the
@@ -3532,13 +3534,13 @@
% \end{option}^^A convertdensity
% \end{option}^^A convertdpi
% \begin{option}{magickexe}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at magick@exe}
% \begin{option}{magicksetting}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at magick@set}
% \begin{option}{magickoperator}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at magick@opr}
% Setting the command including maybe the path to \app{ImageMagick}. The keys
% \opt{magicksetting} and \opt{magickoperator} should be used to add optional
@@ -3576,13 +3578,13 @@
% \end{macro}^^A \svgx at magick@exe
% \end{option}^^A magickexe
% \begin{option}{gsexe}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at gs@exe}
% \begin{option}{gsopt}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at gs@opt}
% \begin{option}{gsdevice}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svgx at gs@device}
% Options to set the command including maybe the path to \app{Ghostscript}. As
% \app{Ghostscript} needs a specific device defined for different output
@@ -3625,14 +3627,14 @@
% \subsubsection{Setting output folder}
%
% \begin{option}{extractpath}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{option}{path}
-% \changes{v2.00}{2017/02/24}{deprecated}
+% \changes{v2.00}{2017/02/24}{deprecated}^^A
% \begin{option}{extractname}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{option}{name}
-% \changes{v2.00}{2017/02/24}{deprecated}
-% \changes{v2.00}{2017/02/24}{support of \pkg{subfig} removed}
+% \changes{v2.00}{2017/02/24}{deprecated}^^A
+% \changes{v2.00}{2017/02/24}{support of \pkg{subfig} removed}^^A
% \begin{macro}{\svgx at out@path}
% \begin{macro}{\svgx at out@name}
% \begin{macro}{\if at svgx@out at sec}
@@ -3723,13 +3725,13 @@
% \subsubsection{Options for the extraction of graphics}
%
% \begin{option}{extractwidth}
-% \changes{v2.00}{2017/02/20}{new}
+% \changes{v2.00}{2017/02/20}{new}^^A
% \begin{macro}{\svgx at param@width}
% \begin{option}{extractheight}
-% \changes{v2.00}{2017/02/20}{new}
+% \changes{v2.00}{2017/02/20}{new}^^A
% \begin{macro}{\svgx at param@width}
% \begin{option}{extractscale}
-% \changes{v2.00}{2017/02/20}{new}
+% \changes{v2.00}{2017/02/20}{new}^^A
% \begin{macro}{\svgx at param@scale}
% For graphic extraction, the given settings regarding the size for inclusion
% can be overwritten with these options. Using \val{\cs{relax}} as value leads
@@ -3808,10 +3810,10 @@
% \end{macro}^^A \svgx at param@width
% \end{option}^^A extractwidth
% \begin{option}{extractpretex}
-% \changes{v2.00}{2017/02/20}{new}
+% \changes{v2.00}{2017/02/20}{new}^^A
% \begin{macro}{\svgx at param@pretex}
% \begin{option}{extractapptex}
-% \changes{v2.00}{2017/02/20}{new}
+% \changes{v2.00}{2017/02/20}{new}^^A
% \begin{macro}{\svgx at param@apptex}
% \begin{option}{extractpostex}
% The similar hooks for executing code right before or after the graphic
@@ -3865,7 +3867,7 @@
% \subsubsection{Miscellaneous options}
%
% \begin{option}{clean}
-% \changes{v2.00}{2017/02/24}{changes, file list possible}
+% \changes{v2.00}{2017/02/24}{changes, file list possible}^^A
% \begin{option}{clear}
% \begin{macro}{\svgx at clean}
% With option \opt{clean} files generated during the extraction process can be
@@ -3936,9 +3938,9 @@
% \subsection{User commands}
%
% \begin{macro}{\svghidepreamblestart}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% \begin{macro}{\svghidepreambleend}
-% \changes{v2.00}{2017/02/24}{new}
+% \changes{v2.00}{2017/02/24}{new}^^A
% Some dummys for package \pkg{svg}.
% \begin{macrocode}
%<*base>
@@ -4873,15 +4875,12 @@
% \begin{macro}{\svgx at box}
% Within the preamble of the auxiliary \LaTeX~file, the desired grahic is used
% to setup a box, which is used both to define the papersize as well as for the
-% output itself.
+% output itself. For \TUDScript-classes, the crop-mode is acrivated.
% \begin{macrocode}
\newbox\svgx at box
\newcommand*\svgxsetbox[2][]{%
+ \csname @tud at x@standalone at croptrue\endcsname%
\sbox\svgx at box{\svg@@input[{#1},draft=false]{#2}}%
-% \end{macrocode}
-% Setting crop-mode for the \TUDScript-classes.
-% \begin{macrocode}
- \csname @tud at x@standalone at croptrue\endcsname%
\svgxsetpapersize%
}
% \end{macrocode}
@@ -4888,25 +4887,30 @@
% \end{macro}^^A \svgx at box
% \end{macro}^^A \svgxsetbox
% \begin{macro}{\svgxsetpapersize}
+% \changes{v2.00a}{2017/02/28}{Bug fix for checking stock- and mediasizes}^^A
% This macro sets all well known length macros for defining the paper size as
% well as the type area to the size of \cs{svgx at box}.
% \begin{macrocode}
\newcommand*\svgxsetpapersize{%
\setlength\paperwidth{\the\wd\svgx at box}%
- \ifx\stockwidth\@undefined\else%
+% \end{macrocode}
+% Due to the fact, that the lengths for stock- and mediasizes are maybe set to
+% \cs{relax}, these macros are checked with \cs{scr at ifundefinedorrelax}.
+% \begin{macrocode}
+ \scr at ifundefinedorrelax{stockwidth}{}{%
\setlength\stockwidth{\paperwidth}%
- \fi%
- \ifx\mediawidth\@undefined\else%
+ }%
+ \scr at ifundefinedorrelax{mediawidth}{}{%
\setlength\mediawidth{\paperwidth}%
- \fi%
+ }%
\setlength\textwidth{\paperwidth}%
\setlength\paperheight{\the\dimexpr\ht\svgx at box+\dp\svgx at box\relax}%
- \ifx\stockheight\@undefined\else%
+ \scr at ifundefinedorrelax{stockheight}{}{%
\setlength\stockheight{\paperheight}%
- \fi%
- \ifx\mediaheight\@undefined\else%
+ }%
+ \scr at ifundefinedorrelax{mediaheight}{}{%
\setlength\mediaheight{\paperheight}%
- \fi%
+ }%
\setlength\textheight{\paperheight}%
% \end{macrocode}
% Any other length regarding the layout is set to have no influence at all.
Modified: trunk/Master/texmf-dist/tex/latex/svg/svg-extract.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/svg/svg-extract.sty 2017-03-28 17:55:13 UTC (rev 43628)
+++ trunk/Master/texmf-dist/tex/latex/svg/svg-extract.sty 2017-03-28 20:37:19 UTC (rev 43629)
@@ -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 at box
\newcommand*\svgxsetbox[2][]{%
+ \csname @tud at x@standalone at croptrue\endcsname%
\sbox\svgx at box{\svg@@input[{#1},draft=false]{#2}}%
- \csname @tud at x@standalone at croptrue\endcsname%
\svgxsetpapersize%
}
\newcommand*\svgxsetpapersize{%
\setlength\paperwidth{\the\wd\svgx at box}%
- \ifx\stockwidth\@undefined\else%
+ \scr at ifundefinedorrelax{stockwidth}{}{%
\setlength\stockwidth{\paperwidth}%
- \fi%
- \ifx\mediawidth\@undefined\else%
+ }%
+ \scr at ifundefinedorrelax{mediawidth}{}{%
\setlength\mediawidth{\paperwidth}%
- \fi%
+ }%
\setlength\textwidth{\paperwidth}%
\setlength\paperheight{\the\dimexpr\ht\svgx at box+\dp\svgx at box\relax}%
- \ifx\stockheight\@undefined\else%
+ \scr at ifundefinedorrelax{stockheight}{}{%
\setlength\stockheight{\paperheight}%
- \fi%
- \ifx\mediaheight\@undefined\else%
+ }%
+ \scr at ifundefinedorrelax{mediaheight}{}{%
\setlength\mediaheight{\paperheight}%
- \fi%
+ }%
\setlength\textheight{\paperheight}%
\hoffset=-1in%
\oddsidemargin=\z@%
Modified: trunk/Master/texmf-dist/tex/latex/svg/svg.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/svg/svg.sty 2017-03-28 17:55:13 UTC (rev 43628)
+++ trunk/Master/texmf-dist/tex/latex/svg/svg.sty 2017-03-28 20:37:19 UTC (rev 43629)
@@ -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 at tempa{}
\newcommand*\svg at tempb{}
\newif\if at svg@tempswa
-\newcount\svg at tempcnt
\newif\if at svg@use at xcolor
\FamilyBoolKey{SVG}{usexcolor}{@svg at use@xcolor}
\DeclareOption{noxcolor}{\FamilyOptions{SVG}{usexcolor=false}}
@@ -872,33 +871,33 @@
\newcommand*\svg at get@lastpage[1]{%
\ifstr{\svg at ink@format}{pdf}{%
\begingroup%
- \svg at tempcnt=\m at ne\relax%
+ \@tempcnta=\m at ne\relax%
\ifx\XeTeXpdfpagecount\@undefined%
\ifpdf%
\ifx\pdfximage\@undefined%
\ifx\saveimageresource\@undefined\else%
\saveimageresource{#1}%
- \svg at tempcnt=\lastsavedimageresourcepages\relax%
+ \@tempcnta=\lastsavedimageresourcepages\relax%
\fi%
\else%
\pdfximage{#1}%
- \svg at tempcnt=\pdflastximagepages\relax%
+ \@tempcnta=\pdflastximagepages\relax%
\fi%
\fi%
\else%
- \svg at tempcnt=\XeTeXpdfpagecount#1\relax%
+ \@tempcnta=\XeTeXpdfpagecount#1\relax%
\fi%
- \ifnum\svg at tempcnt=\m at ne\relax%
+ \ifnum\@tempcnta=\m at 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 at tempcnt}%
+ \PackageInfo{svg}{Last page of `#1' is \the\@tempcnta}%
\fi%
\edef\svg at tempa{%
\noexpand\endgroup%
- \noexpand\FamilyOptions{SVG}{lastpage=\the\svg at tempcnt}%
+ \noexpand\FamilyOptions{SVG}{lastpage=\the\@tempcnta}%
}%
\svg at tempa%
}{}%
More information about the tex-live-commits
mailing list