texinfo update (Wed Oct 24 16:23:01 EDT 2007)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.773
retrieving revision 1.774
diff -u -r1.773 -r1.774
--- ChangeLog   24 Oct 2007 13:31:56 -0000      1.773
+++ ChangeLog   24 Oct 2007 20:03:34 -0000      1.774
@@ -1,3 +1,21 @@
+2007-10-24  Karl Berry  <address@hidden>
+
+       * makeinfo/node.c (cm_node),
+       * makeinfo/cmds.c (cm_settitle): no need to call xml_begin_document.
+       * makeinfo/makeinfo.c (convert_from_loaded_file): call
+       xml_begin_document in docbook case too, else some frontmatter
+       can be lost.
+       Bug report from Sam Varshavchik, 14 Oct 2007 12:10:04, for binutils.
+       
+       * makeinfo/insertion.c: formatting.
+
+       * makeinfo/xml.c (xml_begin_document): arg can be const;
+       use basename of @setfilename instead of "book-root".
+       (xml_push_current_element, xml_pop_current_element): use
+       warning fn for consistent formatting.
+
+       * util/dir-example: binutils update, etc.
+
 2007-10-24  Sergey Poznyakoff  <address@hidden>
 
        * util/gendocs.sh: New option --texi2html, to use texi2html for
Index: doc/makeinfo.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/makeinfo.1,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- doc/makeinfo.1      10 Sep 2007 00:36:29 -0000      1.59
+++ doc/makeinfo.1      24 Oct 2007 20:03:35 -0000      1.60
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
-.TH MAKEINFO "1" "September 2007" "makeinfo 4.11" "User Commands"
+.TH MAKEINFO "1" "October 2007" "makeinfo 4.11" "User Commands"
 .SH NAME
 makeinfo \- translate Texinfo documents
 .SH SYNOPSIS
Index: makeinfo/.gdbinit
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/.gdbinit,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- makeinfo/.gdbinit   26 Sep 2007 20:53:39 -0000      1.38
+++ makeinfo/.gdbinit   24 Oct 2007 20:03:35 -0000      1.39
@@ -263,3 +263,6 @@
 # misaligned index
 set args -I $ks/groff/doc --enable-encoding groff.texinfo
 #set args $ttests/idxalign.tex
+
+# spurious </bookinfo>
+set args -o /tmp/b.xml --docbook $ttests/binutils.tex
Index: makeinfo/cmds.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- makeinfo/cmds.c     13 Oct 2007 23:44:34 -0000      1.77
+++ makeinfo/cmds.c     24 Oct 2007 20:03:35 -0000      1.78
@@ -1,5 +1,5 @@
 /* cmds.c -- Texinfo commands.
-   $Id: cmds.c,v 1.77 2007/10/13 23:44:34 karl Exp $
+   $Id: cmds.c,v 1.78 2007/10/24 20:03:35 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
@@ -1531,7 +1531,6 @@
 {
   if (xml)
     {
-      xml_begin_document (current_output_filename);
       xml_insert_element (SETTITLE, START);
       xml_in_book_title = 1;
       get_rest_of_line (0, &title);
Index: makeinfo/insertion.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- makeinfo/insertion.c        1 Jul 2007 21:20:32 -0000       1.64
+++ makeinfo/insertion.c        24 Oct 2007 20:03:35 -0000      1.65
@@ -1,5 +1,5 @@
 /* insertion.c -- insertions for Texinfo.
-   $Id: insertion.c,v 1.64 2007/07/01 21:20:32 karl Exp $
+   $Id: insertion.c,v 1.65 2007/10/24 20:03:35 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
@@ -526,7 +526,7 @@
          output it right away since xml output is never split.
          For html, we output it specifically in html_output_head. 
          For plain text, there's no way to hide it, so the author must
-          use @insertcopying in the desired location.  */
+         use @insertcopying in the desired location.  */
       if (docbook)
        {
          if (!xml_in_bookinfo)
@@ -542,7 +542,6 @@
 
       if (docbook)
         xml_insert_element (LEGALNOTICE, END);
-
       break;
 
     case quotation:
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- makeinfo/makeinfo.c 24 Sep 2007 19:04:10 -0000      1.111
+++ makeinfo/makeinfo.c 24 Oct 2007 20:03:35 -0000      1.112
@@ -1,5 +1,5 @@
 /* makeinfo -- convert Texinfo source into other formats.
-   $Id: makeinfo.c,v 1.111 2007/09/24 19:04:10 karl Exp $
+   $Id: makeinfo.c,v 1.112 2007/10/24 20:03:35 karl Exp $
 
    Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
@@ -1648,7 +1648,7 @@
 
   set_current_output_filename (real_output_filename);
   
-  if (xml && !docbook)
+  if (xml)
     xml_begin_document (filename_part (output_filename));
 
   if (verbose_mode)
Index: makeinfo/node.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/node.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- makeinfo/node.c     15 Sep 2007 23:48:46 -0000      1.38
+++ makeinfo/node.c     24 Oct 2007 20:03:35 -0000      1.39
@@ -1,5 +1,5 @@
 /* node.c -- nodes for Texinfo.
-   $Id: node.c,v 1.38 2007/09/15 23:48:46 karl Exp $
+   $Id: node.c,v 1.39 2007/10/24 20:03:35 karl Exp $
 
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
    Free Software Foundation, Inc.
@@ -656,7 +656,6 @@
   no_indent = 1;
   if (xml)
     {
-      xml_begin_document (current_output_filename);
       xml_begin_node ();
       if (!docbook)
        {
Index: makeinfo/xml.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- makeinfo/xml.c      1 Jul 2007 21:20:33 -0000       1.72
+++ makeinfo/xml.c      24 Oct 2007 20:03:36 -0000      1.73
@@ -1,5 +1,5 @@
 /* xml.c -- xml output, both TexinfoML and Docbook.
-   $Id: xml.c,v 1.72 2007/07/01 21:20:33 karl Exp $
+   $Id: xml.c,v 1.73 2007/10/24 20:03:36 karl Exp $
 
    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
@@ -613,7 +613,7 @@
 }
 
 void
-xml_begin_document (char *output_filename)
+xml_begin_document (const char *output_basename)
 {
   if (book_started)
     return;
@@ -658,23 +658,29 @@
 
   if (strcmp (xml_element_list[PARA].name, "para"))
     {
-      printf ("internal error: xml_element_list table inconsistent");
+      warning ("internal error: xml_element_list table inconsistent");
       xexit (-1);
     }
 
   if (language_code != last_language_code)
     {
       if (docbook)
-       /* The toplevel <book> element needs an id attribute if you want to use
-          the chunk.xml feature of the DocBook-XSL stylesheets. */
-        xml_insert_element_with_attribute (TEXINFO, START, "id=\"book-root\" 
lang=\"%s\"", language_table[language_code].abbrev);
+       /* The toplevel <book> element needs an id attribute if you want
+           to use the chunk.xml feature of the Docbook-XSL stylesheets.
+           Might as well use the output filename?  */
+        xml_insert_element_with_attribute (TEXINFO, START,
+                                           "id=\"%s\" lang=\"%s\"",
+                                         output_basename,
+                                         language_table[language_code].abbrev);
       else
-       xml_insert_element_with_attribute (TEXINFO, START, "xml:lang=\"%s\"", 
language_table[language_code].abbrev);
+       xml_insert_element_with_attribute (TEXINFO, START,
+                                           "xml:lang=\"%s\"",
+                                         language_table[language_code].abbrev);
     }
   if (!docbook)
     {
       xml_insert_element (SETFILENAME, START);
-      insert_string (output_filename);
+      insert_string (output_basename);
       xml_insert_element (SETFILENAME, END);
     }
 }
@@ -694,10 +700,9 @@
 xml_push_current_element (int elt)
 {
   element_stack[element_stack_index++] = elt;
-  if (element_stack_index > 200)
-    printf ("*** stack overflow (%d - %s) ***\n",
-            element_stack_index,
-            xml_element_list[elt].name);
+  if (element_stack_index > 200)  /* fixxme, no hard limits */
+    warning ("internal error: xml stack overflow (%d - %s)",
+             element_stack_index, xml_element_list[elt].name);
 }
 
 static void
@@ -706,7 +711,8 @@
   element_stack_index--;
   if (element_stack_index < 0)
     {
-      printf ("*** stack underflow (index %d) ***\n", element_stack_index);
+      warning ("internal error: xml stack underflow (index %d)",
+               element_stack_index);
       element_stack_index = 0;
     }
 }
@@ -1084,7 +1090,7 @@
       xml_insert_element (BOOKINFO, END);
       xml_in_bookinfo = 0;
     }
-  if (xml_node_open && ! docbook)
+  if (xml_node_open && !docbook)
     {
       if (xml_node_level != -1)
         {
Index: makeinfo/xml.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xml.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- makeinfo/xml.h      1 Jul 2007 21:20:33 -0000       1.30
+++ makeinfo/xml.h      24 Oct 2007 20:03:36 -0000      1.31
@@ -1,5 +1,5 @@
 /* xml.h -- xml (including Docbook) output declarations.
-   $Id: xml.h,v 1.30 2007/07/01 21:20:33 karl Exp $
+   $Id: xml.h,v 1.31 2007/10/24 20:03:36 karl Exp $
 
    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007
    Free Software Foundation, Inc.
@@ -114,7 +114,7 @@
   xml_synindex (char *from, char *to),
   xml_start_para (void),
   xml_end_para (void),
-  xml_begin_document (char *output_filename),
+  xml_begin_document (const char *output_basename),
   xml_end_document (void),
   xml_start_menu_entry (char *tem),
   xml_end_menu (void),
Index: util/dir-example
===================================================================
RCS file: /sources/texinfo/texinfo/util/dir-example,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- util/dir-example    8 Oct 2007 18:22:27 -0000       1.74
+++ util/dir-example    24 Oct 2007 19:54:16 -0000      1.75
@@ -10,7 +10,7 @@
 If you have dir entries for Texinfo manuals you'd like to be added here,
   please send them to address@hidden
 
-$Id: dir-example,v 1.74 2007/10/08 18:22:27 karl Exp $
+$Id: dir-example,v 1.75 2007/10/24 19:54:16 karl Exp $
 
 File: dir,     Node: Top,      This is the top of the INFO tree.
 
@@ -90,7 +90,7 @@
 * As: (as).                     Assembler.
 * Autoconf: (autoconf).         Create source code configuration scripts.
 * Automake: (automake).         Making GNU standards-compliant Makefiles.
-* Binutils: (binutils).         ar/copy/objdump/nm/size/strip/ranlib.
+* Binutils: (binutils).         The GNU binary utilities.
 * Cpp: (cpp).                  The GNU C preprocessor.
 * Cpplib: (cppinternals).       Cpplib internals.
 * CVS: (cvs).                   Concurrent Versions System
@@ -214,7 +214,6 @@
 GNU organization
 * Maintain: (maintain).         GNU maintainer guidelines.
 * Standards: (standards).        GNU coding standards.
-* Tasks: (tasks).               GNU task list.
 
 GNU music project
 * LilyPond: (lilypond).                        The GNU music typesetter.
@@ -249,42 +248,30 @@
 * R FAQ: (R-FAQ).               The R statistical language FAQ.
 
 Other things
-* Amd: (am-utils).              Filesystem automounter.
-* CMUCL: (cmu-user).            CMU Common Lisp.
-* File headers: (filehdr).      Bibliographic information for computer files.
-* GCP: (gcp).                   Game club protocol.
-* GIMP: (pdb).                  The GIMP procedural database.
-* HTML: (snafu).                Hypertext Markup Language 2.0 specification.
 * Jargon: (jargon).             The jargon file.
 * Netpbm: (netpbm).             Images/graphics manipulation programs.
 * JED: (jed).                   JED editor documentation.
-* octave: (octave).             Octave - A language for numerical computation.
-* Perl: (perl).                 Practical extraction and report language.
+* Octave: (octave).             Octave - A language for numerical computation.
 * PRCS: (prcs).                 Project revision control system.
 * Screen: (screen).             Terminal multiplexer.
 
 Individual utilities
 * aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
-* ar: (binutils)ar.                             Create/modify/extract archives.
+* addr2line: (binutils)addr2line. Convert addresses to file and line.
+* ar: (binutils)ar.             Create, modify, and extract from archives.
 * at-pr: (gnats)at-pr.                          Bug report timely reminders.
-* autoconf: (autoconf)autoconf Invocation.
-                                How to create configuration scripts
-* autoheader: (autoconf)autoheader Invocation.
-                                How to create configuration templates
-* autom4te: (autoconf)autom4te Invocation.
-                                The Autoconf executables backbone
+* autoconf: (autoconf)autoconf Invocation. How to create configuration scripts.
+* autoheader: (autoconf)autoheader Invocation. How to create configuration 
templates
+* autom4te: (autoconf)autom4te Invocation. The Autoconf executables backbone.
 * automake: (automake)Invoking Automake.        Generating Makefile.in.
-* autoreconf: (autoconf)autoreconf Invocation.
-                                Remaking multiple `configure' scripts
-* autoscan: (autoconf)autoscan Invocation.
-                                Semi-automatic `configure.ac' writing
-* autoupdate: (autoconf)autoupdate Invocation.
-                                Automatic update of `configure.ac'
+* autoreconf: (autoconf)autoreconf Invocation. Remaking multiple `configure' 
scripts
+* autoscan: (autoconf)autoscan Invocation.     Semi-automatic `configure.ac' 
writing
+* autoupdate: (autoconf)autoupdate Invocation. Automatic update of 
`configure.ac'
 * awk: (gawk)Invoking gawk.                     Text scanning and processing.
 * base64: (coreutils)base64 invocation.         Base64 encode/decode data.
 * basename: (coreutils)basename invocation.     Strip directory and suffix.
 * bibtex: (web2c)BibTeX invocation.             Maintaining bibliographies.
-* c++filt: (binutils)c++filt.                   Demangle C++ symbols.
+* c++filt: (binutils)c++filt.  Filter to demangle encoded C++ symbols.
 * cat: (coreutils)cat invocation.               Concatenate and write files.
 * chgrp: (coreutils)chgrp invocation.           Change file groups.
 * chmod: (coreutils)chmod invocation.           Change file permissions.
@@ -301,6 +288,7 @@
 * cut: (coreutils)cut invocation.               Print selected parts of lines.
 * cvs: (cvs)CVS commands.       Concurrent Versions System
 * cvsclient: (cvsclient).      The CVS client/server protocol.
+* cxxfilt: (binutils)c++filt.   MS-DOS name for c++filt.
 * date: (coreutils)date invocation.             Print/set system date and time.
 * dd: (coreutils)dd invocation.                 Copy and convert a file.
 * df: (coreutils)df invocation.                 Report file system disk usage.
@@ -309,6 +297,7 @@
 * dir: (coreutils)dir invocation.               List directories briefly.
 * dircolors: (coreutils)dircolors invocation.   Color setup for ls.
 * dirname: (coreutils)dirname invocation.       Strip non-directory suffix.
+* dlltool: (binutils)dlltool.  Create files needed to build and use DLLs.
 * dmp: (web2c)Dmp invocation.                   Troff->MPX (MetaPost pictures).
 * du: (coreutils)du invocation.                 Report on disk usage.
 * dvicopy: (web2c)DVIcopy invocation.           Virtual font expansion
@@ -390,11 +379,11 @@
 * newer: (web2c)Newer invocation.               Compare modification times.
 * nice: (coreutils)nice invocation.             Modify niceness.
 * nl: (coreutils)nl invocation.                 Number lines and write files.
-* nlmconv: (binutils)nlmconv.                   Convert object to NetWare LM.
-* nm: (binutils)nm.                             List symbols in object files.
+* nlmconv: (binutils)nlmconv.   Converts object code into an NLM.
+* nm: (binutils)nm.             List symbols from object files.
 * nohup: (coreutils)nohup invocation.           Immunize to hangups.
-* objcopy: (binutils)objcopy.                   Copy/translate object files.
-* objdump: (binutils)objdump.                   Display info from object files.
+* objcopy: (binutils)objcopy.  Copy and translate object files.
+* objdump: (binutils)objdump.   Display information from object files.
 * od: (coreutils)od invocation.                 Dump files in octal, etc.
 * paste: (coreutils)paste invocation.           Merge lines of files.
 * patch: (diff)Invoking patch.                  Apply a patch to a file.
@@ -415,8 +404,9 @@
 * pwd: (coreutils)pwd invocation.               Print working directory.
 * query-pr: (gnats)Invoking query-pr.           Bug searching/reporting.
 * queue-pr: (gnats)queue-pr.                    Handling incoming traffic.
-* ranlib: (binutils)ranlib.                     Index archive file contents.
+* ranlib: (binutils)ranlib.     Generate index to archive contents.
 * rcp: (inetutils)rcp invocation.               Strip non-directory suffix.
+* readelf: (binutils)readelf.  Display the contents of ELF format files.
 * readlink: (coreutils)readlink invocation.     Print referent of a symlink.
 * readmsg: (mailutils)readmsg.                  Extract messages from a folder.
 * rexecd: (inetutils)rexecd invocation.         Remote execution server.
@@ -435,13 +425,13 @@
 * shred: (coreutils)shred invocation.           Remove files more securely.
 * shuf: (coreutils)shuf invocation.             Shuffling text files.
 * sieve: (mailutils)sieve.                      Mail filtering utility.
-* size: (binutils)size.                         List object file section sizes.
+* size: (binutils)size.         List section sizes and total size.
 * sleep: (coreutils)sleep invocation.           Delay for a specified time.
 * sort: (coreutils)sort invocation.             Sort text files.
 * split: (coreutils)split invocation.           Split into fixed-size pieces.
 * stat: (coreutils)stat invocation.             Report file(system) status.
-* strings: (binutils)strings.                   List printable strings.
-* strip: (binutils)strip.                       Discard symbols.
+* strings: (binutils)strings.   List printable strings from files.
+* strip: (binutils)strip.       Discard symbols.
 * stty: (coreutils)stty invocation.             Print/change terminal settings.
 * su: (coreutils)su invocation.                 Modify user and group ID.
 * sum: (coreutils)sum invocation.               Print traditional checksum.
@@ -490,6 +480,8 @@
 * weave: (web2c)Weave invocation.               WEB to TeX.
 * who: (coreutils)who invocation.               Print who is logged in.
 * whoami: (coreutils)whoami invocation.         Print effective user ID.
+* windmc: (binutils)windmc.    Generator for Windows message resources.
+* windres: (binutils)windres.  Manipulate Windows resources.
 * xargs: (find)Invoking xargs.                  Operating on many files.
 * xtokid: (id-utils)xtokid invocation.         Testing mkid scanners.
 * yes: (coreutils)yes invocation.               Print a string indefinitely.
P ChangeLog
P doc/makeinfo.1
P makeinfo/.gdbinit
P makeinfo/cmds.c
P makeinfo/insertion.c
P makeinfo/makeinfo.c
P makeinfo/node.c
P makeinfo/xml.c
P makeinfo/xml.h
P util/dir-example