texinfo update (Mon Apr 18 09:22:01 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.490
retrieving revision 1.491
diff -c -r1.490 -r1.491
*** ChangeLog   12 Apr 2005 13:09:27 -0000      1.490
--- ChangeLog   18 Apr 2005 13:14:45 -0000      1.491
***************
*** 1,3 ****
--- 1,8 ----
+ 2005-04-18  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.tex (\smallerbook): new (test) definition for 6x9,
+               which is what lulu.com (print-on-demand) accepts.
+ 
  2005-04-05  Matthias Kilian  <address@hidden>  (tiny changes)
  
        * makeinfo/html.c (rollback_empty_tag): be sure to avoid negative
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.186
retrieving revision 1.187
diff -c -r1.186 -r1.187
*** doc/texinfo.tex     22 Mar 2005 01:29:05 -0000      1.186
--- doc/texinfo.tex     18 Apr 2005 13:14:45 -0000      1.187
***************
*** 3,9 ****
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2005-03-21.17}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
--- 3,9 ----
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2005-04-17.16}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
***************
*** 6883,6891 ****
    \fi
  }
  
! % Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
! % 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8)
! % physical page width.
  %
  % We also call \setleading{\textleading}, so the caller should define
  % \textleading.  The caller should also set \parskip.
--- 6883,6891 ----
    \fi
  }
  
! % Parameters in order: 1) textheight; 2) textwidth;
! % 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
! % 7) physical page height; 8) physical page width.
  %
  % We also call \setleading{\textleading}, so the caller should define
  % \textleading.  The caller should also set \parskip.
***************
*** 6932,6938 ****
                      {11in}{8.5in}%
  }}
  
! % Use @smallbook to reset parameters for 7x9.5 (or so) format.
  \def\smallbook{{\globaldefs = 1
    \parskip = 2pt plus 1pt
    \textleading = 12pt
--- 6932,6938 ----
                      {11in}{8.5in}%
  }}
  
! % Use @smallbook to reset parameters for 7x9.25 trim size.
  \def\smallbook{{\globaldefs = 1
    \parskip = 2pt plus 1pt
    \textleading = 12pt
***************
*** 6949,6954 ****
--- 6949,6972 ----
    \defbodyindent = .5cm
  }}
  
+ % Use @smallerbook to reset parameters for 6x9 trim size.
+ % (Just testing, parameters still in flux.)
+ \def\smallerbook{{\globaldefs = 1
+   \parskip = 1.5pt plus 1pt
+   \textleading = 12pt
+   %
+   \internalpagesizes{7.4in}{4.8in}%
+                     {-.2in}{-.4in}%
+                     {0pt}{14pt}%
+                     {9in}{6in}%
+   %
+   \lispnarrowing = 0.25in
+   \tolerance = 700
+   \hfuzz = 1pt
+   \contentsrightmargin = 0pt
+   \defbodyindent = .4cm
+ }}
+ 
  % Use @afourpaper to print on European A4 paper.
  \def\afourpaper{{\globaldefs = 1
    \parskip = 3pt plus 2pt minus 1pt
P ChangeLog
P doc/texinfo.tex