pgf (19dec19)

git-svn-id: svn://tug.org/texlive/trunk@53187 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 27 insertions, 17 deletions

diff --git a/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.pdflinks.code.tex b/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.pdflinks.code.tex
index a23b9ad6861..370c5ad071d 100644
--- a/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.pdflinks.code.tex
+++ b/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.pdflinks.code.tex
@@ -53,13 +53,6 @@
 
 \newif\ifpgfmanualshowlabels
 
-% FIXME : \cleanedhypertarget/\cleanedhyperlink have been introduced
-% in  http://pgf.cvs.sourceforge.net/viewvc/pgf/pgf/latex/pgf/doc/pgfmanual.pdflinks.code.tex?r1=1.15&r2=1.16
-% but they are not present on my (CFR) system... what problem did they
-% address/how can we satisfy this dependency?
-\pgfutil@IfUndefined{cleanedhypertarget}{\let\cleanedhypertarget=\hypertarget}{}
-\pgfutil@IfUndefined{cleanedhyperlink}{\let\cleanedhyperlink=\hyperlink}{}
-
 \pgfkeys{%
     /codeexample/prettyprint/cs arguments/pgfkeys/.initial=1,
     /codeexample/prettyprint/cs/pgfkeys/.code 2 args={\pgfmanualpdfref{#1}{#1}\{\pgfmanualprettyprintpgfkeys{#2}\pgfmanualclosebrace},
@@ -238,9 +231,9 @@
         \expandafter\gdef\csname pgfd@lbl@\pgfmanualpdflabel@@\endcsname{w}% 1. remember the label AND remember that we "w"rote it into the pdf.
         \edef\pgfmanualpdflabel@@{\pgfkeysvalueof{/pdflinks/internal link prefix}.\pgfmanualpdflabel@@}%
         \ifvmode%
-          \expandafter\cleanedhypertarget\expandafter{\pgfmanualpdflabel@@}{#2}%
+          \expandafter\hypertarget\expandafter{\pgfmanualpdflabel@@}{#2}%
         \else%
-          {\setbox0=\hbox{\raise1em\hbox{\expandafter\cleanedhypertarget\expandafter{\pgfmanualpdflabel@@}{}}}\ht0=0pt\box0}#2%
+          {\setbox0=\hbox{\raise1em\hbox{\expandafter\hypertarget\expandafter{\pgfmanualpdflabel@@}{}}}\ht0=0pt\box0}#2%
         \fi%
     \else
         #2%
@@ -287,7 +280,7 @@
 }%
 \def\pgfmanualpdfref@#1#2{%
     \pgfkeysgetvalue{/pdflinks/internal link prefix}\pgfmanual@temp
-    \expandafter\cleanedhyperlink\expandafter{\pgfmanual@temp.#1}{\pgfkeysvalueof{/pdflinks/render hyperlink/.@cmd}{#2}\pgfeov}%
+    \expandafter\hyperlink\expandafter{\pgfmanual@temp.#1}{\pgfkeysvalueof{/pdflinks/render hyperlink/.@cmd}{#2}\pgfeov}%
     \ifpgfmanualshowlabels
         \pgfkeysvalueof{/pdflinks/show labels code/.@cmd}{#1}\pgfeov
     \fi
diff --git a/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.prettyprinter.code.tex b/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.prettyprinter.code.tex
index e8aa334224c..3a230cac233 100644
--- a/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.prettyprinter.code.tex
+++ b/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.prettyprinter.code.tex
@@ -720,7 +720,7 @@
 % Collects tokens inside of a token list up to a single delimiting token, dealing with nested
 % catcode-12-braces.
 %
-% #1: is the end token, the delimiter. It won't be collected.
+% #1: list of tokens, each of which is marking the end. It won't be collected.
 % #2: is code to invoke after
 % \pgfmanualprettyprinterhandlecollectedargsVtwo has been invoked.
 %
@@ -742,8 +742,9 @@
 %
 \def\pgfmanualprettyprintercollectupto#1#2{%
     \pgfmanualprettyprinterarghasunmatchedbracesfalse
+    \def\pgfmanualprettyprinterterminator{}%
     \begingroup
-    \def\pgfmanual@loc@delimittoken{#1}%
+    \def\pgfmanual@loc@delimittokens{#1}%
     \toksdef\t@afterpgfmanualprettyprinterhandlecollected=10
     \t@afterpgfmanualprettyprinterhandlecollected={#2}%
     %
@@ -758,6 +759,12 @@
     \pgfmanual@pretty@collectupto@loop
 }%
 
+% Stores the token that marks the end in the first argument of
+% \pgfmanualprettyprintercollectupto.  For example if the token list was {,]}
+% and ] was encountered first, then \pgfmanualprettyprinterterminator will
+% be ].
+\def\pgfmanualprettyprinterterminator{}
+
 % loops through all tokens, collecting the required number of
 % arguments. This involves to track nested braces manually.
 % #1 is a single token.
@@ -794,11 +801,13 @@
                         \advance\c@pgfmanual@pretty@openbracecount by-1
                         \t@pgfmanual@currentarg=\expandafter{\the\t@pgfmanual@currentarg#1}%
                     \else
-                        \ifx\pgfmanual@loc@TMPc\pgfmanual@loc@delimittoken
+                        \expandafter\expandafter\expandafter\pgfutil@in@\expandafter\pgfmanual@loc@TMPc\expandafter{\pgfmanual@loc@delimittokens}%
+                        \ifpgfutil@in@
                             \ifnum\c@pgfmanual@pretty@openbracecount=0
                                 % do NOT include the delimit token.
                                 \edef\pgfmanual@pretty@collectupto@loop@NEXT{%
                                     \noexpand\endgroup
+                                    \noexpand\def\noexpand\pgfmanualprettyprinterterminator{\pgfmanual@loc@TMPc}%
                                     \noexpand\pgfmanualprettyprinterhandlecollectedargsVtwo{\the\t@pgfmanual@currentarg}{1}%
                                     \noexpand\pgfmanualprettyprintercollectupto@restore@callback
                                     \the\t@afterpgfmanualprettyprinterhandlecollected
@@ -1053,7 +1062,7 @@
         \if\pgfmanual@pretty@isconsumed0%
             \def\pgfmanualprettyprinterhandlecollectedargsVtwo##1##2{\pgfmanual@pretty@pgfkeys@processvalue{##1}}% the braces will be handled separately.
             \def\pgfmanual@pretty@pgfkeys@collectvalue@next{%
-                \pgfmanualprettyprintercollectupto,{\afterpgfmanual@pretty@collectargs@finish@value}#1%
+                \pgfmanualprettyprintercollectupto{,]}{\afterpgfmanual@pretty@collectargs@finish@value}#1%
             }%
         \fi
     \fi
@@ -1063,7 +1072,7 @@
     \pgfutil@ifnextchar\pgfmanual@EOI{%
         \pgfmanual@pretty@pgfkeys@loop
     }{%
-        \pgfmanual@pretty@pgfkeys@loop,% re-insert the gobbled comma here!
+        \expandafter\pgfmanual@pretty@pgfkeys@loop\pgfmanualprettyprinterterminator% re-insert the gobbled comma here!
     }%
 }%
 
diff --git a/Master/texmf-dist/tex/latex/pgf/utilities/tikzexternal.sty b/Master/texmf-dist/tex/latex/pgf/utilities/tikzexternal.sty
index 4f9d31572f6..75cb9aedb56 100644
--- a/Master/texmf-dist/tex/latex/pgf/utilities/tikzexternal.sty
+++ b/Master/texmf-dist/tex/latex/pgf/utilities/tikzexternal.sty
@@ -69,6 +69,10 @@
 \def\tikz@opt@process#1#2{\tikzexternal@image}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+\def\pgf@marshal{\let\ifmeasuring@\iffalse}
+\ifdefined\ifmeasuring@\else
+    \expandafter\pgf@marshal
+\fi
 \def\tikzexternal@image{%
     \leavevmode
     \begingroup
@@ -80,14 +84,18 @@
         \t@tikzexternal@tmpb=\expandafter{\tikzexternal@figurename}%
         \count0=\csname c@tikzext@no@\tikzexternal@figurename\endcsname
         \xdef\tikzexternal@curfilename{\the\t@tikzexternal@tmpa\the\t@tikzexternal@tmpb\the\count0 }%
-        \advance\count0 by1\relax
+        \ifmeasuring@\else
+            \advance\count0 by1\relax
+        \fi
         \expandafter\xdef\csname c@tikzext@no@\tikzexternal@figurename\endcsname{\the\count0 }%
     \else
         \t@tikzexternal@tmpb=\expandafter{\tikzexternal@nextfile}%
         \xdef\tikzexternal@curfilename{\the\t@tikzexternal@tmpa\the\t@tikzexternal@tmpb}%
     \fi
     \endgroup
-    \global\let\tikzexternal@nextfile=\empty
+    \ifmeasuring@\else
+        \global\let\tikzexternal@nextfile=\empty
+    \fi
     \pgfincludeexternalgraphics\tikzexternal@curfilename
 }%
 \def\tikzset#1{}\def\pgfkeys#1{}\def\pgfqkeys#1#2{}