[CWEB] Update auxiliary PDF macros.

git-svn-id: svn://tug.org/texlive/trunk@55616 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 10 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctwimac.tex b/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctwimac.tex
index f92625fed9c..64f17fcd8f9 100644
--- a/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctwimac.tex
+++ b/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctwimac.tex
@@ -24,8 +24,6 @@
 \let\:=\. % preserve a way to get the dot accent
  % (all other accents will still work as usual)
 
-\def\contentspagenumber{0} % default page number for table of contents
-
 \newdimen\em \em=10pt % this "em" will not change with font size
 \parskip 0pt plus .1pt % almost no stretch between paragraphs
 \parindent 1\em % for paragraphs and for the first line of C text
@@ -61,7 +59,6 @@
 \font\ninebf=cmbx9
 \font\eightbf=cmbx8
 \font\sixbf=cmbx6
-\font\niness=cmss9
 \font\ninett=cmtt9
 \font\eighttt=cmtt8
 \hyphenchar\ninett=-1 \hyphenchar\eighttt=-1
@@ -118,7 +115,7 @@
   \textfont\ttfam=\ninett
   \def\ttx{\ninetex}%
   \normalbaselineskip=11pt
-  \let\cmntfont=\niness%\ninerm
+  \let\cmntfont=\ninerm
   \let\mc=\eightrm
   \let\sc=\sevenrm
   \let\big=\ninebig
@@ -156,7 +153,7 @@
 \def\eightbig#1{{\hbox{$\textfont0=\ninerm\textfont2=\ninesy
   \left#1\vbox to6.5pt{}\right.\nulldelimiterspace=0pt$}}}
 
-\font\tenss=cmss10 \let\cmntfont\tenss % alternative comment font
+%\font\tenss=cmss10 \let\cmntfont\tenss % alternative comment font
 \font\titlefont=cmr7 scaled\magstep4 % title on the contents page
 \font\ttitlefont=cmtt10 scaled\magstep2 % typewriter type in title
 
@@ -238,7 +235,7 @@
 \let\yskip=\smallskip
 \def\?{\mathrel?}
 \def\note#1#2.{\par\penalty5000
-  \Y\noindent{\hangindent2\em\baselineskip10pt
+  \Y\noindent{\hangindent2\em\baselineskip10pt%
     \eightrm#1~\ifacro{\pdfnote#2.}\else#2\fi.\par}}
 
 \newtoks\toksA \newtoks\toksB \newtoks\toksC \newtoks\toksD
@@ -407,6 +404,7 @@
 \def\A{\note{See also section}} % xref for doubly defined section name
 \def\As{\note{See also sections}} % xref for multiply defined section name
 \def\B{\iftenpoint\ninepoint\fi
+  \font\niness=cmss9 \let\cmntfont\niness % alternative comment font
   \rightskip=0pt plus 100pt minus 10pt % go into C mode
   \sfcode`;=3000
   \pretolerance 10000
@@ -641,6 +639,7 @@
 
 \hsize=\pagewd \vsize=\maxdimen \output={\twillout}
 
+\def\contentspagenumber{0} % default page number for table of contents
 \def\contentsfile{\jobname.toc} % file that gets table of contents info
 \def\readcontents{\input \contentsfile}
 \def\readsections{\input \jobname.scn}
@@ -655,24 +654,21 @@
   \ifpdftex
     \immediate\write\cont{\catcode `\noexpand\@=12\relax} % \makeatother
     \immediate\closeout\cont % the contents information has been fully gathered
-  \fi
-}
-\def\fin{\message{Section names:}
+  \fi}
+\def\fin{\ifacro \message{Section names:}
   \def\U##1.{} \def\Us##1.{} \let\I=\relax \let\*=*
-  \ifacro \def\outsecname{Names of the sections}
+  \def\outsecname{Names of the sections}
   \ifpdftex \makebookmarks
     \pdfoutline goto num 1 count -\secno {\outsecname}
     \def\X##1:##2\X{\firstsecno##1.%
       {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
       \pdfoutline goto num \the\toksA \expandafter{\the\toksE}}
-  \else \special{pdf: outline -1 << /Title (\outsecname)
-        /A << /S /Goto /D (1) >> >>}%
+  \else \special{pdf: outline -1 << /Title (\outsecname) >>}%
     \def\X##1:##2\X{\firstsecno##1.%
       {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
       \special{pdf: outline 0 << /Title (\the\toksE)
         /A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}}
-  \fi\fi
-  \readsections}
+  \fi \readsections \fi}
 \def\makebookmarks{\let\ZZ=\writebookmarkline \readcontents\relax}
 \def\writebookmarkline#1#2#3#4#5{{%
   \let\(=\let \let\)=\let \let\[=\let \let\]=\let \let\/=\let