diff options
Diffstat (limited to 'Build/source/utils/asymptote/doc/asy-latex.dtx')
-rw-r--r-- | Build/source/utils/asymptote/doc/asy-latex.dtx | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/Build/source/utils/asymptote/doc/asy-latex.dtx b/Build/source/utils/asymptote/doc/asy-latex.dtx index 3cb386cd6b4..1e9c795303f 100644 --- a/Build/source/utils/asymptote/doc/asy-latex.dtx +++ b/Build/source/utils/asymptote/doc/asy-latex.dtx @@ -38,7 +38,7 @@ Licence: GPL2+ %</driver> %<pkg>\ProvidesPackage{asymptote} %<*pkg> - [2011/05/15 v1.24 Asymptote style file for LaTeX] + [2011/11/29 v1.26 Asymptote style file for LaTeX] %</pkg> % %<*driver> @@ -129,11 +129,11 @@ Licence: GPL2+ % addition to locally setting \texttt{inline} and \texttt{attach}, the % following options may also be used: % \begin{description} -% \item[height] Height of the figure % \item[width] Width of the figure +% \item[height] Height of the figure % \item[keepAspect] Maintain aspect ratio [default true] -% \item[viewportheight] Viewport height for 3D figures % \item[viewportwidth] Viewport width for 3D figures +% \item[viewportheight] Viewport height for 3D figures % \end{description} % These may also be set globally using the \cmd\asysetup\ command. % @@ -230,6 +230,7 @@ Licence: GPL2+ % % \begin{macro}{\CatchFileDef} % Used for \cmd\asyinclude. +% Note that the fallback definition is not as robust as the one provided by catchfile. % \begin{macrocode} \IfFileExists{catchfile.sty}{ \RequirePackage{catchfile} @@ -240,12 +241,12 @@ Licence: GPL2+ \ENDCATCHFILEMARKER \noexpand }% - \long\def\@tempa##1\ENDCATCHFILEMARKER{% + \long\def\@tempa####1\ENDCATCHFILEMARKER{% \endgroup - \def#1{##1}% + \def##1{####1}% }% - #3% - \expandafter\@tempa\@@input #2\relax + ##3% + \expandafter\@tempa\@@input ##2\relax } } % \end{macrocode} @@ -526,11 +527,7 @@ Licence: GPL2+ \fi % \end{macrocode} % Setting \verb|viewportsize=()|. Same logic as for \verb|size()|. -% Note that \cs{ASYviewportwidth} varies according to \cs{ASYattach}, -% by default, so it needs to be fully expanded before checking if it equals -% zero. % \begin{macrocode} - \edef\ASYviewportwidth{\ASYviewportwidth}% locally "freeze" viewportwidth \ifx\ASYviewportwidth\@empty \ifx\ASYviewportheight\@empty % write nothing! @@ -619,25 +616,25 @@ Licence: GPL2+ \immediate\write\AsyPreStream{% \noexpand\InputIfFileExists{% \ASYprefix\noexpand\jobname-\the\c@asy.pre}{}{}% - } + }% \asy@write@graphic@header \IfFileExists{#2.asy}{% \CatchFileDef\@tempa{#2.asy}{% \let\do\@makeother \dospecials \endlinechar=10\relax - } - }{ + }% + }{% \IfFileExists{#2}{% \CatchFileDef\@tempa{#2}{% \let\do\@makeother \dospecials \endlinechar=10\relax - } - }{ + }% + }{% \PackageWarning{asymptote}{file #2 not found}% - } - } + }% + }% \immediate\write\AsyStream{\unexpanded\expandafter{\@tempa}}% \asy@finalise@stream \asy@input@graphic @@ -649,7 +646,7 @@ Licence: GPL2+ \newcommand{\ASYanimategraphics}[5][]{% \IfFileExists{_#3.pdf}{% \animategraphics[{#1}]{#2}{_#3}{#4}{#5}% - }{} + }{}% } % \end{macrocode} % @@ -676,10 +673,7 @@ Licence: GPL2+ {\ASYkeepAspecttrue} {\ASYkeepAspectfalse}% } -\def\ASYviewportwidth{\ASYdefaultviewportwidth} -\def\ASYdefaultviewportwidth{% - \ifASYattach \@empty \else \the\linewidth \fi -} +\def\ASYviewportwidth{} \define@key{ASYkeys}{viewportwidth}{% \edef\ASYviewportwidth{\the\dimexpr#1\relax}% } |