diff options
author | Karl Berry <karl@freefriends.org> | 2019-07-12 20:45:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-07-12 20:45:15 +0000 |
commit | aebf7cb9eaabd4c0092643c77009a567ede155dc (patch) | |
tree | fa4aae570987002e252dd9c3d3b96b7571f03848 /Master/texmf-dist/tex/generic/pgf/utilities | |
parent | 2d83a76b7d0fa40bf7b1c90280ee3388258a73f3 (diff) |
pgf (12jul19)
git-svn-id: svn://tug.org/texlive/trunk@51626 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/utilities')
7 files changed, 26 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex index 5ff18417bc6..4e351c902be 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgffor.code.tex @@ -202,7 +202,7 @@ \def\pgffor@invokebody{% - \pgffor@begingroup% + \pgffor@begingroup% \expandafter\pgfutil@in@\expandafter/\expandafter{\pgffor@var}% \ifpgfutil@in@% \expandafter\def\expandafter\pgffor@valuerest\expandafter{\pgffor@value//\relax}% @@ -520,12 +520,12 @@ \def\pgffor@atendforeach{% \global\edef\pgffor@remember@expanded{\pgffor@remember@code}% - \endgroup% - \ifx\pgffor@remember@expanded\pgfutil@empty% - \else% - \pgffor@remember@expanded% - \global\let\pgffor@remember@expanded=\pgfutil@empty% - \fi% + \ifx\pgffor@remember@expanded\pgfutil@empty% + \else% + \pgffor@remember@expanded% + \global\let\pgffor@remember@expanded=\pgfutil@empty% + \fi% + \endgroup% } \def\pgffor@default@begingroup{% \begingroup% diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeys.code.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeys.code.tex index 84d4bd5d529..2f17652628a 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeys.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeys.code.tex @@ -520,7 +520,11 @@ \fi% \pgfkeys@splitter#2/% } -\def\pgfkeys@gobbletoslash\pgfkeys@splitter/{\expandafter\pgfkeys@remove@slash\the\pgfkeys@pathtoks\relax}% +\def\pgfkeys@gobbletoslash\pgfkeys@splitter/{% + \if\relax\detokenize\expandafter{\the\pgfkeys@pathtoks}\relax\else + \expandafter\pgfkeys@remove@slash\the\pgfkeys@pathtoks\relax + \fi +}% \def\pgfkeys@remove@slash#1/\relax{\pgfkeys@pathtoks{#1}} diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeysfiltered.code.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeysfiltered.code.tex index 7c6d6e49cef..ef70baf021f 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeysfiltered.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfkeysfiltered.code.tex @@ -504,8 +504,6 @@ \ifpgfkeyssuccess\else \pgfkeys@try \ifpgfkeyssuccess\else - % discard the '.lastretry' suffix: - \edef\pgfkeyscurrentkey{\pgfkeyscurrentpath}% \pgfkeys@split@path% \pgfkeys@unknown \fi diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex index 4eba7a9787f..6fbaf2687ba 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-common.tex @@ -75,9 +75,9 @@ \def\pgfutil@letfirst@end{} \long\def\pgfutil@secondoftwo#1#2{#2} \def\pgfutil@empty{} -\def\pgfutil@gobble@until@relax#1\relax{} -\def\pgfutil@gobble#1{} -\def\pgfutil@gobbletwo#1#2{} +\long\def\pgfutil@gobble@until@relax#1\relax{} +\long\def\pgfutil@gobble#1{} +\long\def\pgfutil@gobbletwo#1#2{} \def\pgfutil@namedef#1{\expandafter\def\csname #1\endcsname} \def\pgfutil@namelet#1{\expandafter\pgfutil@@namelet\csname#1\endcsname} \def\pgfutil@@namelet#1#2{\expandafter\let\expandafter#1\csname#2\endcsname} diff --git a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-context.def b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-context.def index 2539c764e44..bf7e43a298c 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-context.def +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-context.def @@ -147,6 +147,11 @@ \def\pgfutil@emu@select#1#2#3#4#5{#5} +\def\XC@tgt@mod#1{#1} +\def\XC@sdef#1#2{\edef#1{#2}} +\def\XC@mod@cmyk{cmyk} +\def\XC@mod@rgb{rgb} + % goody \let\colorlet=\pgfutil@colorlet 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 97f884aff95..2ac8ec42120 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-latex.def @@ -189,9 +189,9 @@ % pgfcalendar uses translations \ifx\translate\@undefined % check if \translate is available - \def\pgfutil@translate#1{\translate{#1}} -\else \def\pgfutil@translate#1{#1} +\else + \def\pgfutil@translate#1{\translate{#1}} \fi % e-TeX primitives 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 14ebcf4b986..090fcaeb5ae 100644 --- a/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def +++ b/Master/texmf-dist/tex/generic/pgf/utilities/pgfutil-plain.def @@ -140,7 +140,10 @@ \let\extractcolorspec=\pgfutil@extractcolorspec \let\convertcolorspec=\pgfutil@convertcolorspec - +\def\XC@tgt@mod#1{#1} +\def\XC@sdef#1#2{\edef#1{#2}} +\def\XC@mod@cmyk{cmyk} +\def\XC@mod@rgb{rgb} % pgfutil@minipage |