texinfo TODO install-info/install-info.c instal...

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/12/31 19:02:58

Modified files:
        .              : TODO 
        install-info   : install-info.c 
        install-info/tests: README 

Log message:
        install-info help

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/TODO?cvsroot=texinfo&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/install-info.c?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/tests/README?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/TODO,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- TODO        15 Dec 2012 22:59:41 -0000      1.69
+++ TODO        31 Dec 2012 19:02:57 -0000      1.70
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.69 2012/12/15 22:59:41 karl Exp $
+$Id: TODO,v 1.70 2012/12/31 19:02:57 karl Exp $
 This is the todo list for GNU Texinfo.
 If you are interested in working on any of these, email address@hidden
 
@@ -149,6 +149,8 @@
   - Handle M-n, C-u m, and C-u g like Emacs Info (opening new windows).
 
 * install-info:
+  - install-info --dir-file=dir2 --entry=info foo.info installs garbage
+    from the misformatted --entry (and no entries from foo.info).
   - be able to copy the info file to compile-time $infodir, to
     simplify by-hand installation.
   - also support installing HTML files, etc., along with subsidiary

Index: install-info/install-info.c
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/install-info.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- install-info/install-info.c 11 Jun 2012 17:54:27 -0000      1.19
+++ install-info/install-info.c 31 Dec 2012 19:02:57 -0000      1.20
@@ -1,5 +1,5 @@
-/* install-info -- create Info directory entry(ies) for an Info file.
-   $Id: install-info.c,v 1.19 2012/06/11 17:54:27 karl Exp $
+/* install-info -- merge Info directory entries from an Info file.
+   $Id: install-info.c,v 1.20 2012/12/31 19:02:57 karl Exp $
 
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    2005, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
@@ -182,9 +182,9 @@
    deleted. */
 int remove_empty_sections = 1;
 
-/* Nonzero means that new Info entries into the DIR file will go into all 
+/* Nonzero means that new Info entries into the DIR file go into all 
    sections that match with --section-regex or --section.  Zero means 
-   that new entries wil go into the first section that matches.*/
+   that new entries go into only the first section that matches.  */
 int add_entries_into_all_matching_sections = 1;
 
 /* Nonzero means we do not replace same-named info entries. */
@@ -527,10 +527,18 @@
   printf (_("Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"), progname);
   puts ("");
   puts (_("Add or remove entries in INFO-FILE from the Info directory 
DIR-FILE."));
+  puts (_("INFO-FILE and DIR-FILE are required unless the --info-file or"));
+  puts (_("--dir-file (or --info-dir) options are given, respectively."));
   puts ("");
 
   puts (_("\
 Options:\n\
+ --add-once          add only to first matching section, not all.\n\
+ --align=COL         start description of new entries at column COL.\n\
+ --calign=COL        format second and subsequent description lines to\n\
+                       start at column COL."));
+
+  puts (_("\
  --debug             report what is being done.\n\
  --delete            delete existing entries for INFO-FILE from DIR-FILE;\n\
                       don't insert any new entries.\n\
@@ -542,16 +550,13 @@
  --dry-run           same as --test."));
 
   puts (_("\
- --entry=TEXT        insert TEXT as an Info directory entry.\n\
+ --entry=TEXT        insert TEXT as an Info directory entry,\n\
+                      overriding any corresponding entry from DIR-FILE.\n\
                       TEXT is written as an Info menu item line followed\n\
                        by zero or more extra lines starting with whitespace.\n\
                       If you specify more than one entry, all are added.\n\
                       If you don't specify any entries, they are determined\n\
-                       from information in the Info file itself.\n\
-                      When removing, TEXT specifies the entry to remove.\n\
-                      TEXT is only removed as a last resort, if the\n\
-                      entry as determined from the Info file is not present,\n\
-                      and the basename of the Info file isn't found either."));
+                       from information in the Info file itself."));
 
   puts (_("\
  --help              display this help and exit.\n\
@@ -559,7 +564,10 @@
  --info-file=FILE    specify Info file to install in the directory;\n\
                       equivalent to using the INFO-FILE argument.\n\
  --item=TEXT         same as --entry=TEXT.\n\
- --keep-old          do not replace entries, or remove empty sections.\n\
+ --keep-old          do not replace entries, or remove empty sections."));
+
+  puts (_("\
+ --maxwidth, --max-width=COL  wrap description at column COL.\n\
  --menuentry=TEXT    same as --name=TEXT.\n\
  --name=TEXT         the name of the entry is TEXT; used with --description\n\
                       to become synonymous with the --entry option.\n\

Index: install-info/tests/README
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/tests/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- install-info/tests/README   2 Jan 2008 01:36:16 -0000       1.1
+++ install-info/tests/README   31 Dec 2012 19:02:58 -0000      1.2
@@ -1,7 +1,7 @@
-$Id: README,v 1.1 2008/01/02 01:36:16 karl Exp $
+$Id: README,v 1.2 2012/12/31 19:02:58 karl Exp $
 install-info/tests/README
 
-  Copyright (C) 2008 Free Software Foundation, Inc.
+  Copyright 2008, 2012 Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
@@ -170,3 +170,6 @@
       entries in the DIR file.  A warning is issued, but it isn't an error.
 0050: Removing an Info file.  The Info file is responsible for a single
       entry in the gzipped DIR file.
+0051: Allow periods in menu item name, e.g., config.status.
+0052: Allow periods in node name also, e.g., "config.status Invocation".
+0053: Check newline handling in input dir entries.