texlive[73217] Build/source/texk/web2c/cwebdir: [CTWILL] Rename page
commits+ascherer at tug.org
commits+ascherer at tug.org
Fri Dec 27 12:00:07 CET 2024
Revision: 73217
https://tug.org/svn/texlive?view=revision&revision=73217
Author: ascherer
Date: 2024-12-27 12:00:07 +0100 (Fri, 27 Dec 2024)
Log Message:
-----------
[CTWILL] Rename page dimensions.
Match page dimensions in [pdf]ctwimac.tex with those in
cwebmac.tex and [pdf]proofmac.tex.
Modified Paths:
--------------
trunk/Build/source/texk/web2c/cwebdir/ChangeLog
trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
trunk/Build/source/texk/web2c/cwebdir/ctwimac.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-12-27 00:42:06 UTC (rev 73216)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog 2024-12-27 11:00:07 UTC (rev 73217)
@@ -1,3 +1,9 @@
+2024-12-27 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill-mini.ch,
+ * ctwimac.tex,
+ * texinputs/pdfctwimac.tex: Rename page dimensions.
+
2024-11-20 Andreas Scherer <https://ascherer.github.io>
* cwebman-w2c.ch: Link to extended WEB manual in TeX Live.
Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch 2024-12-27 00:42:06 UTC (rev 73216)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch 2024-12-27 11:00:07 UTC (rev 73217)
@@ -21,8 +21,8 @@
@y
\ifx\undefined\pdfpagewidth
\else
- \pdfpagewidth=\pagewd \advance\pdfpagewidth by 2cm
- \pdfpageheight=\pageht \advance\pdfpageheight by 5cm
+ \pdfpagewidth=\pagewidth \advance\pdfpagewidth by 2cm
+ \pdfpageheight=\pageheight \advance\pdfpageheight by 5cm
\ifpdflua \pdfhorigin=1cm \pdfvorigin=1cm
\else \global\hoffset=-1.54cm \global\voffset=-1.54cm \fi
\fi
Modified: trunk/Build/source/texk/web2c/cwebdir/ctwimac.tex
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwimac.tex 2024-12-27 00:42:06 UTC (rev 73216)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwimac.tex 2024-12-27 11:00:07 UTC (rev 73217)
@@ -259,9 +259,9 @@
% \L is Polish letter suppressed-L
\outer\def\M#1{\def\secno{#1}\startsection\ignorespaces}
\outer\def\N{\ifvoid\partialpage\lefttrue
- \else\ifdim\ht\partialpage<\pageht \leftfalse\else\lefttrue\fi\fi\NNN}
+ \else\ifdim\ht\partialpage<\pageheight \leftfalse\else\lefttrue\fi\fi\NNN}
\outer\def\NN{\ifvoid\partialpage\leftfalse
- \else\ifdim\ht\partialpage<\pageht \lefttrue\else\leftfalse\fi\fi\NNN}
+ \else\ifdim\ht\partialpage<\pageheight \lefttrue\else\leftfalse\fi\fi\NNN}
\outer\def\NNN#1#2#3.{% beginning of starred section
\gdepth=#1\gtitle={#3}\def\secno{#2}
\ifleft \flushout
@@ -268,7 +268,7 @@
\gdef\rlhead{\let\i=I\uppercase{\ignorespaces#3}} % running left headline
\global\let\rrhead=\rlhead % running right headline
\else\global\setbox\partialpage=\vbox{
- \vbox to\pageht{\unvbox\partialpage\vfill}\break}
+ \vbox to\pageheight{\unvbox\partialpage\vfill}\break}
\gdef\rrhead{\let\i=I\uppercase{\ignorespaces#3}}
\fi
\message{*\secno} % progress report
@@ -315,12 +315,12 @@
% \count and \toks registers 200--219 are also used to keep track of refs
\catcode`\@=11
\newcount\@n \newcount\@m \newcount\@p
-\newdimen\pageht \pageht=19cm
-\newdimen\pagewd \pagewd=13cm
-\newdimen\colwd \colwd=\pagewd
+\newdimen\pageheight \pageheight=19cm
+\newdimen\pagewidth \pagewidth=13cm
+\newdimen\colwd \colwd=\pagewidth
\advance\colwd by -2pc \divide\colwd by 3 % for three columns
-\newdimen\fullpageht \fullpageht=\pageht \advance\fullpageht by 4pc
-\newdimen\pagethresh \pagethresh=2\pageht
+\newdimen\fullpageheight \fullpageheight=\pageheight \advance\fullpageheight by 4pc
+\newdimen\pagethresh \pagethresh=2\pageheight
\newdimen\nsize \newdimen\msize
\newskip\intersecskip \intersecskip=8pt plus 2pt minus 3pt
\newbox\partialpage
@@ -331,7 +331,7 @@
\newif\iftitle \newif\ifleft
\def\flushout{\ifvoid\partialpage\else
- \setbox0=\vsplit\partialpage to \pageht
+ \setbox0=\vsplit\partialpage to \pageheight
\shipout\vbox{
\vbox to 3pc{\leftheadline\vfill}
\nointerlineskip\box0}
@@ -345,7 +345,7 @@
\hyphenpenalty 10000 \exhyphenpenalty 10000
\noindent\vbox to1pt{}\par % 1pt = \topskip - \ninept
\readin}
- \shipout\vbox to\fullpageht{
+ \shipout\vbox to\fullpageheight{
\vbox to 3pc{\rightheadline\vfill}
\unvbox\partialpage
\vfill
@@ -364,10 +364,10 @@
\@n=199 \loop \ifnum\@n<222 \toks\@n={} \count\@n=0 \advance\@n 1 \repeat
\nrefs=0
\baseno=\secno}}
-\def\leftheadline{\hbox to\pagewd{\vbox to10pt{}%
+\def\leftheadline{\hbox to\pagewidth{\vbox to10pt{}%
\iftitle\global\titlefalse\else\ninerm\title:\enspace \eightsl\rlhead\fi
\hfil\eightrm\folio}}
-\def\rightheadline{\hbox to\pagewd{\vbox to10pt{}%
+\def\rightheadline{\hbox to\pagewidth{\vbox to10pt{}%
\eightrm\folio\hfil\ninerm\title:\enspace \eightsl\rrhead\/}}
\def\mini{\begingroup \obeylines \globaldefs=1 \newrefs=\bgroup}
@@ -448,7 +448,7 @@
\def\donewithpage#1 {\let\readin=\relax}
\catcode`\@=12
-\hsize=\pagewd \vsize=\maxdimen \output={\twillout}
+\hsize=\pagewidth \vsize=\maxdimen \output={\twillout}
\def\inx{\flushout\end}
\def\fin{\parfillskip 0pt plus 1fil
Modified: trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex 2024-12-27 00:42:06 UTC (rev 73216)
+++ trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex 2024-12-27 11:00:07 UTC (rev 73217)
@@ -296,9 +296,9 @@
{\xdef\secstar{#1}\let\*=\empty\xdef\secno{#1}}% remove \* from section name
\vskip\intersecskip\startsection\ignorespaces}
\outer\def\N{\ifvoid\partialpage\lefttrue
- \else\ifdim\ht\partialpage<\pageht \leftfalse\else\lefttrue\fi\fi\NNN}
+ \else\ifdim\ht\partialpage<\pageheight \leftfalse\else\lefttrue\fi\fi\NNN}
\outer\def\NN{\ifvoid\partialpage\leftfalse
- \else\ifdim\ht\partialpage<\pageht \lefttrue\else\leftfalse\fi\fi\NNN}
+ \else\ifdim\ht\partialpage<\pageheight \lefttrue\else\leftfalse\fi\fi\NNN}
\outer\def\NNN#1#2#3.{% beginning of starred section
\ifacro{\makeoutlinetoks#3\outlinedone}\fi
\gdepth=#1\gtitle={#3}\def\secno{#2}\xdef\secstar{#2}
@@ -306,7 +306,7 @@
\gdef\rlhead{\let\i=I\uppercase{\ignorespaces#3}} % running left headline
\global\let\rrhead=\rlhead % running right headline
\else\global\setbox\partialpage=\vbox{
- \vbox to\pageht{\unvbox\partialpage\vfill}\break}
+ \vbox to\pageheight{\unvbox\partialpage\vfill}\break}
\gdef\rrhead{\let\i=I\uppercase{\ignorespaces#3}}
\fi
\message{*\secno} % progress report
@@ -367,12 +367,12 @@
% \count and \toks registers 200--219 are also used to keep track of refs
\catcode`\@=11
\newcount\@n \newcount\@m \newcount\@p
-\newdimen\pageht \pageht=19cm
-\newdimen\pagewd \pagewd=13cm
-\newdimen\colwd \colwd=\pagewd
+\newdimen\pageheight \pageheight=19cm
+\newdimen\pagewidth \pagewidth=13cm
+\newdimen\colwd \colwd=\pagewidth
\advance\colwd by -2pc \divide\colwd by 3 % for three columns
-\newdimen\fullpageht \fullpageht=\pageht \advance\fullpageht by 4pc
-\newdimen\pagethresh \pagethresh=2\pageht
+\newdimen\fullpageheight \fullpageheight=\pageheight \advance\fullpageheight by 4pc
+\newdimen\pagethresh \pagethresh=2\pageheight
\newdimen\nsize \newdimen\msize
\newskip\intersecskip \intersecskip=8pt plus 2pt minus 3pt
\newbox\partialpage
@@ -383,7 +383,7 @@
\newif\iftitle \newif\ifleft
\def\flushout{\ifvoid\partialpage\else
- \setbox0=\vsplit\partialpage to \pageht
+ \setbox0=\vsplit\partialpage to \pageheight
\shipout\vbox{
\vbox to 3pc{\leftheadline\vfill}
\nointerlineskip\box0}
@@ -397,7 +397,7 @@
\hyphenpenalty 10000 \exhyphenpenalty 10000
\noindent\vbox to1pt{}\par % 1pt = \topskip - \ninept
\readin}
- \shipout\vbox to\fullpageht{
+ \shipout\vbox to\fullpageheight{
\vbox to 3pc{\rightheadline\vfill}
\unvbox\partialpage
\vfill
@@ -416,10 +416,10 @@
\@n=199 \loop \ifnum\@n<222 \toks\@n={} \count\@n=0 \advance\@n 1 \repeat
\nrefs=0
\baseno=\secno}}
-\def\leftheadline{\hbox to\pagewd{\vbox to10pt{}%
+\def\leftheadline{\hbox to\pagewidth{\vbox to10pt{}%
\iftitle\global\titlefalse\else\ninerm\title:\enspace \eightsl\rlhead\fi
\hfil\eightrm\folio}}
-\def\rightheadline{\hbox to\pagewd{\vbox to10pt{}%
+\def\rightheadline{\hbox to\pagewidth{\vbox to10pt{}%
\eightrm\folio\hfil\ninerm\title:\enspace \eightsl\rrhead\/}}
\def\mini{\begingroup \obeylines \globaldefs=1 \newrefs=\bgroup}
@@ -501,15 +501,15 @@
\def\donewithpage#1 {\let\readin=\relax}
\catcode`\@=12
-\hsize=\pagewd \vsize=\maxdimen \output={\twillout}
+\hsize=\pagewidth \vsize=\maxdimen \output={\twillout}
%\let\page=\pagebody \raggedbottom
% \def\page{\box255 }\normalbottom % faster, but loses plain TeX footnotes
%\def\normaloutput#1#2#3{\ifodd\pageno\hoffset=\pageshift\fi
%\shipout\vbox{
- %\vbox to\fullpageht{
+ %\vbox to\fullpageheight{
%\iftitle\global\titlefalse
- %\else\hbox to\pagewd{\vbox to10pt{}\ifodd\pageno #3\else#2\fi}\fi
+ %\else\hbox to\pagewidth{\vbox to10pt{}\ifodd\pageno #3\else#2\fi}\fi
%\vfill#1}} % parameter #1 is the page itself
%\global\advance\pageno by1}
%\def\topofcontents{\centerline{\titlefont\title}\vskip.7in
@@ -520,7 +520,7 @@
\def\contentspagenumber{0} % default page number for table of contents
%\newdimen\pageshift \pageshift=\hoffset
%% shift righthand pages wrt lefthand ones (changed in version 3.70)
-%\def\setpage{\hsize\pagewd\vsize\pageht} % use after changing page size
+%\def\setpage{\hsize\pagewidth\vsize\pageheight} % use after changing page size
\def\contentsfile{\jobname.toc} % file that gets table of contents info
\def\readcontents{\input \contentsfile}
\def\readsections{\input \jobname.scn}
More information about the tex-live-commits
mailing list.