texlive[72004] Build/source/texk/web2c/cwebdir: [CWEB] Move '\scan'
commits+ascherer at tug.org
commits+ascherer at tug.org
Sat Aug 10 14:22:02 CEST 2024
Revision: 72004
https://tug.org/svn/texlive?view=revision&revision=72004
Author: ascherer
Date: 2024-08-10 14:22:02 +0200 (Sat, 10 Aug 2024)
Log Message:
-----------
[CWEB] Move '\scan' to 'cwebacromac.tex'.
Remove redundant copies of these macros.
Note that '\scan' has moved almost next to '\pdfnote'. However, I don't
see how to replace the latter with the former at this time. '\pdfnote'
receives much more than just numbers outside of the '\inx' macro.
Modified Paths:
--------------
trunk/Build/source/texk/web2c/cwebdir/ChangeLog
trunk/Build/source/texk/web2c/cwebdir/cwebacromac.tex
trunk/Build/source/texk/web2c/cwebdir/cwebmac.tex
trunk/Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex
trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctproofmac.tex
trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex
Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog 2024-08-10 09:27:39 UTC (rev 72003)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog 2024-08-10 12:22:02 UTC (rev 72004)
@@ -3,7 +3,8 @@
* cwebacromac.tex,
* cwebmac.tex,
* texinputs/icwebmac.tex,
- * texinputs/pdfctproofmac.tex: Apply new scanning macros.
+ * texinputs/pdfctproofmac.tex,
+ * texinputs/pdfctwimac.tex: Apply new scanning macros.
2024-08-08 Andreas Scherer <https://ascherer.github.io>
Modified: trunk/Build/source/texk/web2c/cwebdir/cwebacromac.tex
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cwebacromac.tex 2024-08-10 09:27:39 UTC (rev 72003)
+++ trunk/Build/source/texk/web2c/cwebdir/cwebacromac.tex 2024-08-10 12:22:02 UTC (rev 72004)
@@ -29,6 +29,20 @@
\fi
\ifpdflua\pdfcatalog{\pagemode\space\pagelabels}
\else\special{pdf: docview << \pagemode\space\pagelabels >>}\fi}
+\ifacrohint\def\digits{\pdflink{\the\countA}\scan}
+\else\def\digits{{\the\countA}\scan}\fi
+\def\scan#1{\begingroup
+ \ifx!#1% exit on exclamation point
+ \else\ifx,#1,\space\aftergroup\scan % insert ,\space}\scan ...
+ \else\ifx\[#1\aftergroup#1% insert }\[...
+ \else\ifx\*#1\aftergroup\lapstar\aftergroup\scan % insert }\lapstar\scan ...
+ \else\ifnum`#1>`9#1\aftergroup\scan % insert #1}\scan ...
+ \else\ifnum`#1<`0#1\aftergroup\scan % insert #1}\scan ...
+ \else
+ \afterassignment\digits \aftergroup\countA
+ \aftergroup#1% insert }\countA=#1...\digits ...
+ \fi\fi\fi\fi\fi \fi
+ \endgroup}
% Local variables; there are a few externals like '\toksA' and '\countA'
\newtoks\toksB \newtoks\toksC \newtoks\toksD \newtoks\toksF \newtoks\sanitizer
Modified: trunk/Build/source/texk/web2c/cwebdir/cwebmac.tex
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cwebmac.tex 2024-08-10 09:27:39 UTC (rev 72003)
+++ trunk/Build/source/texk/web2c/cwebdir/cwebmac.tex 2024-08-10 12:22:02 UTC (rev 72004)
@@ -131,7 +131,7 @@
\def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too
\def\Blue{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}}
\fi
-\ifacrohint \input cwebacromac \fi % load hypertext macros
+\input cwebacromac % load hypertext macros
\def\pdfURL#1#2{\ifpdf \ifpdflua\pdfannotlink height \theheight depth \thedepth
attr {/Border [0 0 0]} user { /Type /Annot /Subtype /Link /A
<< /S /URI /URI (#2) >>}\Blue #1\Black \pdfendlink % changed in 3.69
@@ -324,20 +324,6 @@
\outer\def\I##1, ##2.{\par\hangindent2em\noindent##1:\kern1em
\scan##2!.} % index entry
\def\[##1]{$\underline{\scan##1!}$\scan} % underlined index item
- \ifacrohint\def\digits{\pdflink{\the\countA}\scan}
- \else\def\digits{{\the\countA}\scan}\fi
- \def\scan##1{\begingroup
- \ifx!##1% exit on exclamation point
- \else\ifx,##1,\space\aftergroup\scan %insert,\space}\scan ...
- \else\ifx\[##1\aftergroup##1%{% insert }\[...
- \else\ifx\*##1\aftergroup\lapstar\aftergroup\scan %insert }\lapstar\scan ...
- \else\ifnum`##1>`9##1\aftergroup\scan %{% insert #1}\scan ...
- \else\ifnum`##1<`0##1\aftergroup\scan %{% insert #1}\scan ...
- \else
- \afterassignment\digits \aftergroup\countA
- \aftergroup##1%{% insert }\countA=#1...\digits ...
- \fi\fi\fi\fi\fi \fi
- \endgroup}
\rm \rightskip0pt plus 2.5em \tolerance 10000
\hyphenpenalty 10000 \parindent0pt
\readindex}
Modified: trunk/Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex 2024-08-10 09:27:39 UTC (rev 72003)
+++ trunk/Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex 2024-08-10 12:22:02 UTC (rev 72004)
@@ -93,20 +93,6 @@
\outer\def\I##1, ##2.{\par\hangindent2em\noindent##1:\kern1em
\scan##2!.} % index entry
\def\[##1]{$\underline{\scan##1!}$\scan} % underlined index item
- \ifacrohint\def\digits{\pdflink{\the\countA}\scan}
- \else\def\digits{{\the\countA}\scan}\fi
- \def\scan##1{\begingroup
- \ifx!##1% exit on exclamation point
- \else\ifx,##1,\space\aftergroup\scan %insert,\space}\scan ...
- \else\ifx\[##1\aftergroup##1%{% insert }\[...
- \else\ifx\*##1\aftergroup\lapstar\aftergroup\scan %insert }\lapstar\scan ...
- \else\ifnum`##1>`9##1\aftergroup\scan %{% insert #1}\scan ...
- \else\ifnum`##1<`0##1\aftergroup\scan %{% insert #1}\scan ...
- \else
- \afterassignment\digits \aftergroup\countA
- \aftergroup##1%{% insert }\countA=#1...\digits ...
- \fi\fi\fi\fi\fi \fi
- \endgroup}
\rm \rightskip0pt plus 2.5em \tolerance 10000
\hyphenpenalty 10000 \parindent0pt
\readindex}
Modified: trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctproofmac.tex
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctproofmac.tex 2024-08-10 09:27:39 UTC (rev 72003)
+++ trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctproofmac.tex 2024-08-10 12:22:02 UTC (rev 72004)
@@ -136,7 +136,7 @@
\def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too
\def\Blue{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}}
\fi
-\ifacrohint \input cwebacromac \fi % load hypertext macros
+\input cwebacromac % load hypertext macros
\def\pdfURL#1#2{\ifpdf \ifpdflua\pdfannotlink height \theheight depth \thedepth
attr {/Border [0 0 0]} user { /Type /Annot /Subtype /Link /A
<< /S /URI /URI (#2) >>}\Blue #1\Black \pdfendlink % changed in 3.69
@@ -346,20 +346,6 @@
\outer\def\I##1, ##2.{\par\hangindent2em\noindent##1:\kern1em
\scan##2!.} % index entry
\def\[##1]{$\underline{\scan##1!}$\scan} % underlined index item
- \ifacrohint\def\digits{\pdflink{\the\countA}\scan}
- \else\def\digits{{\the\countA}\scan}\fi
- \def\scan##1{\begingroup
- \ifx!##1% exit on exclamation point
- \else\ifx,##1,\space\aftergroup\scan %insert,\space}\scan ...
- \else\ifx\[##1\aftergroup##1%{% insert }\[...
- \else\ifx\*##1\aftergroup\lapstar\aftergroup\scan %insert }\lapstar\scan ...
- \else\ifnum`##1>`9##1\aftergroup\scan %{% insert #1}\scan ...
- \else\ifnum`##1<`0##1\aftergroup\scan %{% insert #1}\scan ...
- \else
- \afterassignment\digits \aftergroup\countA
- \aftergroup##1%{% insert }\countA=#1...\digits ...
- \fi\fi\fi\fi\fi \fi
- \endgroup}
\rm \rightskip0pt plus 2.5em \tolerance 10000
\hyphenpenalty 10000 \parindent0pt
\readindex}
Modified: trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex 2024-08-10 09:27:39 UTC (rev 72003)
+++ trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex 2024-08-10 12:22:02 UTC (rev 72004)
@@ -252,7 +252,7 @@
\def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too
\def\Blue{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}}
\fi
-\ifacrohint \input cwebacromac \fi % load hypertext macros
+\input cwebacromac % load hypertext macros
\def\lapstar{\rlap{*}}
\def\stsec{\tenpoint\rightskip=0pt % get out of C mode (cf. \B)
More information about the tex-live-commits
mailing list.