[Gsrc-commit] trunk r7242: texinfo.tex

[Carl Hansen]

------------------------------------------------------------
revno: 7242
revision-id: carlhansen1234@gmail.com-20201024230652-7j3ty2th36t1pu3r
parent: carlhansen1234@gmail.com-20201024230459-f29d6f7waavfdu7n
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Sat 2020-10-24 16:06:52 -0700
message:
  texinfo.tex
modified:
  doc/texinfo.tex                texinfo.tex-20190530181338-ltiwe8dnocveg3er-1
  doc/version.texi               version.texi-20160617183752-q0c4b06v8yopjsxf-1

=== modified file 'doc/texinfo.tex'
--- a/doc/texinfo.tex   2020-10-22 01:01:39 +0000
+++ b/doc/texinfo.tex   2020-10-24 23:06:52 +0000
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2020-10-15.12}
+\def\texinfoversion{2020-10-24.12}
 %
 % Copyright 1985, 1986, 1988, 1990-2020 Free Software Foundation, Inc.
 %
@@ -7666,7 +7666,7 @@
 \endgroup
 %
 \envdef\verbatim{%
-    \setupverbatim\doverbatim
+    \setnormaldispenv\setupverbatim\doverbatim
 }
 \let\Everbatim = \afterenvbreak
 
@@ -11486,6 +11486,18 @@
   \globaldefs = 0
 }}
 
+\def\bsixpaper{{\globaldefs = 1
+  \afourpaper
+  \internalpagesizes{140mm}{100mm}%
+                    {-6.35mm}{-12.7mm}%
+                    {\bindingoffset}{14pt}%
+                    {176mm}{125mm}%
+  \let\SETdispenvsize=\smallword
+  \lispnarrowing = 0.2in
+  \globaldefs = 0
+}}
+
+
 % @pagesizes TEXTHEIGHT[,TEXTWIDTH]
 % Perhaps we should allow setting the margins, \topskip, \parskip,
 % and/or leading, also. Or perhaps we should compute them somehow.
@@ -11499,12 +11511,12 @@
   \setleading{\textleading}%
   %
   \dimen0 = #1\relax
-  \advance\dimen0 by \voffset
-  \advance\dimen0 by 1in % reference point for DVI is 1 inch from top of page
+  \advance\dimen0 by 2.5in % default 1in margin above heading line
+                           % and 1.5in to include heading, footing and
+                           % bottom margin
   %
   \dimen2 = \hsize
-  \advance\dimen2 by \normaloffset
-  \advance\dimen2 by 1in % reference point is 1 inch from left edge of page
+  \advance\dimen2 by 2in % default to 1 inch margin on each side
   %
   \internalpagesizes{#1}{\hsize}%
                     {\voffset}{\normaloffset}%

=== modified file 'doc/version.texi'
--- a/doc/version.texi  2020-05-22 18:50:05 +0000
+++ b/doc/version.texi  2020-10-24 23:06:52 +0000
@@ -1,4 +1,4 @@
-@set UPDATED 21 October 2019
-@set UPDATED-MONTH October 2019
+@set UPDATED 19 December 2019
+@set UPDATED-MONTH December 2019
 @set EDITION 2014.10.11
 @set VERSION 2014.10.11