diff options
author | Karl Berry <karl@freefriends.org> | 2019-04-08 17:23:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-04-08 17:23:59 +0000 |
commit | 9da8ac113f97e68e91e3a1ef26467f9814eb4312 (patch) | |
tree | f36b76c9a982931638dde95501c51072185dec56 /Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def | |
parent | e919fa4b004d0ef401808c337d7def5fa259da0f (diff) |
pgf revert to previous release (r49607, committed 5jan19)
git-svn-id: svn://tug.org/texlive/trunk@50867 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def | 114 |
1 files changed, 55 insertions, 59 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def index f8e1e327991..3d7573f7071 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def @@ -51,7 +51,7 @@ \expandafter\pgfsys@outerinvoke\expandafter{\pgfsysprotocol@currentprotocol}% }% \pgfsysprotocol@setcurrentprotocol\pgfutil@emu@temp% - \aftergroup\pgfutil@reset@color% + \aftergroup\pgfutil@reset@color% } \def\pgfutil@extractcolorspec#1#2{% @@ -69,7 +69,7 @@ \else \let\pgf@next=\pgfutil@firstoftwo% \fi% - \pgf@next{#2}{#3}% + \pgf@next{#2}{#3}% } @@ -100,7 +100,7 @@ \edef\pgf@marshal{\noexpand\let\expandafter\noexpand\csname\string\color@#1\endcsname=% \expandafter\noexpand\csname\string\color@#2\endcsname}% \pgf@marshal% - \fi% + \fi% } \def\pgfutil@emu@mix#1!#2!#3!#4\@nil{% \expandafter\expandafter\expandafter\pgfutil@emu@unpack\csname\string\color@#1\endcsname% @@ -161,7 +161,7 @@ \def\pgfutil@guessdriver{ \ifx\directlua\@undefined - \ifx\HCode\@undefined% + \ifx\HCode\@undefined% \ifcase\pdfoutput% \ifx\XeTeXversion\@undefined \def\pgfsysdriver{pgfsys-dvips.def}% hopefully @@ -179,7 +179,7 @@ \fi } - + % Global colors @@ -247,18 +247,18 @@ \def\pgfutil@insertatbegincurrentpagefrombox#1{% \edef\pgf@temp{\the\wd\pgfutil@abb}% \global\setbox\pgfutil@abb\hbox{% - \unhbox\pgfutil@abb - % - % the order in which \pgfutil@insertatbegincurrentpagefrombox - % matters unless we make the following -shift! - % To see this, consider writing two such statements. The second - % one will (naturally) be placed more to the right, although there - % is no apparent reason why it should. - % - % CF observed problems when placing patterns in XObjects without - % this skip (dvipdfmx driver for pgfplots shader=interp) - \hskip-\pgf@temp\relax - #1% + \unhbox\pgfutil@abb + % + % the order in which \pgfutil@insertatbegincurrentpagefrombox + % matters unless we make the following -shift! + % To see this, consider writing two such statements. The second + % one will (naturally) be placed more to the right, although there + % is no apparent reason why it should. + % + % CF observed problems when placing patterns in XObjects without + % this skip (dvipdfmx driver for pgfplots shader=interp) + \hskip-\pgf@temp\relax + #1% }% } \newbox\pgfutil@abb% @@ -272,55 +272,51 @@ \let\pgfutil@abe\pgfutil@empty% % Code by Heiko Oberdiek on ctt -\input atbegshi.sty\relax -\AtBeginShipout{% - \setbox\AtBeginShipoutBox=\vbox{% - \setbox0=\hbox{% - \begingroup - % the boxes \pgfutil@abe ("every page") and \pgfutil@abb ("current page") - % are used to generate pdf objects / dictionaries which are - % required for the graphics which are somewhere in the "real" - % page content. - % BUT: these pdf objects MUST NOT be affected by text layout - % shifts! Consequently, we have to undo \hoffset and \voffset - % (which are h/v shifts to the page layout). - % - % Note that this of importance for shadings. To be more - % specific: try out shadings with standalone (which uses - % \hoffset) and with xdvipdfmx (which appears to be more - % fragile than pdflatex) - they break unless we undo \hoffset - % and \voffset. - \ifdim\hoffset=0pt \else \hskip-\hoffset\fi - \pgfutil@abe - \unhbox\pgfutil@abb - \pgfutil@abc - \global\let\pgfutil@abc\pgfutil@empty - \ifdim\hoffset=0pt \else \hskip+\hoffset\fi - \endgroup - }% - \wd0=0pt\relax - \ht0=0pt\relax - \dp0=0pt\relax - % ... see remark above regarding \hoffset/\voffset: - \ifdim\voffset=0pt \else \vskip-\voffset\fi - \box0 % - \ifdim\voffset=0pt \else \vskip+\voffset\fi - \nointerlineskip - \box\AtBeginShipoutBox - }% -}% +\input atbegshi.sty\relax +\AtBeginShipout{% + \setbox\AtBeginShipoutBox=\vbox{% + \setbox0=\hbox{% + \begingroup + % the boxes \pgfutil@abe ("every page") and \pgfutil@abb ("current page") + % are used to generate pdf objects / dictionaries which are + % required for the graphics which are somewhere in the "real" + % page content. + % BUT: these pdf objects MUST NOT be affected by text layout + % shifts! Consequently, we have to undo \hoffset and \voffset + % (which are h/v shifts to the page layout). + % + % Note that this of importance for shadings. To be more + % specific: try out shadings with standalone (which uses + % \hoffset) and with xdvipdfmx (which appears to be more + % fragile than pdflatex) - they break unless we undo \hoffset + % and \voffset. + \ifdim\hoffset=0pt \else \hskip-\hoffset\fi + \pgfutil@abe + \unhbox\pgfutil@abb + \pgfutil@abc + \global\let\pgfutil@abc\pgfutil@empty + \ifdim\hoffset=0pt \else \hskip+\hoffset\fi + \endgroup + }% + \wd0=0pt\relax + \ht0=0pt\relax + \dp0=0pt\relax + % ... see remark above regarding \hoffset/\voffset: + \ifdim\voffset=0pt \else \vskip-\voffset\fi + \box0 % + \ifdim\voffset=0pt \else \vskip+\voffset\fi + \nointerlineskip + \box\AtBeginShipoutBox + }% +}% % End of HO code % The following is still messy and needs to be cleanup up (everything -% prefixed by pgfutil@): +% prefixed by pgfutil@): %\def\PackageInfo#1#2{} %\def\PackageWarning#1#2{\immediate\write17{Package #1: Warning! #2.}}% %\def\PackageError#1#2#3{\immediate\write17{Package #1: Error! #2.}}% \long\def\AtBeginDocument#1{#1}% -% pgfcalendar uses translations - -\def\pgfutil@translate#1{#1} % is there a translator package for plain? - \endinput |