diff options
author | Andreas Scherer <andreas_tex@freenet.de> | 2022-02-14 18:52:24 +0000 |
---|---|---|
committer | Andreas Scherer <andreas_tex@freenet.de> | 2022-02-14 18:52:24 +0000 |
commit | 2042bc985ef166c542469342d2cd3032fce8e720 (patch) | |
tree | 6c1a1303da64b5d495a7c02f79b6f139a33d5854 /Build/source/texk/web2c | |
parent | dc54dfddee8aa51b8c0747c467abe3f6bed18309 (diff) |
[CWEB] Adapt HINT to ifhint.tex.
git-svn-id: svn://tug.org/texlive/trunk@62022 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
7 files changed, 30 insertions, 21 deletions
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 20dac101e9f..1c76d57ed44 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,5 +1,14 @@ 2022-02-14 Andreas Scherer <https://ascherer.github.io> + * cwebmac.tex, + * cwebman-w2c.ch, + * cwebman.tex, + * texinputs/dcwebstrings.tex, + * texinputs/fcwebmac.tex, + * texinputs/icwebmac.tex: Adapt to 'ifhint.tex'. + +2022-02-14 Andreas Scherer <https://ascherer.github.io> + * common.c, * ctangle.c, * ctangle.w: Add '#line' after '#endif'. diff --git a/Build/source/texk/web2c/cwebdir/cwebmac.tex b/Build/source/texk/web2c/cwebdir/cwebmac.tex index 3010b17facb..7b3163efd85 100644 --- a/Build/source/texk/web2c/cwebdir/cwebmac.tex +++ b/Build/source/texk/web2c/cwebdir/cwebmac.tex @@ -16,10 +16,10 @@ \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\fi -\newif\ifHINT -\ifx\HINTversion\undefined \HINTfalse \else \HINTtrue \fi +\newif\ifhint +\ifx\HINTversion\undefined \hintfalse \else \hinttrue \fi \newif\ifacro \ifpdf\acrotrue\fi \ifpdftex\acrotrue\fi -\newif\ifacroHINT \ifacro\acroHINTtrue\fi \ifHINT\acroHINTtrue\fi +\newif\ifacrohint \ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi \let\:=\. % preserve a way to get the dot accent % (all other accents will still work as usual) @@ -70,7 +70,7 @@ tangles as \tentex "#2"\egroup\par} \def\noATL#1 #2 {} \def\noatl{\let\ATL=\noATL} % suppress output from @l -\def\ATH{{\acroHINTfalse\X\kern-.5em:Preprocessor definitions\X}} +\def\ATH{{\acrohintfalse\X\kern-.5em:Preprocessor definitions\X}} \let\PB=\relax % hook for program brackets |...| in TeX part or section name \chardef\AM=`\& % ampersand character in a string @@ -130,7 +130,7 @@ \def\?{\mathrel?} \def\,{\relax\ifmmode\mskip\thinmuskip\else\thinspace\fi} \def\note#1#2.{\Y\noindent{\hangindent2em% - \baselineskip10pt\eightrm#1~\ifacroHINT{\pdfnote#2.}\else#2\fi.\par}} + \baselineskip10pt\eightrm#1~\ifacrohint{\pdfnote#2.}\else#2\fi.\par}} \newtoks\toksA \newtoks\toksB \newtoks\toksC \newtoks\toksD \newtoks\toksE \newtoks\toksF \newtoks\usersanitizer @@ -251,7 +251,7 @@ \outlinest\let\outlinedone=\relax} \fi % End of pdf macros -\ifHINT +\ifhint % The following uses HINT primitives to implement: % \HINThome to mark the position of the home page % \HINTlabel to attach a label to the top of a section @@ -267,8 +267,8 @@ \let\pdflink=\HINTlink \fi % End of HINT macros -% Common macros for \ifacro and \ifHINT -\ifacroHINT +% Common macros for \ifacro and \ifhint +\ifacrohint \def\pdfnote#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}\maketoks}\the\toksA} \def\firstsecno#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}% \def\makenote{\addtokens\toksB{\the\toksC}\def\makenote{\toksD={} @@ -308,7 +308,7 @@ \def\lapstar{\rlap{*}} \def\stsec{\rightskip=0pt % get out of C mode (cf. \B) \sfcode`;=1500 \pretolerance 200 \hyphenpenalty 50 \exhyphenpenalty 50 - \ifHINT\HINTlabel\fi% Start page before section + \ifhint\HINTlabel\fi% Start page before section \noindent{\let\*=\lapstar\bf\secstar.\quad}% \ifacro \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty \ifpdftex \pdfdest num \secstar fith% @@ -382,7 +382,7 @@ \let\W=\land % logical and \def\X#1:#2\X{\ifmmode\gdef\XX{\null$\null}\else\gdef\XX{}\fi %$% section name \XX$\langle\,${\let\I=\ne#2\eightrm\kern.5em - \ifacroHINT{\pdfnote#1.}\else#1\fi}$\,\rangle$\XX} + \ifacrohint{\pdfnote#1.}\else#1\fi}$\,\rangle$\XX} \def\Y{\par\yskip} \let\Z=\le \let\ZZ=\let % now you can \write the control sequence \ZZ @@ -476,7 +476,7 @@ \vsize=\pageheight \advance\vsize by -\ht\sbox % the remaining height \hsize=.5\pagewidth \advance\hsize by -10pt % column width for the index (20pt between cols) - \ifHINT\else + \ifhint\else \parfillskip 0pt plus .6\hsize % try to avoid almost empty lines \fi \def\lr{L} % this tells whether the left or right column is next @@ -487,7 +487,7 @@ \message{Index:} \parskip 0pt plus .5pt \outer\def\I##1, ##2.{\par\hangindent2em\noindent##1:\kern1em - \ifacroHINT\pdfnote##2.\else##2\fi.} % index entry + \ifacrohint\pdfnote##2.\else##2\fi.} % index entry \def\[##1]{$\underline{##1}$} % underlined index item \rm \rightskip0pt plus 2.5em \tolerance 10000 \let\*=\lapstar \hyphenpenalty 10000 \parindent0pt @@ -502,7 +502,7 @@ \message{Section names:} \output={\normaloutput\page\lheader\rheader} \setpage - \def\note##1##2.{\quad{\eightrm##1~\ifacroHINT{\pdfnote##2.}\else{##2}\fi.}} + \def\note##1##2.{\quad{\eightrm##1~\ifacrohint{\pdfnote##2.}\else{##2}\fi.}} \def\Q{\note{Cited in section}} % crossref for mention of a section \def\Qs{\note{Cited in sections}} % crossref for mentions of a section \def\U{\note{Used in section}} % crossref for use of a section @@ -539,16 +539,16 @@ \pageno=\contentspagenumber \def\grouptitle{TABLE OF CONTENTS} \message{Table of contents:} - \ifHINT\HINThome\fi% Mark the Table of contents as home page + \ifhint\HINThome\fi% Mark the Table of contents as home page \topofcontents \startpdf - \line{\hfil Section\ifHINT\else\hbox to3em{\hss Page}\fi}% No Page in HINT + \line{\hfil Section\ifhint\else\hbox to3em{\hss Page}\fi}% No Page in HINT \let\ZZ=\contentsline \readcontents\relax % read the contents info \botofcontents \end} % print the contents page(s) and terminate \def\contentsline#1#2#3#4#5{\ifnum#2=0 \smallbreak\fi \line{\consetup{#2}#1 \rm\leaders\hbox to .5em{.\hfil}\hfil - \ \ifHINT + \ \ifhint \HINTlink{#3}{\romannumeral#3}% No page numbers in HINT \HINTcontents{#1}{#2}{#3}% \else\ifacro\pdflink{#3}{\romannumeral#3}\else#3\fi diff --git a/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch b/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch index 86492411920..309add06700 100644 --- a/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch @@ -18,7 +18,7 @@ @x \input cwebmac -\acrofalse\pdffalse\pdftexfalse\HINTfalse\acroHINTfalse +\acrofalse\pdffalse\pdftexfalse\hintfalse\acrohintfalse @y \input cwebmac @z diff --git a/Build/source/texk/web2c/cwebdir/cwebman.tex b/Build/source/texk/web2c/cwebdir/cwebman.tex index c36b26c9ff4..a2df0fe44ed 100644 --- a/Build/source/texk/web2c/cwebdir/cwebman.tex +++ b/Build/source/texk/web2c/cwebdir/cwebman.tex @@ -2,7 +2,7 @@ \def\tangref{3} % where the main explanation of CTANGLing is given \input cwebmac -\acrofalse\pdffalse\pdftexfalse\HINTfalse\acroHINTfalse +\acrofalse\pdffalse\pdftexfalse\hintfalse\acrohintfalse \def\page{\box255 } \normalbottom \parskip 0pt plus 1pt \def\RA{\char'31 } % right arrow diff --git a/Build/source/texk/web2c/cwebdir/texinputs/dcwebstrings.tex b/Build/source/texk/web2c/cwebdir/texinputs/dcwebstrings.tex index 298ca2edfd8..28049f3b4c1 100644 --- a/Build/source/texk/web2c/cwebdir/texinputs/dcwebstrings.tex +++ b/Build/source/texk/web2c/cwebdir/texinputs/dcwebstrings.tex @@ -3,7 +3,7 @@ % first command after `\input german.sty' in your CWEB source. \def\originalthree{\def\3##1{\hfil\penalty##10\hfilneg}} -\def\ATH{{\acroHINTfalse\X\kern-.5em:Pr\"aprozessor Definitionen\X}} +\def\ATH{{\acrohintfalse\X\kern-.5em:Pr\"aprozessor Definitionen\X}} \def\A{\note{Siehe auch Abschnitt}} % xref for doubly defined section name \def\As{\note{Siehe auch die Abschnitte}} diff --git a/Build/source/texk/web2c/cwebdir/texinputs/fcwebmac.tex b/Build/source/texk/web2c/cwebdir/texinputs/fcwebmac.tex index f74ef7570e9..9a19a884074 100644 --- a/Build/source/texk/web2c/cwebdir/texinputs/fcwebmac.tex +++ b/Build/source/texk/web2c/cwebdir/texinputs/fcwebmac.tex @@ -46,7 +46,7 @@ \def\postATL#1 #2 {\bf La lettre \\{\uppercase{\char"#1}} est \string`\string`tanglee\string'\string' en \tentex "#2"\egroup\par} -\def\ATH{{\acroHINTfalse\X\kern-.5em:D\'efinitions du pr\'eprocesseur\X}} +\def\ATH{{\acrohintfalse\X\kern-.5em:D\'efinitions du pr\'eprocesseur\X}} \def\A{\note{Voir aussi la section}} % xref for doubly defined section name \def\As{\note{Voir aussi les sections}} % xref for multiply defined section name diff --git a/Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex b/Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex index bcf66b1e472..d3eeca269e7 100644 --- a/Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex +++ b/Build/source/texk/web2c/cwebdir/texinputs/icwebmac.tex @@ -44,7 +44,7 @@ \def\postATL#1 #2 {\bf lettera \\{\uppercase{\char"#1}} tangles as \tentex "#2"\egroup\par} -\def\ATH{{\acroHINTfalse\X\kern-.5em:Definizioni preprocessore\X}} +\def\ATH{{\acrohintfalse\X\kern-.5em:Definizioni preprocessore\X}} \def\A{\note{Vedi anche sezione}} % xref for doubly defined section name \def\As{\note{Vedi anche sezioni}} % xref for multiply defined section name |