From 4b795f65d52cde0d136c0175ce20101946378b54 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 5 Feb 2020 03:03:08 +0000 Subject: CTAN sync 202002050303 --- macros/generic/tokcycle/tokcycle-doc.pdf | Bin 255336 -> 254565 bytes macros/generic/tokcycle/tokcycle-examples.pdf | Bin 260545 -> 258884 bytes macros/generic/tokcycle/tokcycle-examples.tex | 101 -------------------------- macros/generic/tokcycle/tokcycle.tex | 12 ++- 4 files changed, 8 insertions(+), 105 deletions(-) (limited to 'macros/generic') diff --git a/macros/generic/tokcycle/tokcycle-doc.pdf b/macros/generic/tokcycle/tokcycle-doc.pdf index c35f641258..1d143f75af 100644 Binary files a/macros/generic/tokcycle/tokcycle-doc.pdf and b/macros/generic/tokcycle/tokcycle-doc.pdf differ diff --git a/macros/generic/tokcycle/tokcycle-examples.pdf b/macros/generic/tokcycle/tokcycle-examples.pdf index b67afe35e4..34a21e3f68 100644 Binary files a/macros/generic/tokcycle/tokcycle-examples.pdf and b/macros/generic/tokcycle/tokcycle-examples.pdf differ diff --git a/macros/generic/tokcycle/tokcycle-examples.tex b/macros/generic/tokcycle/tokcycle-examples.tex index ec63d48f94..e3b21b1007 100644 --- a/macros/generic/tokcycle/tokcycle-examples.tex +++ b/macros/generic/tokcycle/tokcycle-examples.tex @@ -60,107 +60,6 @@ \tableofcontents -\makeatletter -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% ALREADY PLACED IN tokcycle.tex -% -%\def\trapactivetok#1{\tctestifcatnx~#1{\activetoktrue}{\trapactivelet#1}} -% -%% WILL ALSO TRAP ACTIVE \let TO PRIMITIVES AS IMPLICIT; UNDO LATER IN \can@absorb@@ -%\def\trapactivelet#1{\tctestifcon{% -% \expandafter\if\detokenize{#1}#1}{}{\activetoktrue\implicittoktrue}} -% -%\makeatletter -%\long\def\backslashcmds#1{% -% \test@ifmacro#1{\tctestifcon\ifcatSIX{\implicittoktrue\@chrT#1}{\@macT#1}}% -% {\implicittoktrue\trapimplicitegrp#1\tctestifcon{\iftc@implicitgrp}% -% {\ifcase\@implicitgroupingcase\or\addcytoks{#1}\or\@chrT{#1}\fi}% -% {\@chrT#1}}} -% -%\long\def\can@absorb@#1{\tctestifnum{\count@stringtoks{#1}>1}% -% {\tctestifx{\endtokcycraw#1}{#1}{\backslashcmds#1\@tokcycle}}% -% {\trapactivetok#1\tc@trapescape#1{\tc@escapecytoks}{\can@absorb@@#1}}} -% -%\long\def\can@absorb@@#1{\let\@tmp#1\test@ifmacro\@tmp -% {\implicittokfalse\@macT#1}{\@chrT#1}\@tokcycle} -% -%\long\def\count@toks#1{\the\numexpr-1\count@@toks#1.\tc@endcnt} -%\long\def\count@@toks#1#2\tc@endcnt{+1\tc@ifempty{#2}{\relax}{\count@@toks#2\tc@endcnt}} -% -% END ALREADY PLACED IN tokcycle.tex - -% REVISED ACTIVE TOK TRAP -%\newif\ifactivechar -%\newif\ifactivetokunexpandable - -%\def\tc@resetifs{\activetokfalse\implicittokfalse\tc@implicitgrpfalse -% \catSIXfalse\activecharfalse\activetokunexpandablefalse} - -%\long\def\can@absorb@#1{\tctestifnum{\count@stringtoks{#1}>1}% -% {\tctestifx{\endtokcycraw#1}{#1}{\backslashcmds#1\@tokcycle}}% -% {\trapactives#1\tc@trapescape#1{\tc@escapecytoks}{\can@absorb@@#1}}} - -% \activechartrue: \catcode`X=\active AT TIME OF TEST -% \activetoktrue: \catcode`X=\active AT TIME OF X's TOKENIZATION -% \activetokunexpandabletrue: \catcode`X=\active WHEN TOKENIZED AND -% \let XY or \let X\primitive AT TIME OF TEST -% \implicittoktrue \let(X or \X)Y WHERE Y IS NOT cat-0 - -%\def\trapactives#1{\trapactivechar{#1}\trapactivetok{#1}} -%\def\trapactivechar#1{\tctestifnum{\number\catcode`#1=13}{\activechartrue}{}} -%\def\trapactivetok#1{\tctestifcatnx~#1{\activetoktrue}{% -% \trapactivetokunexpandable#1}} -%%% WILL ALSO TRAP ACTIVE \let TO PRIMITIVES AS IMPLICIT; UNDO LATER IN \can@absorb@@ -%\def\trapactivetokunexpandable#1{\tctestifcon{\expandafter\if -% \detokenize{#1}#1}{}{\activetoktrue\activetokunexpandabletrue\implicittoktrue}} -% END REVISED ACTIVE TOK TRAP - -% ACTIVE IMPLICIT CAT-6 TRAP -%\def\trapcatSIXc#1{\tctestifnum{\count@stringtoks{#1}>1}{\tc@defx\six@str{\string#1}% -% \global\let\implicitsixtok\six@str\tc@tok{\implicitsixtok}}% -% {\tc@tok\expandafter{\string#1}\tctestifnum{\number\catcode`#1=6}% -% {}{\activetoktrue\implicittoktrue}}} -% END ACTIVE IMPLICIT CAT-6 TRAP - -% ACTIVE CHAR \bgroup -%\def\@@@grpT#1{\tctestifnum{\number\catcode`#1=1}% -% {\expandafter\@@grpT\expandafter{\iffalse}\fi}% { -% {\implicittoktrue\tc@implicitgrptrue% -% \tctestifnum{`#1=92}% WORKS EVEN IF CAT-0 HAS CHANGED -% {\csmk{\expandafter\backslashcmds\thecs\@tokcycle}}% \bgroup -% {\begingroup\catcode`#1=\active \xdef\@tmp{\scantokens{#1\noexpand}}\endgroup -% \expandafter\@chrT\@tmp\@tokcycle}% ACTIVE CHAR \bgroup -% }% -%} -% END ACTIVE CHAR \bgroup - -%%%%%%%%%%TRAPS ACTIVE-IMPLICIT GROUP TOKS FOR \stripimplicitgroupingcase -%\def\implicitgrpfork#1{\tctestifcon{\iftc@implicitgrp}{\ifcase -% \@implicitgroupingcase\or\addcytoks{#1}\or\@chrT{#1}\fi}{\@chrT#1}} - -%\def\@@@grpT#1{\tctestifnum{\number\catcode`#1=1}% -% {\expandafter\@@grpT\expandafter{\iffalse}\fi}% { -% {\implicittoktrue\tc@implicitgrptrue% -% \tctestifnum{`#1=92}% WORKS EVEN IF CAT-0 HAS CHANGED -% {\csmk{\expandafter\backslashcmds\thecs\@tokcycle}}% \bgroup -% {\begingroup\catcode`#1=\active \xdef\@tmp{\scantokens{#1\noexpand}}\endgroup -% \expandafter\implicitgrpfork\@tmp\@tokcycle}% ACTIVE CHAR \bgroup -% }} - -%\long\def\can@absorb@@#1{\let\@tmp#1\test@ifmacro\@tmp{\implicittokfalse -% \@macT#1}{\trapimplicitegrp#1\implicitgrpfork#1}\@tokcycle} - -%\long\def\backslashcmds#1{% -% \test@ifmacro#1{\tctestifcon\ifcatSIX{\implicittoktrue\@chrT#1}{\@macT#1}}% -% {\implicittoktrue\trapimplicitegrp#1\implicitgrpfork#1}} -%%%%%%%%%%END TRAPS ACTIVE-IMPLICIT GROUP TOKS FOR \stripimplicitgroupingcase - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - -\makeatother - %%%%%%%%%%%%%% SUPPORT MACRO \newcommand\macname[1]{\texttt{\char92#1}} diff --git a/macros/generic/tokcycle/tokcycle.tex b/macros/generic/tokcycle/tokcycle.tex index 5a33109df6..d0819da2cf 100644 --- a/macros/generic/tokcycle/tokcycle.tex +++ b/macros/generic/tokcycle/tokcycle.tex @@ -1,7 +1,7 @@ \def\tcname {tokcycle} -\def\tcver {1.1} +\def\tcver {1.11} % -\def\tcdate {2019/9/27} +\def\tcdate {2020/02/04} % % Author : Steven B Segletes, Christian Tellechea (contributor) % Maintainer : Steven B Segletes @@ -100,7 +100,7 @@ \long\def\can@absorb@#1{\tctestifnum{\count@stringtoks{#1}>1}% {\tctestifx{\endtokcycraw#1}{#1}{\backslashcmds#1\@tokcycle}}% {\trapactives#1\tc@trapescape#1{\tc@escapecytoks}{\can@absorb@@#1}}} -\long\def\can@absorb@@#1{\let\@tmp#1\test@ifmacro\@tmp{\implicittokfalse +\long\def\can@absorb@@#1{\let\@tmp=#1\test@ifmacro\@tmp{\implicittokfalse \@macT#1}{\trapimplicitegrp#1\implicitgrpfork#1}\@tokcycle} %CONVERT NEXT (SPACE OR BEGIN-GROUP) TOKEN TO STRING \def\stringify#1{\expandafter#1\string}% #1 WILL BE \@@@@@spcT or \@@@@grpT @@ -213,4 +213,8 @@ v1.1 2019/9/27 token vs. active character code, in the event that an earlier tokenized token no longer shares the current characteristics of the character code - Added ability to handle active-implicit grouping tokens - - Added ability to handle active-implicit cat-6 tokens \ No newline at end of file + - Added ability to handle active-implicit cat-6 tokens + +v1.11 2020/02/04 + - Fixed bug in \can@absorb@@ macro, which prevented the proper absorption/ + handling of the = token. \ No newline at end of file -- cgit v1.2.3