[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Tue Jan 1 20:53:01 EST 2008)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Tue Jan 1 20:53:01 EST 2008) |
|
Date: |
Tue, 01 Jan 2008 20:53:04 -0500 |
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.793
retrieving revision 1.794
diff -u -r1.793 -r1.794
--- ChangeLog 2 Jan 2008 00:54:28 -0000 1.793
+++ ChangeLog 2 Jan 2008 01:36:14 -0000 1.794
@@ -1,3 +1,39 @@
+2008-01-02 Karl Berry <address@hidden>
+
+ * install-info/, install-info/tests/: new subdirectories.
+ * util/Makefile.am: move install-info stuff to its own dir, with tests.
+ * configure.ac,
+ * Makefile.am (SUBDIRS): take care of new dirs.
+ * doc/Makefile.am (install-info.1): new source location for man page.
+ * po/POTFILES.in: update source list.
+
+2008-01-02 Ben Asselstine <address@hidden>
+
+ * install-info/install-info.c: much work toward Debian compatibility.
+ (line_data): new member num_sections to add; change type of
+ add_entries_before.
+ (spec_entry): new members missing_name, missing_description,
+ missing_basename.
+ (longopts): new options --name, --menuentry, --description,
+ --no-indent, --keep-old, --maxwidth, --max-width,
+ --section-regex, --dry-run.
+ (remove_empty_sections, add_entries_into_all_matching_sections,
+ keep_old_flag, indent_flag,
+ order_new_sections_alphabetically_flag): new globals.
+ (print_help): list new options.
+ (output_dirfile): count sections added, and possibly sort them.
+ (parse_input): handle delete_flag.
+ (parse_dir_file): write the end of the last node.
+ (mark_entry_for_deletion, adjust_column, format_entry,
+ split_entry, reformat_new_entries, add_missing_basenames,
+ add_missing_names, add_missing_descriptions,
+ munge_old_style_debian_options): new fns.
+ (main): new variables calign, align, maxwidth,
+ entries_to_add_from_file; munge per debian if needed; handle new
+ options.
+ (compare_entries_text): use mbsncasecmp.
+ * doc/texinfo.txi (Invoking install-info): mention the new options.
+
2008-01-01 Karl Berry <address@hidden>
* info/info.c (info_short_help): break help string into smaller
Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.am 1 Jul 2007 18:44:23 -0000 1.21
+++ Makefile.am 2 Jan 2008 01:36:15 -0000 1.22
@@ -1,5 +1,5 @@
# Makefile.am for texinfo.
-# $Id: Makefile.am,v 1.21 2007/07/01 18:44:23 karl Exp $
+# $Id: Makefile.am,v 1.22 2008/01/02 01:36:15 karl Exp $
# Process this file with automake to produce Makefile.in in all directories.
#
# This file is free software; as a special exception the author gives
@@ -26,13 +26,14 @@
if TOOLS_ONLY
# Build native tools only.
- SUBDIRS = lib info makeinfo util
+ SUBDIRS = lib info install-info makeinfo util
else
# All subdirectories.
# Do libs first since the C programs depend on it.
# Do doc last so makeinfo will be built when we get there.
# Others are alphabetical.
- SUBDIRS = $(native_tools) gnulib/lib lib info makeinfo po util doc
+ SUBDIRS = $(native_tools) gnulib/lib lib \
+ install-info info makeinfo po util doc
endif
# One special target for installers to use by hand if desired.
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- NEWS 24 Dec 2007 00:24:06 -0000 1.156
+++ NEWS 2 Jan 2008 01:36:15 -0000 1.157
@@ -1,9 +1,9 @@
-$Id: NEWS,v 1.156 2007/12/24 00:24:06 karl Exp $
+$Id: NEWS,v 1.157 2008/01/02 01:36:15 karl Exp $
This NEWS file records noteworthy changes, very tersely.
See the manual for detailed information.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -22,6 +22,10 @@
-------------------------------------------------------------------------------
+* install-info:
+ . Much work towards compatibility with Debian's independent implementation.
+ . New section in the Texinfo manual describing all this.
+
* Info:
. regular expression searches are now the default; the new R command
toggles between regexp and literal-string searches.
Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- configure.ac 24 Dec 2007 00:24:06 -0000 1.74
+++ configure.ac 2 Jan 2008 01:36:15 -0000 1.75
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.74 2007/12/24 00:24:06 karl Exp $
+# $Id: configure.ac,v 1.75 2008/01/02 01:36:15 karl Exp $
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -9,7 +9,7 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
-AC_INIT([GNU Texinfo], [4.11], address@hidden)
+AC_INIT([GNU Texinfo], [4.11.90], address@hidden)
dnl Must come before AM_INIT_AUTOMAKE.
AC_CONFIG_AUX_DIR([build-aux])
@@ -226,6 +226,8 @@
doc/Makefile
gnulib/lib/Makefile
info/Makefile
+ install-info/Makefile
+ install-info/tests/Makefile
lib/Makefile
makeinfo/Makefile
makeinfo/tests/Makefile
Index: doc/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- doc/Makefile.am 30 Nov 2007 17:58:26 -0000 1.35
+++ doc/Makefile.am 2 Jan 2008 01:36:15 -0000 1.36
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.35 2007/11/30 17:58:26 gray Exp $
+# $Id: Makefile.am,v 1.36 2008/01/02 01:36:15 karl Exp $
# Makefile.am for texinfo/doc.
# Run automake in .. to produce Makefile.in from this.
#
@@ -67,7 +67,7 @@
man_rule_0 = \
program=`expr '/$@' : '.*/\(.*\)\.1'` && \
case $$program in makeinfo) dir=makeinfo;; info*) dir=info;; \
- *) dir=util;; esac && \
+ *install-info) dir=install-info;; *) dir=util;; esac && \
dir="$(top_builddir)/$(native_tools)/$$dir" && \
case $$program in info|install-info) program=g$$program;; \
esac
@@ -85,7 +85,7 @@
@name="read Info documents" && $(man_rule_bin)
$(srcdir)/infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps)
@name="compile customizations for Info" && $(man_rule_bin)
-$(srcdir)/install-info.1: $(top_srcdir)/util/install-info.c $(common_mandeps)
+$(srcdir)/install-info.1: $(top_srcdir)/install-info/install-info.c
$(common_mandeps)
@name="update info/dir entries" && $(man_rule_bin)
# Here we need some postprocessing:
Index: doc/info.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/info.1,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- doc/info.1 10 Sep 2007 00:36:29 -0000 1.48
+++ doc/info.1 2 Jan 2008 01:36:15 -0000 1.49
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
-.TH INFO "1" "September 2007" "info 4.11" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH INFO "1" "January 2008" "info 4.11.90" "User Commands"
.SH NAME
info \- read Info documents
.SH SYNOPSIS
@@ -9,7 +9,7 @@
Read documentation in Info format.
.SH OPTIONS
.TP
-\fB\-\-apropos\fR=\fISTRING\fR
+\fB\-k\fR, \fB\-\-apropos\fR=\fISTRING\fR
look up STRING in all indices of all manuals.
.TP
\fB\-d\fR, \fB\-\-directory\fR=\fIDIR\fR
@@ -48,14 +48,14 @@
\fB\-\-subnodes\fR
recursively output menu items.
.TP
-\fB\-w\fR, \fB\-\-where\fR, \fB\-\-location\fR
-print physical location of Info file.
-.TP
\fB\-\-vi\-keys\fR
use vi\-like and less\-like key bindings.
.TP
\fB\-\-version\fR
display version information and exit.
+.TP
+\fB\-w\fR, \fB\-\-where\fR, \fB\-\-location\fR
+print physical location of Info file.
.PP
The first non\-option argument, if present, is the menu entry to start from;
it is searched for in all `dir' files along INFOPATH.
Index: doc/infokey.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/infokey.1,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- doc/infokey.1 10 Sep 2007 00:36:29 -0000 1.25
+++ doc/infokey.1 2 Jan 2008 01:36:15 -0000 1.26
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
-.TH INFOKEY "1" "September 2007" "infokey 4.11" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH INFOKEY "1" "January 2008" "infokey 4.11.90" "User Commands"
.SH NAME
infokey \- compile customizations for Info
.SH SYNOPSIS
Index: doc/install-info.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/install-info.1,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- doc/install-info.1 10 Sep 2007 00:36:29 -0000 1.47
+++ doc/install-info.1 2 Jan 2008 01:36:15 -0000 1.48
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
-.TH INSTALL-INFO "1" "September 2007" "install-info 4.11" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH INSTALL-INFO "1" "January 2008" "install-info 4.11.90" "User Commands"
.SH NAME
install-info \- update info/dir entries
.SH SYNOPSIS
@@ -27,6 +27,22 @@
If you specify more than one entry, they are all added.
If you don't specify any entries, they are determined
from information in the Info file itself.
+When removing TEXT is the name of the entry to remove.
+TEXT is only removed as a last\-ditch effort if the
+entry as determined from the Info file is not present
+and the basename of the Info file isn't found either.
+.TP
+\fB\-\-name\fR=\fITEXT\fR
+the name of the entry is TEXT. Used with \fB\-\-description\fR
+to become synonymous with the \fB\-\-entry\fR option.
+.TP
+\fB\-\-menuentry\fR=\fITEXT\fR
+same as \fB\-\-name\fR=\fITEXT\fR.
+.TP
+\fB\-\-description\fR=\fITEXT\fR the description of the entry is TEXT.
+It is used with
+the \fB\-\-name\fR option to become synonymous with the
+\fB\-\-entry\fR option.
.TP
\fB\-\-help\fR
display this help and exit.
@@ -39,9 +55,15 @@
same as \fB\-\-dir\-file\fR=\fIDIR\fR/dir.
.TP
\fB\-\-item\fR=\fITEXT\fR
-same as \fB\-\-entry\fR TEXT.
+same as \fB\-\-entry\fR=\fITEXT\fR.
An Info directory entry is actually a menu item.
.TP
+\fB\-\-keep\-old\fR
+do not replace entries, or remove empty sections.
+.TP
+\fB\-\-no\-indent\fR
+do not format new entries in the DIR file.
+.TP
\fB\-\-quiet\fR
suppress warnings.
.TP
@@ -59,13 +81,19 @@
If you don't specify any sections, they are determined
from information in the Info file itself.
.TP
-\fB\-\-section\-regex\fR=\fIR\fR if an entry is added to a section that does
not exist,
-look for a section matching basic regular expression R
-(and ignoring case) before starting a new section.
+\fB\-\-section\fR R SEC
+equivalent to \fB\-\-regex\fR=\fIR\fR \fB\-\-section\fR=\fISEC\fR
\fB\-\-add\-once\fR.
+.TP
+\fB\-\-regex\fR=\fIR\fR
+put this file's entries in all sections that match the
+regular expression R (ignoring case).
.TP
\fB\-\-test\fR
suppress updating of DIR\-FILE.
.TP
+\fB\-\-dry\-run\fR
+same as \fB\-\-test\fR.
+.TP
\fB\-\-silent\fR
suppress warnings.
.TP
Index: doc/makeinfo.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/makeinfo.1,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- doc/makeinfo.1 24 Oct 2007 20:03:35 -0000 1.60
+++ doc/makeinfo.1 2 Jan 2008 01:36:15 -0000 1.61
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
-.TH MAKEINFO "1" "October 2007" "makeinfo 4.11" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH MAKEINFO "1" "January 2008" "makeinfo 4.11.90" "User Commands"
.SH NAME
makeinfo \- translate Texinfo documents
.SH SYNOPSIS
@@ -48,8 +48,8 @@
output plain text rather than Info.
.SS "General output options:"
.TP
-\fB\-E\fR, \fB\-\-macro\-expand\fR FILE
-output macro\-expanded source to FILE.
+\fB\-E\fR, \fB\-\-macro\-expand\fR=\fIFILE\fR
+output macro\-expanded source to FILE,
ignoring any @setfilename.
.TP
\fB\-\-no\-headers\fR
@@ -59,14 +59,14 @@
also, write to standard output by default.
.TP
\fB\-\-no\-split\fR
-suppress splitting of Info or HTML output,
+suppress the splitting of Info or HTML output,
generate only one output file.
.TP
\fB\-\-number\-sections\fR
output chapter and sectioning numbers.
.TP
\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR
-output to FILE (directory if split HTML),
+output to FILE (or directory if split HTML).
.SS "Options for Info and plain text:"
.TP
\fB\-\-disable\-encoding\fR
Index: doc/texi2dvi.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texi2dvi.1,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- doc/texi2dvi.1 10 Sep 2007 00:39:50 -0000 1.66
+++ doc/texi2dvi.1 2 Jan 2008 01:36:15 -0000 1.67
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
-.TH TEXI2DVI "1" "September 2007" "texi2dvi 1.104" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH TEXI2DVI "1" "January 2008" "texi2dvi 1.105" "User Commands"
.SH NAME
texi2dvi \- convert Texinfo documents to DVI
.SH SYNOPSIS
@@ -139,7 +139,7 @@
.IP
\- clutter can be reduced to zero using \fB\-\-build\-dir=\fR/tmp/$USER.t2d or
.HP
-\fB\-\-build\-dir=\fR/u/karl/.t2d.
+\fB\-\-build\-dir=\fR/home/karl/.t2d.
.IP
\- the output file is updated after every succesful TeX run, for
.TP
Index: doc/texindex.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texindex.1,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- doc/texindex.1 10 Sep 2007 00:36:29 -0000 1.47
+++ doc/texindex.1 2 Jan 2008 01:36:15 -0000 1.48
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
-.TH TEXINDEX "1" "September 2007" "texindex 4.11" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH TEXINDEX "1" "January 2008" "texindex 4.11.90" "User Commands"
.SH NAME
texindex \- sort Texinfo index files
.SH SYNOPSIS
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.209
retrieving revision 1.211
diff -u -r1.209 -r1.211
--- doc/texinfo.txi 27 Nov 2007 16:55:47 -0000 1.209
+++ doc/texinfo.txi 2 Jan 2008 01:41:50 -0000 1.211
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.209 2007/11/27 16:55:47 karl Exp $
address@hidden $Id: texinfo.txi,v 1.211 2008/01/02 01:41:50 karl Exp $
@c Ordinarily, Texinfo files have the extension .texi. But texinfo.texi
@c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
@@ -45,7 +45,7 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual'',
and with the Back-Cover Texts as in (a) below. A copy of the license
is included in the section entitled ``GNU Free Documentation
License.''
@@ -16301,10 +16301,13 @@
command. If you use them later on in the input, @code{install-info}
will not notice them.
-As a matter of convention, please start the description for the main
-entry (above, @samp{The GNU documentation format}) at column 32. This
-will make it align with most others. Description for individual
-utilities best start in column 48, where possible.
address@hidden will automatically reformat the description of the
+menu entries it is adding. As a matter of convention, the description of
+the main entry (above, @samp{The GNU documentation format}) should start
+at column 32. This will make it align with most others. Description for
+individual utilities best start in column 48, where possible.
+For more information about formatting see the @samp{--calign}, @samp{--align},
+and @samp{--max-width} options in @ref{Invoking install-info}.
If you use @code{@@dircategory} more than once in the Texinfo source,
each usage specifies the `current' category; any subsequent
@@ -16345,7 +16348,8 @@
@code{install-info} inserts menu entries from an Info file into the
top-level @file{dir} file in the Info system (see the previous sections
-for an explanation of how the @file{dir} file works). It's most often
+for an explanation of how the @file{dir} file works). @code{install-info}
+also removes menu entries from the @file{dir} file. It's most often
run as part of software installation, or when constructing a @file{dir} file
for all manuals on a system. Synopsis:
@@ -16374,6 +16378,28 @@
Options:
@table @code
address@hidden --add-once
+Specifies that the entry or entries will only be put into a single section.
+
address@hidden address@hidden
address@hidden address@hidden
+Specifies the column that the second and subsequent lines of menu entry's
+description will be formatted to begin at. The default for this option is
address@hidden It is used in conjunction with the @samp{--max-width} option.
address@hidden starts counting at 1.
+
address@hidden --append-new-sections
+Instead of alphabetizing new sections, place them at the end of the DIR file.
+
address@hidden address@hidden
address@hidden address@hidden
+Specifies the column that the first line of menu entry's description will
+be formatted to begin at. The default for this option is @samp{33}. It is
+used in conjunction with the @samp{--max-width} option.
+When the name of the menu entry exceeds this column, entry's description
+will start on the following line.
address@hidden starts counting at 1.
+
@item --debug
@opindex --debug
Report what is being done.
@@ -16383,12 +16409,23 @@
Delete the entries in @var{info-file} from @var{dir-file}. The file
name in the entry in @var{dir-file} must be @var{info-file} (except for
an optional @samp{.info} in either one). Don't insert any new entries.
+Any empty sections that result from the removal are also removed.
+
address@hidden address@hidden
address@hidden address@hidden
+Specify the explanatory portion of the menu entry. If you don't specify
+a description (either via @samp{--entry}, @samp{--item} or this option),
+the description is taken from the Info file itself.
@item address@hidden
@opindex address@hidden
Specify file name of the Info directory file. This is equivalent to
using the @var{dir-file} argument.
address@hidden --dry-run
address@hidden --dry-run
+Same as @samp{--test}.
+
@item address@hidden
@opindex address@hidden
Insert @var{text} as an Info directory entry; @var{text} should have the
@@ -16412,11 +16449,47 @@
Specify the directory where the directory file @file{dir} resides.
Equivalent to @address@hidden/dir}.
address@hidden address@hidden
address@hidden address@hidden
+Same as @samp{--info-dir}.
+
@item address@hidden
@opindex address@hidden
Same as @address@hidden An Info directory entry is actually
a menu item.
address@hidden --keep-old
address@hidden --keep-old
+Do not replace pre-existing menu entries. When @samp{--remove} is specified,
+this option means that empty sections are not removed.
+
address@hidden address@hidden
address@hidden address@hidden
+Specifies the column that the menu entry's description will be word-wrapped
+at. @var{column} starts counting at 1.
+
address@hidden address@hidden
address@hidden address@hidden
+Same as @samp{--max-width}.
+
address@hidden address@hidden
address@hidden address@hidden
+Same as @samp{--name}.
+
address@hidden address@hidden
address@hidden address@hidden
+Specify the name portion of the menu entry. If the @var{text} does not start
+with an asterisk @samp{*}, it is presumed to be the text after the @samp{*}
+and before the parentheses that specify the Info file. Otherwise @var{text}
+is taken verbatim, and is meant to include the text up to and including the
+first dot @samp{.}. If you don't specify the name (either via @samp{--entry},
address@hidden or this option), it is taken from the Info file itself. If
+the Info does not contain the name, the basename of the Info file is used.
+
address@hidden --no-indent
address@hidden --no-indent
+Suppress formatting of new entries into the @file{dir} file.
+
@item --quiet
@opindex --quiet
@itemx --silent
@@ -16438,15 +16511,36 @@
Put this file's entries in section @var{sec} of the directory. If you
specify more than one section, all the entries are added in each of the
sections. If you don't specify any sections, they are determined from
-information in the Info file itself.
+information in the Info file itself. If the Info file doesn't specify
+a section, the menu entries are put into the Miscellaneous section.
+
address@hidden --section @var{regex} @var{sec}
address@hidden --section @var{regex} @var{sec}
+Same as @address@hidden address@hidden --add-once}.
+
address@hidden tries to detect when this alternate syntax is used,
+but does not always guess correctly! Here is the heuristic that
address@hidden uses:
address@hidden
address@hidden
+If the second argument to @code{--section} starts with a hyphen, the original
syntax is presumed.
address@hidden
+If the second argument to @code{--section} is a file that can be opened, the
original syntax is presumed
address@hidden
+Otherwise the alternate syntax is used.
address@hidden enumerate
+
+When heuristic fails because your section title starts with a hyphen, or it
+happens to be a filename that can be opened, the syntax should be changed
+to @address@hidden address@hidden --add-once}.
+
address@hidden address@hidden
address@hidden address@hidden
-If an entry is added to a section that does not exist, look for a
-section matching the regular expression @var{regex} (and ignoring
-case) before starting a new section. Specify @var{regex} using
-basic regular expression syntax, more or less as used with
address@hidden, for example.
address@hidden address@hidden
address@hidden address@hidden
+Put this file's entries into any section that matches @var{regex}. If
+more than one section matches, all of the entries are added in each of the
+sections. Specify @var{regex} using basic regular expression syntax, more
+or less as used with @command{grep}, for example.
@item --test
@opindex --test
@@ -18893,7 +18987,7 @@
(@url{http://www.gnu.org/software/rcs}) version control systems, which
expand it into a string such as:
@example
-$Id: texinfo.txi,v 1.209 2007/11/27 16:55:47 karl Exp $
+$Id: texinfo.txi,v 1.211 2008/01/02 01:41:50 karl Exp $
@end example
(This is useful in all sources that use version control, not just manuals.)
You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -18967,7 +19061,7 @@
@verbatim
\input texinfo @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.209 2007/11/27 16:55:47 karl Exp $
address@hidden $Id: texinfo.txi,v 1.211 2008/01/02 01:41:50 karl Exp $
@comment %**start of header
@setfilename sample.info
@include version.texi
Index: doc/version-stnd.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version-stnd.texi,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- doc/version-stnd.texi 10 Sep 2007 00:36:29 -0000 1.21
+++ doc/version-stnd.texi 2 Jan 2008 01:36:15 -0000 1.22
@@ -1,4 +1,4 @@
address@hidden UPDATED 5 September 2007
address@hidden UPDATED-MONTH September 2007
address@hidden EDITION 4.11
address@hidden VERSION 4.11
address@hidden UPDATED 2 January 2008
address@hidden UPDATED-MONTH January 2008
address@hidden EDITION 4.11.90
address@hidden VERSION 4.11.90
Index: doc/version.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- doc/version.texi 8 Oct 2007 18:22:27 -0000 1.49
+++ doc/version.texi 2 Jan 2008 01:36:16 -0000 1.50
@@ -1,4 +1,4 @@
address@hidden UPDATED 3 October 2007
address@hidden UPDATED-MONTH October 2007
address@hidden EDITION 4.11
address@hidden VERSION 4.11
address@hidden UPDATED 26 December 2007
address@hidden UPDATED-MONTH December 2007
address@hidden EDITION 4.11.90
address@hidden VERSION 4.11.90
Index: gnulib/lib/malloca.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/malloca.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/malloca.h 26 Nov 2007 19:12:40 -0000 1.2
+++ gnulib/lib/malloca.h 2 Jan 2008 01:41:50 -0000 1.3
@@ -70,9 +70,19 @@
# define freea free
#endif
-/* Maybe we should also define a variant
- nmalloca (size_t n, size_t s) - behaves like malloca (n * s)
- If this would be useful in your application. please speak up. */
+/* nmalloca(N,S) is an overflow-safe variant of malloca (N * S).
+ It allocates an array of N objects, each with S bytes of memory,
+ on the stack. S must be positive and N must be nonnegative.
+ The array must be freed using freea() before the function returns. */
+#if 1
+/* Cf. the definition of xalloc_oversized. */
+# define nmalloca(n, s) \
+ ((n) > (size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) \
+ ? NULL \
+ : malloca ((n) * (s)))
+#else
+extern void * nmalloca (size_t n, size_t s);
+#endif
#ifdef __cplusplus
Index: po/POTFILES.in
===================================================================
RCS file: /sources/texinfo/texinfo/po/POTFILES.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- po/POTFILES.in 24 Nov 2006 14:05:11 -0000 1.6
+++ po/POTFILES.in 2 Jan 2008 01:36:32 -0000 1.7
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
@@ -21,10 +21,12 @@
info/m-x.c
info/makedoc.c
info/nodemenu.c
+info/search.c
info/session.c
info/tilde.c
info/variables.c
info/window.c
+install-info/install-info.c
lib/xexit.c
makeinfo/cmds.c
makeinfo/defun.c
@@ -42,5 +44,4 @@
makeinfo/sectioning.c
makeinfo/xml.c
makeinfo/xref.c
-util/install-info.c
util/texindex.c
Index: util/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/util/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- util/.cvsignore 2 Jul 2007 13:59:29 -0000 1.7
+++ util/.cvsignore 2 Jan 2008 01:36:32 -0000 1.8
@@ -2,8 +2,6 @@
Makefile
Makefile.in
defs
-ginstall-info
-install-info
testSubDir
texindex
texinfo.cat
Index: util/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/util/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.31
diff -u -r1.29 -r1.31
--- util/Makefile.am 29 Jul 2007 15:11:29 -0000 1.29
+++ util/Makefile.am 2 Jan 2008 01:45:39 -0000 1.31
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.29 2007/07/29 15:11:29 karl Exp $
+# $Id: Makefile.am,v 1.31 2008/01/02 01:45:39 karl Exp $
# Makefile.am for texinfo/util.
# Run automake in .. to produce Makefile.in from this.
#
@@ -10,22 +10,14 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-bin_PROGRAMS = ginstall-info texindex
+#SUBDIRS = tests
+bin_PROGRAMS = texindex
bin_SCRIPTS = texi2dvi texi2pdf pdftexi2dvi
# for auctex.
pdftexi2dvi: texi2pdf
cp -f $(srcdir)/texi2pdf $@
-# Use `ginstall-info' in the definition of PROGRAMS and in dependencies
-# because automake generates an install-info target in every Makefile (a
-# bug, IMHO, but this is easier than patching Automake.)
-ginstall_info_SOURCES = install-info.c
-
-# Transform `ginstall-info' to `install-info' before applying any
-# user-specified name transformations.
-transform = s/ginstall-info/install-info/; $(program_transform_name)
-
localedir = $(datadir)/locale
AM_CPPFLAGS = \
-I$(top_srcdir) \
Index: util/README
===================================================================
RCS file: /sources/texinfo/texinfo/util/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- util/README 11 Apr 2004 17:56:47 -0000 1.5
+++ util/README 2 Jan 2008 01:36:32 -0000 1.6
@@ -1,14 +1,13 @@
-$Id: README,v 1.5 2004/04/11 17:56:47 karl Exp $
+$Id: README,v 1.6 2008/01/02 01:36:32 karl Exp $
texinfo/util/README
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2008 Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved.
-Assorted Texinfo-related programs and scripts.
+Assorted Texinfo-related files.
-texindex, texi2dvi, and install-info get installed.
+texindex, texi2dvi, texi2pdf, pdftexi2dvi, and the XML stuff get installed.
The other items here are for your amusement and/or hacking pleasure.
-
Index: util/dir-example
===================================================================
RCS file: /sources/texinfo/texinfo/util/dir-example,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- util/dir-example 24 Oct 2007 19:54:16 -0000 1.75
+++ util/dir-example 2 Jan 2008 01:40:00 -0000 1.76
@@ -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.75 2007/10/24 19:54:16 karl Exp $
+$Id: dir-example,v 1.76 2008/01/02 01:40:00 karl Exp $
File: dir, Node: Top, This is the top of the INFO tree.
@@ -77,11 +77,12 @@
* Wget: (wget). Non-interactive network downloader.
Printing Tools
-* a2ps: (a2ps). PostScript Generating Utility
* PreScript: (a2ps) PreScript. Input language for a2ps
+* a2ps: (a2ps). PostScript Generating Utility
* card: (a2ps) card. Print Reference Cards
-* fixps: (a2ps) fixps. Fixing Some Ill Designed PostScript Files
* fixnt: (a2ps) fixnt. Fixing Microsoft NT PostScript Files
+* fixps: (a2ps) fixps. Fixing Some Ill Designed PostScript Files
+* ogonkify: (ogonkify). Ogonkify
* pdiff: (a2ps) pdiff. Produce Pretty Comparison of Files
* psmandup: (a2ps) psmandup. Printing Duplex on Simplex Printers
* psset: (a2ps) psset. Inserting calls to setpagedevice
@@ -204,7 +205,6 @@
* Mmalloc: (mmalloc). The GNU mapped-malloc package.
* Stabs: (stabs). The "stabs" debugging information format.
* Readline: (readline). General command-line interface.
-* Regex: (regex). Regular expressions.
* Termcap: (termcap). All about /etc/termcap.
C++ libraries
cvs diff: Tag HEAD refers to a dead (removed) revision in file
`util/install-info.c'.
cvs diff: No comparison available. Pass `-N' to `cvs diff'?
P ChangeLog
P Makefile.am
P NEWS
P configure.ac
P doc/Makefile.am
P doc/info.1
P doc/infokey.1
P doc/install-info.1
P doc/makeinfo.1
P doc/texi2dvi.1
P doc/texindex.1
P doc/texinfo.txi
U doc/version-stnd.texi
U doc/version.texi
P gnulib/lib/malloca.h
U install-info/.cvsignore
U install-info/Makefile.am
U install-info/README
U install-info/install-info.c
U install-info/tests/.cvsignore
U install-info/tests/Makefile.am
U install-info/tests/README
U install-info/tests/ii-0001-expected-dir-file
U install-info/tests/ii-0001-input-dir-file
U install-info/tests/ii-0001-input-info-file
U install-info/tests/ii-0001-test
U install-info/tests/ii-0002-expected-dir-file
U install-info/tests/ii-0002-input-dir-file
U install-info/tests/ii-0002-input-info-file
U install-info/tests/ii-0002-test
U install-info/tests/ii-0003-expected-dir-file
U install-info/tests/ii-0003-input-dir-file
U install-info/tests/ii-0003-input-info-file
U install-info/tests/ii-0003-test
U install-info/tests/ii-0004-expected-dir-file
U install-info/tests/ii-0004-input-dir-file
U install-info/tests/ii-0004-input-info-file
U install-info/tests/ii-0004-test
U install-info/tests/ii-0005-expected-dir-file
U install-info/tests/ii-0005-input-dir-file
U install-info/tests/ii-0005-input-info-file
U install-info/tests/ii-0005-test
U install-info/tests/ii-0006-expected-dir-file
U install-info/tests/ii-0006-input-dir-file
U install-info/tests/ii-0006-input-info-file
U install-info/tests/ii-0006-test
U install-info/tests/ii-0007-expected-dir-file
U install-info/tests/ii-0007-input-dir-file
U install-info/tests/ii-0007-input-info-file
U install-info/tests/ii-0007-test
U install-info/tests/ii-0008-expected-dir-file
U install-info/tests/ii-0008-input-dir-file
U install-info/tests/ii-0008-input-info-file
U install-info/tests/ii-0008-test
U install-info/tests/ii-0009-expected-dir-file
U install-info/tests/ii-0009-input-dir-file
U install-info/tests/ii-0009-input-info-file
U install-info/tests/ii-0009-test
U install-info/tests/ii-0010-expected-dir-file
U install-info/tests/ii-0010-input-dir-file
U install-info/tests/ii-0010-input-info-file
U install-info/tests/ii-0010-test
U install-info/tests/ii-0011-expected-dir-file
U install-info/tests/ii-0011-input-dir-file
U install-info/tests/ii-0011-input-info-file
U install-info/tests/ii-0011-test
U install-info/tests/ii-0012-expected-dir-file
U install-info/tests/ii-0012-input-dir-file
U install-info/tests/ii-0012-input-info-file
U install-info/tests/ii-0012-test
U install-info/tests/ii-0013-expected-dir-file
U install-info/tests/ii-0013-input-dir-file
U install-info/tests/ii-0013-input-info-file
U install-info/tests/ii-0013-test
U install-info/tests/ii-0014-expected-dir-file
U install-info/tests/ii-0014-input-dir-file
U install-info/tests/ii-0014-input-info-file
U install-info/tests/ii-0014-test
U install-info/tests/ii-0015-expected-dir-file
U install-info/tests/ii-0015-input-dir-file
U install-info/tests/ii-0015-input-info-file
U install-info/tests/ii-0015-test
U install-info/tests/ii-0016-expected-dir-file
U install-info/tests/ii-0016-input-dir-file
U install-info/tests/ii-0016-input-info-file
U install-info/tests/ii-0016-test
U install-info/tests/ii-0017-expected-dir-file
U install-info/tests/ii-0017-input-dir-file
U install-info/tests/ii-0017-input-info-file
U install-info/tests/ii-0017-test
U install-info/tests/ii-0018-input-dir-file
U install-info/tests/ii-0018-input-info-file
U install-info/tests/ii-0018-test
U install-info/tests/ii-0019-input-dir-file
U install-info/tests/ii-0019-input-info-file
U install-info/tests/ii-0019-test
U install-info/tests/ii-0020-expected-dir-file
U install-info/tests/ii-0020-input-dir-file
U install-info/tests/ii-0020-input-info-file
U install-info/tests/ii-0020-test
U install-info/tests/ii-0021-expected-dir-file
U install-info/tests/ii-0021-input-dir-file
U install-info/tests/ii-0021-input-info-file
U install-info/tests/ii-0021-test
U install-info/tests/ii-0022-expected-dir-file
U install-info/tests/ii-0022-input-dir-file
U install-info/tests/ii-0022-input-info-file
U install-info/tests/ii-0022-test
U install-info/tests/ii-0023-expected-dir-file
U install-info/tests/ii-0023-input-dir-file
U install-info/tests/ii-0023-input-info-file
U install-info/tests/ii-0023-test
U install-info/tests/ii-0024-expected-dir-file
U install-info/tests/ii-0024-input-dir-file
U install-info/tests/ii-0024-input-info-file
U install-info/tests/ii-0024-test
U install-info/tests/ii-0025-expected-dir-file
U install-info/tests/ii-0025-input-dir-file
U install-info/tests/ii-0025-input-info-file
U install-info/tests/ii-0025-test
U install-info/tests/ii-0026-expected-dir-file
U install-info/tests/ii-0026-input-dir-file
U install-info/tests/ii-0026-input-info-file
U install-info/tests/ii-0026-test
U install-info/tests/ii-0027-expected-dir-file
U install-info/tests/ii-0027-input-dir-file
U install-info/tests/ii-0027-input-info-file
U install-info/tests/ii-0027-test
U install-info/tests/ii-0028-expected-dir-file
U install-info/tests/ii-0028-input-dir-file
U install-info/tests/ii-0028-input-info-file
U install-info/tests/ii-0028-test
U install-info/tests/ii-0029-expected-dir-file
U install-info/tests/ii-0029-input-dir-file
U install-info/tests/ii-0029-input-info-file
U install-info/tests/ii-0029-test
U install-info/tests/ii-0030-expected-dir-file
U install-info/tests/ii-0030-input-dir-file
U install-info/tests/ii-0030-input-info-file
U install-info/tests/ii-0030-test
U install-info/tests/ii-0031-expected-dir-file
U install-info/tests/ii-0031-input-dir-file
U install-info/tests/ii-0031-input-info-file
U install-info/tests/ii-0031-test
U install-info/tests/ii-0032-expected-dir-file
U install-info/tests/ii-0032-input-dir-file
U install-info/tests/ii-0032-input-info-file
U install-info/tests/ii-0032-test
U install-info/tests/ii-0033-expected-dir-file
U install-info/tests/ii-0033-input-dir-file
U install-info/tests/ii-0033-input-info-file
U install-info/tests/ii-0033-test
U install-info/tests/ii-0034-expected-dir-file
U install-info/tests/ii-0034-input-dir-file
U install-info/tests/ii-0034-input-info-file
U install-info/tests/ii-0034-test
U install-info/tests/ii-0035-expected-dir-file
U install-info/tests/ii-0035-input-dir-file
U install-info/tests/ii-0035-input-info-file
U install-info/tests/ii-0035-test
U install-info/tests/ii-0036-expected-dir-file
U install-info/tests/ii-0036-input-dir-file
U install-info/tests/ii-0036-input-info-file
U install-info/tests/ii-0036-test
U install-info/tests/ii-0037-expected-dir-file
U install-info/tests/ii-0037-input-dir-file
U install-info/tests/ii-0037-input-info-file
U install-info/tests/ii-0037-test
U install-info/tests/ii-0038-expected-dir-file
U install-info/tests/ii-0038-input-dir-file
U install-info/tests/ii-0038-input-info-file
U install-info/tests/ii-0038-test
U install-info/tests/ii-0039-expected-dir-file
U install-info/tests/ii-0039-input-dir-file
U install-info/tests/ii-0039-input-info-file
U install-info/tests/ii-0039-test
U install-info/tests/ii-0040-expected-dir-file
U install-info/tests/ii-0040-input-dir-file
U install-info/tests/ii-0040-input-info-file
U install-info/tests/ii-0040-test
U install-info/tests/ii-0041-expected-dir-file.gz
U install-info/tests/ii-0041-input-dir-file.gz
U install-info/tests/ii-0041-input-info-file
U install-info/tests/ii-0041-test
U install-info/tests/ii-0042-expected-dir-file
U install-info/tests/ii-0042-input-dir-file
U install-info/tests/ii-0042-input-info-file
U install-info/tests/ii-0042-test
U install-info/tests/ii-0043-expected-dir-file
U install-info/tests/ii-0043-input-dir-file
U install-info/tests/ii-0043-input-info-file
U install-info/tests/ii-0043-test
U install-info/tests/ii-0044-expected-dir-file
U install-info/tests/ii-0044-input-dir-file
U install-info/tests/ii-0044-input-info-file
U install-info/tests/ii-0044-test
U install-info/tests/ii-0045-expected-dir-file
U install-info/tests/ii-0045-input-dir-file
U install-info/tests/ii-0045-input-info-file
U install-info/tests/ii-0045-test
U install-info/tests/ii-0046-expected-dir-file
U install-info/tests/ii-0046-input-dir-file
U install-info/tests/ii-0046-test
U install-info/tests/ii-0047-expected-dir-file
U install-info/tests/ii-0047-input-dir-file
U install-info/tests/ii-0047-input-info-file
U install-info/tests/ii-0047-test
U install-info/tests/ii-0048-expected-dir-file
U install-info/tests/ii-0048-input-dir-file
U install-info/tests/ii-0048-input-info-file
U install-info/tests/ii-0048-test
U install-info/tests/ii-0049-expected-dir-file
U install-info/tests/ii-0049-input-dir-file
U install-info/tests/ii-0049-input-info-file
U install-info/tests/ii-0049-test
U install-info/tests/ii-0050-expected-dir-file.gz
U install-info/tests/ii-0050-input-dir-file.gz
U install-info/tests/ii-0050-input-info-file
U install-info/tests/ii-0050-test
P po/POTFILES.in
P util/.cvsignore
P util/Makefile.am
P util/README
P util/dir-example
cvs update: `util/install-info.c' is no longer in the repository
U util/tests/Makefile.am
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Tue Jan 1 20:53:01 EST 2008),
Karl Berry <=