From 3de6683607c3042def19b77ca8a338814d0a1575 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 8 May 2019 21:09:31 +0000 Subject: pgf revert again to r49607, after mistaken update git-svn-id: svn://tug.org/texlive/trunk@51047 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/pgf/utilities/pgfutil-latex.def | 95 ++++++++++------------ 1 file changed, 44 insertions(+), 51 deletions(-) (limited to 'Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def') diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def index f4c3ea92d3f..aad781a60ef 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def @@ -54,7 +54,7 @@ \else \let\pgf@next=\pgfutil@firstoftwo% \fi% - \pgf@next{#2}{#3}% + \pgf@next{#2}{#3}% } \let\pgfutil@raggedleft\raggedleft @@ -90,23 +90,23 @@ \def\pgfutil@check@rerun#1#2{\@newl@bel{pgf@lab}{#1}{#2}} -\AtBeginDocument{\AtEndDocument{\clearpage\the\pgfutil@everybye}} +\AtBeginDocument{\AtEndDocument{\par\vfil\penalty-10000\relax\the\pgfutil@everybye}} \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% @@ -124,40 +124,40 @@ % Add at begin page stuff \setbox\@cclv=\vbox{% \setbox\z@=\hbox{% - % 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 - }% + % 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 + }% \wd\z@=\z@% \ht\z@=\z@% \dp\z@=\z@% - % ... see remark above regarding \hoffset/\voffset: - \ifdim\voffset=0pt \else \vskip-\voffset\fi + % ... see remark above regarding \hoffset/\voffset: + \ifdim\voffset=0pt \else \vskip-\voffset\fi \box\z@% - \ifdim\voffset=0pt \else \vskip+\voffset\fi - % - % if TeX changes into vertical mode, it inserts \parskip and - % \lineskip. Disable it here: + \ifdim\voffset=0pt \else \vskip+\voffset\fi + % + % if TeX changes into vertical mode, it inserts \parskip and + % \lineskip. Disable it here: \nointerlineskip% \ifvbox\@cclv \unvbox\@cclv \else\hsize=\wd\@cclv \noindent\unhbox\@cclv \fi% - %\box\@cclv - % using \box instead of \unhbox or \unvbox - % has the advantage that glue settings won't be - % altered (as for \unhbox/\unvbox). But \box breaks compatibility - % with the 'remember picture' feature. + %\box\@cclv + % using \box instead of \unhbox or \unvbox + % has the advantage that glue settings won't be + % altered (as for \unhbox/\unvbox). But \box breaks compatibility + % with the 'remember picture' feature. }% } @@ -175,23 +175,16 @@ \fi }{}% } - + % Guess the driver: \def\pgfutil@guessdriver{ - \ifx\HCode\@undefined% + \ifx\HCode\@undefined% \edef\pgfsysdriver{pgfsys-\Gin@driver}% should be right \else% \def\pgfsysdriver{pgfsys-tex4ht.def}% should be right \fi% } -% pgfcalendar uses translations - -\ifx\translate\@undefined % check if \translate is available - \def\pgfutil@translate#1{\translate{#1}} -\else - \def\pgfutil@translate#1{#1} -\fi \endinput -- cgit v1.2.3