From 511cb55530b3a63078f9ee5ff603b59cb93066df Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@gnu.org>
Date: Mon, 8 Jun 1998 21:37:20 +0000
Subject: [PATCH] * texinfo.tex (\pagesizes): Rename to
\internalpagesizes. (\custompaper): Rename to \pagesizes.
---
texinfo.tex | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/texinfo.tex b/texinfo.tex
index e2446879..add4f31c 100644
--- a/texinfo.tex
+++ b/texinfo.tex
@@ -5047,7 +5047,7 @@ width0pt\relax} \fi
% 4) hoffset; 5) binding offset; 6) topskip. Then whoever calls us can
% set \parskip and call \setleading for \baselineskip.
%
-\def\pagesizes#1#2#3#4#5#6{%
+\def\internalpagesizes#1#2#3#4#5#6{%
\voffset = #3\relax
\topskip = #6\relax
\splittopskip = \topskip
@@ -5076,7 +5076,7 @@ width0pt\relax} \fi
\setleading{13.2pt}%
%
% If page is nothing but text, make it come out even.
- \pagesizes{46\baselineskip}{6in}{\voffset}{.25in}{\bindingoffset}{36pt}%
+ \internalpagesizes{46\baselineskip}{6in}{\voffset}{.25in}{\bindingoffset}{36pt}%
}}
% Use @smallbook to reset parameters for 7x9.5 (or so) format.
@@ -5084,7 +5084,7 @@ width0pt\relax} \fi
\parskip = 2pt plus 1pt
\setleading{12pt}%
%
- \pagesizes{7.5in}{5.in}{\voffset}{.25in}{\bindingoffset}{16pt}%
+ \internalpagesizes{7.5in}{5.in}{\voffset}{.25in}{\bindingoffset}{16pt}%
%
\lispnarrowing = 0.3in
\tolerance = 700
@@ -5103,7 +5103,7 @@ width0pt\relax} \fi
\setleading{12pt}%
\parskip = 3pt plus 2pt minus 1pt
%
- \pagesizes{53\baselineskip}{6.5in}{\voffset}{.25in}{\bindingoffset}{44pt}%
+ \internalpagesizes{53\baselineskip}{6.5in}{\voffset}{.25in}{\bindingoffset}{44pt}%
%
\tolerance = 700
\hfuzz = 1pt
@@ -5115,7 +5115,7 @@ width0pt\relax} \fi
\setleading{13.6pt}%
%
\afourpaper
- \pagesizes{237mm}{150mm}{3.6mm}{3.6mm}{3mm}{7mm}%
+ \internalpagesizes{237mm}{150mm}{3.6mm}{3.6mm}{3mm}{7mm}%
%
\globaldefs = 0
}}
@@ -5123,25 +5123,25 @@ width0pt\relax} \fi
% Use @afourwide to print on European A4 paper in wide format.
\def\afourwide{%
\afourpaper
- \pagesizes{9.5in}{6.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}%
+ \internalpagesizes{9.5in}{6.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}%
%
\globaldefs = 0
}
-% @custompaper TEXTHEIGHT[,TEXTWIDTH]
+% @pagesizes TEXTHEIGHT[,TEXTWIDTH]
% Perhaps we should allow setting the margins, \topskip, \parskip,
% and/or leading, also. Or perhaps we should compute them somehow.
%
-\def\custompaper{\parsearg\custompaperxxx}
-\def\custompaperxxx#1{\custompaperyyy #1,\finish}
-\def\custompaperyyy#1,#2\finish{{%
+\def\pagesizes{\parsearg\pagesizesxxx}
+\def\pagesizesxxx#1{\pagesizesyyy #1,,\finish}
+\def\pagesizesyyy#1,#2,#3\finish{{%
\setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi
\globaldefs = 1
%
\parskip = 3pt plus 2pt minus 1pt
\setleading{13.2pt}%
%
- \pagesizes{#1}{\hsize}{\voffset}{\normaloffset}{\bindingoffset}{44pt}%
+ \internalpagesizes{#1}{\hsize}{\voffset}{\normaloffset}{\bindingoffset}{44pt}%
}}
% Set default to letter.