Import of stripped down GNU texinfo 4.2

This commit is contained in:
Ruslan Ermilov 2002-07-22 16:52:57 +00:00
parent 3423f6a2cb
commit f045034c56
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/vendor/texinfo/dist/; revision=100513
43 changed files with 3246 additions and 2313 deletions

View File

@ -1,3 +1,328 @@
2002-04-01 <karl@gnu.org>
* configure.ac: version 4.2.
* util/texi2dvi: 4.2
* makeinfo/toc.c: doc fix.
* util/install-info-html:
* makeinfo/texinfo.xsl: Fixes From: Ville Skyttä
<ville.skytta@iki.fi>.
* makeinfo/insertion.c (begin_insertion): (copying case) omit
cm_insert_copying if no_headers.
Bug report from Stephen Gildea.
2002-03-28 <karl@gnu.org>
* configure.ac: pretest 4.1d.
* doc/texinfo.txi:
* makeinfo/cmds.c: ignore headings commands. From Stephen Gildea.
* doc/texinfo.txi: @ifplaintext
2002-03-26 <karl@gnu.org>
* doc/texinfo.tex (\ifplaintext,\ifnotplaintext): new output
format conditional.
* makeinfo/cmds.c (cm_settitle):
* makeinfo/node.c (cm_node): need to pass output filename arg to
* xml_begin_document.
* makeinfo/cmds.c (cm_sp): need close_single_paragraph instead of
close_paragraph to avoid an extra blank line. Bug report from Stephen Gildea.
* doc/texinfo.tex (\doignore): can't do c kludge for
documentdescription. Bug report from Stephen Gildea.
* doc/texinfo.txi: missing t in documentdescription example, from
Stephen Gildea.
2002-03-24 <karl@gnu.org>
* doc/texinfo.txi: invar sec
2002-03-23 <karl@gnu.org>
* configure.ac: pretest 4.1c.
2002-03-23 Eli Zaretskii <eliz@is.elta.co.il>
* info/search.c (skip_non_whitespace): Don't go beyond the
terminating null character.
* info/filesys.c (filesys_read_info_file)
(filesys_read_compressed): Null-terminate the contents of the file
we've read, so it could be used as a C string.
2002-03-23 Eli Zaretskii <eliz@is.elta.co.il>
* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Fix
computation of output_filename's length, to avoid overrunning
malloc'ed buffer. If mkdir returns with EEXIST, assume we can use
an existing directory only if the existing file is indeed a
directory. On MS-DOS, allow for EACCES in addition to EEXIST.
<max_name_len>: Remove this variable.
* makeinfo/makeinfo.c (expansion): Protect execute_string from too
long strings.
(EXECUTE_STRING_MAX): New macro.
(execute_string): Use EXECUTE_STRING_MAX, not 4000.
2002-03-23 <karl@gnu.org>
* doc/texinfo.txi:
* makeinfo/insertion.h:
* makeinfo/texinfo.dtd:
* makeinfo/xml.h:
* makeinfo/xml.c:
* makeinfo/makeinfo.h:
* makeinfo/insertion.c:
* makeinfo/html.c:
* makeinfo/cmds.c:
* doc/info-stnd.texi: @permissions -> @copying.
* doc/texinfo.tex: permissions -> copying.
2002-03-22 <karl@gnu.org>
* configure.ac: pretest 4.1b.
* info/Makefile.am (BUILT_SOURCES): conditionalize on
TEXINFO_MAINT, to appease distcheck.
* From: Matthew Woodcraft <mattheww@chiark.greenend.org.uk>:
* makeinfo/makeinfo.h (next_menu_item_number): New global.
* makeinfo/insertion.c (begin_insertion): Initialise it.
* makeinfo/makeinfo.c (handle_menu_entry): Emit accesskey attribute
in html output, according to next_menu_item_number.
* makeinfo/node.c (cm_node): Emit accesskey attributes in html output.
* doc/texinfo.txi: GNU texts.
* doc/info-stnd.texi: @syncodeindex, not @synindex.
2002-03-21 <karl@gnu.org>
* doc/texinfo.txi: @permissions.
2002-03-20 <karl@gnu.org>
* doc/texinfo.txi: document --no-headers a bit better.
* makeinfo/makeinfo.c: better description of --no-headers,
suggested by Stephen Gildea.
* makeinfo/makeinfo.c (insert_toplevel_subdirectory): use
command-line specified output name unchanged.
* makeinfo/makeinfo.c (full_expansion): new routine, separated
from expansion, that does not tamper with the formatting parameters.
* makeinfo/insertion.c: copying -> permissions.
(cm_insert_permissions): insert rather than add.
* makeinfo/texinfo.dtd:
* makeinfo/xml.h:
* makeinfo/xml.c:
* makeinfo/cmds.c: copying -> permissions.
* makeinfo/makeinfo.h: copying -> permissions.
(full_expansion): declare.
* doc/texinfo.txi: @copying -> @permissions, @include fdl.texi.
* doc/info-stnd.texi: @copying -> @permissions, always include the FDL.
* makeinfo/html.c (html_output_head): copying -> permissions, use
insert_string.
* makeinfo/insertion.h: copying -> permissions.
* doc/texinfo.tex: \copying -> \permissions.
* doc/Makefile.am (EXTRA_DIST): include fdl.texi.
2002-03-19 <karl@gnu.org>
* makeinfo/insertion.c (cm_insert_copying): use insert_string in
the xml case, sigh.
* doc/info-stnd.texi: copying
* dir-example: info standalone.
* makeinfo/html.c: copyright_text -> copying_text.
* makeinfo/texinfo.dtd:
* makeinfo/insertion.c:
* makeinfo/insertion.h:
* makeinfo/makeinfo.h:
* makeinfo/xml.c:
* makeinfo/xml.h:
* makeinfo/cmds.c: copyrighttext -> copying.
* doc/info-stnd.texi: copyrighttext -> copying.
* doc/texinfo.tex (\copying, \insertcopying): rename from
copyrighttext per rms.
* makeinfo/index.c (index_add_arg): don't emit warning for index
entries containing : after all.
* info/infokey.c: remove non-ansi trailing commas from last items
of enums. From: Albert Chin-A-Young <china@thewrittenword.com>.
2002-03-18 <karl@gnu.org>
* doc/info-stnd.texi: @include after @setfilename.
* doc/texinfo.txi: @insertcopyrighttext, @settitle GNU ...
* doc/texinfo.txi: mention @setfilename and source filename
exceptions at the top.
* makeinfo/defun.c (scan_group_in_string): handle escaped @{ and @}.
Bug report from Werner Lemberg.
* doc/info-stnd.texi: add version number to title a la Texinfo.
* doc/info-stnd.texi: file -> manual.
* doc/info-stnd.texi: use @copyrighttext.
* makeinfo/insertion.c (begin_insertion, end_insertion):
copyrighttext case.
* makeinfo/makeinfo.h (copyright_text): declare/define.
* makeinfo/html.c (html_output_head): output copyrighttext.
* makeinfo/texinfo.dtd: Add copyrighttext.
* makeinfo/xml.h (xml_element): add COPYRIGHTTEXT.
* makeinfo/xml.c (texinfoml_element_list, docbook_element_list):
copyrighttext case.
2002-03-17 <karl@gnu.org>
* makeinfo/insertion.h (insertion_type): include copyrighttext.
* makeinfo/cmds.c (command_table): new command copyrighttext.
* doc/texinfo.tex (\copyrighttext, \insertcopyrighttext): new
Texinfo commands to handle the copyright and permission text cleanly.
(\dblarrowbox,\longdblarrowbox,\pushcharbox,\equivbox,\bullbox):
remove these definitions that have not been used for ages.
* configure.ac: call AC_CANONICAL_BUILD before the termcap
checking. Bug report from Eli.
2002-03-16 Eli Zaretskii <eliz@is.elta.co.il>
* makeinfo/node.c (cm_anchor): When recording the anchor position,
account for output_paragraph_offset, since the current paragraph
might not be closed yet (happens inside a menu, for example).
* djgpp/config.sed: Tweak to adapt to the new Automake/Autoconf.
* djgpp/README: Update.
2002-03-15 <karl@gnu.org>
* dir-example: GNU organization.
2002-03-14 <karl@gnu.org>
* makeinfo/cmds.c (cm_titlepage): do not declare nonexistent
function.
2002-03-14 <karl@gnu.org>
* doc/texinfo.txi: don't say specifically html 3.2, since <html
lang=...> is not 3.2.
Bug reprt from: Matthew Woodcraft <mattheww@chiark.greenend.org.uk>.
2002-03-13 <karl@gnu.org>
* doc/texinfo.tex (\writetocentry): set \pdfmakepagedesttrue here.
(\Etitlepage): instead of here. In case the document has no
@titlepage. Bug report from Stephen Gildea.
* util/texi2dvi: be verbose after the definition of cmd, not
before. From Andreas Schwab.
2002-03-12 <karl@gnu.org>
* pretest 4.1a.
* doc/info-stnd.texi: update to FDL.
2002-03-11 <karl@gnu.org>
* util/texi2dvi:
* util/texindex.c:
* util/install-info.c:
* makeinfo/makeinfo.c:
* info/infokey.c:
* info/info.c: home page and help message.
* doc/texinfo.txi (math): document @\ (aka \\) for literal \.
regularize index entries.
* makeinfo/cmds.c (command_table): \\ -> insert_self.
* doc/texinfo.tex (\mathbackslash): new definition.
(\math): handle \\ too.
(\codeunder): handle @code{\} in mmode.
* makeinfo/html.c: make home page be gnu's.
* doc/texinfo.txi (Conventions): rewrite description of quotes so
as to work in all formats; there was no output for HTML.
Report from: David Merrill <david@lupercalia.net>.
2002-03-10 <karl@gnu.org>
* doc/texinfo.txi (Texinfo Copying Conditions): mention this
manual's license specifically.
2002-03-09 Eli Zaretskii <eliz@is.elta.co.il>
* info/indices.c (add_index_to_index_nodenames): Fix an off-by-one
error when computing the number of the last index entry.
2002-03-08 <karl@gnu.org>
* doc/texinfo.tex: Rewrite unnumbered toc handling to keep track
of their sequence, so they can be handled correctly in
the PDF toc (= bookmarks).
From: Werner LEMBERG <wl@gnu.org>.
* configure.ac: AC_MSG_WARN if can't find a term library. From:
Marc.Herbert@ens-lyon.fr.
* info/info.c: alphabetize.
* info/info.c: include short option names.
2002-03-08 Eli Zaretskii <eliz@is.elta.co.il>
* info/display.c (display_update_one_window): Dynamically reallocate
printed_line[] as needed. When under -R, ignore ANSI escapes for
the purposes of line wrap display. Clear the line to EOL if it
used escape sequences. Reallocate entry->text if the new
printed_line is longer than screenwidth.
* info/window.c (string_width): Don't count ANSI escape sequences
in string width, when under -R..
(calculate_line_starts): Don't count ANSI escape sequences in line
width, when under -R.
(window_get_cursor_column, window_chars_to_goal): When under -R,
ANSI escapes don't affect the horizontal position.
* info/info-utils.c (printed_representation): If -R is in effect,
treat ESC as a normal character.
2002-03-08 <karl@gnu.org>
* util/Makefile.am:
* info/Makefile.am:
* makeinfo/Makefile.am:
* lib/Makefile.am: doc fix.
* doc/Makefile.am (install-tex): prefix the install directories
with $(DESTDIR), because that is what automake does for all
generated install rules. The file pdfcolor.tex should be
installed as such (and not as epsf.tex).
From: Peter Breitenlohner <peb@mppmu.mpg.de>.
* configure.ac (AC_INIT): now pass [GNU Texinfo].
(AM_INIT_AUTOMAKE): now no args, for automake 1.6.
2002-03-05 <karl@gnu.org>
* doc/texinfo.txi: history
2002-03-04 <karl@gnu.org>
* configure.ac: version 4.1.

View File

@ -1,5 +1,5 @@
Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01
Free Software Foundation.
Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or

View File

@ -1,5 +1,5 @@
Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02
Free Software Foundation.
Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or
@ -8,6 +8,43 @@ Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
This file records noteworthy changes.
*** IMPORTANT NEWS FOR ALL AUTHORS OF TEXINFO MANUALS ***
As of version 4.2, Texinfo has a new command @copying to define the
copyright and copying permissions for a manual. It's important to
switch to using it as soon as possible (as in your next release),
because the historical method of doing copyright permissions using
@ifinfo failed to output copyright information in the HTML (or XML)
formats. The manual has detailed explanations and examples. For
convenience, here's a url to one of the relevant sections:
http://texinfo.org/manual/Document-Permissions.html
4.2 (1 April 2002)
* Language:
. new command @copying to define copying permissions. See above.
. new conditionals @ifplaintext, @ifnotplaintext for the plain text
(--no-headers) output format.
. new command @\ to produce literal \ inside @math, since \ by itself
no longer works.
* makeinfo:
. emit accesskey attributes for keyboard shortcuts to menu items.
. @{even,every,odd}{footing,header} are ignored by makeinfo now, so
they no longer need to be enclosed in @iftex.
* texinfo.tex:
. bug fix for pdf-format table of contents.
* info:
. bug fixes for -R (--raw-escapes).
. --help shows short option names.
* Distribution:
. the doc.c, funs.h, and key.c files in info/ are no longer generated
at make time, to appease Automake's make distcheck.
. gettext 0.11.1, autoconf 2.53, automake 1.6 (with install-info kludge).
4.1 (4 March 2002)
* Language:
. new commands @verbatim and @verb for printing verbatim inserts.
@ -34,6 +71,7 @@ This file records noteworthy changes.
. update to GNU gettext 0.11, autoconf 2.52, and automake 1.5.
. Danish, Swedish, and Hebrew message translations.
4.0 (28 September 1999)
* Language:
. New command @anchor for cross references to arbitrary points.

View File

@ -1,5 +1,5 @@
Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02
Free Software Foundation.
Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or

View File

@ -1,4 +1,4 @@
Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01
Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02
Free Software Foundation.
Permission is granted to copy, distribute and/or modify this document
@ -28,12 +28,15 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org.
multiple redefinitions of every Texinfo command in different contexts.
- Handle @hsep and @vsep in @multitables.
- Introduce new command to change \bindingoffset.
- Reasonable way to change fonts from the default (some work has been done).
- Reasonable way to change fonts from the default (some work has been
done), to allow for PostScript fonts, for example.
- How about using latex2html to produce HTML?
- Support 8-bit input characters, perhaps via the ec fonts.
- Repeat table headings if a @multitable is multiple pages long.
- Table of contents gets misaligned if there are 10 or more [sub]sections.
* General:
- Rationalize and improve the dir categories in existing manuals.
- @xindexterm [def] primary [,secondary [,tertiary]] or some such?
- Support compressed image files.
- Handle reference card creation, perhaps by only paying attention to
@ -61,7 +64,10 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org.
- Allow @hsep/@vsep at @item, instead of just in template.
- Support automatic line numbering of examples.
- Better macro syntax.
- Allow : in node names for info files, for names like `class::method'.
- Allow : in node names for info files, for names like
`class::method'. Likewise index entries. A quoting mechanism such
as surrounding node names with SPACE BACKSPACE is probably the best
solution, although this is an incompatible change to Info format, sigh.
- Change bars. This is difficult or impossible in TeX,
unfortunately. To do it right requires device driver support.
wdiff or ediff may be all we can do.

View File

@ -1,73 +1,31 @@
/* config.in. Generated automatically from configure.ac by autoheader. */
/* acconfig.h
This file is in the public domain.
$Id: acconfig.h,v 1.3 1998/12/06 22:04:03 karl Exp $
Descriptive text for the C preprocessor macros that
the distributed Autoconf macros can define.
No software package will use all of them; autoheader copies the ones
your configure.in uses into your configuration header file templates.
The entries are in sort -df order: alphabetical, case insensitive,
ignoring punctuation (such as underscores). Although this order
can split up related entries, it makes it easier to check whether
a given entry is in the file.
Leave the following blank line there!! Autoheader needs it. */
/* Define to 1 if including sys/ioctl.h is needed to get TIOCGWINSZ. */
#undef GWINSZ_IN_SYS_IOCTL
/* Define to 1 if NLS is requested. */
#undef ENABLE_NLS
/* Define as 1 if you have catgets and don't want to use GNU gettext. */
#undef HAVE_CATGETS
/* Define as 1 if you have gettext and don't want to use GNU gettext. */
#undef HAVE_GETTEXT
/* Define if your locale.h file contains LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
/* Define as 1 if you have the stpcpy function. */
#undef HAVE_STPCPY
/* Define to the name of the distribution. */
#undef PACKAGE
/* Define to the version of the distribution. */
#undef VERSION
/* config.in. Generated from configure.ac by autoheader. */
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
*/
#undef CRAY_STACKSEG_END
/* Define if using `alloca.c'. */
/* Define to 1 if using `alloca.c'. */
#undef C_ALLOCA
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
/* Define if `TIOCGWINSZ' requires <sys/ioctl.h> */
/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
#undef GWINSZ_IN_SYS_IOCTL
/* Define if you have `alloca', as a function or macro. */
/* Define to 1 if you have `alloca', as a function or macro. */
#undef HAVE_ALLOCA
/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
*/
#undef HAVE_ALLOCA_H
/* Define if you have the <argz.h> header file. */
/* Define to 1 if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H
/* Define if you have the `bzero' function. */
/* Define to 1 if you have the `bzero' function. */
#undef HAVE_BZERO
/* Define if the GNU dcgettext() function is already present or preinstalled.
@ -86,49 +44,49 @@
/* Define if this function is declared. */
#undef HAVE_DECL_STRNCASECMP
/* Define if you don't have `vprintf' but do have `_doprnt.' */
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
/* Define if you have the <fcntl.h> header file. */
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define if you have the `feof_unlocked' function. */
/* Define to 1 if you have the `feof_unlocked' function. */
#undef HAVE_FEOF_UNLOCKED
/* Define if you have the `fgets_unlocked' function. */
/* Define to 1 if you have the `fgets_unlocked' function. */
#undef HAVE_FGETS_UNLOCKED
/* Define if you have the `getcwd' function. */
/* Define to 1 if you have the `getcwd' function. */
#undef HAVE_GETCWD
/* Define if you have the `getc_unlocked' function. */
/* Define to 1 if you have the `getc_unlocked' function. */
#undef HAVE_GETC_UNLOCKED
/* Define if you have the `getegid' function. */
/* Define to 1 if you have the `getegid' function. */
#undef HAVE_GETEGID
/* Define if you have the `geteuid' function. */
/* Define to 1 if you have the `geteuid' function. */
#undef HAVE_GETEUID
/* Define if you have the `getgid' function. */
/* Define to 1 if you have the `getgid' function. */
#undef HAVE_GETGID
/* Define if you have the `getpagesize' function. */
/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
/* Define if you have the `getuid' function. */
/* Define to 1 if you have the `getuid' function. */
#undef HAVE_GETUID
/* Define if you have the iconv() function. */
#undef HAVE_ICONV
/* Define if you have the <inttypes.h> header file. */
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if you have the <io.h> header file. */
/* Define to 1 if you have the <io.h> header file. */
#undef HAVE_IO_H
/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
@ -137,157 +95,158 @@
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
/* Define if you have the `bsd' library (-lbsd). */
/* Define to 1 if you have the `bsd' library (-lbsd). */
#undef HAVE_LIBBSD
/* Define if you have the <limits.h> header file. */
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
/* Define if you have the <locale.h> header file. */
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define if you have the <malloc.h> header file. */
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
/* Define if you have the `memcpy' function. */
/* Define to 1 if you have the `memcpy' function. */
#undef HAVE_MEMCPY
/* Define if you have the `memmove' function. */
/* Define to 1 if you have the `memmove' function. */
#undef HAVE_MEMMOVE
/* Define if you have the <memory.h> header file. */
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define if you have the `mempcpy' function. */
/* Define to 1 if you have the `mempcpy' function. */
#undef HAVE_MEMPCPY
/* Define if you have the `memset' function. */
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
/* Define if you have a working `mmap' system call. */
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP
/* Define if you have the `munmap' function. */
/* Define to 1 if you have the `munmap' function. */
#undef HAVE_MUNMAP
/* Define if you have the <ncurses/termcap.h> header file. */
/* Define to 1 if you have the <ncurses/termcap.h> header file. */
#undef HAVE_NCURSES_TERMCAP_H
/* Define if you have the <nl_types.h> header file. */
/* Define to 1 if you have the <nl_types.h> header file. */
#undef HAVE_NL_TYPES_H
/* Define if you have the `putenv' function. */
/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
/* Define if you have the <pwd.h> header file. */
/* Define to 1 if you have the <pwd.h> header file. */
#undef HAVE_PWD_H
/* Define if you have the `setenv' function. */
/* Define to 1 if you have the `setenv' function. */
#undef HAVE_SETENV
/* Define if you have the `setlocale' function. */
/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
/* Define if you have the `setvbuf' function. */
/* Define to 1 if you have the `setvbuf' function. */
#undef HAVE_SETVBUF
/* Define if you have the `sigprocmask' function. */
/* Define to 1 if you have the `sigprocmask' function. */
#undef HAVE_SIGPROCMASK
/* Define if you have the `sigsetmask' function. */
/* Define to 1 if you have the `sigsetmask' function. */
#undef HAVE_SIGSETMASK
/* Define if you have the <stddef.h> header file. */
/* Define to 1 if you have the <stddef.h> header file. */
#undef HAVE_STDDEF_H
/* Define if you have the <stdint.h> header file. */
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define if you have the <stdlib.h> header file. */
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define if you have the `stpcpy' function. */
/* Define to 1 if you have the `stpcpy' function. */
#undef HAVE_STPCPY
/* Define if you have the `strcasecmp' function. */
/* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
/* Define if you have the `strchr' function. */
/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
/* Define if you have the `strcoll' function and it is properly defined. */
/* Define to 1 if you have the `strcoll' function and it is properly defined.
*/
#undef HAVE_STRCOLL
/* Define if you have the `strdup' function. */
/* Define to 1 if you have the `strdup' function. */
#undef HAVE_STRDUP
/* Define if you have the `strerror' function. */
/* Define to 1 if you have the `strerror' function. */
#undef HAVE_STRERROR
/* Define if you have the <strings.h> header file. */
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define if you have the <string.h> header file. */
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define if you have the `strncasecmp' function. */
/* Define to 1 if you have the `strncasecmp' function. */
#undef HAVE_STRNCASECMP
/* Define if you have the `strtoul' function. */
/* Define to 1 if you have the `strtoul' function. */
#undef HAVE_STRTOUL
/* Define if you have the <sys/fcntl.h> header file. */
/* Define to 1 if you have the <sys/fcntl.h> header file. */
#undef HAVE_SYS_FCNTL_H
/* Define if you have the <sys/file.h> header file. */
/* Define to 1 if you have the <sys/file.h> header file. */
#undef HAVE_SYS_FILE_H
/* Define if you have the <sys/param.h> header file. */
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define if you have the <sys/ptem.h> header file. */
/* Define to 1 if you have the <sys/ptem.h> header file. */
#undef HAVE_SYS_PTEM_H
/* Define if you have the <sys/stat.h> header file. */
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define if you have the <sys/time.h> header file. */
/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
/* Define if you have the <sys/ttold.h> header file. */
/* Define to 1 if you have the <sys/ttold.h> header file. */
#undef HAVE_SYS_TTOLD_H
/* Define if you have the <sys/types.h> header file. */
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define if you have the <sys/wait.h> header file. */
/* Define to 1 if you have the <sys/wait.h> header file. */
#undef HAVE_SYS_WAIT_H
/* Define if you have the <termcap.h> header file. */
/* Define to 1 if you have the <termcap.h> header file. */
#undef HAVE_TERMCAP_H
/* Define if you have the <termios.h> header file. */
/* Define to 1 if you have the <termios.h> header file. */
#undef HAVE_TERMIOS_H
/* Define if you have the <termio.h> header file. */
/* Define to 1 if you have the <termio.h> header file. */
#undef HAVE_TERMIO_H
/* Define if you have the `tsearch' function. */
/* Define to 1 if you have the `tsearch' function. */
#undef HAVE_TSEARCH
/* Define if you have the <unistd.h> header file. */
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define if you have the `vprintf' function. */
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
/* Define if you have the `__argz_count' function. */
/* Define to 1 if you have the `__argz_count' function. */
#undef HAVE___ARGZ_COUNT
/* Define if you have the `__argz_next' function. */
/* Define to 1 if you have the `__argz_next' function. */
#undef HAVE___ARGZ_NEXT
/* Define if you have the `__argz_stringify' function. */
/* Define to 1 if you have the `__argz_stringify' function. */
#undef HAVE___ARGZ_STRINGIFY
/* Define as const if the declaration of iconv() needs const. */
@ -296,6 +255,21 @@
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
@ -307,26 +281,26 @@
STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION
/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
#undef STAT_MACROS_BROKEN
/* Define if you have the ANSI C header files. */
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define if your <sys/time.h> declares `struct tm'. */
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
/* Version number of package */
#undef VERSION
/* Define if on MINIX. */
/* Define to 1 if on MINIX. */
#undef _MINIX
/* Define if the system does not provide POSIX.1 features except with this
defined. */
/* Define to 2 if the system does not provide POSIX.1 features except with
this defined. */
#undef _POSIX_1_SOURCE
/* Define if you need to in order for `stat' and other things to work. */
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
/* Define to empty if `const' does not conform to ANSI C. */
@ -341,9 +315,3 @@
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
/* Leave that blank line there!! Autoheader needs it.
If you're adding to this file, keep in mind:
The entries are in sort -df order: alphabetical, case insensitive,
ignoring punctuation (such as underscores). */

View File

@ -8,7 +8,7 @@ vary so widely. Installing them in the wrong place would give a false
sense of security. So, you should simply cp *.tex to the appropriate
place. If your installation follows the TeX Directory Structure
standard (http://tug.org/tds/), this will be the directory
TEXMF/tex/texinfo/ for texinfo.tex, TEXMF/tex/plain/dvips/ for epsf.tex,
TEXMF/tex/texinfo/ for texinfo.tex, TEXMF/tex/generic/dvips/ for epsf.tex,
and TEXMF/pdftex/plain/misc for pdfcolor.tex. If you use the default
installation paths, TEXMF will be /usr/local/share/texmf. On systems
with TeX preinstalled, as most GNU/Linux distributions offer, TEXMF

View File

@ -0,0 +1,403 @@
@node GNU Free Documentation License
@appendixsec GNU Free Documentation License
@cindex FDL, GNU Free Documentation License
@center Version 1.1, March 2000
@display
Copyright @copyright{} 2000 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@end display
@enumerate 0
@item
PREAMBLE
The purpose of this License is to make a manual, textbook, or other
written document @dfn{free} in the sense of freedom: to assure everyone
the effective freedom to copy and redistribute it, with or without
modifying it, either commercially or noncommercially. Secondarily,
this License preserves for the author and publisher a way to get
credit for their work, while not being considered responsible for
modifications made by others.
This License is a kind of ``copyleft'', which means that derivative
works of the document must themselves be free in the same sense. It
complements the GNU General Public License, which is a copyleft
license designed for free software.
We have designed this License in order to use it for manuals for free
software, because free software needs free documentation: a free
program should come with manuals providing the same freedoms that the
software does. But this License is not limited to software manuals;
it can be used for any textual work, regardless of subject matter or
whether it is published as a printed book. We recommend this License
principally for works whose purpose is instruction or reference.
@item
APPLICABILITY AND DEFINITIONS
This License applies to any manual or other work that contains a
notice placed by the copyright holder saying it can be distributed
under the terms of this License. The ``Document'', below, refers to any
such manual or work. Any member of the public is a licensee, and is
addressed as ``you''.
A ``Modified Version'' of the Document means any work containing the
Document or a portion of it, either copied verbatim, or with
modifications and/or translated into another language.
A ``Secondary Section'' is a named appendix or a front-matter section of
the Document that deals exclusively with the relationship of the
publishers or authors of the Document to the Document's overall subject
(or to related matters) and contains nothing that could fall directly
within that overall subject. (For example, if the Document is in part a
textbook of mathematics, a Secondary Section may not explain any
mathematics.) The relationship could be a matter of historical
connection with the subject or with related matters, or of legal,
commercial, philosophical, ethical or political position regarding
them.
The ``Invariant Sections'' are certain Secondary Sections whose titles
are designated, as being those of Invariant Sections, in the notice
that says that the Document is released under this License.
The ``Cover Texts'' are certain short passages of text that are listed,
as Front-Cover Texts or Back-Cover Texts, in the notice that says that
the Document is released under this License.
A ``Transparent'' copy of the Document means a machine-readable copy,
represented in a format whose specification is available to the
general public, whose contents can be viewed and edited directly and
straightforwardly with generic text editors or (for images composed of
pixels) generic paint programs or (for drawings) some widely available
drawing editor, and that is suitable for input to text formatters or
for automatic translation to a variety of formats suitable for input
to text formatters. A copy made in an otherwise Transparent file
format whose markup has been designed to thwart or discourage
subsequent modification by readers is not Transparent. A copy that is
not ``Transparent'' is called ``Opaque''.
Examples of suitable formats for Transparent copies include plain
@sc{ascii} without markup, Texinfo input format, La@TeX{} input format,
@acronym{SGML} or @acronym{XML} using a publicly available
@acronym{DTD}, and standard-conforming simple @acronym{HTML} designed
for human modification. Opaque formats include PostScript,
@acronym{PDF}, proprietary formats that can be read and edited only by
proprietary word processors, @acronym{SGML} or @acronym{XML} for which
the @acronym{DTD} and/or processing tools are not generally available,
and the machine-generated @acronym{HTML} produced by some word
processors for output purposes only.
The ``Title Page'' means, for a printed book, the title page itself,
plus such following pages as are needed to hold, legibly, the material
this License requires to appear in the title page. For works in
formats which do not have any title page as such, ``Title Page'' means
the text near the most prominent appearance of the work's title,
preceding the beginning of the body of the text.
@item
VERBATIM COPYING
You may copy and distribute the Document in any medium, either
commercially or noncommercially, provided that this License, the
copyright notices, and the license notice saying this License applies
to the Document are reproduced in all copies, and that you add no other
conditions whatsoever to those of this License. You may not use
technical measures to obstruct or control the reading or further
copying of the copies you make or distribute. However, you may accept
compensation in exchange for copies. If you distribute a large enough
number of copies you must also follow the conditions in section 3.
You may also lend copies, under the same conditions stated above, and
you may publicly display copies.
@item
COPYING IN QUANTITY
If you publish printed copies of the Document numbering more than 100,
and the Document's license notice requires Cover Texts, you must enclose
the copies in covers that carry, clearly and legibly, all these Cover
Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
the back cover. Both covers must also clearly and legibly identify
you as the publisher of these copies. The front cover must present
the full title with all words of the title equally prominent and
visible. You may add other material on the covers in addition.
Copying with changes limited to the covers, as long as they preserve
the title of the Document and satisfy these conditions, can be treated
as verbatim copying in other respects.
If the required texts for either cover are too voluminous to fit
legibly, you should put the first ones listed (as many as fit
reasonably) on the actual cover, and continue the rest onto adjacent
pages.
If you publish or distribute Opaque copies of the Document numbering
more than 100, you must either include a machine-readable Transparent
copy along with each Opaque copy, or state in or with each Opaque copy
a publicly-accessible computer-network location containing a complete
Transparent copy of the Document, free of added material, which the
general network-using public has access to download anonymously at no
charge using public-standard network protocols. If you use the latter
option, you must take reasonably prudent steps, when you begin
distribution of Opaque copies in quantity, to ensure that this
Transparent copy will remain thus accessible at the stated location
until at least one year after the last time you distribute an Opaque
copy (directly or through your agents or retailers) of that edition to
the public.
It is requested, but not required, that you contact the authors of the
Document well before redistributing any large number of copies, to give
them a chance to provide you with an updated version of the Document.
@item
MODIFICATIONS
You may copy and distribute a Modified Version of the Document under
the conditions of sections 2 and 3 above, provided that you release
the Modified Version under precisely this License, with the Modified
Version filling the role of the Document, thus licensing distribution
and modification of the Modified Version to whoever possesses a copy
of it. In addition, you must do these things in the Modified Version:
@enumerate A
@item
Use in the Title Page (and on the covers, if any) a title distinct
from that of the Document, and from those of previous versions
(which should, if there were any, be listed in the History section
of the Document). You may use the same title as a previous version
if the original publisher of that version gives permission.
@item
List on the Title Page, as authors, one or more persons or entities
responsible for authorship of the modifications in the Modified
Version, together with at least five of the principal authors of the
Document (all of its principal authors, if it has less than five).
@item
State on the Title page the name of the publisher of the
Modified Version, as the publisher.
@item
Preserve all the copyright notices of the Document.
@item
Add an appropriate copyright notice for your modifications
adjacent to the other copyright notices.
@item
Include, immediately after the copyright notices, a license notice
giving the public permission to use the Modified Version under the
terms of this License, in the form shown in the Addendum below.
@item
Preserve in that license notice the full lists of Invariant Sections
and required Cover Texts given in the Document's license notice.
@item
Include an unaltered copy of this License.
@item
Preserve the section entitled ``History'', and its title, and add to
it an item stating at least the title, year, new authors, and
publisher of the Modified Version as given on the Title Page. If
there is no section entitled ``History'' in the Document, create one
stating the title, year, authors, and publisher of the Document as
given on its Title Page, then add an item describing the Modified
Version as stated in the previous sentence.
@item
Preserve the network location, if any, given in the Document for
public access to a Transparent copy of the Document, and likewise
the network locations given in the Document for previous versions
it was based on. These may be placed in the ``History'' section.
You may omit a network location for a work that was published at
least four years before the Document itself, or if the original
publisher of the version it refers to gives permission.
@item
In any section entitled ``Acknowledgments'' or ``Dedications'',
preserve the section's title, and preserve in the section all the
substance and tone of each of the contributor acknowledgments
and/or dedications given therein.
@item
Preserve all the Invariant Sections of the Document,
unaltered in their text and in their titles. Section numbers
or the equivalent are not considered part of the section titles.
@item
Delete any section entitled ``Endorsements''. Such a section
may not be included in the Modified Version.
@item
Do not retitle any existing section as ``Endorsements''
or to conflict in title with any Invariant Section.
@end enumerate
If the Modified Version includes new front-matter sections or
appendices that qualify as Secondary Sections and contain no material
copied from the Document, you may at your option designate some or all
of these sections as invariant. To do this, add their titles to the
list of Invariant Sections in the Modified Version's license notice.
These titles must be distinct from any other section titles.
You may add a section entitled ``Endorsements'', provided it contains
nothing but endorsements of your Modified Version by various
parties---for example, statements of peer review or that the text has
been approved by an organization as the authoritative definition of a
standard.
You may add a passage of up to five words as a Front-Cover Text, and a
passage of up to 25 words as a Back-Cover Text, to the end of the list
of Cover Texts in the Modified Version. Only one passage of
Front-Cover Text and one of Back-Cover Text may be added by (or
through arrangements made by) any one entity. If the Document already
includes a cover text for the same cover, previously added by you or
by arrangement made by the same entity you are acting on behalf of,
you may not add another; but you may replace the old one, on explicit
permission from the previous publisher that added the old one.
The author(s) and publisher(s) of the Document do not by this License
give permission to use their names for publicity for or to assert or
imply endorsement of any Modified Version.
@item
COMBINING DOCUMENTS
You may combine the Document with other documents released under this
License, under the terms defined in section 4 above for modified
versions, provided that you include in the combination all of the
Invariant Sections of all of the original documents, unmodified, and
list them all as Invariant Sections of your combined work in its
license notice.
The combined work need only contain one copy of this License, and
multiple identical Invariant Sections may be replaced with a single
copy. If there are multiple Invariant Sections with the same name but
different contents, make the title of each such section unique by
adding at the end of it, in parentheses, the name of the original
author or publisher of that section if known, or else a unique number.
Make the same adjustment to the section titles in the list of
Invariant Sections in the license notice of the combined work.
In the combination, you must combine any sections entitled ``History''
in the various original documents, forming one section entitled
``History''; likewise combine any sections entitled ``Acknowledgments'',
and any sections entitled ``Dedications''. You must delete all sections
entitled ``Endorsements.''
@item
COLLECTIONS OF DOCUMENTS
You may make a collection consisting of the Document and other documents
released under this License, and replace the individual copies of this
License in the various documents with a single copy that is included in
the collection, provided that you follow the rules of this License for
verbatim copying of each of the documents in all other respects.
You may extract a single document from such a collection, and distribute
it individually under this License, provided you insert a copy of this
License into the extracted document, and follow this License in all
other respects regarding verbatim copying of that document.
@item
AGGREGATION WITH INDEPENDENT WORKS
A compilation of the Document or its derivatives with other separate
and independent documents or works, in or on a volume of a storage or
distribution medium, does not as a whole count as a Modified Version
of the Document, provided no compilation copyright is claimed for the
compilation. Such a compilation is called an ``aggregate'', and this
License does not apply to the other self-contained works thus compiled
with the Document, on account of their being thus compiled, if they
are not themselves derivative works of the Document.
If the Cover Text requirement of section 3 is applicable to these
copies of the Document, then if the Document is less than one quarter
of the entire aggregate, the Document's Cover Texts may be placed on
covers that surround only the Document within the aggregate.
Otherwise they must appear on covers around the whole aggregate.
@item
TRANSLATION
Translation is considered a kind of modification, so you may
distribute translations of the Document under the terms of section 4.
Replacing Invariant Sections with translations requires special
permission from their copyright holders, but you may include
translations of some or all Invariant Sections in addition to the
original versions of these Invariant Sections. You may include a
translation of this License provided that you also include the
original English version of this License. In case of a disagreement
between the translation and the original English version of this
License, the original English version will prevail.
@item
TERMINATION
You may not copy, modify, sublicense, or distribute the Document except
as expressly provided for under this License. Any other attempt to
copy, modify, sublicense or distribute the Document is void, and will
automatically terminate your rights under this License. However,
parties who have received copies, or rights, from you under this
License will not have their licenses terminated so long as such
parties remain in full compliance.
@item
FUTURE REVISIONS OF THIS LICENSE
The Free Software Foundation may publish new, revised versions
of the GNU Free Documentation License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns. See
@uref{http://www.gnu.org/copyleft/}.
Each version of the License is given a distinguishing version number.
If the Document specifies that a particular numbered version of this
License ``or any later version'' applies to it, you have the option of
following the terms and conditions either of that specified version or
of any later version that has been published (not as a draft) by the
Free Software Foundation. If the Document does not specify a version
number of this License, you may choose any version ever published (not
as a draft) by the Free Software Foundation.
@end enumerate
@page
@appendixsubsec ADDENDUM: How to use this License for your documents
To use this License in a document you have written, include a copy of
the License in the document and put the following copyright and
license notices just after the title page:
@smallexample
@group
Copyright (C) @var{year} @var{your name}.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1
or any later version published by the Free Software Foundation;
with the Invariant Sections being @var{list their titles}, with the
Front-Cover Texts being @var{list}, and with the Back-Cover Texts being @var{list}.
A copy of the license is included in the section entitled ``GNU
Free Documentation License''.
@end group
@end smallexample
If you have no Invariant Sections, write ``with no Invariant Sections''
instead of saying which ones are invariant. If you have no
Front-Cover Texts, write ``no Front-Cover Texts'' instead of
``Front-Cover Texts being @var{list}''; likewise for Back-Cover Texts.
If your document contains nontrivial examples of program code, we
recommend releasing these examples in parallel under your choice of
free software license, such as the GNU General Public License,
to permit their use in free software.
@c Local Variables:
@c ispell-local-pdict: "ispell-dict"
@c End:

View File

@ -1,14 +1,36 @@
\input texinfo @c -*-texinfo-*-
@comment $Id: info-stnd.texi,v 1.43 2002/03/23 20:38:57 karl Exp $
@comment %**start of header
@setfilename info-stnd.info
@settitle GNU Info
@synindex vr cp
@synindex fn cp
@synindex ky cp
@comment %**end of header
@comment $Id: info-stnd.texi,v 1.33 2002/03/02 15:03:54 karl Exp $
@include version-stnd.texi
@settitle GNU Info @value{VERSION}
@syncodeindex vr cp
@syncodeindex fn cp
@syncodeindex ky cp
@comment %**end of header
@copying
This manual is for GNU Info (version @value{VERSION}, @value{UPDATED}),
a program for viewing documents in Info format (usually created from
Texinfo source files).
Copyright @copyright{} 1992, 93, 96, 97, 98, 99, 2001, 02
Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or
any later version published by the Free Software Foundation; with no
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.''
(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
this GNU Manual, like GNU software. Copies published by the Free
Software Foundation raise funds for GNU development.''
@end quotation
@end copying
@dircategory Texinfo documentation system
@direntry
@ -16,65 +38,13 @@
* infokey: (info-stnd)Invoking infokey. Compile Info customizations.
@end direntry
@ifinfo
This file documents GNU Info, a program for viewing the on-line formatted
versions of Texinfo files. This documentation is different from the
documentation for the Info reader that is part of GNU Emacs. If you do
not know how to use Info, but have a working Info reader, you should
read that documentation first.
Copyright @copyright{} 1992, 93, 96, 97, 98, 99,
2001, 02 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
preserved on all copies.
@ignore
Permission is granted to process this file through TeX and print the
results, provided the printed document carries a copying permission
notice identical to this one except for the removal of this paragraph
(this paragraph not being relevant to the printed manual).
@end ignore
Permission is granted to copy and distribute modified versions of this
manual under the conditions for verbatim copying, provided also that the
sections entitled ``Copying'' and ``GNU General Public License'' are
included exactly as in the original, and provided that the entire
resulting derived work is distributed under the terms of a permission
notice identical to this one.
Permission is granted to copy and distribute translations of this manual
into another language, under the above conditions for modified versions,
except that this permission notice may be stated in a translation
approved by the Free Software Foundation.
@end ifinfo
@titlepage
@title GNU Info
@subtitle for version @value{VERSION}, @value{UPDATED}
@author Brian J. Fox (bfox@@gnu.org)
@page
@vskip 0pt plus 1filll
Copyright @copyright{} 1992, 93, 97, 98, 99, 2001, 02 Free Software Foundation
This manual is for GNU Info version @value{VERSION}, @value{UPDATED}.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
preserved on all copies.
Permission is granted to copy and distribute modified versions of this
manual under the conditions for verbatim copying, provided also that the
sections entitled ``Copying'' and ``GNU General Public License'' are
included exactly as in the original, and provided that the entire
resulting derived work is distributed under the terms of a permission
notice identical to this one.
Permission is granted to copy and distribute translations of this manual
into another language, under the above conditions for modified versions,
except that this permission notice may be stated in a translation
approved by the Free Software Foundation.
@insertcopying
@end titlepage
@contents
@ -83,12 +53,12 @@ approved by the Free Software Foundation.
@node Top
@top GNU Info
This file documents GNU Info, a program for viewing the on-line
formatted versions of Texinfo files, version @value{VERSION}. This
documentation is different from the documentation for the Info reader
that is part of GNU Emacs.
@insertcopying
This manual is for Info version @value{VERSION}, updated @value{UPDATED}.
This documentation is different from the documentation for the Info
reader that is part of GNU Emacs. If you do not know how to use Info,
but have a working Info reader, you should read the Emacs documentation
first, as it includes more background information and a thorough tutorial.
@end ifnottex
@menu
@ -105,6 +75,7 @@ This manual is for Info version @value{VERSION}, updated @value{UPDATED}.
* Variables:: How to change the default behavior of Info.
* Custom Key Bindings:: How to define your own key-to-command
bindings.
* Copying This Manual:: The GNU Free Documentation License.
* Index:: Global index containing keystrokes,
command names, variable names,
and general concepts.
@ -2203,6 +2174,16 @@ Some common ways to organize Info files.
@end ignore
@node Copying This Manual
@appendix Copying This Manual
@menu
* GNU Free Documentation License:: License for copying this manual.
@end menu
@include fdl.texi
@node Index
@appendix Index

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
.TH INFO "1" "March 2002" "GNU texinfo 4.1" FSF
.TH INFO "1" "April 2002" "GNU texinfo 4.2" FSF
.SH NAME
info \- read Info documents
.SH SYNOPSIS
@ -9,37 +9,37 @@ info \- read Info documents
Read documentation in Info format.
.SH OPTIONS
.TP
\fB\-\-apropos\fR=\fISUBJECT\fR
look up SUBJECT in all indices of all manuals.
\fB\-\-apropos\fR=\fISTRING\fR
look up STRING in all indices of all manuals.
.TP
\fB\-\-directory\fR=\fIDIR\fR
\fB\-d\fR, \fB\-\-directory\fR=\fIDIR\fR
add DIR to INFOPATH.
.TP
\fB\-\-dribble\fR=\fIFILENAME\fR
remember user keystrokes in FILENAME.
.TP
\fB\-\-file\fR=\fIFILENAME\fR
\fB\-f\fR, \fB\-\-file\fR=\fIFILENAME\fR
specify Info file to visit.
.TP
\fB\-\-help\fR
\fB\-h\fR, \fB\-\-help\fR
display this help and exit.
.TP
\fB\-\-index\-search\fR=\fISTRING\fR
go to node pointed by index entry STRING.
.TP
\fB\-\-node\fR=\fINODENAME\fR
\fB\-n\fR, \fB\-\-node\fR=\fINODENAME\fR
specify nodes in first visited Info file.
.TP
\fB\-\-output\fR=\fIFILENAME\fR
\fB\-o\fR, \fB\-\-output\fR=\fIFILENAME\fR
output selected nodes to FILENAME.
.TP
\fB\-\-raw\-escapes\fR
\fB\-R\fR, \fB\-\-raw\-escapes\fR
don't remove ANSI escapes from man pages.
.TP
\fB\-\-restore\fR=\fIFILENAME\fR
read initial keystrokes from FILENAME.
.TP
\fB\-\-show\-options\fR, \fB\-\-usage\fR
\fB\-O\fR, \fB\-\-show\-options\fR, \fB\-\-usage\fR
go to command-line options node.
.TP
\fB\-\-subnodes\fR
@ -75,6 +75,7 @@ show file ./foo.info, not searching dir
.SH "REPORTING BUGS"
Email bug reports to bug-texinfo@gnu.org,
general questions and discussion to help-texinfo@gnu.org.
Texinfo home page: http://www.gnu.org/software/texinfo/
.SH COPYRIGHT
Copyright \(co 2002 Free Software Foundation, Inc.
There is NO warranty. You may redistribute this software

View File

@ -6,18 +6,18 @@
@syncodeindex vr cp
@syncodeindex ky cp
@comment %**end of header
@comment $Id: info.texi,v 1.22 2002/02/09 00:54:34 karl Exp $
@comment $Id: info.texi,v 1.20 2002/03/18 06:45:49 eliz Exp $
@dircategory Texinfo documentation system
@direntry
* Info: (info). Documentation browsing system.
* Info: (info). How to use the documentation browsing system.
@end direntry
@ifinfo
This file describes how to use Info, the on-line, menu-driven GNU
documentation system.
Copyright (C) 1989, 92, 96, 97, 98, 99, 2000, 2001
Copyright (C) 1989, 92, 96, 97, 98, 99, 2000, 2001, 2002
Free Software Foundation, Inc.

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
.TH INSTALL-INFO "1" "March 2002" "GNU texinfo 4.1" FSF
.TH INSTALL-INFO "1" "April 2002" "GNU texinfo 4.2" FSF
.SH NAME
install-info \- update info/dir entries
.SH SYNOPSIS
@ -58,6 +58,7 @@ display version information and exit.
.SH "REPORTING BUGS"
Email bug reports to bug-texinfo@gnu.org,
general questions and discussion to help-texinfo@gnu.org.
Texinfo home page: http://www.gnu.org/software/texinfo/
.SH COPYRIGHT
Copyright \(co 2002 Free Software Foundation, Inc.
There is NO warranty. You may redistribute this software

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
.TH MAKEINFO "1" "March 2002" "GNU texinfo 4.1" FSF
.TH MAKEINFO "1" "April 2002" "GNU texinfo 4.2" FSF
.SH NAME
makeinfo \- translate Texinfo documents
.SH SYNOPSIS
@ -41,11 +41,6 @@ output DocBook rather than Info.
\fB\-\-html\fR
output HTML rather than Info.
.TP
\fB\-\-no\-headers\fR
output plain text, suppressing Info node
separators and Node: lines; also, write to
standard output without \fB\-\-output\fR.
.TP
\fB\-\-xml\fR
output XML (TexinfoML) rather than Info.
.SS "General output options:"
@ -54,6 +49,12 @@ output XML (TexinfoML) rather than Info.
output macro-expanded source to FILE.
ignoring any @setfilename.
.TP
\fB\-\-no\-headers\fR
suppress node separators, Node: lines, and menus
from Info output (thus producing plain text)
or from HTML (thus producing shorter output);
also, write to standard output by default.
.TP
\fB\-\-no\-split\fR
suppress splitting of Info or HTML output,
generate only one output file.
@ -108,10 +109,13 @@ undefine the variable VAR, as with @clear.
process @ifhtml and @html even if not generating HTML.
.TP
\fB\-\-ifinfo\fR
process @ifinfo text even when generating HTML.
process @ifinfo even if not generating Info.
.TP
\fB\-\-ifplaintext\fR
process @ifplaintext even if not generating plain text.
.TP
\fB\-\-iftex\fR
process @iftex and @tex text; implies \fB\-\-no\-split\fR.
process @iftex and @tex; implies \fB\-\-no\-split\fR.
.TP
\fB\-\-no\-ifhtml\fR
do not process @ifhtml and @html text.
@ -119,31 +123,40 @@ do not process @ifhtml and @html text.
\fB\-\-no\-ifinfo\fR
do not process @ifinfo text.
.TP
\fB\-\-no\-ifplaintext\fR
do not process @ifplaintext text.
.TP
\fB\-\-no\-iftex\fR
do not process @iftex and @tex text.
.IP
The defaults for the @if... conditionals depend on the output format:
if generating HTML, \fB\-\-ifhtml\fR is on and the others are off;
if generating Info or plain text, \fB\-\-ifinfo\fR is on and the others are off.
if generating Info, \fB\-\-ifinfo\fR is on and the others are off;
if generating plain text, \fB\-\-ifplaintext\fR is on and the others are off;
.SH EXAMPLES
.TP
makeinfo foo.texi
write Info to foo's @setfilename
.TP
makeinfo \fB\-\-html\fR foo.texi
write HTML to foo's @setfilename
write HTML to @setfilename
.TP
makeinfo \fB\-\-no\-headers\fR \fB\-o\fR - foo.texi
makeinfo \fB\-\-xml\fR foo.texi
write XML to @setfilename
.TP
makeinfo \fB\-\-docbook\fR foo.texi
write DocBook XML to @setfilename
.TP
makeinfo \fB\-\-no\-headers\fR foo.texi
write plain text to standard output
.TP
makeinfo \fB\-\-number\-sections\fR foo.texi
write Info with numbered sections
.TP
makeinfo \fB\-\-no\-split\fR foo.texi
write one Info file however big
.IP
makeinfo \fB\-\-html\fR \fB\-\-no\-headers\fR foo.texi write html without node lines, menus
makeinfo \fB\-\-number\-sections\fR foo.texi write Info with numbered sections
makeinfo \fB\-\-no\-split\fR foo.texi write one Info file however big
.SH "REPORTING BUGS"
Email bug reports to bug-texinfo@gnu.org,
general questions and discussion to help-texinfo@gnu.org.
Texinfo home page: http://www.gnu.org/software/texinfo/
.SH COPYRIGHT
Copyright \(co 2002 Free Software Foundation, Inc.
There is NO warranty. You may redistribute this software

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
.TH TEXINDEX "1" "March 2002" "GNU texinfo 4.1" FSF
.TH TEXINDEX "1" "April 2002" "GNU texinfo 4.2" FSF
.SH NAME
texindex \- sort Texinfo index files
.SH SYNOPSIS
@ -27,6 +27,7 @@ display version information and exit
.SH "REPORTING BUGS"
Email bug reports to bug-texinfo@gnu.org,
general questions and discussion to help-texinfo@gnu.org.
Texinfo home page: http://www.gnu.org/software/texinfo/
.SH COPYRIGHT
Copyright \(co 2002 Free Software Foundation, Inc.
There is NO warranty. You may redistribute this software

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
@set UPDATED 2 March 2002
@set UPDATED 23 March 2002
@set UPDATED-MONTH March 2002
@set EDITION 4.1
@set VERSION 4.1
@set EDITION 4.2
@set VERSION 4.2

View File

@ -1,4 +1,4 @@
@set UPDATED 4 March 2002
@set UPDATED 28 March 2002
@set UPDATED-MONTH March 2002
@set EDITION 4.1
@set VERSION 4.1
@set EDITION 4.2
@set VERSION 4.2

View File

@ -1,5 +1,5 @@
/* display.c -- How to display Info windows.
$Id: display.c,v 1.6 1997/07/24 21:13:27 karl Exp $
$Id: display.c,v 1.7 2002/03/08 21:41:44 karl Exp $
Copyright (C) 1993, 97 Free Software Foundation, Inc.
@ -103,6 +103,8 @@ display_update_one_window (win)
char *printed_line; /* Buffer for a printed line. */
int pl_index = 0; /* Index into PRINTED_LINE. */
int line_index = 0; /* Number of lines done so far. */
int pl_ignore = 0; /* How many chars use zero width on screen. */
int allocated_win_width;
DISPLAY_LINE **display = the_display;
/* If display is inhibited, that counts as an interrupted display. */
@ -123,7 +125,8 @@ display_update_one_window (win)
/* Print each line in the window into our local buffer, and then
check the contents of that buffer against the display. If they
differ, update the display. */
printed_line = (char *)xmalloc (1 + win->width);
allocated_win_width = win->width + 1;
printed_line = (char *)xmalloc (allocated_win_width);
if (!win->node || !win->line_starts)
goto done_with_node_display;
@ -147,7 +150,7 @@ display_update_one_window (win)
{
if (*nodetext == '\r' || *nodetext == '\n')
{
replen = win->width - pl_index;
replen = win->width - pl_index + pl_ignore;
}
else
{
@ -156,9 +159,26 @@ display_update_one_window (win)
}
}
/* Support ANSI escape sequences under -R. */
if (raw_escapes_p
&& *nodetext == '\033'
&& nodetext[1] == '['
&& isdigit (nodetext[2]))
{
if (nodetext[3] == 'm')
pl_ignore += 4;
else if (isdigit (nodetext[3]) && nodetext[4] == 'm')
pl_ignore += 5;
}
while (pl_index + 2 >= allocated_win_width - 1)
{
allocated_win_width *= 2;
printed_line = (char *)xrealloc (printed_line, allocated_win_width);
}
/* If this character can be printed without passing the width of
the line, then stuff it into the line. */
if (replen + pl_index < win->width)
if (replen + pl_index < win->width + pl_ignore)
{
/* Optimize if possible. */
if (replen == 1)
@ -189,7 +209,7 @@ display_update_one_window (win)
the next line. Remember the offset of the last character
printed out of REP so that we can carry the character over
to the next line. */
for (i = 0; pl_index < (win->width - 1);)
for (i = 0; pl_index < (win->width + pl_ignore - 1);)
printed_line[pl_index++] = rep[i++];
rep_carried_over = rep + i;
@ -214,7 +234,9 @@ display_update_one_window (win)
/* If the screen line is inversed, then we have to clear
the line from the screen first. Why, I don't know. */
if (entry->inverse)
if (entry->inverse
/* Need to erase the line if it has escape sequences. */
|| (raw_escapes_p && strchr (entry->text, '\033') != 0))
{
terminal_goto_xy (0, line_index + win->first_row);
terminal_clear_to_eol ();
@ -242,13 +264,21 @@ display_update_one_window (win)
/* If the printed text didn't extend all the way to the edge
of the window, and text was appearing between here and the
edge of the window, clear from here to the end of the line. */
if ((pl_index < win->width && pl_index < entry->textlen) ||
(entry->inverse))
if ((pl_index < win->width + pl_ignore
&& pl_index < entry->textlen)
|| (entry->inverse))
terminal_clear_to_eol ();
fflush (stdout);
/* Update the display text buffer. */
if (strlen (printed_line) > screenwidth)
/* printed_line[] can include more than screenwidth
characters if we are under -R and there are escape
sequences in it. However, entry->text was
allocated (in display_initialize_display) for
screenwidth characters only. */
entry->text = xrealloc (entry->text, strlen (printed_line)+1);
strcpy (entry->text + i, printed_line + i);
entry->textlen = pl_index;
@ -274,6 +304,7 @@ display_update_one_window (win)
/* Reset PL_INDEX to the start of the line. */
pl_index = 0;
pl_ignore = 0; /* this is computed per line */
/* If there are characters from REP left to print, stuff them
into the buffer now. */

View File

@ -1,5 +1,5 @@
/* filesys.c -- filesystem specific functions.
$Id: filesys.c,v 1.14 2002/03/02 15:05:04 karl Exp $
$Id: filesys.c,v 1.15 2002/03/23 20:45:24 karl Exp $
Copyright (C) 1993, 97, 98, 2000 Free Software Foundation, Inc.
@ -510,6 +510,7 @@ filesys_read_info_file (pathname, filesize, finfo, is_compressed)
want to waste storage. */
if (*filesize < st_size)
contents = (char *)xrealloc (contents, 1 + *filesize);
contents[*filesize] = '\0';
return (contents);
}
@ -596,6 +597,7 @@ filesys_read_compressed (pathname, filesize, finfo)
{
*filesize = convert_eols (contents, offset);
contents = (char *)xrealloc (contents, 1 + *filesize);
contents[*filesize] = '\0';
}
}
else

View File

@ -1,7 +1,7 @@
/* indices.c -- deal with an Info file index.
$Id: indices.c,v 1.14 1999/09/25 16:10:04 karl Exp $
$Id: indices.c,v 1.15 2002/03/11 13:43:52 karl Exp $
Copyright (C) 1993, 97, 98, 99 Free Software Foundation, Inc.
Copyright (C) 1993, 97, 98, 99, 2002 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -61,7 +61,7 @@ add_index_to_index_nodenames (array, node)
register int i, last;
INDEX_NAME_ASSOC *assoc;
for (last = 0; array[last]; last++);
for (last = 0; array[last + 1]; last++);
assoc = (INDEX_NAME_ASSOC *)xmalloc (sizeof (INDEX_NAME_ASSOC));
assoc->name = xstrdup (node->nodename);

View File

@ -1,5 +1,5 @@
/* info-utils.c -- miscellanous.
$Id: info-utils.c,v 1.7 1998/08/10 18:07:47 karl Exp $
$Id: info-utils.c,v 1.8 2002/03/08 21:41:44 karl Exp $
Copyright (C) 1993, 98 Free Software Foundation, Inc.
@ -443,9 +443,11 @@ printed_representation (character, hpos)
{
register int i = 0;
int printable_limit = ISO_Latin_p ? 255 : 127;
if (raw_escapes_p && character == '\033')
the_rep[i++] = character;
/* Show CTRL-x as ^X. */
if (iscntrl (character) && character < 127)
else if (iscntrl (character) && character < 127)
{
switch (character)
{

View File

@ -1,5 +1,5 @@
/* info.c -- Display nodes of Info files in multiple windows.
$Id: info.c,v 1.53 2002/03/02 15:18:58 karl Exp $
$Id: info.c,v 1.60 2002/03/11 19:54:29 karl Exp $
Copyright (C) 1993, 96, 97, 98, 99, 2000, 01, 02
Free Software Foundation, Inc.
@ -99,22 +99,22 @@ int speech_friendly = 0;
static struct option long_options[] = {
{ "apropos", 1, 0, APROPOS_OPTION },
{ "directory", 1, 0, 'd' },
{ "node", 1, 0, 'n' },
{ "dribble", 1, 0, DRIBBLE_OPTION },
{ "file", 1, 0, 'f' },
{ "subnodes", 0, &dump_subnodes, 1 },
{ "help", 0, &print_help_p, 1 },
{ "index-search", 1, 0, IDXSRCH_OPTION },
{ "node", 1, 0, 'n' },
{ "output", 1, 0, 'o' },
{ "raw-escapes", 0, &raw_escapes_p, 1 },
{ "show-options", 0, 0, 'O' },
{ "usage", 0, 0, 'O' },
{ "vi-keys", 0, &vi_keys_p, 1 },
{ "help", 0, &print_help_p, 1 },
{ "version", 0, &print_version_p, 1 },
{ "dribble", 1, 0, DRIBBLE_OPTION },
{ "restore", 1, 0, RESTORE_OPTION },
{ "show-options", 0, 0, 'O' },
{ "subnodes", 0, &dump_subnodes, 1 },
{ "usage", 0, 0, 'O' },
{ "version", 0, &print_version_p, 1 },
{ "vi-keys", 0, &vi_keys_p, 1 },
#ifdef __MSDOS__
{ "speech-friendly", 0, &speech_friendly, 1 },
#endif
{ "index-search", 1, 0, IDXSRCH_OPTION },
{NULL, 0, NULL, 0}
};
@ -553,7 +553,7 @@ info_short_help ()
{
#ifdef __MSDOS__
static const char speech_friendly_string[] = N_("\
--speech-friendly be friendly to speech synthesizers.\n");
-b, --speech-friendly be friendly to speech synthesizers.\n");
#else
static const char speech_friendly_string[] = "";
#endif
@ -565,20 +565,20 @@ Usage: %s [OPTION]... [MENU-ITEM...]\n\
Read documentation in Info format.\n\
\n\
Options:\n\
--apropos=SUBJECT look up SUBJECT in all indices of all manuals.\n\
--directory=DIR add DIR to INFOPATH.\n\
--dribble=FILENAME remember user keystrokes in FILENAME.\n\
--file=FILENAME specify Info file to visit.\n\
--help display this help and exit.\n\
--index-search=STRING go to node pointed by index entry STRING.\n\
--node=NODENAME specify nodes in first visited Info file.\n\
--output=FILENAME output selected nodes to FILENAME.\n\
--raw-escapes don't remove ANSI escapes from man pages.\n\
--restore=FILENAME read initial keystrokes from FILENAME.\n\
--show-options, --usage go to command-line options node.\n%s\
--subnodes recursively output menu items.\n\
--vi-keys use vi-like and less-like key bindings.\n\
--version display version information and exit.\n\
--apropos=STRING look up STRING in all indices of all manuals.\n\
-d, --directory=DIR add DIR to INFOPATH.\n\
--dribble=FILENAME remember user keystrokes in FILENAME.\n\
-f, --file=FILENAME specify Info file to visit.\n\
-h, --help display this help and exit.\n\
--index-search=STRING go to node pointed by index entry STRING.\n\
-n, --node=NODENAME specify nodes in first visited Info file.\n\
-o, --output=FILENAME output selected nodes to FILENAME.\n\
-R, --raw-escapes don't remove ANSI escapes from man pages.\n\
--restore=FILENAME read initial keystrokes from FILENAME.\n\
-O, --show-options, --usage go to command-line options node.\n%s\
--subnodes recursively output menu items.\n\
--vi-keys use vi-like and less-like key bindings.\n\
--version display version information and exit.\n\
\n\
The first non-option argument, if present, is the menu entry to start from;\n\
it is searched for in all `dir' files along INFOPATH.\n\
@ -592,12 +592,14 @@ Examples:\n\
info emacs buffers start at buffers node within emacs manual\n\
info --show-options emacs start at node with emacs' command line options\n\
info -f ./foo.info show file ./foo.info, not searching dir\n\
\n\
Email bug reports to bug-texinfo@gnu.org,\n\
general questions and discussion to help-texinfo@gnu.org.\n\
"),
program_name, speech_friendly_string);
puts (_("\n\
Email bug reports to bug-texinfo@gnu.org,\n\
general questions and discussion to help-texinfo@gnu.org.\n\
Texinfo home page: http://www.gnu.org/software/texinfo/"));
xexit (0);
}

View File

@ -1,5 +1,5 @@
/* infokey.c -- compile ~/.infokey to ~/.info.
$Id: infokey.c,v 1.5 2002/02/26 16:17:57 karl Exp $
$Id: infokey.c,v 1.10 2002/03/19 14:36:49 karl Exp $
Copyright (C) 1999, 2001, 02 Free Software Foundation, Inc.
@ -60,7 +60,7 @@ enum sect_e
{
info = 0,
ea = 1,
var = 2,
var = 2
};
struct sect
{
@ -400,7 +400,7 @@ compile (fp, filename, sections)
got_varname,
get_equals,
got_equals,
get_value,
get_value
}
state = start_of_line;
enum sect_e section = info;
@ -410,7 +410,7 @@ compile (fp, filename, sections)
slosh,
control,
octal,
special_key,
special_key
}
seqstate; /* used if state == get_keyseq */
char meta = 0;
@ -888,7 +888,7 @@ suggest_help ()
static void
short_help ()
{
printf (_ ("\
printf (_("\
Usage: %s [OPTION]... [INPUT-FILE]\n\
\n\
Compile infokey source file to infokey file. Reads INPUT-FILE (default\n\
@ -898,11 +898,12 @@ Options:\n\
--output FILE output to FILE instead of $HOME/.info\n\
--help display this help and exit.\n\
--version display version information and exit.\n\
\n\
"), program_name);
puts (_("\n\
Email bug reports to bug-texinfo@gnu.org,\n\
general questions and discussion to help-texinfo@gnu.org.\n\
"),
program_name
);
Texinfo home page: http://www.gnu.org/software/texinfo/"));
xexit (0);
}

View File

@ -1,7 +1,7 @@
/* infokey.h -- Custom keystroke definition support.
$Id: $
$Id: infokey.h,v 1.1 2002/03/20 16:03:22 karl Exp $
Copyright (C) 1999 Free Software Foundation, Inc.
Copyright (C) 1999, 2002 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

View File

@ -1,5 +1,5 @@
/* search.c -- searching large bodies of text.
$Id: search.c,v 1.5 1999/03/05 19:56:59 karl Exp $
$Id: search.c,v 1.6 2002/03/23 20:45:24 karl Exp $
Copyright (C) 1993, 97, 98 Free Software Foundation, Inc.
@ -301,7 +301,7 @@ skip_non_whitespace (string)
{
register int i;
for (i = 0; string && !whitespace (string[i]); i++);
for (i = 0; string && string[i] && !whitespace (string[i]); i++);
return (i);
}

View File

@ -1,5 +1,5 @@
/* window.c -- windows in Info.
$Id: window.c,v 1.15 2002/01/19 01:08:20 karl Exp $
$Id: window.c,v 1.16 2002/03/08 21:41:44 karl Exp $
Copyright (C) 1993, 97, 98, 2001, 02 Free Software Foundation, Inc.
@ -758,7 +758,20 @@ string_width (string, hpos)
for (width = 0, i = 0; string[i]; i++)
{
this_char_width = character_width (string[i], hpos);
/* Support ANSI escape sequences for -R. */
if (raw_escapes_p
&& string[i] == '\033'
&& string[i+1] == '['
&& isdigit (string[i+2])
&& (string[i+3] == 'm'
|| (isdigit (string[i+3]) && string[i+4] == 'm')))
{
while (string[i] != 'm')
i++;
this_char_width = 0;
}
else
this_char_width = character_width (string[i], hpos);
width += this_char_width;
hpos += this_char_width;
}
@ -830,7 +843,29 @@ calculate_line_starts (window)
could be passed as negative integers to character_width
and wreak havoc on some naive implementations of iscntrl. */
c = (unsigned char) node->contents[i];
cwidth = character_width (c, hpos);
/* Support ANSI escape sequences for -R. */
if (raw_escapes_p
&& c == '\033'
&& node->contents[i+1] == '['
&& isdigit (node->contents[i+2]))
{
if (node->contents[i+3] == 'm')
{
i += 3;
cwidth = 0;
}
else if (isdigit (node->contents[i+3])
&& node->contents[i+4] == 'm')
{
i += 4;
cwidth = 0;
}
else
cwidth = character_width (c, hpos);
}
else
cwidth = character_width (c, hpos);
/* If this character fits within this line, just do the next one. */
if ((hpos + cwidth) < window->width)
@ -1009,7 +1044,23 @@ window_get_cursor_column (window)
end = window->point - (line - window->node->contents);
for (hpos = 0, i = 0; i < end; i++)
hpos += character_width (line[i], hpos);
{
/* Support ANSI escape sequences for -R. */
if (raw_escapes_p
&& line[i] == '\033'
&& line[i+1] == '['
&& isdigit (line[i+2]))
{
if (line[i+3] == 'm')
i += 3;
else if (isdigit (line[i+3]) && line[i+4] == 'm')
i += 4;
else
hpos += character_width (line[i], hpos);
}
else
hpos += character_width (line[i], hpos);
}
return (hpos);
}
@ -1025,8 +1076,17 @@ window_chars_to_goal (line, goal)
for (hpos = 0, i = 0; line[i] != '\n'; i++)
{
check = hpos + character_width (line[i], hpos);
/* Support ANSI escape sequences for -R. */
if (raw_escapes_p
&& line[i] == '\033'
&& line[i+1] == '['
&& isdigit (line[i+2])
&& (line[i+3] == 'm'
|| (isdigit (line[i+3]) && line[i+4] == 'm')))
while (line[i] != 'm')
i++;
else
check = hpos + character_width (line[i], hpos);
if (check > goal)
break;

View File

@ -1,7 +1,7 @@
/* cmds.c -- Texinfo commands.
$Id: cmds.c,v 1.69 2002/02/09 00:54:51 karl Exp $
$Id: cmds.c,v 1.79 2002/03/28 16:35:29 karl Exp $
Copyright (C) 1998, 99, 2000, 01 Free Software Foundation, Inc.
Copyright (C) 1998, 99, 2000, 01, 02 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -47,7 +47,8 @@ void
cm_image (), cm_kbd (), cm_key (), cm_no_op (),
cm_novalidate (), cm_not_fixed_width (), cm_r (),
cm_strong (), cm_var (), cm_sc (), cm_w (), cm_email (), cm_url (),
cm_verb (), cm_documentdescription ();
cm_verb (), cm_copying (), cm_insert_copying (),
cm_documentdescription ();
void
cm_anchor (), cm_node (), cm_menu (), cm_xref (), cm_ftable (),
@ -64,7 +65,7 @@ void
cm_print (), cm_error (), cm_point (), cm_today (), cm_flushleft (),
cm_flushright (), cm_finalout (), cm_cartouche (), cm_detailmenu (),
cm_multitable (), cm_settitle (), cm_titlefont (), cm_tt (),
cm_verbatim (), cm_verbatiminclude (), cm_titlepage ();
cm_verbatim (), cm_verbatiminclude ();
/* Conditionals. */
void cm_set (), cm_clear (), cm_ifset (), cm_ifclear ();
@ -95,6 +96,7 @@ COMMAND command_table[] = {
{ "=", cm_accent, MAYBE_BRACE_ARGS },
{ "?", insert_self, NO_BRACE_ARGS },
{ "@", insert_self, NO_BRACE_ARGS },
{ "\\", insert_self, NO_BRACE_ARGS },
{ "^", cm_accent_hat, MAYBE_BRACE_ARGS },
{ "`", cm_accent_grave, MAYBE_BRACE_ARGS },
{ "{", insert_self, NO_BRACE_ARGS },
@ -139,6 +141,7 @@ COMMAND command_table[] = {
{ "command", cm_code, BRACE_ARGS },
{ "comment", cm_ignore_line, NO_BRACE_ARGS },
{ "contents", cm_contents, NO_BRACE_ARGS },
{ "copying", cm_copying, NO_BRACE_ARGS },
{ "copyright", cm_copyright, BRACE_ARGS },
{ "ctrl", cm_obsolete, BRACE_ARGS },
{ "defcodeindex", cm_defcodeindex, NO_BRACE_ARGS },
@ -202,6 +205,10 @@ COMMAND command_table[] = {
{ "env", cm_code, BRACE_ARGS },
{ "equiv", cm_equiv, BRACE_ARGS },
{ "error", cm_error, BRACE_ARGS },
{ "evenfooting", cm_ignore_line, NO_BRACE_ARGS },
{ "evenheading", cm_ignore_line, NO_BRACE_ARGS },
{ "everyfooting", cm_ignore_line, NO_BRACE_ARGS },
{ "everyheading", cm_ignore_line, NO_BRACE_ARGS },
{ "example", cm_example, NO_BRACE_ARGS },
{ "exampleindent", cm_exampleindent, NO_BRACE_ARGS },
{ "exclamdown", cm_special_char, BRACE_ARGS },
@ -228,13 +235,16 @@ COMMAND command_table[] = {
{ "ifinfo", cm_ifinfo, NO_BRACE_ARGS },
{ "ifnothtml", cm_ifnothtml, NO_BRACE_ARGS },
{ "ifnotinfo", cm_ifnotinfo, NO_BRACE_ARGS },
{ "ifnotplaintext", cm_ifnotplaintext, NO_BRACE_ARGS },
{ "ifnottex", cm_ifnottex, NO_BRACE_ARGS },
{ "ifplaintext", cm_ifplaintext, NO_BRACE_ARGS },
{ "ifset", cm_ifset, NO_BRACE_ARGS },
{ "iftex", cm_iftex, NO_BRACE_ARGS },
{ "ignore", command_name_condition, NO_BRACE_ARGS },
{ "image", cm_image, BRACE_ARGS },
{ "include", cm_include, NO_BRACE_ARGS },
{ "inforef", cm_inforef, BRACE_ARGS },
{ "insertcopying", cm_insert_copying, NO_BRACE_ARGS },
{ "item", cm_item, NO_BRACE_ARGS },
{ "itemize", cm_itemize, NO_BRACE_ARGS },
{ "itemx", cm_itemx, NO_BRACE_ARGS },
@ -257,6 +267,8 @@ COMMAND command_table[] = {
{ "noindent", cm_novalidate, NO_BRACE_ARGS },
{ "nwnode", cm_node, NO_BRACE_ARGS },
{ "o", cm_special_char, BRACE_ARGS },
{ "oddfooting", cm_ignore_line, NO_BRACE_ARGS },
{ "oddheading", cm_ignore_line, NO_BRACE_ARGS },
{ "oe", cm_special_char, BRACE_ARGS },
{ "option", cm_code, BRACE_ARGS },
{ "page", cm_no_op, NO_BRACE_ARGS },
@ -962,7 +974,7 @@ cm_settitle ()
{
if (xml)
{
xml_begin_document ();
xml_begin_document (current_output_filename);
xml_insert_element (SETTITLE, START);
get_rest_of_line (0, &title);
execute_string ("%s", title);
@ -1016,7 +1028,8 @@ cm_sp ()
int save_filling_enabled = filling_enabled;
filling_enabled = 0;
close_paragraph ();
/* close_paragraph generates an extra blank line. */
close_single_paragraph ();
if (lines && html && !executing_string)
html_output_head ();

View File

@ -1,5 +1,5 @@
/* defun.c -- @defun and friends.
$Id: defun.c,v 1.18 2002/01/22 18:01:24 karl Exp $
$Id: defun.c,v 1.19 2002/03/18 16:54:54 karl Exp $
Copyright (C) 1998, 99, 2000, 01, 02 Free Software Foundation, Inc.
@ -66,6 +66,7 @@ scan_group_in_string (string_pointer)
{
char *scan_string = (*string_pointer) + 1;
unsigned int level = 1;
int started_command = 0;
for (;;)
{
@ -80,17 +81,20 @@ scan_group_in_string (string_pointer)
{
/* Tweak line_number to compensate for fact that
we gobbled the whole line before coming here. */
line_number -= 1;
line_number--;
line_error (_("Missing `}' in @def arg"));
line_number += 1;
line_number++;
*string_pointer = scan_string - 1;
return 0;
}
if (c == '{')
level += 1;
if (c == '}')
level -= 1;
if (c == '{' && !started_command)
level++;
if (c == '}' && !started_command)
level--;
/* remember if at @. */
started_command = (c == '@' && !started_command);
}
}

View File

@ -1,5 +1,5 @@
/* html.c -- html-related utilities.
$Id: html.c,v 1.19 2002/02/23 19:12:15 karl Exp $
$Id: html.c,v 1.26 2002/03/23 20:39:49 karl Exp $
Copyright (C) 1999, 2000, 01, 02 Free Software Foundation, Inc.
@ -56,7 +56,19 @@ html_output_head ()
add_word_args ("<meta name=description content=\"%s\">\n",
document_description);
add_word_args ("<meta name=generator content=\"makeinfo %s\">\n", VERSION);
add_word ("<link href=\"http://texinfo.org/\" rel=generator-home>\n");
add_word ("<link href=\"http://www.gnu.org/software/texinfo/\" rel=generator-home>\n");
if (copying_text)
{ /* copying_text has already been fully expanded in
begin_insertion (by full_expansion), so use insert_ rather than
add_. It is not ideal that we include the html markup here within
<head>, but the alternative is to have yet more and different
expansions of the copying text. Yuck. */
insert_string ("<!--\n");
insert_string (copying_text);
insert_string ("-->\n");
}
add_word ("</head>\n<body>\n");
if (title && !html_title_written)

View File

@ -1,7 +1,7 @@
/* html.h -- declarations for html-related utilities.
$Id: html.h,v 1.2 2000/12/19 15:17:52 karl Exp $
$Id: html.h,v 1.4 2002/03/18 19:45:18 karl Exp $
Copyright (C) 1999, 2000 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 02 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

View File

@ -1,5 +1,5 @@
/* index.c -- indexing for Texinfo.
$Id: index.c,v 1.24 2002/01/22 14:28:07 karl Exp $
$Id: index.c,v 1.25 2002/03/19 14:43:04 karl Exp $
Copyright (C) 1998, 99, 2002 Free Software Foundation, Inc.
@ -227,10 +227,17 @@ index_add_arg (name)
(see the findexerr test). */
new->defining_file = xstrdup (input_filename);
the_indices[which] = new;
/* The index breaks if there are colons in the entry. */
#if 0
/* The index breaks if there are colons in the entry.
-- This is true, but it's too painful to force changing index
entries to use `colon', and too confusing for users. The real
fix is to change Info support to support arbitrary characters
in node names, and we're not ready to do that. --karl,
19mar02. */
if (strchr (new->entry_text, ':'))
warning (_("Info cannot handle `:' in index entry `%s'"),
new->entry_text);
#endif
}
if (xml)
xml_insert_indexterm (index_entry, name);

View File

@ -1,5 +1,5 @@
/* insertion.c -- insertions for Texinfo.
$Id: insertion.c,v 1.39 2002/03/02 15:05:21 karl Exp $
$Id: insertion.c,v 1.47 2002/04/01 14:01:36 karl Exp $
Copyright (C) 1998, 99, 2000, 01, 02 Free Software Foundation, Inc.
@ -28,16 +28,17 @@
/* Must match list in insertion.h. */
static char *insertion_type_names[] =
{
"cartouche", "defcv", "deffn", "defivar", "defmac", "defmethod",
"defop", "defopt", "defspec", "deftp", "deftypefn", "deftypefun",
"deftypeivar", "deftypemethod", "deftypeop", "deftypevar",
"deftypevr", "defun", "defvar", "defvr", "detailmenu", "direntry",
"display", "documentdescription", "enumerate", "example", "flushleft",
"flushright", "format", "ftable", "group", "ifclear", "ifhtml",
"ifinfo", "ifnothtml", "ifnotinfo", "ifnottex", "ifset", "iftex",
"itemize", "lisp", "menu", "multitable", "quotation", "rawhtml",
"rawtex", "smalldisplay", "smallexample", "smallformat", "smalllisp",
"verbatim", "table", "tex", "vtable", "bad_type"
"cartouche", "copying", "defcv", "deffn", "defivar", "defmac",
"defmethod", "defop", "defopt", "defspec", "deftp", "deftypefn",
"deftypefun", "deftypeivar", "deftypemethod", "deftypeop",
"deftypevar", "deftypevr", "defun", "defvar", "defvr", "detailmenu",
"direntry", "display", "documentdescription", "enumerate", "example",
"flushleft", "flushright", "format", "ftable", "group", "ifclear",
"ifhtml", "ifinfo", "ifnothtml", "ifnotinfo", "ifnotplaintext", "ifnottex",
"ifplaintext", "ifset", "iftex", "itemize", "lisp", "menu",
"multitable", "quotation", "rawhtml", "rawtex", "smalldisplay",
"smallexample", "smallformat", "smalllisp", "verbatim", "table",
"tex", "vtable", "bad_type"
};
/* All nested environments. */
@ -46,21 +47,23 @@ INSERTION_ELT *insertion_stack = NULL;
/* How deeply we're nested. */
int insertion_level = 0;
/* Whether to examine menu lines. */
int in_menu = 0;
/* Set to 1 if we've processed (commentary) text in a @menu that
wasn't part of a menu item. */
int had_menu_commentary;
/* How to examine menu lines. */
int in_detailmenu = 0;
/* Set to 1 if we've processed (commentary) text in a @menu that
wasn't part of a menu item. */
int had_menu_commentary;
/* Whether to examine menu lines. */
int in_menu = 0;
/* Set to 1 if <p> is written in normal context.
Used for menu and itemize. */
int in_paragraph = 0;
static const char dl_tag[] = "<dl>\n";
extern void cm_insert_copying ();
void
init_insertion_stack ()
@ -95,7 +98,9 @@ current_item_function ()
case ifinfo:
case ifnothtml:
case ifnotinfo:
case ifnotplaintext:
case ifnottex:
case ifplaintext:
case ifset:
case iftex:
case rawhtml:
@ -382,7 +387,8 @@ begin_insertion (type)
if (xml)
xml_insert_element (MENU, START);
next_menu_item_number = 1;
in_menu++;
in_fixed_width_font++;
no_discard++;
@ -430,13 +436,44 @@ begin_insertion (type)
}
break;
case copying:
{
/* Save the copying text away for @insertcopying,
typically used on the back of the @titlepage (for TeX) and
the Top node (for info/html). */
char *text;
int start_of_end;
discard_until ("\n"); /* ignore remainder of @copying line */
start_of_end = get_until ("\n@end copying", &text);
/* include all the output-format-specific markup. */
copying_text = full_expansion (text, 0);
free (text);
input_text_offset = start_of_end; /* go back to the @end to match */
}
/* For info, output the copying text right away, so it will end up
in the header of the Info file, before the first node, and thus
get copied automatically to all the split files. For xml, also
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. */
if (!html && !no_headers)
cm_insert_copying ();
break;
case quotation:
/* @quotation does filling (@display doesn't). */
if (html)
add_word ("<blockquote>\n");
else
{
close_single_paragraph ();
/* with close_single_paragraph, we get no blank line above
within @copying. */
close_paragraph ();
last_char_was_newline = no_indent = 0;
indented_fill = filling_enabled = 1;
inhibit_paragraph_indentation = 1;
@ -567,7 +604,9 @@ begin_insertion (type)
case ifinfo:
case ifnothtml:
case ifnotinfo:
case ifnotplaintext:
case ifnottex:
case ifplaintext:
case ifset:
case iftex:
case rawtex:
@ -665,6 +704,9 @@ end_insertion (type)
case ifinfo:
case documentdescription:
break;
case copying:
xml_insert_element (COPYING, END);
break;
case quotation:
xml_insert_element (QUOTATION, END);
break;
@ -712,13 +754,16 @@ end_insertion (type)
switch (type)
{
/* Insertions which have no effect on paragraph formatting. */
case copying:
case documentdescription:
case ifclear:
case ifinfo:
case ifhtml:
case ifnothtml:
case ifnotinfo:
case ifnotplaintext:
case ifnottex:
case ifplaintext:
case ifset:
case iftex:
case rawtex:
@ -728,11 +773,6 @@ end_insertion (type)
escape_html = 1;
break;
case direntry: /* Eaten if html. */
insert_string ("END-INFO-DIR-ENTRY\n\n");
close_insertion_paragraph ();
break;
case detailmenu:
in_detailmenu--; /* No longer hacking menus. */
if (!in_menu)
@ -742,6 +782,11 @@ end_insertion (type)
}
break;
case direntry: /* Eaten if html. */
insert_string ("END-INFO-DIR-ENTRY\n\n");
close_insertion_paragraph ();
break;
case menu:
in_menu--; /* No longer hacking menus. */
if (html)
@ -941,6 +986,26 @@ cm_cartouche ()
begin_insertion (cartouche);
}
void
cm_copying ()
{
if (xml)
xml_insert_element (COPYING, START);
begin_insertion (copying);
}
/* Not an insertion, despite the name, but it goes with cm_copying. */
void
cm_insert_copying ()
{
if (copying_text)
{ /* insert_string rather than add_word because we've already done
full expansion on copying_text when we saved it. */
insert_string (copying_text);
insert ('\n');
}
}
void
cm_format ()
{
@ -1136,25 +1201,6 @@ cm_group ()
begin_insertion (group);
}
void
cm_ifinfo ()
{
if (process_info)
begin_insertion (ifinfo);
else
command_name_condition ();
}
void
cm_ifnotinfo ()
{
if (!process_info)
begin_insertion (ifnotinfo);
else
command_name_condition ();
}
/* Insert raw HTML (no escaping of `<' etc.). */
void
cm_html ()
@ -1184,6 +1230,44 @@ cm_ifnothtml ()
}
void
cm_ifinfo ()
{
if (process_info)
begin_insertion (ifinfo);
else
command_name_condition ();
}
void
cm_ifnotinfo ()
{
if (!process_info)
begin_insertion (ifnotinfo);
else
command_name_condition ();
}
void
cm_ifplaintext ()
{
if (process_plaintext)
begin_insertion (ifplaintext);
else
command_name_condition ();
}
void
cm_ifnotplaintext ()
{
if (!process_plaintext)
begin_insertion (ifnotplaintext);
else
command_name_condition ();
}
void
cm_tex ()
{
@ -1339,7 +1423,9 @@ cm_item ()
case ifinfo:
case ifnothtml:
case ifnotinfo:
case ifnotplaintext:
case ifnottex:
case ifplaintext:
case ifset:
case iftex:
case rawhtml:

View File

@ -1,7 +1,7 @@
/* insertion.h -- declarations for insertion.c.
$Id: insertion.h,v 1.8 2001/06/30 00:29:41 karl Exp $
$Id: insertion.h,v 1.13 2002/03/28 16:33:48 karl Exp $
Copyright (C) 1998, 99, 2001 Free Software Foundation, Inc.
Copyright (C) 1998, 99, 2001, 02 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -23,14 +23,15 @@
/* Must match list in insertion.c. */
enum insertion_type
{
cartouche, defcv, deffn, defivar, defmac, defmethod, defop, defopt,
defspec, deftp, deftypefn, deftypefun, deftypeivar, deftypemethod,
deftypeop, deftypevar, deftypevr, defun, defvar, defvr, detailmenu,
direntry, display, documentdescription, enumerate, example, flushleft,
flushright, format, ftable, group, ifclear, ifhtml, ifinfo, ifnothtml,
ifnotinfo, ifnottex, ifset, iftex, itemize, lisp, menu, multitable,
quotation, rawhtml, rawtex, smalldisplay, smallexample, smallformat,
smalllisp, verbatim, table, tex, vtable, bad_type
cartouche, copying, defcv, deffn, defivar, defmac, defmethod, defop,
defopt, defspec, deftp, deftypefn, deftypefun, deftypeivar,
deftypemethod, deftypeop, deftypevar, deftypevr, defun, defvar, defvr,
detailmenu, direntry, display, documentdescription, enumerate,
example, flushleft, flushright, format, ftable, group, ifclear,
ifhtml, ifinfo, ifnothtml, ifnotinfo, ifnotplaintext, ifnottex,
ifplaintext, ifset, iftex, itemize, lisp, menu, multitable, quotation,
rawhtml, rawtex, smalldisplay, smallexample, smallformat, smalllisp,
verbatim, table, tex, vtable, bad_type
};
typedef struct istack_elt
@ -55,7 +56,8 @@ extern int had_menu_commentary;
extern int in_paragraph;
extern void command_name_condition ();
extern void cm_ifnothtml (), cm_ifhtml(), cm_html ();
extern void cm_ifhtml (), cm_ifnothtml(), cm_html ();
extern void cm_ifinfo (), cm_ifnotinfo ();
extern void cm_ifnottex (), cm_iftex (), cm_tex ();
extern void cm_ifplaintext (), cm_ifnotplaintext();
extern void cm_iftex (), cm_ifnottex (), cm_tex ();
#endif /* !INSERTION_H */

View File

@ -1,5 +1,5 @@
/* makeinfo -- convert Texinfo source into other formats.
$Id: makeinfo.c,v 1.195 2002/02/11 17:12:49 karl Exp $
$Id: makeinfo.c,v 1.205 2002/03/28 16:33:48 karl Exp $
Copyright (C) 1987, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02
Free Software Foundation, Inc.
@ -66,6 +66,7 @@ char *output_filename = NULL;
/* Name of the output file that the user elected to pass on the command line.
Such a name overrides any name found with the @setfilename command. */
char *command_output_filename = NULL;
static char *save_command_output_filename = NULL;
/* Flags which control initial output string for xrefs. */
int px_ref_flag = 0;
@ -371,12 +372,11 @@ usage (exit_value)
{
printf (_("Usage: %s [OPTION]... TEXINFO-FILE...\n"), progname);
printf ("\n");
/* xgettext: no-wrap */
puts (_("\
Translate Texinfo source documentation to various other formats, by default\n\
Info files suitable for reading online with Emacs or standalone GNU Info.\n"));
/* xgettext: no-wrap */
printf (_("\
General options:\n\
--error-limit=NUM quit after NUM errors (default %d).\n\
@ -395,9 +395,6 @@ General options:\n\
Output format selection (default is to produce Info):\n\
--docbook output DocBook rather than Info.\n\
--html output HTML rather than Info.\n\
--no-headers output plain text, suppressing Info node\n\
separators and Node: lines; also, write to\n\
standard output without --output.\n\
--xml output XML (TexinfoML) rather than Info.\n\
"));
@ -405,13 +402,16 @@ Output format selection (default is to produce Info):\n\
General output options:\n\
-E, --macro-expand FILE output macro-expanded source to FILE.\n\
ignoring any @setfilename.\n\
--no-headers suppress node separators, Node: lines, and menus\n\
from Info output (thus producing plain text)\n\
or from HTML (thus producing shorter output);\n\
also, write to standard output by default.\n\
--no-split suppress splitting of Info or HTML output,\n\
generate only one output file.\n\
--number-sections output chapter and sectioning numbers.\n\
-o, --output=FILE output to FILE (directory if split HTML),\n\
"));
/* xgettext: no-wrap */
printf (_("\
Options for Info and plain text:\n\
--enable-encoding output accented and special characters in\n\
@ -430,7 +430,6 @@ Options for Info and plain text:\n\
}
printf ("\n");
/* xgettext: no-wrap */
puts (_("\
Input file options:\n\
--commands-in-node-names allow @ commands in node names.\n\
@ -439,38 +438,44 @@ Input file options:\n\
-P DIR prepend DIR to the @include search path.\n\
-U VAR undefine the variable VAR, as with @clear.\n\
"));
/* xgettext: no-wrap */
puts (_("\
Conditional processing in input:\n\
--ifhtml process @ifhtml and @html even if not generating HTML.\n\
--ifinfo process @ifinfo text even when generating HTML.\n\
--iftex process @iftex and @tex text; implies --no-split.\n\
--no-ifhtml do not process @ifhtml and @html text.\n\
--no-ifinfo do not process @ifinfo text.\n\
--no-iftex do not process @iftex and @tex text.\n\
--ifhtml process @ifhtml and @html even if not generating HTML.\n\
--ifinfo process @ifinfo even if not generating Info.\n\
--ifplaintext process @ifplaintext even if not generating plain text.\n\
--iftex process @iftex and @tex; implies --no-split.\n\
--no-ifhtml do not process @ifhtml and @html text.\n\
--no-ifinfo do not process @ifinfo text.\n\
--no-ifplaintext do not process @ifplaintext text.\n\
--no-iftex do not process @iftex and @tex text.\n\
"));
/* xgettext: no-wrap */
puts (_("\
The defaults for the @if... conditionals depend on the output format:\n\
if generating HTML, --ifhtml is on and the others are off;\n\
if generating Info or plain text, --ifinfo is on and the others are off.\n\
if generating Info, --ifinfo is on and the others are off;\n\
if generating plain text, --ifplaintext is on and the others are off;\n\
"));
/* xgettext: no-wrap */
puts (_("\
fputs (_("\
Examples:\n\
makeinfo foo.texi write Info to foo's @setfilename\n\
makeinfo --html foo.texi write HTML to foo's @setfilename\n\
makeinfo --no-headers -o - foo.texi write plain text to standard output\n\
makeinfo --html foo.texi write HTML to @setfilename\n\
makeinfo --xml foo.texi write XML to @setfilename\n\
makeinfo --docbook foo.texi write DocBook XML to @setfilename\n\
makeinfo --no-headers foo.texi write plain text to standard output\n\
\n\
makeinfo --html --no-headers foo.texi write html without node lines, menus\n\
makeinfo --number-sections foo.texi write Info with numbered sections\n\
makeinfo --no-split foo.texi write one Info file however big\n\
"));
"), stdout);
/* xgettext: no-wrap */
puts (_("\
puts (_("\n\
Email bug reports to bug-texinfo@gnu.org,\n\
general questions and discussion to help-texinfo@gnu.org."));
general questions and discussion to help-texinfo@gnu.org.\n\
Texinfo home page: http://www.gnu.org/software/texinfo/"));
xexit (exit_value);
}
@ -487,11 +492,13 @@ struct option long_options[] =
{ "html", 0, 0, 'w' },
{ "ifhtml", 0, &process_html, 1 },
{ "ifinfo", 0, &process_info, 1 },
{ "ifplaintext", 0, &process_plaintext, 1 },
{ "iftex", 0, &process_tex, 1 },
{ "macro-expand", 1, 0, 'E' },
{ "no-headers", 0, &no_headers, 1 },
{ "no-ifhtml", 0, &process_html, 0 },
{ "no-ifinfo", 0, &process_info, 0 },
{ "no-ifplaintext", 0, &process_plaintext, 0 },
{ "no-iftex", 0, &process_tex, 0 },
{ "no-number-footnotes", 0, &number_footnotes, 0 },
{ "no-number-sections", 0, &number_sections, 0 },
@ -607,6 +614,7 @@ main (argc, argv)
case 'o': /* --output */
command_output_filename = xstrdup (optarg);
save_command_output_filename = command_output_filename;
break;
case 'p': /* --paragraph-indent */
@ -689,7 +697,6 @@ For more information about these matters, see the files named COPYING.\n"),
case 'w': /* --html */
html = 1;
process_html = 1;
process_info = 0;
break;
case 'x': /* --xml */
@ -735,7 +742,19 @@ For more information about these matters, see the files named COPYING.\n"),
if (!command_output_filename)
command_output_filename = xstrdup ("-");
}
if (process_info == -1)
{ /* no explicit --[no-]ifinfo option, so we'll do @ifinfo
if we're generating info or (for compatibility) plain text. */
process_info = !html && !xml;
}
if (process_plaintext == -1)
{ /* no explicit --[no-]ifplaintext option, so we'll do @ifplaintext
if we're generating plain text. */
process_plaintext = no_headers && !html && !xml;
}
if (verbose_mode)
print_version_info ();
@ -1274,14 +1293,15 @@ convert_from_file (name)
}
/* Given OUTPUT_FILENAME == ``/foo/bar/baz.html'', return
``/foo/bar/baz/baz.html''.
"/foo/bar/baz/baz.html". This routine is called only if html && splitting.
Split html output goes into the subdirectory of the toplevel
filename, without extension. For example:
@setfilename foo.info
produces output in files foo/index.html, foo/second-node.html, .... */
produces output in files foo/index.html, foo/second-node.html, ...
But if the user said -o foo.whatever on the cmd line, then use
foo.whatever unchanged. */
static char *
insert_toplevel_subdirectory (output_filename)
@ -1289,7 +1309,7 @@ insert_toplevel_subdirectory (output_filename)
{
char *dir, *subdir, *base, *basename, *p;
char buf[PATH_MAX];
int max_name_len;
struct stat st;
static const char index_name[] = "index.html";
const int index_len = sizeof (index_name) - 1;
@ -1303,36 +1323,48 @@ insert_toplevel_subdirectory (output_filename)
p = strrchr (base, '.');
if (p)
*p = 0;
/* Split html output goes into subdirectory of toplevel name. */
subdir = "";
if (FILENAME_CMP (base, filename_part (dir)) != 0)
subdir = base;
max_name_len = strlen (basename);
if (index_len > max_name_len)
max_name_len = index_len;
{
if (save_command_output_filename
&& STREQ (output_filename, save_command_output_filename))
subdir = basename; /* from user, use unchanged */
else
subdir = base; /* implicit, omit suffix */
}
free (output_filename);
output_filename = xmalloc (strlen (dir) + 1
+ strlen (subdir) + 1
+ max_name_len
output_filename = xmalloc (strlen (dir) + 1
+ strlen (basename) + 1
+ index_len
+ 1);
strcpy (output_filename, dir);
if (strlen (dir))
strcat (output_filename, "/");
strcat (output_filename, subdir);
if (mkdir (output_filename, 0777) == -1 && errno != EEXIST)
if (mkdir (output_filename, 0777) == -1 && errno != EEXIST
/* output_filename might exist, but be a non-directory. */
|| (stat (output_filename, &st) == 0 && !S_ISDIR (st.st_mode)))
{ /* that failed, try subdir name with .html */
strcpy (output_filename, dir);
if (strlen (dir))
strcat (output_filename, "/");
strcat (output_filename, basename);
if (mkdir (output_filename, 0777) == -1 && errno != EEXIST)
{
if (mkdir (output_filename, 0777) == -1)
{
char *errmsg = strerror (errno);
if ((errno == EEXIST
#ifdef __MSDOS__
|| errno == EACCES
#endif
)
&& (stat (output_filename, &st) == 0 && !S_ISDIR (st.st_mode)))
errmsg = _("File exists, but is not a directory");
line_error (_("Can't create directory `%s': %s"),
output_filename,
strerror (errno));
output_filename, errmsg);
exit (1);
}
strcat (output_filename, "/");
@ -1449,7 +1481,7 @@ convert_from_loaded_file (name)
input_text_offset = 0;
real_output_filename = output_filename = command_output_filename;
command_output_filename = NULL;
command_output_filename = NULL; /* for included files or whatever */
}
canon_white (output_filename);
@ -1692,7 +1724,14 @@ handle_menu_entry ()
in_paragraph = 0;
}
add_word ("<li><a href=\"");
add_word ("<li><a");
if (next_menu_item_number <= 9)
{
add_word(" accesskey=");
add_word_args("%d", next_menu_item_number);
next_menu_item_number++;
}
add_word (" href=\"");
string = expansion (tem, 0);
add_anchor_name (string, 1);
add_word ("\">");
@ -3922,6 +3961,9 @@ maybe_update_execution_strings (text, new_len)
abort ();
}
/* FIXME: this is an arbitrary limit. */
#define EXECUTE_STRING_MAX 16*1024
/* Execute the string produced by formatting the ARGs with FORMAT. This
is like submitting a new file with @include. */
void
@ -3939,7 +3981,7 @@ execute_string (format, va_alist)
va_list ap;
#endif
es = get_execution_string (4000);
es = get_execution_string (EXECUTE_STRING_MAX);
temp_string = es->string;
es->in_use = 1;
@ -3968,12 +4010,49 @@ execute_string (format, va_alist)
/* Return what would be output for STR (in newly-malloced memory), i.e.,
expand Texinfo commands. If IMPLICIT_CODE is set, expand @code{STR}. */
expand Texinfo commands. If IMPLICIT_CODE is set, expand @code{STR}.
This is generally used for short texts; filling, indentation, and
html escapes are disabled. */
char *
expansion (str, implicit_code)
char *str;
int implicit_code;
{
char *result;
/* Inhibit indentation and filling, so that extra newlines
are not added to the expansion. (This is undesirable if
we write the expanded text to macro_expansion_output_stream.) */
int saved_filling_enabled = filling_enabled;
int saved_indented_fill = indented_fill;
int saved_no_indent = no_indent;
int saved_escape_html = escape_html;
filling_enabled = 0;
indented_fill = 0;
no_indent = 1;
escape_html = 0;
result = full_expansion (str, implicit_code);
filling_enabled = saved_filling_enabled;
indented_fill = saved_indented_fill;
no_indent = saved_no_indent;
escape_html = saved_escape_html;
return result;
}
/* Expand STR (or @code{STR} if IMPLICIT_CODE is nonzero). No change to
any formatting parameters -- filling, indentation, html escapes,
etc., are not reset. */
char *
full_expansion (str, implicit_code)
char *str;
int implicit_code;
{
int length;
char *result;
@ -3983,13 +4062,7 @@ expansion (str, implicit_code)
int saved_paragraph_is_open = paragraph_is_open;
int saved_output_column = output_column;
/* Inhibit indentation and filling, so that extra newlines
are not added to the expansion. (This is undesirable if
we write the expanded text to macro_expansion_output_stream.) */
int saved_filling_enabled = filling_enabled;
int saved_indented_fill = indented_fill;
int saved_no_indent = no_indent;
int saved_escape_html = escape_html;
/* More output state to save. */
int saved_meta_pos = meta_char_pos;
int saved_last_char = last_inserted_character;
int saved_last_nl = last_char_was_newline;
@ -4000,14 +4073,14 @@ expansion (str, implicit_code)
it from under our feet if it finds any macros in STR. */
char *saved_command = command ? xstrdup (command) : NULL;
filling_enabled = 0;
indented_fill = 0;
no_indent = 1;
escape_html = 0;
inhibit_output_flushing ();
paragraph_is_open = 1;
execute_string (implicit_code ? "@code{%s}" : "%s", str);
if (strlen (str) > (implicit_code
? EXECUTE_STRING_MAX - 1 - sizeof("@code{}")
: EXECUTE_STRING_MAX - 1))
line_error (_("`%.40s...' is too long for expansion; not expanded"), str);
else
execute_string (implicit_code ? "@code{%s}" : "%s", str);
uninhibit_output_flushing ();
/* Copy the expansion from the buffer. */
@ -4019,13 +4092,11 @@ expansion (str, implicit_code)
/* Pretend it never happened. */
free_and_clear (&command);
command = saved_command;
output_paragraph_offset = start;
paragraph_is_open = saved_paragraph_is_open;
output_column = saved_output_column;
filling_enabled = saved_filling_enabled;
indented_fill = saved_indented_fill;
no_indent = saved_no_indent;
escape_html = saved_escape_html;
meta_char_pos = saved_meta_pos;
last_inserted_character = saved_last_char;
last_char_was_newline = saved_last_nl;
@ -4043,10 +4114,13 @@ text_expansion (str)
{
char *ret;
int save_html = html;
int save_xml = xml;
html = 0;
xml = 0;
ret = expansion (str, 0);
html = save_html;
xml = save_xml;
return ret;
}

View File

@ -1,7 +1,7 @@
/* makeinfo.h -- declarations for Makeinfo.
$Id: makeinfo.h,v 1.31 2001/09/11 16:37:51 karl Exp $
$Id: makeinfo.h,v 1.37 2002/03/28 16:33:48 karl Exp $
Copyright (C) 1996, 97, 98, 99, 2000, 01 Free Software Foundation, Inc.
Copyright (C) 1996, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -45,7 +45,7 @@ DECLARE (int, executing_string, 0);
stream, because it has already been written. */
DECLARE (int, me_inhibit_expansion, 0);
extern char *expansion (), *text_expansion ();
extern char *expansion (), *text_expansion (), *full_expansion ();
/* Current output stream. */
DECLARE (FILE *, output_stream, NULL);
@ -129,6 +129,10 @@ DECLARE (int, enable_encoding, 0);
DECLARE (int, escape_html, 1);
extern char *escape_string (); /* do HTML escapes */
/* Access key number for next menu entry to be generated (1 to 9, or 10 to
mean no access key) */
DECLARE (int, next_menu_item_number, 1);
/* Nonzero means that the use of paragraph_start_indent is inhibited.
@example uses this to line up the left columns of the example text.
A negative value for this variable is incremented each time it is used.
@ -144,6 +148,9 @@ DECLARE (char *, current_node, NULL);
/* Command name in the process of being hacked. */
DECLARE (char *, command, NULL);
/* @copying ... @end copying. */
DECLARE (char *, copying_text, NULL);
/* @documentdescription ... @end documentdescription. */
DECLARE (char *, document_description, NULL);
@ -174,9 +181,15 @@ DECLARE (int, no_headers, 0);
generating HTML. (--ifhtml) */
DECLARE (int, process_html, 0);
/* Nonzero means that we process @ifinfo even when generating HTML.
(--ifinfo) */
DECLARE (int, process_info, 1);
/* Positive means process @ifinfo (even if not generating Info);
zero means don't process @ifinfo (even if we are);
-1 means we don't know yet. (--ifinfo) */
DECLARE (int, process_info, -1);
/* Positive means process @ifplaintext (even if not generating plain text);
zero means we don't process @ifplaintext (even if we are);
-1 means we don't know yet. (--ifplaintext) */
DECLARE (int, process_plaintext, -1);
/* Nonzero means that we process @tex and @iftex. (--iftex) */
DECLARE (int, process_tex, 0);

View File

@ -1,5 +1,5 @@
/* node.c -- nodes for Texinfo.
$Id: node.c,v 1.31 2002/02/23 19:12:15 karl Exp $
$Id: node.c,v 1.34 2002/03/26 16:16:29 karl Exp $
Copyright (C) 1998, 99, 2000, 01, 02 Free Software Foundation, Inc.
@ -599,7 +599,7 @@ cm_node ()
no_indent = 1;
if (xml)
{
xml_begin_document ();
xml_begin_document (current_output_filename);
xml_begin_node ();
if (!docbook)
{
@ -928,7 +928,7 @@ cm_node ()
tem = expansion (next, 0);
add_word (",\n");
add_word (_("Next:"));
add_word ("<a rel=next href=\"");
add_word ("<a rel=next accesskey=n href=\"");
add_anchor_name (tem, 1);
add_word_args ("\">%s</a>", tem);
free (tem);
@ -938,7 +938,7 @@ cm_node ()
tem = expansion (prev, 0);
add_word (",\n");
add_word (_("Previous:"));
add_word ("<a rel=previous href=\"");
add_word ("<a rel=previous accesskey=p href=\"");
add_anchor_name (tem, 1);
add_word_args ("\">%s</a>", tem);
free (tem);
@ -948,7 +948,7 @@ cm_node ()
tem = expansion (up, 0);
add_word (",\n");
add_word (_("Up:"));
add_word ("<a rel=up href=\"");
add_word ("<a rel=up accesskey=u href=\"");
add_anchor_name (tem, 1);
add_word_args ("\">%s</a>", tem);
free (tem);
@ -1149,7 +1149,8 @@ cm_anchor (arg)
xml_insert_element (ANCHOR, END);
}
/* Save it in the tag table. */
remember_node (anchor, NULL, NULL, NULL, output_position + output_column,
remember_node (anchor, NULL, NULL, NULL,
output_position + output_paragraph_offset,
line_number, fname_for_anchor, TAG_FLAG_ANCHOR);
}

View File

@ -1,21 +1,11 @@
<!-- $Id: texinfo.dtd,v 1.1 2001/05/21 17:36:22 karl Exp $
Document Type Definition for Texinfo
************************************
For texinfo-4.0b
*******************
<!-- $Id: texinfo.dtd,v 1.5 2002/03/23 20:41:32 karl Exp $
Document Type Definition for Texinfo.
Author: Philippe Martin (feloy@free.fr)
Contributors:
Karl Eichwalder (keichwa@gmx.net)
HISTORY
*******
Version 0.2 - 2001-05-08
Version 0.1 - 2001-05-07
Copyright (C) 2001 Free Software Foundation, Inc.
Copyright (C) 2001, 02 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -40,7 +30,8 @@
<!-- block -->
<!-- ***** -->
<!ENTITY % block "menu | para | quotation | example | smallexample | lisp
| smalllisp | cartouche | format | smallformat | display
| smalllisp | cartouche | copying
| format | smallformat | display
| smalldisplay | itemize | enumerate | sp | center | group
| table | multitable">
@ -151,6 +142,7 @@
<!ELEMENT lisp (#PCDATA | %block; | %Inline.phrase;)*>
<!ELEMENT smalllisp (#PCDATA | %block; | %Inline.phrase;)*>
<!ELEMENT cartouche (#PCDATA | %block; | %Inline.phrase;)*>
<!ELEMENT copying (#PCDATA | %block; | %Inline.phrase;)*>
<!ELEMENT format (#PCDATA | %block; | %Inline.phrase;)*>
<!ELEMENT smallformat (#PCDATA | %block; | %Inline.phrase;)*>
<!ELEMENT display (#PCDATA | %block; | %Inline.phrase;)*>

View File

@ -1,5 +1,5 @@
<?xml version='1.0'?>
<!-- $Id: texinfo.xsl,v 1.1 2001/06/07 18:35:23 karl Exp $ -->
<!-- $Id: texinfo.xsl,v 1.2 2002/04/01 14:06:15 karl Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
@ -7,12 +7,12 @@
<!-- root rule -->
<xsl:template match="/">
<HTML>
<HEAD><TITLE>
<html>
<head><title>
<xsl:apply-templates select="TEXINFO/SETTITLE" mode="head"/>
</TITLE></HEAD>
<BODY BGCOLOR="#FFFFFF"><xsl:apply-templates/>
</BODY></HTML>
</title></head>
<body bgcolor="#FFFFFF"><xsl:apply-templates/>
</body></html>
</xsl:template>
@ -46,7 +46,8 @@
<!-- The node -->
<xsl:template match="TEXINFO/NODE">
<hr><p>
<hr/>
<p>
<xsl:apply-templates select="NODENAME" mode="select"/>
<xsl:apply-templates select="NODEPREV" mode="select"/>
<xsl:apply-templates select="NODEUP" mode="select"/>
@ -56,7 +57,7 @@
<ol>
<xsl:apply-templates select=".//FOOTNOTE" mode="footnote"/>
</ol>
</p></hr>
</p>
</xsl:template>
<xsl:template match="TEXINFO/NODE/NODENAME" mode="select">
@ -127,7 +128,7 @@
<xsl:apply-templates select="MENUTITLE"/>
</a>:
<xsl:apply-templates select="MENUCOMMENT"/>
<br></br>
<br/>
</xsl:template>
<xsl:template match="//MENU/MENUENTRY/MENUNODE">
@ -239,4 +240,3 @@
</xsl:template>
</xsl:stylesheet>

View File

@ -1,5 +1,5 @@
/* toc.c -- table of contents handling.
$Id: toc.c,v 1.21 2002/02/23 19:12:15 karl Exp $
$Id: toc.c,v 1.22 2002/04/01 14:07:11 karl Exp $
Copyright (C) 1999, 2000, 01, 02 Free Software Foundation, Inc.
@ -74,16 +74,16 @@ toc_add_entry (tocname, level, node_name, anchor)
if (html)
{
/* We need to insert the expanded node name into the TOC, so
that when we eventually output the TOC, its <A REF= link will
point to the <A NAME= tag created by cm_node in the navigation
/* We need to insert the expanded node name into the toc, so
that when we eventually output the toc, its <a ref= link will
point to the <a name= tag created by cm_node in the navigation
bar. We cannot expand the containing_node member, for the
reasons explained in the WARNING below. We also cannot wait
with the node name expansion until the TOC is actually output,
with the node name expansion until the toc is actually output,
since by that time the macro definitions may have been changed.
So instead we store in the tocname member the expanded node
name and the TOC name concatenated together (with the necessary
HTML markup), since that's how they are output. */
name and the toc name concatenated together (with the necessary
html markup), since that's how they are output. */
if (!anchor)
s = expanded_node = expand_node_name (node_name);
else

View File

@ -1,5 +1,5 @@
/* xml.c -- xml output.
$Id: xml.c,v 1.7 2002/01/16 15:52:45 karl Exp $
$Id: xml.c,v 1.11 2002/03/23 20:41:12 karl Exp $
Copyright (C) 2001, 02 Free Software Foundation, Inc.
@ -109,6 +109,7 @@ element texinfoml_element_list [] = {
{ "lisp", 1, 0 },
{ "smalllisp", 1, 0 },
{ "cartouche", 1, 0 },
{ "copying", 1, 0 },
{ "format", 1, 0 },
{ "smallformat", 1, 0 },
{ "display", 1, 0 },
@ -243,6 +244,7 @@ element docbook_element_list [] = {
{ "screen", 0, 1 }, /* LISP */
{ "screen", 0, 1 }, /* SMALLLISP */
{ "", 1, 0 }, /* CARTOUCHE */
{ "", 1, 0 }, /* COPYING */
{ "screen", 0, 1 }, /* FORMAT */
{ "screen", 0, 1 }, /* SMALLFORMAT */
{ "screen", 0, 1 }, /* DISPLAY */

View File

@ -1,7 +1,7 @@
/* xml.h -- xml output declarations.
$Id: xml.h,v 1.3 2001/05/01 16:29:29 karl Exp $
$Id: xml.h,v 1.7 2002/03/23 20:41:21 karl Exp $
Copyright (C) 2001 Free Software Foundation, Inc.
Copyright (C) 2001, 02 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -40,22 +40,26 @@ enum xml_element
NODE /* 4 */, NODENEXT, NODEPREV, NODEUP,
/* Structuring */
CHAPTER /* 8 */, SECTION, SUBSECTION, SUBSUBSECTION,
TOP /* 12 */, UNNUMBERED, UNNUMBEREDSEC, UNNUMBEREDSUBSEC, UNNUMBEREDSUBSUBSEC,
TOP /* 12 */, UNNUMBERED, UNNUMBEREDSEC, UNNUMBEREDSUBSEC,
UNNUMBEREDSUBSUBSEC,
APPENDIX /* 17 */, APPENDIXSEC, APPENDIXSUBSEC, APPENDIXSUBSUBSEC,
MAJORHEADING /* 21 */, CHAPHEADING, HEADING, SUBHEADING, SUBSUBHEADING,
/* Menu */
MENU /* 26 */, MENUENTRY, MENUTITLE, MENUCOMMENT, MENUNODE, NODENAME,
/* -- */
ACRONYM/* 32 */, TT, CODE, KBD, URL, KEY, VAR, SC, DFN, EMPH, STRONG, CITE, NOTFIXEDWIDTH, I, B, R,
ACRONYM/* 32 */, TT, CODE, KBD, URL, KEY, VAR, SC, DFN, EMPH, STRONG,
CITE, NOTFIXEDWIDTH, I, B, R,
TITLE,
IFINFO,
SP, CENTER,
DIRCATEGORY,
QUOTATION, EXAMPLE, SMALLEXAMPLE, LISP, SMALLLISP, CARTOUCHE, FORMAT, SMALLFORMAT, DISPLAY, SMALLDISPLAY,
QUOTATION, EXAMPLE, SMALLEXAMPLE, LISP, SMALLLISP, CARTOUCHE,
COPYING, FORMAT, SMALLFORMAT, DISPLAY, SMALLDISPLAY,
FOOTNOTE,
ITEMIZE, ITEMFUNCTION, ITEM, ENUMERATE, TABLE, TABLEITEM, TABLETERM,
INDEXTERM,
XREF, XREFNODENAME, XREFINFONAME, XREFPRINTEDDESC, XREFINFOFILE, XREFPRINTEDNAME,
XREF, XREFNODENAME, XREFINFONAME, XREFPRINTEDDESC, XREFINFOFILE,
XREFPRINTEDNAME,
INFOREF, INFOREFNODENAME, INFOREFREFNAME, INFOREFINFONAME,
UREF, UREFURL, UREFDESC, UREFREPLACEMENT,
EMAIL, EMAILADDRESS, EMAILNAME,
@ -63,7 +67,8 @@ enum xml_element
PRINTINDEX,
ANCHOR,
IMAGE,
PRIMARY, SECONDARY, INFORMALFIGURE, MEDIAOBJECT, IMAGEOBJECT, IMAGEDATA, TEXTOBJECT,
PRIMARY, SECONDARY, INFORMALFIGURE, MEDIAOBJECT, IMAGEOBJECT,
IMAGEDATA, TEXTOBJECT,
INDEXENTRY, PRIMARYIE, SECONDARYIE, INDEXDIV,
MULTITABLE, TGROUP, COLSPEC, TBODY, ENTRY, ROW,
BOOKINFO, ABSTRACT, REPLACEABLE,

View File

@ -1,5 +1,5 @@
/* install-info -- create Info directory entry(ies) for an Info file.
$Id: install-info.c,v 1.52 2002/01/19 01:12:29 karl Exp $
$Id: install-info.c,v 1.55 2002/03/11 19:55:23 karl Exp $
Copyright (C) 1996, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
@ -416,10 +416,12 @@ Options:\n\
If you don't specify any sections, they are determined\n\
from information in the Info file itself.\n\
--version display version information and exit.\n\
\n\
"), progname);
puts (_("\n\
Email bug reports to bug-texinfo@gnu.org,\n\
general questions and discussion to help-texinfo@gnu.org.\n\
"), progname);
Texinfo home page: http://www.gnu.org/software/texinfo/"));
}

View File

@ -1,5 +1,5 @@
/* Process TeX index dribble output into an actual index.
$Id: texindex.c,v 1.37 2002/01/19 01:12:54 karl Exp $
$Id: texindex.c,v 1.41 2002/03/11 19:55:46 karl Exp $
Copyright (C) 1987, 91, 92, 96, 97, 98, 99, 2000, 01, 02
Free Software Foundation, Inc.
@ -286,7 +286,8 @@ _("Usually FILE... is specified as `foo.%c%c\' for a document `foo.texi'.\n"),
fputs (_("\n\
Email bug reports to bug-texinfo@gnu.org,\n\
general questions and discussion to help-texinfo@gnu.org.\n\
"), f);
Texinfo home page: http://www.gnu.org/software/texinfo/"), f);
fputs ("\n", f);
xexit (result_value);
}