texlive[53669] Master/texmf-dist: tokcycle (4feb20)
commits+karl at tug.org
commits+karl at tug.org
Tue Feb 4 23:16:06 CET 2020
Revision: 53669
http://tug.org/svn/texlive?view=revision&revision=53669
Author: karl
Date: 2020-02-04 23:16:06 +0100 (Tue, 04 Feb 2020)
Log Message:
-----------
tokcycle (4feb20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/tokcycle/tokcycle-doc.pdf
trunk/Master/texmf-dist/doc/generic/tokcycle/tokcycle-examples.pdf
trunk/Master/texmf-dist/doc/generic/tokcycle/tokcycle-examples.tex
trunk/Master/texmf-dist/tex/generic/tokcycle/tokcycle.tex
Modified: trunk/Master/texmf-dist/doc/generic/tokcycle/tokcycle-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tokcycle/tokcycle-examples.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tokcycle/tokcycle-examples.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/tokcycle/tokcycle-examples.tex 2020-02-04 22:15:56 UTC (rev 53668)
+++ trunk/Master/texmf-dist/doc/generic/tokcycle/tokcycle-examples.tex 2020-02-04 22:16:06 UTC (rev 53669)
@@ -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 at absorb@@
-%\def\trapactivelet#1{\tctestifcon{%
-% \expandafter\if\detokenize{#1}#1}{}{\activetoktrue\implicittoktrue}}
-%
-%\makeatletter
-%\long\def\backslashcmds#1{%
-% \test at ifmacro#1{\tctestifcon\ifcatSIX{\implicittoktrue\@chrT#1}{\@macT#1}}%
-% {\implicittoktrue\trapimplicitegrp#1\tctestifcon{\iftc at implicitgrp}%
-% {\ifcase\@implicitgroupingcase\or\addcytoks{#1}\or\@chrT{#1}\fi}%
-% {\@chrT#1}}}
-%
-%\long\def\can at absorb@#1{\tctestifnum{\count at stringtoks{#1}>1}%
-% {\tctestifx{\endtokcycraw#1}{#1}{\backslashcmds#1\@tokcycle}}%
-% {\trapactivetok#1\tc at trapescape#1{\tc at escapecytoks}{\can at absorb@@#1}}}
-%
-%\long\def\can at absorb@@#1{\let\@tmp#1\test at ifmacro\@tmp
-% {\implicittokfalse\@macT#1}{\@chrT#1}\@tokcycle}
-%
-%\long\def\count at toks#1{\the\numexpr-1\count@@toks#1.\tc at endcnt}
-%\long\def\count@@toks#1#2\tc at endcnt{+1\tc at ifempty{#2}{\relax}{\count@@toks#2\tc at endcnt}}
-%
-% END ALREADY PLACED IN tokcycle.tex
-
-% REVISED ACTIVE TOK TRAP
-%\newif\ifactivechar
-%\newif\ifactivetokunexpandable
-
-%\def\tc at resetifs{\activetokfalse\implicittokfalse\tc at implicitgrpfalse
-% \catSIXfalse\activecharfalse\activetokunexpandablefalse}
-
-%\long\def\can at absorb@#1{\tctestifnum{\count at stringtoks{#1}>1}%
-% {\tctestifx{\endtokcycraw#1}{#1}{\backslashcmds#1\@tokcycle}}%
-% {\trapactives#1\tc at trapescape#1{\tc at escapecytoks}{\can at 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 at 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 at stringtoks{#1}>1}{\tc at defx\six at str{\string#1}%
-% \global\let\implicitsixtok\six at str\tc at tok{\implicitsixtok}}%
-% {\tc at 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 at 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 at 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 at 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 at absorb@@#1{\let\@tmp#1\test at ifmacro\@tmp{\implicittokfalse
-% \@macT#1}{\trapimplicitegrp#1\implicitgrpfork#1}\@tokcycle}
-
-%\long\def\backslashcmds#1{%
-% \test at 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}}
Modified: trunk/Master/texmf-dist/tex/generic/tokcycle/tokcycle.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tokcycle/tokcycle.tex 2020-02-04 22:15:56 UTC (rev 53668)
+++ trunk/Master/texmf-dist/tex/generic/tokcycle/tokcycle.tex 2020-02-04 22:16:06 UTC (rev 53669)
@@ -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 at absorb@#1{\tctestifnum{\count at stringtoks{#1}>1}%
{\tctestifx{\endtokcycraw#1}{#1}{\backslashcmds#1\@tokcycle}}%
{\trapactives#1\tc at trapescape#1{\tc at escapecytoks}{\can at absorb@@#1}}}
-\long\def\can at absorb@@#1{\let\@tmp#1\test at ifmacro\@tmp{\implicittokfalse
+\long\def\can at absorb@@#1{\let\@tmp=#1\test at 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 @@
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 at absorb@@ macro, which prevented the proper absorption/
+ handling of the = token.
\ No newline at end of file
More information about the tex-live-commits
mailing list.