summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-08-25 20:04:31 +0000
committerKarl Berry <karl@freefriends.org>2021-08-25 20:04:31 +0000
commitb78496e345c38c0cc7e8df07a9ddf0be7b89796c (patch)
tree1d943c8591e26917a7afeb8fa31b2c990a26467f
parentdaad571338123052e0466c3e59cb183fe12aeb67 (diff)
tokcycle (25aug21)
git-svn-id: svn://tug.org/texlive/trunk@60320 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/tokcycle/tokcycle-doc.pdfbin601001 -> 627435 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tokcycle/tokcycle-examples.pdfbin604143 -> 630351 bytes
-rw-r--r--Master/texmf-dist/tex/generic/tokcycle/tokcycle.tex12
3 files changed, 8 insertions, 4 deletions
diff --git a/Master/texmf-dist/doc/generic/tokcycle/tokcycle-doc.pdf b/Master/texmf-dist/doc/generic/tokcycle/tokcycle-doc.pdf
index 14f11699699..7085af2002a 100644
--- a/Master/texmf-dist/doc/generic/tokcycle/tokcycle-doc.pdf
+++ b/Master/texmf-dist/doc/generic/tokcycle/tokcycle-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/tokcycle/tokcycle-examples.pdf b/Master/texmf-dist/doc/generic/tokcycle/tokcycle-examples.pdf
index c9652ee142f..557f771a529 100644
--- a/Master/texmf-dist/doc/generic/tokcycle/tokcycle-examples.pdf
+++ b/Master/texmf-dist/doc/generic/tokcycle/tokcycle-examples.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/tokcycle/tokcycle.tex b/Master/texmf-dist/tex/generic/tokcycle/tokcycle.tex
index 0db55bd49cf..ef499db4163 100644
--- a/Master/texmf-dist/tex/generic/tokcycle/tokcycle.tex
+++ b/Master/texmf-dist/tex/generic/tokcycle/tokcycle.tex
@@ -1,7 +1,7 @@
\def\tcname {tokcycle}
-\def\tcver {1.41}
+\def\tcver {1.42}
%
-\def\tcdate {2021/06/25}
+\def\tcdate {2021/08/25}
%
% Author : Steven B Segletes, Christian Tellechea (contributor)
% Maintainer : Steven B Segletes
@@ -112,7 +112,7 @@
\the\tc@tok}
\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}}}
+ {\trapactives#1\tc@trapescape#1{\tc@escapecytoks\empty}{\can@absorb@@#1}}}
\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
@@ -151,7 +151,7 @@
\@implicitgroupingcase\or\addcytoks{#1}\or\@chrT{#1}\fi}{\@chrT#1}}
% SET UP ESCAPE MECHANISM
\def\settcEscapechar#1{\let\@tcEscapeptr#1%
- \def\tc@escapecytoks##1#1{\addcytoks{##1}\@tokcycle}}
+ \def\tc@escapecytoks##1#1{\addcytoks[1]{##1}\@tokcycle}}
\def\tc@trapescape#1{\tctestifx{\@tcEscapeptr#1}}
% TRAP CAT-6
\long\def\trapcatSIX#1{\tctestifcatnx#1\relax{}{\trapcatSIXb#1}}
@@ -337,3 +337,7 @@ v1.41 2021/06/25
- Bug fix in \tcpopliteralappto (\@tmp interfered with itself). Altered,
substituting \@@tmp.
+v1.42 2021/08/25
+ - Bug fix in \tc@escapecytoks (if escaped text was a single brace group, the
+ braces were lost)
+