diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex | 76 |
1 files changed, 45 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex index 558f715788c..406d52e3a22 100644 --- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcorescopes.code.tex @@ -7,7 +7,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorescopes.code.tex,v 1.34 2010/09/08 15:07:18 tantau Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcorescopes.code.tex,v 1.44 2013/10/09 18:30:27 tantau Exp $ % Globals @@ -50,10 +50,14 @@ \pgfsys@beginscope% \pgf@resetpathsizes% \edef\pgfscope@linewidth{\the\pgflinewidth}% + \expandafter\let\expandafter\pgfscope@stroke@color\csname\string\color@pgfstrokecolor\endcsname% + \expandafter\let\expandafter\pgfscope@fill@color\csname\string\color@pgffillcolor\endcsname% \begingroup} \def\endpgfscope{% \endgroup% \global\pgflinewidth=\pgfscope@linewidth% + \expandafter\global\expandafter\let\csname\string\color@pgfstrokecolor\endcsname\pgfscope@stroke@color% + \expandafter\global\expandafter\let\csname\string\color@pgffillcolor\endcsname\pgfscope@fill@color% \pgfsys@endscope} @@ -116,6 +120,8 @@ \expandafter\pgf@text@setkeys\expandafter{\pgf@text@options}% \csname pgf@halign\pgf@text@hshift\endcsname% \csname pgf@valign\pgf@text@vshift\endcsname% + % + \pgfapproximatenonlineartransformation% % Protocol sizes: \pgf@process{\pgfpointtransformed{\pgfqpoint{0pt}{\dp\pgf@hbox}}}% \pgf@protocolsizes{\pgf@x}{\pgf@y}% @@ -190,8 +196,6 @@ % \pgfusepath{stroke} % \end{pgfpicture} -\newif\ifpgfpicture - \def\pgfresetboundingbox{% \global\pgf@picmaxx=-16000pt\relax% \global\pgf@picminx=16000pt\relax% @@ -257,23 +261,26 @@ \pgf@relevantforpicturesizefalse% \pgf@process{\pgf@baseline}% \xdef\pgf@shift@baseline{\the\pgf@y}% - % + % \pgf@process{\pgf@trimleft}% \global\advance\pgf@x by-\pgf@picminx - % prepare \hskip\pgf@trimleft@final. + % prepare \hskip\pgf@trimleft@final. % note that \pgf@trimleft@final is also queried % by the pgf image externalization. \xdef\pgf@trimleft@final{-\the\pgf@x}% - % + % \pgf@process{\pgf@trimright}% \global\advance\pgf@x by-\pgf@picmaxx - % prepare \hskip\pgf@trimright@final. + % prepare \hskip\pgf@trimright@final. % note that \pgf@trimright@final is also queried % by the pgf image externalization. \xdef\pgf@trimright@final{\the\pgf@x}% + % + \pgf@remember@layerlist@globally \endgroup% \hss% \egroup% + \pgf@restore@layerlist@from@global \pgf@insertlayers% \endgroup% \pgfsys@discardpath% @@ -287,6 +294,12 @@ \endgroup% } +\def\pgf@remember@layerlist@globally{% + \global\let\pgf@layerlist@=\pgf@layerlist +}% +\def\pgf@restore@layerlist@from@global{% + \let\pgf@layerlist=\pgf@layerlist@ +}% \def\pgf@insertlayers{% \box\pgf@layerbox@main% } @@ -356,20 +369,20 @@ % \pgfsetbaseline{default}% resets to default value \def\pgfsetbaseline#1{% - \def\pgf@temp{#1}% - \ifx\pgf@temp\pgf@default@text - \pgfsetbaseline{\pgf@picminy}% - \else - \pgfsetbaselinepointlater{\pgfpoint{0pt}{#1}}% - \fi + \def\pgf@temp{#1}% + \ifx\pgf@temp\pgf@default@text + \pgfsetbaseline{\pgf@picminy}% + \else + \pgfsetbaselinepointlater{\pgfpoint{0pt}{#1}}% + \fi } \pgfsetbaseline{\pgf@picminy} % controls how the image externalization implements trim: \newif\ifpgf@trim@lowlevel \pgfkeys{ - /pgf/trim lowlevel/.is if=pgf@trim@lowlevel, - /pgf/trim lowlevel/.default=true, + /pgf/trim lowlevel/.is if=pgf@trim@lowlevel, + /pgf/trim lowlevel/.default=true, } % Same as the y-baseline for horizontal alignment. @@ -385,12 +398,12 @@ % or % \pgfsettrimleft{default} \def\pgfsettrimleft#1{% - \def\pgf@temp{#1}% - \ifx\pgf@temp\pgf@default@text - \pgfsettrimleft{\pgf@picminx} - \else - \pgfsettrimleftpointlater{\pgfpoint{#1}{0pt}}% - \fi + \def\pgf@temp{#1}% + \ifx\pgf@temp\pgf@default@text + \pgfsettrimleft{\pgf@picminx} + \else + \pgfsettrimleftpointlater{\pgfpoint{#1}{0pt}}% + \fi } \pgfsettrimleft{\pgf@picminx} @@ -404,12 +417,12 @@ % or % \pgfsettrimright{default} \def\pgfsettrimright#1{% - \def\pgf@temp{#1}% - \ifx\pgf@temp\pgf@default@text - \pgfsettrimright{\pgf@picmaxx}% - \else - \pgfsettrimrightpointlater{\pgfpoint{#1}{0pt}}% - \fi + \def\pgf@temp{#1}% + \ifx\pgf@temp\pgf@default@text + \pgfsettrimright{\pgf@picmaxx}% + \else + \pgfsettrimrightpointlater{\pgfpoint{#1}{0pt}}% + \fi } \pgfsettrimright{\pgf@picmaxx} @@ -445,6 +458,7 @@ \pgfsyssoftpath@setcurrentpath\pgfutil@empty% \edef\pgfscope@linewidth{\the\pgflinewidth}% \let\pgf@interrupt@lastmoveto=\pgfsyssoftpath@lastmoveto% + \let\pgf@interrupt@nlt@infos=\pgf@nlt@infos% \begingroup% } \def\endpgfinterruptpath @@ -453,9 +467,10 @@ \global\pgflinewidth=\pgfscope@linewidth% \pgfsyssoftpath@setcurrentpath\pgf@interrupt@path% \pgf@setpathsizes\pgf@interrupt@pathsizes% - \global\pgf@path@lastx=\pgf@interrupt@savex% - \global\pgf@path@lasty=\pgf@interrupt@savey% - \global\let\pgfsyssoftpath@lastmoveto=\pgf@interrupt@lastmoveto% + \global\pgf@path@lastx\pgf@interrupt@savex% + \global\pgf@path@lasty\pgf@interrupt@savey% + \global\let\pgfsyssoftpath@lastmoveto\pgf@interrupt@lastmoveto% + \global\let\pgf@nlt@infos=\pgf@interrupt@nlt@infos% \endgroup% } @@ -570,5 +585,4 @@ \let\pgf@savelayers=\relax \let\pgf@restorelayers=\relax - \endinput |