From f591a33013bcb59e62da63f3af222102cb87021a Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Sun, 19 Jun 2022 13:01:23 +0000 Subject: [CWEB] \ifacro is synonymous for \ifpdf. git-svn-id: svn://tug.org/texlive/trunk@63651 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/cwebdir/ChangeLog | 4 +++ Build/source/texk/web2c/cwebdir/comm-w2c.ch | 2 +- Build/source/texk/web2c/cwebdir/ctwill-mini.ch | 2 +- Build/source/texk/web2c/cwebdir/cwebmac.tex | 41 +++++++++++----------- Build/source/texk/web2c/cwebdir/cwebman-w2c.ch | 31 ++++++++-------- Build/source/texk/web2c/cwebdir/cwebman.tex | 2 +- .../texk/web2c/cwebdir/texinputs/dctproofmac.tex | 2 +- .../texk/web2c/cwebdir/texinputs/dctwimac.tex | 2 +- .../texk/web2c/cwebdir/texinputs/pdfctwimac.tex | 39 ++++++++++---------- 9 files changed, 64 insertions(+), 61 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 8f878fca6a6..98456afa9a6 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,8 +1,12 @@ 2022-06-19 Andreas Scherer + * comm-w2c.ch, + * ctwill-mini.ch, * cwebmac.tex, * cwebman-w2c.ch, * cwebman.tex, + * texinputs/dctproofmac.tex, + * texinputs/dctwimac.tex, * texinputs/pdfctwimac.tex: Use 'iftex.sty' for TeX engine tests. 2022-06-18 Andreas Scherer diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch index 01f79d97b79..951d8063d69 100644 --- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch @@ -19,7 +19,7 @@ @x \def\title{Common code for CTANGLE and CWEAVE (Version 4.8)} @y -\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi +\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifpdf\sanitizecommand\Kpathsea{KPATHSEA}\fi \def\title{Common code for CTANGLE and CWEAVE (4.8 [\TeX~Live])} @z diff --git a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch index dcb486e91a4..0b14f8f81bc 100644 --- a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch +++ b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch @@ -3,7 +3,7 @@ Section 1. @x @** Introduction. @y -\ifacro \ifx\undefined\pdfpagewidth\else +\ifpdf \ifx\undefined\pdfpagewidth\else \pdfpagewidth=\pagewd \advance\pdfpagewidth by 2cm \pdfpageheight=\pageht \advance\pdfpageheight by 5cm \ifpdftex \pdfhorigin=1cm \pdfvorigin=1cm diff --git a/Build/source/texk/web2c/cwebdir/cwebmac.tex b/Build/source/texk/web2c/cwebdir/cwebmac.tex index 0bdc796a68d..5f05e012ba3 100644 --- a/Build/source/texk/web2c/cwebdir/cwebmac.tex +++ b/Build/source/texk/web2c/cwebdir/cwebmac.tex @@ -13,8 +13,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 -\newif\ifacro \ifpdf\acrotrue\fi -\newif\ifacrohint \ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi +\newif\ifacrohint \ifpdf\acrohinttrue\fi \ifhint\acrohinttrue\fi \let\:=\. % preserve a way to get the dot accent % (all other accents will still work as usual) @@ -134,7 +133,7 @@ \newif\iftokprocessed \newif\ifTnum \newif\ifinstr {\def\\{\global\let\spacechar= }\\ } -\ifacro % The following are pdf macros +\ifpdf % The following are pdf macros \def\thewidth{\the\wd0 \space} \def\theheight{\the\ht\strutbox\space} \def\thedepth{\the\dp\strutbox\space} @@ -262,7 +261,7 @@ \let\pdflink=\HINTlink \fi % End of HINT macros -% Common macros for \ifacro and \ifhint +% Common macros for \ifpdf and \ifhint \ifacrohint \def\pdfnote#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}\maketoks}\the\toksA} \def\firstsecno#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}% @@ -289,14 +288,14 @@ \def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \fi % End of common macros -\def\pdfURL#1#2{\ifpdftex\pdfannotlink height \theheight depth \thedepth - attr {/Border [0 0 0]} user { /Type /Annot /Subtype /Link /A +\def\pdfURL#1#2{\ifpdf \ifpdftex\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 - \else \ifpdf{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}% + \else {\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}% \special{pdf: ec}}\special{pdf: ann width \thewidth height \theheight - depth \thedepth << /Border [0 0 0] - /Type /Annot /Subtype /Link /A << /S /URI /URI (#2) >> >>}\box0\relax}% - \else #1 ({\tt#2})\fi\fi} + depth \thedepth << /Border [0 0 0] /Type /Annot /Subtype /Link /A + << /S /URI /URI (#2) >> >>}\box0\relax}\fi + \else #1 ({\tt#2})\fi} {\catcode`\~=12 \gdef\TILDE/{~}} % ~ in a URL {\catcode`\_=12 \gdef\UNDER/{_}} % _ in a URL @@ -305,7 +304,7 @@ \sfcode`;=1500 \pretolerance 200 \hyphenpenalty 50 \exhyphenpenalty 50 \ifhint\HINTlabel\fi% Start page before section \noindent{\let\*=\lapstar\bf\secstar.\quad}% - \ifacro \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty + \ifpdf \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty \ifpdftex \pdfdest num \secstar fith% \else \special{pdf: dest (\romannumeral\secstar) [ @thispage /FitH @ypos ]}\fi}}\fi} @@ -338,7 +337,7 @@ \outer\def\M#1{\MN{#1}\ifon\vfil\penalty-100\vfilneg % beginning of section \vskip\intersecskip\startsection\ignorespaces} \outer\def\N#1#2#3.{% beginning of starred section - \ifacro{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi + \ifpdf{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi \gdepth=#1\gtitle={#3}\MN{#2}% \ifon\ifnum#1<\secpagedepth \vfil\eject % force page break if depth is small \else\vfil\penalty-100\vfilneg\vskip\intersecskip\fi\fi @@ -347,11 +346,11 @@ \edef\gtitletoks{\expandafter\stripprefix\meaning\gtitletoks}% \edef\next{\write\cont{\ZZ{\gtitletoks}{#1}{\secno}% write to contents file {\noexpand\the\pageno}{\the\toksE}}}\next % \ZZ{title}{depth}{sec}{page}{ss} - \ifpdftex\expandafter\xdef\csname curr#1\endcsname{\secno} + \ifpdf \ifpdftex\expandafter\xdef\csname curr#1\endcsname{\secno} \ifnum#1>0\countB=#1 \advance\countB by-1 - \advancenumber{chunk\the\countB.\expnumber{curr\the\countB}}\fi - \else \ifpdf\special{pdf: outline #1 << /Title (\the\toksE) /Dest - [ @thispage /FitH @ypos ] >>}\fi\fi + \advancenumber{chunk\the\countB.\expnumber{curr\the\countB}}\fi\fi + \else \special{pdf: outline #1 << /Title (\the\toksE) /Dest + [ @thispage /FitH @ypos ] >>}\fi \ifon\startsection{\bf#3.\quad}\ignorespaces} \def\MN#1{\par % common code for \M, \N {\xdef\secstar{#1}\let\*=\empty\xdef\secno{#1}}% remove \* from section name @@ -428,8 +427,8 @@ \def\title{\expandafter\uppercase\expandafter{\jobname}} \def\topofcontents{\centerline{\titlefont\title}\vskip.7in \vfill} % this material will start the table of contents page -\def\startpdf{\ifpdftex\ifnum\pdfoutput>0 \pdfcatalog{/PageMode /UseOutlines}\fi - \else \ifpdf{\special{pdf: docview << /PageMode /UseOutlines >>}}\fi\fi} +\def\startpdf{\ifpdf \ifpdftex\pdfcatalog{/PageMode /UseOutlines} + \else {\special{pdf: docview << /PageMode /UseOutlines >>}}\fi\fi} \def\botofcontents{\vfill \centerline{\covernote}} % this material will end the table of contents page \def\covernote{} @@ -490,7 +489,7 @@ \def\fin{\par\vfill\eject % this is done when we are ending the index \ifpagesaved\null\vfill\eject\fi % output a null index column \if L\lr\else\null\vfill\eject\fi % finish the current page - \ifpdftex \ifnum\pdfoutput>0 \makebookmarks % added in Version 3.68 + \ifpdf \ifpdftex \makebookmarks % added in Version 3.68 \countsections \fi\fi % and in Version 4.9 \parfillskip 0pt plus 1fil \def\grouptitle{NAMES OF THE SECTIONS} @@ -504,7 +503,7 @@ \def\U{\note{Used in section}} % crossref for use of a section \def\Us{\note{Used in sections}} % crossref for uses of a section \def\I{\par\hangindent 2em}\let\*=* - \ifacro \def\outsecname{Names of the sections} \let\Xpdf\X + \ifpdf \def\outsecname{Names of the sections} \let\Xpdf\X % \ifpdftex \makebookmarks \pdfdest name {NOS} fitb % in versions < 3.68 \ifpdftex \pdfdest name {NOS} fith % changed in version 3.69 \pdfoutline goto name {NOS} count -\the\countD {\outsecname} @@ -551,7 +550,7 @@ \ \ifhint \HINTlink{#3}{\romannumeral#3}% No page numbers in HINT \HINTcontents{#1}{#2}{#3}% - \else\ifacro\pdflink{#3}{\romannumeral#3}\else#3\fi + \else\ifpdf\pdflink{#3}{\romannumeral#3}\else#3\fi \hbox to3em{\hss#4}\fi}} \def\consetup#1{\ifcase#1 \bf % depth -1 (@**) \or % depth 0 (@*) diff --git a/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch b/Build/source/texk/web2c/cwebdir/cwebman-w2c.ch index 535e1cd1ae3..fb8421349a3 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\acrohintfalse +\pdffalse\acrohintfalse @y \input cwebmac @z @@ -37,7 +37,7 @@ \centerline{\sectionfont\def\.##1{{\twelvett##1}} #1}\nobreak\vskip 6pt \everypar{\hskip-\parindent\everypar{}}} @y -\ifacro +\ifpdf \pdfpagewidth=\pagewidth \advance\pdfpagewidth by 2cm \pdfpageheight=\pageheight \advance\pdfpageheight by 3cm \ifpdftex \pdfhorigin=1cm \pdfvorigin=1cm @@ -50,7 +50,7 @@ \def\subsections{0} \outer\def\section #1.{\penalty-500\bigskip \centerline{\sectionfont\def\.##1{{\twelvett##1}} - \ifacro\vbox to 0pt{\kern-2.5ex\relax + \ifpdf\vbox to 0pt{\kern-2.5ex\relax \ifpdftex\pdfdest num \destcount fitbh\relax \else\special{pdf: dest (\the\destcount) [ @thispage /FitBH @ypos ]}\fi \def\.##1{##1}\def\TeX{TeX}% @@ -69,7 +69,7 @@ \def\appC{17} \def\Appendix#1{\leavevmode - \ifacro\ifpdftex + \ifpdf\ifpdftex \pdfstartlink attr{/Border[0 0 0]} goto num\csname app#1\endcsname\relax \Blue\hbox{Appendix}~#1\Black \pdfendlink @@ -82,7 +82,7 @@ \newcount\subdestcount \subdestcount=151\relax -\outer\def\subsection #1.{\ifacro +\outer\def\subsection #1.{\ifpdf \ifpdftex\pdfdest num \subdestcount fitbh\relax \pdfoutline goto num \subdestcount {#1}\relax \else\special{pdf: dest (\the\subdestcount) [ @thispage /FitBH @ypos ]}% @@ -142,10 +142,11 @@ email address in a \.{CWEB} file (e.g., it cannot find them in the current directory. @y it cannot find them in the current directory.% -\cwebfootnote{\acrofalse In this extended implementation, if an \.{@i}nclude -file can not be found in the current directory, \.{CWEB} will use the -conventions of the \Kpathsea/ library as outlined in section~\X93:File lookup -with \Kpathsea/\X~of \pdfURL{appendix~D}{common-changes.pdf} to look for it. +\cwebfootnote{In this extended implementation, if an \.{@i}nclude file can not +be found in the current directory, \.{CWEB} will use the conventions of the +\Kpathsea/ library as outlined in {\pdffalse\acrohintfalse section~\X93:File +lookup with \Kpathsea/\X~of} \pdfURL{appendix~D}{common-changes.pdf} to look +for it. % FIXME (This is true for any other input or change file lookup.)} @z @@ -195,7 +196,7 @@ of output instead of the English ones. (Off by default.) (Has no effect on @x Sometimes things don't work as smoothly, and you get a bunch of @y -\acrofalse\pdffalse\acrohintfalse +\pdffalse\acrohintfalse Sometimes things don't work as smoothly, and you get a bunch of @z @@ -204,8 +205,8 @@ Sometimes things don't work as smoothly, and you get a bunch of @y `$\\{main}(\\{argc},\39\\{argv}{}$)'. \ifx\pdf+\pdftrue\fi \ifxetex\pdftrue\fi -\ifpdf\acrotrue\fi \ifpdftex\acrotrue\fi -\ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi +\ifpdftex\ifnum\pdfoutput>0\pdftrue\fi\fi +\ifpdf\acrohinttrue\fi \ifhint\acrohinttrue\fi @z @x @@ -302,7 +303,7 @@ And here's what the same excerpt looks like when typeset. \def\runninghead{APPENDIX A --- FINAL DOCUMENT} \subsection Final document. -\acrofalse\pdffalse\acrohintfalse +\pdffalse\acrohintfalse And here's what the same excerpt looks like when typeset. (Can you spot the typographical niceties used in the \.{CWEB} code?) \let\K=\leftarrow @@ -314,8 +315,8 @@ And here's what the same excerpt looks like when typeset. @y \vfil\eject\titletrue \ifx\pdf+\pdftrue\fi \ifxetex\pdftrue\fi -\ifpdf\acrotrue\fi \ifpdftex\acrotrue\fi -\ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi +\ifpdftex\ifnum\pdfoutput>0 \pdftrue\fi\fi +\ifpdf\acrohinttrue\fi \ifhint\acrohinttrue\fi @z @x diff --git a/Build/source/texk/web2c/cwebdir/cwebman.tex b/Build/source/texk/web2c/cwebdir/cwebman.tex index 7cf56e1e9c3..218a85b5894 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\acrohintfalse +\pdffalse\acrohintfalse \def\page{\box255 } \normalbottom \parskip 0pt plus 1pt \def\RA{\char'31 } % right arrow diff --git a/Build/source/texk/web2c/cwebdir/texinputs/dctproofmac.tex b/Build/source/texk/web2c/cwebdir/texinputs/dctproofmac.tex index 09a8de346b6..0304bfcddff 100644 --- a/Build/source/texk/web2c/cwebdir/texinputs/dctproofmac.tex +++ b/Build/source/texk/web2c/cwebdir/texinputs/dctproofmac.tex @@ -1,7 +1,7 @@ \ifx\undefined\documentclass\input ctproofmac.tex \else\endinput\fi % LaTeX will use other macros -\let\acrofalse=\relax +\let\pdffalse=\relax \input dcwebstrings.tex \def\fin{\par\vfill\eject % this is done when we are ending the index diff --git a/Build/source/texk/web2c/cwebdir/texinputs/dctwimac.tex b/Build/source/texk/web2c/cwebdir/texinputs/dctwimac.tex index aaba94d4ba2..4aa9629421b 100644 --- a/Build/source/texk/web2c/cwebdir/texinputs/dctwimac.tex +++ b/Build/source/texk/web2c/cwebdir/texinputs/dctwimac.tex @@ -1,7 +1,7 @@ \ifx\undefined\documentclass\input ctwimac.tex \else\endinput\fi % LaTeX will use other macros -\let\acrofalse=\relax +\let\pdffalse=\relax \input dcwebstrings.tex \def\fin{\parfillskip 0pt plus 1fil diff --git a/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex b/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex index a7110d35208..6ced8ae94e6 100644 --- a/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex +++ b/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex @@ -16,7 +16,6 @@ \def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too \def\PDFlinkcolor{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}} \fi -\newif\ifacro \ifpdf\acrotrue\fi \let\:=\. % preserve a way to get the dot accent % (all other accents will still work as usual) @@ -177,7 +176,7 @@ tangles as \tentex "#2"\egroup\par} \def\noATL#1 #2 {} \def\noatl{\let\ATL=\noATL} % suppress output from @l -\def\ATH{{\acrofalse\X\kern-.5em:Preprocessor definitions\X}} +\def\ATH{{\pdffalse\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 @@ -235,7 +234,7 @@ \def\,{\relax\ifmmode\mskip\thinmuskip\else\thinspace\fi} \def\note#1#2.{\par\penalty5000 \Y\noindent{\hangindent2\em\baselineskip10pt% - \eightrm#1~\ifacro{\pdfnote#2.}\else#2\fi.\par}} + \eightrm#1~\ifpdf{\pdfnote#2.}\else#2\fi.\par}} \newtoks\toksA \newtoks\toksB \newtoks\toksC \newtoks\toksD \newtoks\toksE \newtoks\toksF \newtoks\usersanitizer @@ -244,7 +243,7 @@ \newif\iftokprocessed \newif\ifTnum \newif\ifinstr {\def\\{\global\let\spacechar= }\\ } -\ifacro % The following are pdf macros +\ifpdf % The following are pdf macros \def\thewidth{\the\wd0 \space} \def\theheight{\the\ht\strutbox\space} \def\thedepth{\the\dp\strutbox\space} @@ -279,14 +278,14 @@ \def\makenote{\addtokens\toksB {\noexpand\pdflink{\the\toksC}{\romannumeral\the\toksC}}\toksC={}\global\countC=0} \def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} -\def\pdfURL#1#2{\ifpdftex\pdfannotlink height\ht\strutbox depth\dp\strutbox - attr {/Border [0 0 0]} user {/Type /Annot /Subtype /Link /A - << /S /URI /URI (#2) >>}\PDFlinkcolor #1\Black \pdfendlink - \else\ifpdf{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}% - \special{pdf: ec}}\special{pdf: ann width \thewidth\space height \theheight - \space depth \thedepth\space << /Border [0 0 0] - /Type /Annot /Subtype /Link /A << /S /URI /URI (#2) >> >>}\box0\relax}% - \else #1 ({\tt#2})\fi\fi} +\def\pdfURL#1#2{\ifpdf \ifpdftex\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 + \else {\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}% + \special{pdf: ec}}\special{pdf: ann width \thewidth height \theheight + depth \thedepth << /Border [0 0 0] /Type /Annot /Subtype /Link /A + << /S /URI /URI (#2) >> >>}\box0\relax}\fi + \else #1 ({\tt#2})\fi} {\catcode`\~=12 \gdef\TILDE/{~}} % ~ in a URL {\catcode`\_=12 \gdef\UNDER/{_}} % _ in a URL \def\sanitizecommand#1#2{\addtokens\usersanitizer @@ -393,7 +392,7 @@ \def\stsec{\tenpoint\rightskip=0pt % get out of C mode (cf. \B) \sfcode`;=1500 \pretolerance 200 \hyphenpenalty 50 \exhyphenpenalty 50 \noindent\strut{\let\*=\lapstar\bf\secno.\quad}% - \ifacro \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty + \ifpdf \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty \ifpdftex \pdfdest num \secstar fith% \else \special{pdf: dest (\romannumeral\secstar) [ @thispage /FitH @ypos ]}\fi}}\fi} @@ -435,7 +434,7 @@ \outer\def\NN{\ifvoid\partialpage\leftfalse \else\ifdim\ht\partialpage<\pageht \lefttrue\else\leftfalse\fi\fi\NNN} \outer\def\NNN#1#2#3.{% beginning of starred section - \ifacro{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi + \ifpdf{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi \gdepth=#1\gtitle={#3}\def\secno{#2}\xdef\secstar{#2} \ifleft \flushout \gdef\rlhead{\let\i=I\uppercase{\ignorespaces#3}} % running left headline @@ -477,7 +476,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\sevenrm\kern.5em - \ifacro{\pdfnote#1.}\else#1\fi}$\,\rangle$\XX} + \ifpdf{\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 @@ -609,7 +608,7 @@ {\obeylines\gdef\makeinref#1 #2 #3 {\ifsorted\else\ttoks={\[#1 #2 #3}\immediate\write\reffile{+ \the\ttoks}\fi % \hangindent=1em \noindent #2\miniform#3, %<== space! - \S\ifacro{\pdfnote#1.}\else{#1}\fi.\par}} + \S\ifpdf{\pdfnote#1.}\else{#1}\fi.\par}} {\obeylines\gdef\makeoutref#1 #2 #3 {\ifsorted\else\ttoks={\]#1 #2 #3}\immediate\write\reffile{+ \the\ttoks}\fi % \hangindent=1em \noindent #2\miniform#3, \extref#1.\par}} @@ -649,8 +648,8 @@ %\global\advance\pageno by1} %\def\topofcontents{\centerline{\titlefont\title}\vskip.7in %\vfill} % this material will start the table of contents page -%\def\startpdf{\ifpdftex\ifnum\pdfoutput>0 \pdfcatalog{/PageMode /UseOutlines}\fi - %\else \ifpdf{\special{pdf: docview << /PageMode /UseOutlines >>}}\fi\fi} +%\def\startpdf{\ifpdf \ifpdftex\pdfcatalog{/PageMode /UseOutlines} + %\else {\special{pdf: docview << /PageMode /UseOutlines >>}}\fi\fi} %\def\botofcontents{\vfill %\centerline{\covernote}} % this material will end the table of contents page %\def\covernote{} @@ -673,7 +672,7 @@ \immediate\write\cont{\catcode `\noexpand\@=12\relax} % \makeatother \immediate\closeout\cont % the contents information has been fully gathered \fi} -\def\fin{\ifacro \message{Section names:} +\def\fin{\ifpdf \message{Section names:} \def\U##1.{} \def\Us##1.{} \let\I=\relax \let\*=* \def\outsecname{Names of the sections} \ifpdftex \makebookmarks \countsections @@ -714,7 +713,7 @@ %\def\contentsline#1#2#3#4#5{\ifnum#2=0 \smallbreak\fi %\line{\consetup{#2}#1 %\rm\leaders\hbox to .5em{.\hfil}\hfil - %\ \ifacro\pdflink{#3}{\romannumeral#3}\else#3\fi\hbox to3em{\hss#4}}} + %\ \ifpdf\pdflink{#3}{\romannumeral#3}\else#3\fi\hbox to3em{\hss#4}}} %\def\consetup#1{\ifcase#1 \bf % depth -1 (@**) %\or % depth 0 (@*) %\or \hskip2em % depth 1 (@*1) -- cgit v1.2.3