From 2dbfa6c67f1c50ff228326c6ec6cccfdecb61735 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 12 Feb 2020 03:02:18 +0000 Subject: CTAN sync 202002120302 --- macros/generic/tokcycle/tokcycle-doc.pdf | Bin 254565 -> 255073 bytes macros/generic/tokcycle/tokcycle-doc.tex | 2 +- macros/generic/tokcycle/tokcycle-examples.pdf | Bin 258884 -> 258377 bytes macros/generic/tokcycle/tokcycle-examples.tex | 2 +- macros/generic/tokcycle/tokcycle.tex | 18 ++++++++++++------ 5 files changed, 14 insertions(+), 8 deletions(-) (limited to 'macros/generic') diff --git a/macros/generic/tokcycle/tokcycle-doc.pdf b/macros/generic/tokcycle/tokcycle-doc.pdf index 1d143f75af..5a86f5c5a2 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-doc.tex b/macros/generic/tokcycle/tokcycle-doc.tex index 882cea40c9..8614827a24 100644 --- a/macros/generic/tokcycle/tokcycle-doc.tex +++ b/macros/generic/tokcycle/tokcycle-doc.tex @@ -204,7 +204,7 @@ In addition to the above macros/environments, the means is provided to define new \TokCycle{} environments: \begin{verbbox}[\vbdelim] -\tokencycleenvironment\environment_name +\tokcycleenvironment\environment_name {} {} {} diff --git a/macros/generic/tokcycle/tokcycle-examples.pdf b/macros/generic/tokcycle/tokcycle-examples.pdf index 34a21e3f68..8b92d14976 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 e3b21b1007..0c46129bbd 100644 --- a/macros/generic/tokcycle/tokcycle-examples.tex +++ b/macros/generic/tokcycle/tokcycle-examples.tex @@ -952,7 +952,7 @@ But if the cat-13 active definition is changed prior to the token assignment will apply. The following example demonstrates this concept, while showing, - whithout changing the input in any way, that \TokCycle{} + without changing the input in any way, that \TokCycle{} can properly digest active and implicit grouping (cat-1,2) characters: \begin{exampleA}[lefthand width=8cm]{Active and implicit grouping diff --git a/macros/generic/tokcycle/tokcycle.tex b/macros/generic/tokcycle/tokcycle.tex index d0819da2cf..50b9dd4cc9 100644 --- a/macros/generic/tokcycle/tokcycle.tex +++ b/macros/generic/tokcycle/tokcycle.tex @@ -1,7 +1,7 @@ \def\tcname {tokcycle} -\def\tcver {1.11} +\def\tcver {1.12} % -\def\tcdate {2020/02/04} +\def\tcdate {2020/02/11} % % Author : Steven B Segletes, Christian Tellechea (contributor) % Maintainer : Steven B Segletes @@ -46,8 +46,8 @@ \tc@deftok\tc@sptoken{ } \expandafter\def\expandafter\tc@absorbSpace\space{} \def\tc@ifempty#1{\tc@testxifx{\expandafter\relax\detokenize{#1}\relax}} -\def\tc@defx#1#2{\tc@earg{\def\expandafter#1}{#2}} -\long\def\tc@earg#1#2{\expandafter#1\expandafter{#2}} +\def\tc@defx#1{\tc@earg{\def\expandafter#1}} +\long\def\tc@earg#1{\expandafter#1\expandafter} \long\def\tc@xarg#1#2{\tc@earg#1{\expanded{#2}}} \long\def\tc@exfirst#1#2{#1} \long\def\tc@exsecond#1#2{#2} @@ -136,7 +136,7 @@ \def\tc@trapescape#1{\tctestifx{\@tcEscapeptr#1}} % TRAP CAT-6 \long\def\trapcatSIX#1{\tctestifcatnx#1\relax{}{\trapcatSIXb#1}} -\def\trapcatSIXb#1{\tc@earg\tctestifcatnx\sv@hash#1{\catSIXtrue\trapcatSIXc#1}{}} +\def\trapcatSIXb#1{\expandafter\tctestifcatnx\sv@hash#1{\catSIXtrue\trapcatSIXc#1}{}} \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}% @@ -217,4 +217,10 @@ v1.1 2019/9/27 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 + handling of the = token. + +v1.12 2020/02/11 + - Documentation correction: \tokcycleenvironment, not \tokencycleenvironment + - Documentation correction: misspelling in tokcycle-examples.tex + - Redefined \tc@defx and \tc@earg to omit #2 as part of definition + - Corrected \trapcatSIXb definition to account for revised \tc@earg definition. \ No newline at end of file -- cgit v1.2.3