diff options
author | Karl Berry <karl@freefriends.org> | 2019-01-05 22:40:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-01-05 22:40:38 +0000 |
commit | 22536bb2b5257046d271b1eaa11b4a275d5ec041 (patch) | |
tree | 2500eaf5c26b11e00ebd33a64fccfa332cd5a66c /Master/texmf-dist/tex/latex/pgf/doc | |
parent | cf794f0e2db6857972a9d48d4466a4f03a7057a0 (diff) |
pgf (5jan19)
git-svn-id: svn://tug.org/texlive/trunk@49607 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pgf/doc')
3 files changed, 47 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.code.tex b/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.code.tex index 1c20205676b..5850362e9d5 100644 --- a/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.code.tex +++ b/Master/texmf-dist/tex/latex/pgf/doc/pgfmanual.code.tex @@ -33,7 +33,7 @@ % % -\def\pgfmanual@warning#1{\immediate\write16{! Package pgfmanual Warning: #1}}% +\def\pgfmanual@warning#1{\pgf@typeout{! Package pgfmanual Warning: #1}}% \pgfkeys{ 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 ba9ed33e243..bdae790399e 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,6 +53,13 @@ \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}, @@ -135,9 +142,9 @@ \gdef\pgfmanualpdf@installreplacements{% \def\marg##1{{##1}}% \def\oarg##1{[##1]}% - \def\meta##1{<##1>}% + \def\meta##1{meta(##1)}% \def\x{x}% - \def\textbackslash{<CS>}% + \def\textbackslash{back/}% \def\\{\textbackslash}% \def\space{:}% \edef\ {\space}% @@ -231,9 +238,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\hypertarget\expandafter{\pgfmanualpdflabel@@}{#2}% + \expandafter\cleanedhypertarget\expandafter{\pgfmanualpdflabel@@}{#2}% \else% - {\setbox0=\hbox{\raise1em\hbox{\expandafter\hypertarget\expandafter{\pgfmanualpdflabel@@}{}}}\ht0=0pt\box0}#2% + {\setbox0=\hbox{\raise1em\hbox{\expandafter\cleanedhypertarget\expandafter{\pgfmanualpdflabel@@}{}}}\ht0=0pt\box0}#2% \fi% \else #2% @@ -280,7 +287,7 @@ }% \def\pgfmanualpdfref@#1#2{% \pgfkeysgetvalue{/pdflinks/internal link prefix}\pgfmanual@temp - \expandafter\hyperlink\expandafter{\pgfmanual@temp.#1}{\pgfkeysvalueof{/pdflinks/render hyperlink/.@cmd}{#2}\pgfeov}% + \expandafter\cleanedhyperlink\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 3ef113dc154..f01db1e2cee 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 @@ -425,14 +425,14 @@ }% \def\pgfmanual@pretty@collectpoint{% - \let\pgfmanualprettyprinterhandlecollectedargs=\pgfmanual@pretty@collectargs@finish@collectpoint + \let\pgfmanualprettyprinterhandlecollectedargsVtwo=\pgfmanual@pretty@collectargs@finish@collectpoint \expandafter\pgfmanualprettyprintercollectupto\pgfmanual@pretty@rroundbrace {\afterpgfmanual@pretty@collectpoint}% } { \catcode`\:=12 -\gdef\pgfmanual@pretty@collectargs@finish@collectpoint#1{% +\gdef\pgfmanual@pretty@collectargs@finish@collectpoint#1#2{% \expandafter\pgfutil@in@\pgfmanual@pretty@colon{#1}% \ifpgfutil@in@ \def\pgfmanual@pretty@collectpoint@getcoordsystem##1:##2\relax{% @@ -449,14 +449,14 @@ \expandafter\def\expandafter\pgfmanual@loc@TMPa\expandafter{\expandafter{\pgfmanual@pretty@glob@TMPa}{##2}}% \expandafter\pgfmanual@loc@TMPb\pgfmanual@loc@TMPa\pgfeov }% - \ifpgfmanualprettyprinterfoundterminator + \if1#2% \pgfmanual@pretty@collectpoint@getcoordsystem#1)\relax \else \pgfmanual@pretty@collectpoint@getcoordsystem#1\relax \fi \else \def\pgfmanual@loc@TMPb{\pgfkeysvalueof{/codeexample/prettyprint/point/.@cmd}}% - \ifpgfmanualprettyprinterfoundterminator + \if1#2% \pgfmanual@loc@TMPb(#1)\pgfeov \else \pgfmanual@loc@TMPb(#1\pgfeov @@ -477,7 +477,7 @@ % a csname may only use letters. And: only letters have a % positive lcccode! \ifnum\lccode`#1=0 - \ifx\pgfmanual@loc@TMPb @% + \ifx\pgfmanual@loc@TMPb\pgfmanual@attext% % ok, we may also accept an `@': \edef\pgfmanual@loc@TMPa{\pgfmanual@loc@TMPa #1}% \else @@ -492,6 +492,7 @@ \pgfmanual@pretty@collectcs@loop@NEXT }% \def\afterpgfmanual@pretty@cs{\pgfmanual@pretty@mainloop}% +\def\pgfmanual@attext{@} \def\pgfmanual@pretty@collectcs@loop@END{% \pgfkeysifdefined{/codeexample/prettyprint/cs arguments/\pgfmanual@loc@TMPa}{% @@ -703,12 +704,25 @@ \newif\ifpgfmanualprettyprinterfoundterminator +\def\pgfmanualprettyprinterhandlecollectedargsVtwo@default#1#2{% + \if1#2% + \pgfmanualprettyprinterfoundterminatortrue + \else + \pgfmanualprettyprinterfoundterminatorfalse + \fi + \pgfmanualprettyprinterhandlecollectedargs{#1}% +}% +\def\pgfmanualprettyprintercollectupto@restore@callback{% + \let\pgfmanualprettyprinterhandlecollectedargsVtwo=\pgfmanualprettyprinterhandlecollectedargsVtwo@default +}% +\pgfmanualprettyprintercollectupto@restore@callback + % 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. % #2: is code to invoke after -% \pgfmanualprettyprinterhandlecollectedargs has been invoked. +% \pgfmanualprettyprinterhandlecollectedargsVtwo has been invoked. % % PRECONDITION: % there is a large token list following @@ -717,17 +731,17 @@ % POSTCONDITION: % - the arguments will be collected as % '<result> := <token list>' -% and then, \pgfmanualprettyprinterhandlecollectedargs{<result>} will be -% invoked. Just define \pgfmanualprettyprinterhandlecollectedargs +% and then, +% \pgfmanualprettyprinterhandlecollectedargsVtwo{<result>}{<found terminator>? 1 : 0} will be +% invoked. Just define +% \pgfmanualprettyprinterhandlecollectedargsVtwo % properly. % Then, #2 will be invoked. -% - The boolean \ifpgfmanualprettyprinterfoundterminator will be set to true if and only if '#1' has been found. % % @see \pgfmanualprettyprintercollectargcount for more details. % \def\pgfmanualprettyprintercollectupto#1#2{% \pgfmanualprettyprinterarghasunmatchedbracesfalse - \pgfmanualprettyprinterfoundterminatortrue \begingroup \def\pgfmanual@loc@delimittoken{#1}% \toksdef\t@afterpgfmanualprettyprinterhandlecollected=10 @@ -756,8 +770,8 @@ \ifnum\c@pgfmanual@pretty@openbracecount>0 \noexpand\pgfmanualprettyprinterarghasunmatchedbracestrue \fi - \noexpand\pgfmanualprettyprinterfoundterminatorfalse - \noexpand\pgfmanualprettyprinterhandlecollectedargs{\the\t@pgfmanual@currentarg}% + \noexpand\pgfmanualprettyprinterhandlecollectedargsVtwo{\the\t@pgfmanual@currentarg}{0}% + \noexpand\pgfmanualprettyprintercollectupto@restore@callback \the\t@afterpgfmanualprettyprinterhandlecollected \noexpand\pgfmanual@EOI% <- put this token back into token list! }% @@ -785,7 +799,8 @@ % do NOT include the delimit token. \edef\pgfmanual@pretty@collectupto@loop@NEXT{% \noexpand\endgroup - \noexpand\pgfmanualprettyprinterhandlecollectedargs{\the\t@pgfmanual@currentarg}% + \noexpand\pgfmanualprettyprinterhandlecollectedargsVtwo{\the\t@pgfmanual@currentarg}{1}% + \noexpand\pgfmanualprettyprintercollectupto@restore@callback \the\t@afterpgfmanualprettyprinterhandlecollected }% \else @@ -854,13 +869,15 @@ } \def\pgfmanual@pretty@pgfkeys{% - \let\pgfmanualprettyprinterhandlecollectedargs=\pgfmanual@pretty@pgfkeys@start + \let\pgfmanualprettyprinterhandlecollectedargsVtwo=\pgfmanual@pretty@pgfkeys@start \pgfmanualprettyprintercollectupto]{\pgfmanual@pretty@mainloop}%% }% -\long\def\pgfmanual@pretty@pgfkeys@start#1{% +\long\def\pgfmanual@pretty@pgfkeys@start#1#2{% [% \pgfmanual@pretty@pgfkeys@loop#1\pgfmanual@EOI - ]% + \if1#2% + ]% + \fi }% % iterates through single tokens, detecting key names and values while % it goes. @@ -1034,7 +1051,7 @@ \fi \fi \if\pgfmanual@pretty@isconsumed0% - \def\pgfmanualprettyprinterhandlecollectedargs##1{\pgfmanual@pretty@pgfkeys@processvalue{##1}}% the braces will be handled separately. + \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% }% |