diff options
author | Karl Berry <karl@freefriends.org> | 2019-12-19 22:11:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-12-19 22:11:59 +0000 |
commit | 8876a8021514f190d676e4e5261f1084a66754d3 (patch) | |
tree | 9a496107a312a1acbbdb06ea0e1657c285109729 /Master/texmf-dist/tex/generic/pgf/modules | |
parent | 693eacf895c01285e2992460bb489142ead8ae8a (diff) |
pgf (19dec19)
git-svn-id: svn://tug.org/texlive/trunk@53187 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/modules')
3 files changed, 36 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulematrix.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulematrix.code.tex index 50c0e1e52f7..4f676aeea47 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulematrix.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmodulematrix.code.tex @@ -24,6 +24,9 @@ \let\pgf@matrix@cell=\pgfnodeparttextbox % alias \let\pgf@matrix@box=\pgf@matrix@cell % alias +\long\def\pgfmatrixbeforeassemblenode#1{% + \long\def\pgf@matrix@before@assemnble@node{#1}} +\pgfmatrixbeforeassemblenode{} % Sets the default row or column sep % @@ -211,6 +214,11 @@ \egroup\egroup% \egroup% % + % Inject custom tokens before assembling the node holding the matrix. Can + % be used to apply additional settings. + % + \pgf@matrix@before@assemnble@node + % % If there are named nodes, we must adjust their coordinates. % \ifx\pgf@matrix@node@list\pgfutil@empty% diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleparser.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleparser.code.tex index 3528771b1a8..3ac1aba9fce 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleparser.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleparser.code.tex @@ -410,7 +410,7 @@ \def\pgfparserlet@g {% \ifx\pgfparserlet@argb\pgfutil@sptoken - % will also gobble the \pgfparserlet@c after \fi + % will also gobble the \pgfparserlet@h after \fi \pgfparserlet@gobble@space\pgfparserlet@f \fi \pgfparserlet@h @@ -496,24 +496,40 @@ {} {\csname \pgfparser@current\space final action\endcsname}% } - {% - \futurelet\pgfparsertoken\pgfparser@getnexttoken@a - }% + {\futurelet\pgfparsertoken\pgfparser@getnexttoken@a}% } \pgfutil@protected\def\pgfparser@getnexttoken@a {% - \pgfparser@getnexttoken@iftokengobble\bgroup\bgroup + % check the problematic categories based on the meaning of the token + \edef\pgfparser@tokencategory{\pgfparser@extractmeaning\pgfparsertoken}% + \pgfparser@getnexttoken@ifcategory\pgfparser@category@i\bgroup {% - \pgfparser@getnexttoken@iftokengobble\egroup\egroup + \pgfparser@getnexttoken@ifcategory\pgfparser@category@ii\egroup {% - \pgfparser@getnexttoken@iftokengobble\pgfutil@sptoken{ }% - {\pgfparser@getnexttoken@defchar}% + \pgfparser@getnexttoken@ifcategory\pgfparser@category@x{ }% + {% + \pgfparser@getnexttoken@ifcategory\pgfparser@category@vi{####}% + {\pgfparser@getnexttoken@defchar}% + }% }% }% } -\pgfutil@protected\def\pgfparser@getnexttoken@iftokengobble#1#2% +\begingroup +\def\pgfparser@extractmeaning#1% {% - \ifx\pgfparsertoken#1% + \endgroup + \def\pgfparser@extractmeaning##1% + {\expandafter\pgfparser@extractmeaning@\meaning##1#1#1\pgfparser@mark}% + \def\pgfparser@extractmeaning@##1#1##2#1##3\pgfparser@mark{##1#1##2}% + } +\catcode`\ =12\pgfparser@extractmeaning{ } % ends the group +\edef\pgfparser@category@i{\pgfparser@extractmeaning\bgroup} +\edef\pgfparser@category@ii{\pgfparser@extractmeaning\egroup} +\edef\pgfparser@category@vi{\pgfparser@extractmeaning#} +\edef\pgfparser@category@x{\pgfparser@extractmeaning\pgfutil@sptoken} +\pgfutil@protected\def\pgfparser@getnexttoken@ifcategory#1#2% + {% + \ifx\pgfparser@tokencategory#1% \def\pgfparserletter{#2}% \pgfparser@getnexttoken@gobble \fi diff --git a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleshapes.code.tex b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleshapes.code.tex index 78edf01c626..166a5d56405 100644 --- a/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleshapes.code.tex +++ b/Master/texmf-dist/tex/generic/pgf/modules/pgfmoduleshapes.code.tex @@ -532,7 +532,7 @@ % Ok, check whether #1 is known! \pgfutil@ifundefined{pgf@sh@ns@#1} {\pgfutil@ifundefined{pgf@sh@ns@not yet positionedPGFINTERNAL#1}{% - \pgferror{No shape named #1 is known}}{ + \pgferror{No shape named `#1' is known}}{ % else, fail silently }% \pgfpointorigin}% @@ -597,7 +597,7 @@ \def\pgfpointshapeborder#1#2{% % Ok, check whether #1 is known! \pgfutil@ifundefined{pgf@sh@ns@#1} - {\pgferror{No shape named #1 is known}% + {\pgferror{No shape named `#1' is known}% \pgfpointorigin}% {% \pgf@process{% @@ -823,7 +823,6 @@ \anchor{north}{\centerpoint}% \anchor{north west}{\centerpoint}% \anchor{north east}{\centerpoint}% - \anchor{center}{\centerpoint}% \anchor{west}{\centerpoint}% \anchor{east}{\centerpoint}% \anchor{mid}{\centerpoint}% |