diff --git a/source/texk/web2c/cwebdir/cwebacromac.tex b/source/texk/web2c/cwebdir/cwebacromac.tex index 1f1838cfd..4c12e4138 100644 --- a/source/texk/web2c/cwebdir/cwebacromac.tex +++ b/source/texk/web2c/cwebdir/cwebacromac.tex @@ -32,9 +32,9 @@ \def\dosanitizecommand#1#2{\ifx\nxt#1\addF{#2}\fi} \catcode`\[=1 \catcode`\]=2 \catcode`\{=12 \catcode`\}=12 - \def\lbchar[{] \def\rbchar[}] + \def\lbchar[{] \def\rbchar[}] \catcode`\[=12 \catcode`\]=12 \catcode`\{=1 \catcode`\}=2 -\catcode`\~=12 \def\tildechar{~} \catcode`\~=13 +\catcode`\~=12 \def\tildechar{~} \catcode`\~=13 \catcode`\|=0 |catcode`|\=12 |def|bschar{\} |catcode`|\=0 \catcode`\|=12 \def\makeoutlinetoks{\Tnumfalse\afterassignment\makeolproctok\let\nxt= } \def\makeolnexttok{\afterassignment\makeolproctok\let\nxt= } @@ -80,12 +80,12 @@ \else\ifx\nxt\\\ifinstr\addF{\bschar\bschar}\else\tokprocessedtrue\fi \else\ifx\nxt\&\ifinstr\addF&\else\tokprocessedtrue\fi \else\ifx\nxt\~\ifTnum\addF{0}\else\addF\tildechar\fi % 077->\T{\~77} - \else\ifx\nxt\_\ifTnum\addF{E}\else\addF_\fi % 0.1E5->\T{0.1\_5} - \else\ifx\nxt\^\ifTnum\addF{0x}\else\addF^\fi % 0x77 -> \T{\^77} - \else\ifx\nxt\\\\\ifTnum\addF{0b}\else\addF\\\fi % 0b10111 -> \T{\\10111} + \else\ifx\nxt\_\ifTnum\addF{E}\else\addF_\fi % 0.1E5->\T{0.1\_5} + \else\ifx\nxt\^\ifTnum\addF{0x}\else\addF^\fi % 0x77 -> \T{\^77} + \else\ifx\nxt\\\\\ifTnum\addF{0b}\else\addF\\\fi % 0b10111 -> \T{\\10111} \else\ifx\nxt\$\ifTnum\tokprocessedtrue\else\addF$\fi %$% \T{77\$L} - \else\ifx\nxt\{\addF\lbchar \else\ifx\nxt\}\addF\rbchar - \else\ifx\nxt\ \addF\space \else\ifx\nxt\#\addF{\string\#}% + \else\ifx\nxt\{\addF\lbchar\else\ifx\nxt\}\addF\rbchar + \else\ifx\nxt\ \addF\space\else\ifx\nxt\#\addF{\string\#}% \else\ifx\nxt\PP\addF{++}\else\ifx\nxt\MM\addF{--}% \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi diff --git a/source/texk/web2c/cwebdir/cwebmac.tex b/source/texk/web2c/cwebdir/cwebmac.tex index 507a42981..4d288e577 100644 --- a/source/texk/web2c/cwebdir/cwebmac.tex +++ b/source/texk/web2c/cwebdir/cwebmac.tex @@ -13,7 +13,7 @@ \newif\ifacrohint \ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi \newif\ifpdflua \ifluatex\pdfluatrue\fi \ifpdftex\pdfluatrue\fi \ifpdflua % luaTeX and pdfTeX produce PDF output if \pdfoutput>0 (default) - \def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too + \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 @@ -298,7 +298,7 @@ \newwrite\cont \output{\setbox0=\page % the first page is garbage \openout\cont=\contentsfile - \write\cont{\catcode `\noexpand\@=11\relax} % \makeatletter + \write\cont{\catcode `\noexpand\@=11\relax} % \makeatletter \global\output{\normaloutput\page\lheader\rheader}} \setpage \vbox to \vsize{} % the first \topmark won't be null @@ -310,7 +310,7 @@ \def\inx{\par\vskip6pt plus 1fil % we are beginning the index \def\page{\box255 } \normalbottom \write\cont{} % ensure that the contents file isn't empty - \write\cont{\catcode `\noexpand\@=12\relax} % \makeatother + \write\cont{\catcode `\noexpand\@=12\relax} % \makeatother \closeout\cont % the contents information has been fully gathered \output{\ifpagesaved\normaloutput{\box\sbox}\lheader\rheader\fi \global\setbox\sbox=\page \global\pagesavedtrue \mark{\topmark}} diff --git a/source/texk/web2c/cwebdir/texinputs/pdfctproofmac.tex b/source/texk/web2c/cwebdir/texinputs/pdfctproofmac.tex index dd8bb72e4..0ba54fbe8 100644 --- a/source/texk/web2c/cwebdir/texinputs/pdfctproofmac.tex +++ b/source/texk/web2c/cwebdir/texinputs/pdfctproofmac.tex @@ -15,7 +15,7 @@ \newif\ifacrohint \ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi \newif\ifpdflua \ifluatex\pdfluatrue\fi \ifpdftex\pdfluatrue\fi \ifpdflua % luaTeX and pdfTeX produce PDF output if \pdfoutput>0 - \def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too + \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 diff --git a/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex b/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex index 99859f420..699cc4766 100644 --- a/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex +++ b/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex @@ -20,7 +20,7 @@ \newif\ifacrohint \ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi \newif\ifpdflua \ifluatex\pdfluatrue\fi \ifpdftex\pdfluatrue\fi \ifpdflua % luaTeX and pdfTeX produce PDF output if \pdfoutput>0 - \def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too + \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