texinfo update (Mon Sep 3 08:23:01 EDT 2007)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.749
retrieving revision 1.751
diff -u -r1.749 -r1.751
--- ChangeLog   2 Sep 2007 21:56:29 -0000       1.749
+++ ChangeLog   3 Sep 2007 12:18:00 -0000       1.751
@@ -1,3 +1,11 @@
+2007-09-03  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\baselinefactor): new macro, 1 by default.
+       (\setleading): use it, to allow for poor man's double spacing.
+       (\afourpaper, \letterpaper): use absolute dimension for height,
+       instead of a multiple of \baselineskip.  (Otherwise things run off
+       the bottom when double-spacing.)
+
 2007-09-01  Juan Manuel Guerrero  <address@hidden>
 
        * djgpp/config.bat: change file names arguments and configure.orig
@@ -10,6 +18,7 @@
        LC_MESSAGES, since djgpp 2.04 doesn't have it.
        Report from Juan Manuel Guerrero, 28 Aug 2007 21:38:18.
        * info/man.c (get_manpage_contents) [LC_MESSAGES]: likewise.
+       * makeinfo/makeinfo.c (main): doc fix, likewise.
 
 2007-08-26  Karl Berry  <address@hidden>
 
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- doc/texinfo.tex     30 Jul 2007 15:50:20 -0000      1.254
+++ doc/texinfo.tex     3 Sep 2007 12:18:01 -0000       1.255
@@ -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{2007-07-30.08}
+\def\texinfoversion{2007-09-03.05}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 2007,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1628,8 +1628,12 @@
 \def\strutheightpercent{.70833}
 \def\strutdepthpercent {.29167}
 %
+% can get a sort of poor man's double spacing by redefining this.
+\def\baselinefactor{1}
+%
 \def\setleading#1{%
-  \normalbaselineskip = #1\relax
+  \dimen0 = #1\relax
+  \normalbaselineskip = \baselinefactor\dimen0
   \normallineskip = \lineskipfactor\normalbaselineskip
   \normalbaselines
   \setbox\strutbox =\hbox{%
@@ -8579,7 +8583,7 @@
 % Don't be so finicky about underfull hboxes, either.
 \hbadness = 2000
 
-% Following George Bush, just get rid of widows and orphans.
+% Following George Bush, get rid of widows and orphans.
 \widowpenalty=10000
 \clubpenalty=10000
 
@@ -8644,7 +8648,7 @@
   \textleading = 13.2pt
   %
   % If page is nothing but text, make it come out even.
-  \internalpagesizes{46\baselineskip}{6in}%
+  \internalpagesizes{607.2pt}{6in}% that's 46 lines
                     {\voffset}{.25in}%
                     {\bindingoffset}{36pt}%
                     {11in}{8.5in}%
@@ -8700,7 +8704,7 @@
   % \global\normaloffset = -6mm
   % \global\bindingoffset = 10mm
   % @end tex
-  \internalpagesizes{51\baselineskip}{160mm}
+  \internalpagesizes{673.2pt}{160mm}% that's 51 lines
                     {\voffset}{\hoffset}%
                     {\bindingoffset}{44pt}%
                     {297mm}{210mm}%
Index: gnulib/lib/streq.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/streq.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/streq.h  26 Jul 2007 21:51:26 -0000      1.1
+++ gnulib/lib/streq.h  3 Sep 2007 12:22:34 -0000       1.2
@@ -18,6 +18,9 @@
 
 /* Written by Bruno Haible <address@hidden>.  */
 
+#ifndef _GL_STREQ_H
+#define _GL_STREQ_H
+
 #include <string.h>
 
 /* STREQ allows to optimize string comparison with a small literal string.
@@ -171,3 +174,5 @@
   (strcmp (s1, s2) == 0)
 
 #endif
+
+#endif /* _GL_STREQ_H */
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- makeinfo/makeinfo.c 11 Jul 2007 00:16:23 -0000      1.104
+++ makeinfo/makeinfo.c 3 Sep 2007 12:06:29 -0000       1.105
@@ -1,5 +1,5 @@
 /* makeinfo -- convert Texinfo source into other formats.
-   $Id: makeinfo.c,v 1.104 2007/07/11 00:16:23 karl Exp $
+   $Id: makeinfo.c,v 1.105 2007/09/03 12:06:29 karl Exp $
 
    Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
@@ -559,7 +559,7 @@
   /* Do not use LC_ALL, because LC_NUMERIC screws up the scanf parsing
      of the argument to @multicolumn.  */
   setlocale (LC_TIME, "");
-#ifdef LC_MESSAGES /* ultrix */
+#ifdef LC_MESSAGES /* ultrix, djgpp 2.04 */
   setlocale (LC_MESSAGES, "");
 #endif
   setlocale (LC_CTYPE, "");
P ChangeLog
P doc/texinfo.tex
P gnulib/lib/streq.h
P makeinfo/makeinfo.c