diff options
| author | christos <christos@NetBSD.org> | 2008-09-02 07:45:41 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2008-09-02 07:45:41 +0000 |
| commit | 14e22615fd3ae4a4c00a5a3f5be8034e69889f2a (patch) | |
| tree | 41260ca4171c399e65d1d3b4773ec5fd6d04ee89 /gnu | |
| parent | 268f1193584105db47480299429f31eed90d50d4 (diff) | |
import last gplv2 version
Diffstat (limited to 'gnu')
197 files changed, 19231 insertions, 5095 deletions
diff --git a/gnu/dist/texinfo/AUTHORS b/gnu/dist/texinfo/AUTHORS index d404fec08f3..8388aa090c4 100644 --- a/gnu/dist/texinfo/AUTHORS +++ b/gnu/dist/texinfo/AUTHORS @@ -1,4 +1,4 @@ -Id: AUTHORS,v 1.2 2003/12/15 13:07:46 karl Exp +Id: AUTHORS,v 1.10 2004/04/11 17:56:45 karl Exp Texinfo authors. Copyright (C) 2003 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/ChangeLog b/gnu/dist/texinfo/ChangeLog index 3827207d9bd..7c53a091188 100644 --- a/gnu/dist/texinfo/ChangeLog +++ b/gnu/dist/texinfo/ChangeLog @@ -1,3 +1,799 @@ +2004-12-31 Karl Berry <karl@gnu.org> + + * Version 4.8. + +2004-12-21 Karl Berry <karl@gnu.org> + + * pretest version 4.7.94. + + * makeinfo/xref.c: doc fix. + +2004-12-20 Karl Berry <karl@gnu.org> + + * makeinfo/html.c (cm_node) <html>: need old-style names in the normal + (not no_headers) html case, too, of course. + (add_html_names): canon_white the new name, too. + +2004-12-19 Karl Berry <karl@gnu.org> + + * pretest version 4.7.93. + + * automake 1.9.4. + + * makeinfo/xml.c (try_docbook_image): new fn. + (xml_insert_docbook_image): call it, trying additional formats + pdf, svg, etc. + * makeinfo/makeinfo.c (cm_image): check for gif too. + http://www.gnu.org/philosophy/gif.html says: + "we can and will include support for displaying GIF files in GNU + software." Leaving it undocumented, though. + Based on patch from Jens Elkner, 18 Dec 2004 01:56:28 +0100. + +2004-12-19 Torsten Bronger <bronger@physik.rwth-aachen.de> + + * util/texinfo.dtd: define most entities, add <neos>. + +2004-12-17 Juan M. Guerrero <st001906@hrz1.hrz.tu-darmstadt.de> + + * djgpp/config.bat: remove files like coXXXXXX.tmp created + in the top_srcdir by the gl_FUNC_MKSTEMP test. + +2004-12-15 Karl Berry <karl@gnu.org> + + * pretest version 4.7.92. + + * util/texinfo.dtd: merge with makeinfo/texinfo.dtd. + * makeinfo/texinfo.dtd, makeinfo/texinfo.xsl: remove. + +2004-12-15 Stepan Kasal <kasal@ucw.cz> + + * Makefile.am (EXTRA_DIST): Removed po/Makevars.template, sorry. + +2004-12-15 Juan M. Guerrero <st001906@hrz1.hrz.tu-darmstadt.de> + + * djgpp/config.sed: adjust for new autoconf. + * makeinfo/node.c (enumerate_filename): make dos_file_names const + instead of static, since it may involve a fn call to pathconf. + +2004-12-15 Karl Berry <karl@gnu.org> + + * Makefile.am (EXTRA_DIST): include ChangeLog.46, README.dev, + and po/Makevars.template. From Stepan. + +2004-12-14 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (inforef): try to explain possible uses more + thoroughly. + From: Luc Teirlinck, 13 Dec 2004 21:45:58 -0600. + + * doc/texinfo.txi (pxref): more explanation. + * doc/info-stnd.texi (Basic Windows): put pxref in parens. + help-texinfo mail from adl, 13 Dec 2004 17:07:50 +0100. + +2004-12-13 Andreas Schwab <schwab@suse.de> + + * info/echo-area.c (DECLARE_INFO_COMMAND): Add intermediate cast + to avoid warning. + * info/infokey.c (compile): Likewise. + * info/session.c (forward_move_node_structure): Likewise. + (DECLARE_INFO_COMMAND): Likewise. + + * makeinfo/makeinfo.c (init_paragraph): Don't use free_and_clear + to avoid strict aliasing issue. + + * makeinfo/cmds.c (cm_center): Avoid strict aliasing issue. + +2004-12-13 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (HTML Cross-reference Command Expansion): add + @euro{} -> U+20AC. texinfo-pretest mail from Patrice, + 12 Dec 2004 23:49:50 +0100. + +2004-12-12 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (makeinfo options): don't be so suggestive about + skipping xref validation. + emacs-devel mail from: Luc Teirlinck, 12 Dec 2004 13:02:11 -0600. + +2004-12-08 Karl Berry <karl@gnu.org> + + * pretest version 4.7.91. + + * info/echo-area.c, info/infokey.c, info/session.c: omit useless + casts to intptr_t, since we're just casting to (void *) next. + intptr_t is not defined with gcc 3.04 on Tru64 Unix V5.1 + (This whole vararg stuff needs to be redone correctly.) + Report from: Svend Tollak Munkejord (via te) + 8 Dec 2004 17:15:17 +0100. + + * doc/texinfo.txi (ref): rewrite last two redundant paragraphs. + +2004-12-07 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (Macro Details): document @c kludge in macro + definitions to work around some newline problems. (From Werner.) + +2004-12-05 Karl Berry <karl@gnu.org> + + * makeinfo/html.c (add_escaped_anchor_name): prefix g_t if the + nodename begins with a nonletter. Ugh. + * doc/texinfo.txi (HTML Xref Node Name Expansion): document this. + http://ff0.org/pipermail/texinfo-pretest/2004-December/000210.html + + * doc/texinfo.txi (HTML Xref 8-bit Character Expansion): define + behavior for Unicode code points above 0xfff. + + * makeinfo/makeinfo.c (reader_loop): <wbr> didn't make it into + HTML 4, remove it. Sigh. + texinfo-pretest mail from wl, 05 Dec 2004 23:39:05 +0100. + +2004-12-02 Karl Berry <karl@gnu.org> + + * configure.ac (install-warnings): simplify default case. From te. + +2004-12-01 Karl Berry <karl@gnu.org> + + * pretest version 4.7.90. + + * util/texi2dvi (recode): new option, off by default. + Unconditionally calling recode seems problematic, when there + hasn't been a release for years and its Texinfo support is less than + perfect. + +2004-11-30 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (Quotations and Examples): @quotation does not + reduce interparagraph spacing. + + * makeinfo/node.c (cm_node) <html>: do not bother calling + add_html_nodes in the split case, the filename is wrong. + +2004-11-29 Karl Berry <karl@gnu.org> + + Support for writing <a name="..."> using the old-style node name + to HTML name conversion, to keep the gcc folks happy. + * makeinfo/node.c (add_html_names): new routine, factoring out + common code (plus new code) from cm_node. + (cm_node) <html>: call it. + * makeinfo/makeinfo.h (OLD_HTML_SAFE, OLD_URL_SAFE_CHAR): + (re)define these. + * makeinfo/html.c (add_escaped_anchor_name): take new argument to + optionally output the old-style conversion. + (add_anchor_name): change call. + * index.c: change calls. + * makeinfo/html.h (add_escaped_anchor_name): change decl. + +2004-11-26 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c (reader_loop): allow <wbr> after — + +2004-11-25 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (Fonts): document new command @sansserif. + * doc/texinfo.tex (\sansserif): new command. + * makeinfo/cmds.h (cm_sansserif): new cmd. + * makeinfo/cmds.c (cm_sansserif): new cmd. + (command_table): add it. + * makeinfo/texinfo.dtd (Inline.fonts): add it; also slanted. + * makeinfo/xml.h (SANSSERIF, SLANTED): define these new elements. + * makeinfo/xml.c (texinfoml_element_list): add them. + From: Frank Küster, 21 Oct 2004 23:27:33 +0200, Debian bug#277754. + + * doc/texinfo.txi (Quotations and Examples, end titlepage): state + that there must be only one space between the @end and its + argument. Report from: christoph.sobotka, 26 Oct 2004 22:04:03 +0200. + +2004-11-22 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (euro): new node, documenting new command, + @euro{}, for the Euro currency symbol. + * doc/texinfo.tex (\euro): new command, along with \eurofont to + support it. The following extra font support is also related to + supporting @euro{}: + (\bfstylename): define this. + (\textnominalsize .. \ssecnominalsize): new macros. + (\textfonts .. \ssecfonts): define \curfontsize. + * makeinfo/cmds.c (command_table): add euro. + * makeinfo/lang.c (cm_special_char): handle euro. + (iso8859_15_map): new global. + +2004-11-18 Stepan Kasal <kasal@ucw.cz> + + * doc/texinfo.tex (\ptexnewwrite): Save \newwrite. + (\newwrite): Call it. + +2004-11-17 Karl Berry <karl@gnu.org> + + * configure.ac (install-warnings): new --enable option, requested + by te. + +2004-11-11 Karl Berry <karl@gnu.org> + + * texinfo.dtd (metainformation): add documentdescription. + (documentdescription): define. + * xml.h (DOCUMENTDESCRIPTION): new value for xml_element. + * xml.c (texinfoml_element_list): define documentdescription. + (docbook_element_list): likewise, but don't know how to handle it. + * cmds.c (cm_documentdescription): insert opening xml tag. + * insertion.c (end_insertion): insert closing xml tag. + + * makeinfo/makeinfo.c (insert_string): declare const char * arg. + * makeinfo/makeinfo.h: likewise. + Report from: Vincent Lefevre, 20 Oct 2004 15:40:39 +0200, + noting a spurious </para> after </dircategory>. + +2004-11-08 Karl Berry <karl@gnu.org> + + * doc/texinfo.tex (\pdfmakeoutlines): in the first run through the + toc, define \thischapnum...\thissubsecnum as 0, rather than \empty. + This is so \expnumber doesn't end up trying to expand + \csname sec\empty\endcsname, i.e., \sec, which is the secant function. + Report from: Oliver Beck, help-texinfo, 8 Nov 2004 08:05:55 +0100. + +2004-11-07 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c (main) [LC_MESSAGES]: #ifdef the setlocale + using LC_MESSAGES. From te, 6 Nov 2004 23:36:10 +0100. + +2004-11-06 Karl Berry <karl@gnu.org> + + * lib/Makefile.am (libtxi_a_SOURCES): add strdup.h. + Report from: Thomas Esser <te@dbs.uni-hannover.de>, + 6 Nov 2004 18:11:51 +0100. + +2004-11-01 Karl Berry <karl@gnu.org> + + * makeinfo/xref.c (cm_xref): don't include the external file name + in the HTML output, since it's pretty traditional not to + distinguish internal and external links in HTML, and it disturbs + the flow of reading. + From: Han-Wen Nienhuys <hanwen@xs4all.nl>, 31 Oct 2004 00:13:36 +0200. + (For lilypond.) + +2004-10-31 Karl Berry <karl@gnu.org> + + * doc/texinfo.tex (\setmultitablespacing): just let \multistrut be + the same as \strut. Its previous computation was wrong. + See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100. + +2004-10-22 Stepan Kasal <kasal@ucw.cz> + + * info/Makefile.am (generated_sources): Add dependencies defining + a total order on the files, to prevent race conditions with + parallel make. + Move the code about generated sources to the end of the file. + +2004-10-20 Stepan Kasal <kasal@ucw.cz> + + * info/Makefile.am (doc.c, key.c, funs.h): Don't distribute them. + of these three files. + (ginfo_SOURCES, nodist_ginfo_SOURCES): Move files. + (infokey_SOURCES, nodist_infokey_SOURCES): Likewise. + (DISTCLEANFILES): Include generated_sources. + +2004-10-20 Stepan Kasal <kasal@ucw.cz> + + BUILT_SOURCES is a special variable for a hack to supplement + the automatic dependency tracking; we need it for funs.h only. + See the explanation in the automake manual. + + * info/Makefile.am (BUILT_SOURCES): All occurences replaced by ... + (generated_sources): ... this new variable. + (BUILT_SOURCES): set to ``funs.h''. + +2004-10-20 Stepan Kasal <kasal@ucw.cz> + + * info/Makefile.am (ginfo_SOURCES): replace $(BUILT_SOURCES) + with ``doc.c funs.h''; this reflects the true situation. + (infokey_SOURCES): Add funs.h. + +2004-10-20 Stepan Kasal <kasal@ucw.cz> + + * info/Makefile.am (EXTRA_DIST): No need to mention the generated + sources here, they are in ginfo_SOURCES or infokey_SOURCES. + +2004-10-19 Stepan Kasal <kasal@ucw.cz> + + * configure.ac: When cross compiling, we have to remove + ./config.status, not "$native_tools"/config.status. + Replace ``echo'' with AC_MSG_NOTICE. Quote the variable + values passed to ``env.'' + +2004-10-17 Karl Berry <karl@gnu.org> + + * makeinfo/node.c (cm_node): don't output <br> after the + navigation line, it's apparently just extra space. + + * configure.ac: Clean environment for native configure. + From: Mark Fortescue <mark@mtfhpc.demon.co.uk>, + 17 Oct 2004 19:09:53 +0100. + +2004-10-11 Stepan Kasal <kasal@ucw.cz> + + * configure.ac: Add a short explanation about cross compile. + +2004-10-08 Karl Berry <karl@gnu.org> + + * info/Makefile.am (generated_sources): remove. Found by Stepan. + +2004-10-08 Stepan Kasal <kasal@ucw.cz> + + Support cross compiling. Based on research by Mark Fortescue. + Maciej W. Rozycki pointed out this issue previously. + + * configure.ac: If cross compiling, run second configure script + in a subdirectory ${native_tools}. New automake conditional + TOOLS_ONLY is set inside that subdirectory. + * Makefile.am (SUBDIRS): Add $(native_tools); restrict the + SUBDIRS to minimum, if we are inside the $(native_toos) dir. + (distclean-local): Remove directory $(native_tools). + * doc/Makefile.am: If necessary, use makeinfo and install-info + from $(native_tools). + * info/Makefile.am: Similarily with the ``makedoc'' program. + +2004-10-07 Stepan Kasal <kasal@ucw.cz> + + @table command doesn't work inside environment @display. + There is no point in trying to fix it: just give up with a cry. + + * doc/texinfo.tex (\table, \ftable, \vtable): Instead of calling + \tablex directly, call ... + (\tablecheck): ... this new macro which checks for active newline; + if it's found, it reports an error and uses \doignore to recover. + * doc/texinfo.txi (display): mention this. + +2004-10-06 Karl Berry <karl@gnu.org> + + * doc/*.texi: more consistent use of dashes. + From Stepan and Benno Schulenberg <benno@nietvergeten.nl>. + +2004-10-04 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c (cm_value): increment and restore + input_text_offset before execute_string on the value, + so cm_xref doesn't complain about missing punctuation. + From: Sergey Poznyakoff <gray@Mirddin.farlep.net>, + 04 Oct 2004 15:04:33 +0300. + +2004-10-01 Karl Berry <karl@gnu.org> + + * lib/Makefile.am (libtxi_a_SOURCES): add getopt_.h. + + * configure.ac: bump version to 4.7.90, although we're not really + pretesting yet. (I need a distribution to check an + automake issue.) + +2004-09-14 Karl Berry <karl@gnu.org> + + * util/srclist.txt (getopt.h): renamed to getopt_.h. + * lib/getopt_.h: new file. + * lib/getopt.h: just include getopt.h. + +2004-09-09 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (Image Syntax): mention @noindent, @center. + +2004-09-06 Stepan Kasal <kasal@ucw.cz> + + * doc/texinfo.tex (\Efloat): Take care to run \scantokens on + \thisshortcaption before writing the lof line to auxfile. + Otherwise, when a newline appears in the argument to + @shortcaption, a literal ^^M is written to the aux file. + Report from Patrice, 1 Aug 2004 15:54:44 +0200. + +2004-09-01 Karl Berry <karl@gnu.org> + + * util/gendocs.sh: show commands, allow / in description. + +2004-08-30 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c (maybe_escaped_expansion): new routine, like + expansion but does HTML escapes. + * makeinfo/makeinfo.h (maybe_escaped_expansion): declare. + * makeinfo/index.c (cm_printindex): call it. + This is @cindex Kahrs, J@"urgen does not get + gawk.texi:23425: Unknown command `"urgen'. + (in gawk 3.1.4). + Report from: Stepan Kasal <kasal@ucw.cz>, 24 Aug 2004 12:36:34 +0200. + +2004-08-29 Karl Berry <karl@gnu.org> + + * makeinfo/node.c (split_file): do not search for output file + along the path when calling find_and_load (can cause seg + fault when cross-compiling). + From: Martin Husemann <martin@duskware.de>, 29 Aug 2004 08:40:33 +0200. + http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=26791 + +2004-08-27 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (Macro details): more warnings about macro usage. + Report from: Stepan Kasal <kasal@ucw.cz>, 24 Aug 2004 09:29:35 +0200. + + * doc/texinfo.tex (\Efloat): \vskip\parskip after printing the + caption; previous \printedsomething code to do this had become + obsolete. Reported by Stepan. + + * doc/texinfo.txi (caption shortcaption): show an example for + @shortcaption, and remark that weird commands like @c and @verb + are not allowed. Suggested by Stepan. + +2004-08-27 Stepan Kasal <kasal@ucw.cz> + + * doc/texinfo.tex (\initial): when breaking the column before the + initial, allow for some space at the bottom of the column, so + the baselineskip is preserved (more or less). + Don't give negative penalty, it encouradges creating of underfull + columns with stretched baselineskip. + At the end, the \nobreak should be before \vskip, not after it. + +2004-08-26 Stepan Kasal <kasal@ucw.cz> + + * util/texi2dvi: fix the sed script searching for @documentencoding; + Double-quote some instances of "$filename_???" + +2004-08-26 Akim Demaille <akim@epita.fr> + + Let DVI and PDF files honor the document encoding in TeX. + + * util/texi2dvi ($language): Be sure to set its value. + (get_xref_files): Turn this external shell script into a function. + (filename_rcd, $tmpdir_rcd): New. + If the file is in Texinfo, and has @documentencoding, and recode + is available, then run it. + +2004-08-25 Akim Demaille <akim@epita.fr> + + * util/Makefile.am (texinfo.cat): Fix for srcdir != builddir. + +2004-08-25 Karl Berry <karl@gnu.org> + + * util/texi2dvi: @ is also ok for the first character of xref_files. + +2004-08-20 Karl Berry <karl@gnu.org> + + * doc/texinfo.tex (\tablez): accidentally removed assignments + enabling @item and @itemx within @table. + +2004-08-19 Karl Berry <karl@gnu.org> + + * doc/texinfo.tex (\multitable): \def\item to \crcr, instead of + \let, to avoid errors with a nested @itemize inside + @multitable. + Report from: Pierre-Luc Veilleux <plv@centretiv.com>, + 18 Aug 2004 13:26:00 -0400. + +2004-08-19 Stepan Kasal <kasal@ucw.cz> + + * doc/texinfo.tex (\scanmacro): Make backslash active, not other, + as this is the default when processing texinfo files. + Otherwise, a \ inside @copying will eventually print as ``. + +2004-08-18 Stepan Kasal <kasal@ucw.cz> + + * doc/texinfo.tex (\scantxt): " is another active char to be + sanitized. + +2004-08-18 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (exampleindent): document that the default is + different in TeX. + From: Simon Josefsson <jas@extundo.com>, 18 Aug 2004 13:44:32 +0200. + +2004-08-14 Karl Berry <karl@gnu.org> + + * doc/texinfo.tex (\cslet): equivalent-or-better, and shorter, + version from dak, 12 Aug 2004 19:17:27 +0200. + + * doc/texinfo.txi (makeinfo options): use --no-number-sections + with non-hierarchical manuals. + +2004-08-13 Karl Berry <karl@gnu.org> + + * util/texi2dvi: check for -file-line-error, since -style is no + longer part of the name. + +2004-08-07 Karl Berry <karl@gnu.org> + + * info/echo-area.c (inform_in_echo_area): avoid buffer overrun. + Report from: Roman Werpachowski <rwerp@gazeta.pl>, + 7 Aug 2004 01:18:32 +0200. + + * info/echo-area.h (inform_in_echo_area): declare arg as const, + while we're at it. + +2004-08-02 Karl Berry <karl@gnu.org> + + * makeinfo/cmds.c (cm_acronym_or_abbr): use strchr, not index. + Report from: Prof Brian Ripley <ripley@stats.ox.ac.uk>, + 2 Aug 2004 12:47:36 +0100 (BST) + +2004-07-31 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi, + * doc/texinfo.tex, + * makeinfo/cmds.c, cmds.h, xml.c, xml.h, + * util/texinfo.dtd: new command @abbr, suggested by Paul Eggert, + who also sent the original documentation. + +2004-07-30 Karl Berry <karl@gnu.org> + + * info/infomap.c (initialize_vi_like_keymaps): bind j to + info_next_line and k to info_prev_line. From Eli. + +2004-07-30 Maciej W. Rozycki <macro@linux-mips.org> + + * info/filesys.c (extract_colon_unit): Clean up handling of the + end of string. + +2004-07-27 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (verb): explicitly warn that @verb cannot be + used in xref contexts. + +2004-07-27 Stepan Kasal <kasal@ucw.cz> + + * doc/texinfo.tex (\float): The parameters for @float are + separated by commas; allow a space after each of the commas. + + The TeX code for @caption, @shortcaption and @copying now uses + a similar mechanism to macro definitions. In detail: + + * doc/texinfo.tex (\macrobodyctxt, \macroargctxt): Generalize, ... + (\scanctxt, \scanargctxt): ... and introduce new variants. + (\scanexp): New macro--expand the parameter and call \scantokens. + (\copying, \docopying, \insertcopying): Use \scanargctxt and + \scanexp--this simplifies things a lot. + (\caption, \shortcaption): Redefine, using \scanargctxt via ... + (\docaption, \defcaption): ... these new macros. + (\appendtomacro): Simplify code, using \expandafter. + +2004-07-26 Karl Berry <karl@gnu.org> + + Avoid using the path for output files, since this led to problems + when incompatible files created by previous versions were found. + * makeinfo/files.c (find_and_load): introduce second parameter + use_path, set to 0 from the call in handle_delayed_writes, + 1 in all cases. + * makeinfo/files.h: change decl. + * makeinfo/cmds.c, makeinfo.c, node.c: change calls. + From: Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>, + 14 Jul 2004 00:31:54 +0200. + +2004-07-25 Werner Lemberg <wl@gnu.org> + + Rename @s to @slanted. + + * doc/texinfo.tex (\s): Replace with... + (\slanted): This. + * doc/texinfo.txi: Updated. + + * makeinfo/cmds.c (command_table): Add @slanted, not @s. + (cm_s): Replace with... + (cm_slanted): This. + * makeinfo/cmds.h: Add cm_slanted, not cm_s.. + + * NEWS: Updated. + +2004-07-24 Karl Berry <karl@gnu.org> + + * info/echo-area.c (ea_possible_completions), + * info/session.c (forward_move_node_structure), + * info/infokey.c (compile): cast to intptr_t to avoid cast to + pointer from integer of different size. + From Havard Eidnes <he@netbsd.org>, 14 Jul 2004 20:38:59 +0200. + +2004-07-19 Alper Ersoy <dirt@gtk.org> + + * makeinfo/makeinfo.c (main): with XML, instead of directly calling + handle_variable_internal for -D and -U command line flags, hold the + variable declarations until output document is started. + (convert_from_loaded_file): handle variables provided with -D and -U + flags here, just before entering the reader_loop. + (Otherwise, -D/-U with --xml cause a segfault.) + +2004-07-15 Werner Lemberg <wl@gnu.org> + + * doc/texinfo.tex (\s): New command to typeset text with a slanted + font. + * doc/texinfo.txi: Document @s. + + * makeinfo/cmds.c (command_table): Add @s. + (cm_s): New function. Currently the same as cm_i -- it probably + has to be adapted to Docbook and XML. + * makeinfo/cmds.h: Add prototype for cm_s. + + * NEWS: Document new command @s. + +2004-07-15 Werner Lemberg <wl@gnu.org> + + * doc/texinfo.tex (\TeX): Adjust \spacefactor to make it act like a + lowercase letter, not like a period. + +2004-07-12 Karl Berry <karl@gnu.org> + + * texinfo/texinfo.txi (Useful Highlighting): Include + cross-references to each of the commands. Suggestion from + Wolfgang Pausch, 12 Jul 2004 08:26:28 +0200. + + * texinfo/texinfo.txi (Invoking makeinfo), + * makeinfo/makeinfo.c: mention that --if-noFORMAT also processes + @ifnotFORMAT blocks. + Suggestion from Stepan. + +2004-07-11 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c (discard_until): leave input_text_offset at + the end of input_text if not found, not at one past the + end of input_text. (Had erroneously put that in the block + only if an error was given.) The result was a null byte + after macro expansions. Report from Werner, + 10 Jul 2004 15:36:40 +0200. + + * makeinfo/node.c (split_file): fwrite Local Variables trailer so + it actually gets into the output of the top-level info + file; don't just insert_string. + Report from: Werner LEMBERG, 11 Jul 2004 08:58:13 +0200. + +2004-07-10 Karl Berry <karl@gnu.org> + + * util/texi2pdf: new script. + * util/Makefile.am: install it. + * doc/texinfo.txi: document it. + +2004-07-05 Karl Berry <karl@gnu.org> + + * makeinfo/xref.c (cm_email, cm_uref, et al.): + * makeinfo/xml.c (xml_insert_indexentry, xml_insert_indexterm): + * makeinfo/sectioning.c (sectioning_underscore): + * makeinfo/makeinfo.c (cm_listoffloats): use %s, don't pass string to + execute_string. Report from Christian Schenk. + +2004-07-02 Karl Berry <karl@gnu.org> + + * makeinfo/makinfo.c (execute_string): don't worry about + mismatched multiline commands if executing_macro. + +2004-06-27 Karl Berry <karl@gnu.org> + + * doc/texinfo.tex: Various doc fixes. + (\dosubindsanitize): propagate the same penalty + >10000, don't just use \nobreak. + (\sectionheading): insert a final penalty of + 10001, not 10000. This causes \aboveenvbreak to + insert \parskip glue, cancelling the + \vskip-\parskip done here. Otherwise, when (e.g.) + @section is followed immediately by @example, the + example can be shrunk up above the section title. + +2004-06-14 Karl Berry <karl@gnu.org> + + * doc/texinfo.tex (\commondummies, \indexnofonts): dummy-up @comma. + Report from Arnold. + +2004-06-06 Karl Berry <karl@gnu.org> + + * makeinfo/index.c (index_add_arg): ensure all elements are always + initialized, including output_file, section, and section_name. + (cm_printindex): don't pass index->output_file to + add_html_block_elt_args if it is null. Also do + not pass spurious extra index_name argument. + + * makeinfo/makeinfo.c (add_char): don't call html_output_head if + only_macro_expansion (e.g., a macro call in the + Top menu). From: Yuri D'Elia <wavexx@yuv.info>, + 05 Jun 2004 21:11:00 +0200. + +2004-06-03 Karl Berry <karl@gnu.org> + + * info/session.c (info_menu_digit): use menu, rather than entry, to + avoid seg fault on "0" (the last item), + since menu has already been checked. + From: Malcolm Rowe <malcolm-gnu@farside.org.uk>, + 02 Jun 2004 21:32:37 +0100. + +2004-05-17 Karl Berry <karl@gnu.org> + + * util/gendocs.sh, gendocs_template: use package.format.tar.gz + consistently. Before, -, _, and . were all used. + +2004-05-16 Karl Berry <karl@gnu.org> + + * lib/Makefile.am (libtxi_a_SOURCES): include strcase.h. + From: "Gerrit P. Haase" <gp@familiehaase.de>, + 15 May 2004 21:50:52 +0200. + + * util/gendocs.sh: force HTML output name, otherwise Emacs fails + with its "@setfilename ../...". + +2004-05-04 Karl Berry <karl@gnu.org> + + * util/texi2dvi (TEX): don't use the value when it ends in + "latex"; TEX is also used by mpost. Report from + Yvon.Henel@wanadoo.fr. + +2004-04-29 Karl Berry <karl@gnu.org> + + * doc.texinfo.txi (Invoking makeinfo): mention --plaintext. + From Akim. + + * doc/texinfo.tex (\emptyusermacros): can use \asis. + (\identity): remove. + +2004-04-29 Stepan Kasal <kasal@ucw.cz> + + * doc/texinfo.tex (\commondummiesnofonts, \indexnofonts): In order + to correctly transform words like `Dvo\v{r}\'{a}k' to `Dvorak' + for index sorting, one has to define all accent control sequences + as @asis. (Current code would produce `Dvor{a}k'.) + +2004-04-29 Jan Nieuwenhuizen <janneke@gnu.org> + + * makeinfo/makeinfo.c (remember_error): Try cm_bye not more than + twice. Fixes `Too many errors! Gave up.' looping. + +2004-04-26 Karl Berry <karl@gnu.org> + + * lib/system.h (STRCASEEQ, STRNCASEEQ): new #defines for + convenience. + * makeinfo/cmds.c (cm_strong): actually change the output to avoid a + spurious xref. Suggestion from Jan Nieuwenhuizen + <janneke@gnu.org>, 26 Apr 2004 00:04:04 +0200, emacs-devel. + + * automake 1.8.4. + +2004-04-24 Karl Berry <karl@gnu.org> + + * doc/texinfo.tex (\emptyusermacros, \identity): new macros. + (\indexdummiesnofonts): call it. + This is to semi-support macro calls in the arg to @deffn. + Report from: Akim Demaille <akim@epita.fr>, 20 Apr 2004 17:48:28 +0200. + +2004-04-21 Karl Berry <karl@gnu.org> + + * configure.ac (gl_FUNC_MKSTEMP): rename from UTILS_FUNC_MKSTEMP, + per new gnulib code. + +2004-04-20 Karl Berry <karl@gnu.org> + + * makeinfo/tests/copying: force POSIX language setting. + +2004-04-19 Karl Berry <karl@gnu.org> + + * makeinfo/cmds.c (cm_code): use <samp> for commands other than + @code, so we get typewriter output; and add `...' + for @samp. + Report from: John Blevin <blevin@lucent.com>, + 16 Apr 2004 11:40:01 -0400. + + * makeinfo/html.c (html_output_head) [CSS_FONT_ROMAN, + CSS_FONT_SMALL_CAPS]: prettify. + +2004-04-18 Karl Berry <karl@gnu.org> + + * doc/texinfo.tex (\Orb): define if undefined. + Report from Laurent Siebenmann. + + * util/dir-example: diff updates. + +2004-04-13 Karl Berry <karl@gnu.org> + + * doc/texinfo.tex: remove trailing blanks. suggestion from Jim. + +2004-04-12 Paul Eggert <eggert@twinsun.com> + + * doc/Makefile.am (info.1, infokey.1, install-info.1, + makeinfo.1, texi2dvi.1, texindex.1): Don't use $< in ordinary + rules; it's not portable. + * util/Makefile.am (texinfo.cat): Likewise. + +2004-04-12 Karl Berry <karl@gnu.org> + + * bootstrap: update from berlios. + +2004-04-11 Karl Berry <karl@gnu.org> + + * Version 4.7. + 2004-04-09 Karl Berry <karl@gnu.org> * makeinfo/makeinfo.c (execute_string): do not free the temporary copy @@ -1041,8 +1837,7 @@ * makeinfo/defun.c: --- (which gets reduced to --) instead of -- (which gets reduced to -). - Report from Akim Demaille <akim@epita.fr>, - 09 Feb 2004 18:06:29 +0100. + Report from Akim Demaille <akim@epita.fr>, 09 Feb 2004 18:06:29 +0100. 2004-02-09 Karl Berry <karl@gnu.org> @@ -1076,8 +1871,7 @@ * doc/texinfo.tex (\indexnofonts): define \bullet .. \result, so they can be used in @?index commands. - Report from: Akim Demaille <akim@epita.fr>, - 06 Feb 2004 13:34:15 +0100. + Report from: Akim Demaille <akim@epita.fr>, 06 Feb 2004 13:34:15 +0100. 2004-02-05 Karl Berry <karl@gnu.org> @@ -4199,6 +4993,8 @@ * version 4.6. +Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. diff --git a/gnu/dist/texinfo/ChangeLog.46 b/gnu/dist/texinfo/ChangeLog.46 new file mode 100644 index 00000000000..c495abfedad --- /dev/null +++ b/gnu/dist/texinfo/ChangeLog.46 @@ -0,0 +1,12516 @@ +2003-06-10 <karl@gnu.org> + + * version 4.6. + +2003-06-04 <karl@gnu.org> + + * config.sub: update from gnulib. + +2003-06-03 <karl@gnu.org> + + * mkinstalldirs: update from gnulib. + +2003-06-02 Akim Demaille <akim@epita.fr> + + * util/texi2dvi (tex_envvars): New. + Use it to forward -I directories to BIBINPUTS and BSTINPUTS, in + addition of INDEXSTYLE and TEXINPUTS. + +2003-06-02 <karl@gnu.org> + + * makeinfo/html.c (html_output_head): don't output the <link>, to + avoid having mozilla put up a document navigation bar when + we don't have anything else to support it yet. Report from: + Per Bothner. + * makeinfo/makeinfo.c: no need to declare add_link or + add_escaped_anchor_name, since they are not used. + + * doc/texinfo.txi (Contents): recommend @contents at the beginning + more strongly. Suggestions from Kevin Ryde. + +2003-06-01 <karl@gnu.org> + + * makeinfo/macro.c (apply): make \\ expand to \ even if the macro + has no arguments. Report from: Jesper Harder <harder@ifa.au.dk>, + 31 May 2003 02:56:20 +0200. + +2003-05-31 <karl@gnu.org> + + * util/dir-example (C++ libraries): new category, suggested by Bruno. + +2003-05-29 <karl@gnu.org> + + * configure.ac: pretest version 4.5.93. + +2003-05-29 gettextize <bug-gnu-gettext@gnu.org> + + * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.12.1. + +2003-05-26 <karl@gnu.org> + + * util/texi2dvi: spurious \ in tex_args assignment. + + * doc/texinfo.txi (Contents): trim excess words. + +2003-05-25 <karl@gnu.org> + + * util/texi2dvi: extra quotes for the tex_args assignment in + --batch mode. + +2003-05-19 <karl@gnu.org> + + * lib/xexit.c: translate fflush error messages, add newlines + (report from Jim Meyering). + * util/{texindex.c,install-info.c}, + * makeinfo/makeinfo.c, + * info/info.c: use xexit again, with redundant return to avoid + warnings. + +2003-05-18 <karl@gnu.org> + + * lib/xexit.c (xexit): fputs not fprintf, so we get newline; + translate the messages, too. Report from Jim Meyering. + + * util/dir-example: move gcc/automake entries. + + * pretest version 4.5.92. + + * update to automake 1.7.5. + + * makeinfo/html.c (append_char): forgot to increment length, duh. + Report from: "Torsten Bronger" <bronger@physik.rwth-aachen.de>, + 18 May 2003 14:36:23 +0200. + +2003-05-17 <karl@gnu.org> + + * makeinfo/makeinfo.c (defining_copying): new fn. + (add_char): call it, when testing if we should + call html_output_head. + Report from: Torsten Bronger <bronger@physik.rwth-aachen.de>, + 17 May 2003 22:10:42 +0200. + + * configure.ac: pretest version 4.5.91. + +2003-05-16 <karl@gnu.org> + + * makeinfo/index.c (sort_index): don't deref NULL. Report from Jan. + +2003-05-13 <karl@gnu.org> + + * makeinfo/html.c (append_char): appease sgi compiler. + * makeinfo/html.c (insert_html_tag): remove spurious arg to pop_tag, + From: ezra peisach <epeisach@med-xtal.bu.edu>, 13 + May 2003 12:13:40 -0400. + + Fix a few GCC warnings, reported by Jim Meyering: + + * info/nodes.c: parenthesize assignment used as truth value. + * info/nodemenu.c (format_node_info): strcpy instead of sprintf, + since there's no format. + * makeinfo/makeinfo.c (isolate_nodename): remove spurious decl. + * makeinfo/xml.c (xml_insert_indexterm): declare as void. + * info/key.c: initialize with 0,0 at end. + * info/infokey.c (main): return instead of xexit, and remove + unused variable. + * makeinfo/html.c (init_buffer): forgot to return buf. + * info/info.c (remember_info_program_name): remove spurious + declaration. + + * makeinfo/sectioning.c, + * info/infomap.c: remove unused variables. + + * makeinfo/makeinfo.c (insert_toplevel_subdirectory), + * info/man.c, + * info/infodoc.c (info_find_or_create_help_window): parenthesize + && within ||. + * info/display.c (display_update_one_window): initialize rep to + NULL, parenthesize && within ||. + + * util/install-info.c, + * info/info.c (main), + * info/makedoc.c (main): return instead of xexit. + +2003-05-13 Akim Demaille <akim@epita.fr> + + * util/texi2dvi (get_xref_files): Pass --file-line-error-style + to TeX when supported. + +2003-05-12 <karl@gnu.org> + + * configure.ac: pretest version 4.5.90. + + * Makefile.am (EXTRA_DIST): add onceonly.m4. + + * makeinfo/tests/accentenc: must discard stderr since we expect + two errors in this case. + + * makeinfo/makeinfo.c (main): new option --css-include. + (usage): add to --help message. + * makeinfo/makeinfo.h (css_include): new global. + * makeinfo/html.c (append_char, process_css_file): new fns + implementing it. + (html_output_head): call it. + * doc/texinfo.txi (HTML CSS): new node describing it. + Also split up the Generating HTML node into subnodes. + + * config.{guess,sub}: update from gnulib. + +2003-05-10 <karl@gnu.org> + + * makeinfo/index.c (sort_index): allocate the sorted index in new + memory, and set the original index to that, to avoid problems with + @printindex being called twice on the same index. + (cm_printindex): do not free the returned index. + Report from: Dumas Patrice <dumas@centre-cired.fr>, 9 May 2003 + 15:12:21 +0200. + +2003-05-09 <karl@gnu.org> + + * makeinfo/defun.c (cm_defun): issue error message without extra + x's. Report from: Dumas Patrice <dumas@centre-cired.fr>, 9 May + 2003 17:24:25 +0200. + +2003-05-07 Akim Demaille <akim@epita.fr> + + * util/texi2dvi (textra_cmd): New. + (textra): Escape escapes from sed's evaluation. + Use them to support additional TeX/LaTeX commands. + Support --command as a synonym for --texinfo. + +2003-05-06 <karl@gnu.org> + + * util/dir-example: finish getting rid of GNU packages. + +2003-05-04 <karl@gnu.org> + + * doc/texinfo.tex (\itemizey): if no arg to @itemize, default to + @bullet. Fix from: Stepan Kasal <kasal@math.cas.cz> 2 May 2003 + 09:32:11 +0200, report from: Jesper Harder <harder@ifa.au.dk>. + +2003-04-30 <karl@gnu.org> + + * makeinfo/.gdbinit: no colon on local variables. + + * doc/texinfo.txi (documentencoding): Document new Info output feature. + makeinfo/lang.h (encoding_type): rename `ecname' member to `encname'. + makeinfo/html.c, lang.c: change usage. + makeinfo/lang.c (cm_documentencoding): fix typo in warning. + makeinfo/makeinfo.h (SPLIT_SIZE_THRESHOLD): remove. + (info_trailer): declare. + makeinfo/makeinfo.c (info_trailer): new fn to generate Local + Variables: section if --enable-encoding and + @documentencoding are given. + (convert_from_loaded_file): call it. + * makeinfo/node.c (split_file): write trailer into each split + file. Also, simply split files if file size is less than + --split-size, removing SPLIT_SIZE_THRESHOLD. + + * doc/texinfo.tex: remove trailing whitespace. + +2003-04-29 <karl@gnu.org> + + * makeinfo/node.c (cm_anchor): normalize_node_name so that an + anchor named "TOP" or "top" or whatever is not allowed. Report + from: Dumas Patrice <dumas@centre-cired.fr>, 29 Apr 2003 18:56:51 + +0200. + +2003-04-28 <karl@gnu.org> + + * makeinfo/makeinfo.c: whitespace cleanup. + + * doc/texinfo.tex (\doprintindex): don't \kern-\parindent, it makes + the first index entry stick out to the left. + Report from: Jesper Harder <harder@ifa.au.dk>, + 28 Apr 2003 03:10:36 +0200. + + From Akim Demaille <akim@epita.fr>: + * makeinfo/makeinfo.c (cm_value): Warn for undefined flags. + +2003-04-27 <karl@gnu.org> + + * doc/texinfo.tex (\footnote, \smartitalicx): use \ptexslash + for italic correction instead of \/, since we've redefined \/ now. + Report from: Jesper Harder <harder@ifa.au.dk>, 27 Apr 2003 + 23:30:29 +0200. + + * util/dir-example (mailutils): more from Wojciech Polak. + (autoconf): align/edit/sort entries. + +2003-04-26 <karl@gnu.org> + + * doc/texinfo.txi (Image Syntax): second and following @image args + optional. Report from: Max Techter <mtechter@gmx.de>, 26 Apr 2003 + 15:50:02 +0200. + + * util/dir-example (anubis): request from Wojciech Polak. + +2003-04-25 <karl@gnu.org> + + * makeinfo/defun.c (defun_internal): whitespace needed in docbook + output for deftype*. From: José Fonseca + <j_r_fonseca@yahoo.co.uk>, 25 Apr 2003 13:07:13 +0100. + +2003-04-21 <karl@gnu.org> + + * doc/texinfo.tex (\dofirstparagraphindent): forgot to rename the + \...word's. + (\suppressfirstparagraphindent): forgot to rename + to \dosuppress... Reported by Simon. + +2003-04-20 <karl@gnu.org> + + * Installed changes from Simon for suppressing indentation on the + first paragraph after section headings, and for new @indent command: + + 2003-04-12 Simon Law <sfllaw@engmail.uwaterloo.ca> + * doc/texinfo.tex (\firstparagraphindent): implement suppression + of the indentation of the first paragraph. + (\dofirstparagraphindent): for parsing arguments. + (\suppressfirstparagraphindent): suppress, or don't suppress. + (\dosuppressfirstparagraphindent): the actual gobbling of indentation. + (\footnote): Compensate for the hanging-indent side-effect. + (\numhead, \apphead, \unnmhead): call \dosuppress... + * makeinfo/cmds.c (command_table): add "firstparagraphindent" + (as cm_firstparagraphindent) + (set_firstparagraphindent, cm_firstparagraphindent): implement + @firstparagraphindent parsing of options. + * makeinfo/makeinfo.h: declare "do_first_par_indent". + * makeinfo/sectioning.c (sectioning_underscore): suppress + indentation if requested. + * doc/texinfo.txi: document it. + + * doc/texinfo.tex (\indent): override \indent primitive to + clear \everypar. + (\ptexindent): for saving/restoring \indent in @tex. + (\footnote): Neutralise the effect of @indent + within a footnote. + * makeinfo/cmds.c (command_table): add "indent" (as cm_indent). + (cm_indent): un-inhibit_paragraph_indentation. + * doc/texinfo.txi: document it. + + * doc/texinfo.txi (Conventions): remove spurious extra vertical space + from bulleted itemize which starts with a quote. + + * makeinfo/cmds.c (command_table): fix @novalidate definition. + + + * Installed changes from Jan for @image support in Info format: + + 2003-04-14 Jan Nieuwenhuizen <janneke@gnu.org> + * info/display.c (display_update_one_window): Skip new style + image tag/cookie. + + 2003-04-09 Jan Nieuwenhuizen <janneke@gnu.org> + * makeinfo/makeinfo.c (cm_image): Write ^@^H[image ...^@^H] tag. + + + * makeinfo/html.c (html_output_head): use <style> to get the + regular roman font instead of typewriter for @format and @display; + likewise to reduce the font size for @small*. Suggestion from: + "Torsten Bronger" <bronger@physik.rwth-aachen.de>, 20 Apr 2003 + 11:03:59 +0200. + +2003-04-18 <karl@gnu.org> + + * configure.ac (ncurses/termcap.h): move test to after termlib's + definition, of course. Reported by Norton Allen + <allen@huarp.harvard.edu>, 18 Apr 2003 13:31:35 -0400. + + * configure.ac: remove comma from comment in AC_TRY_LINK program, + to avoid spurious misinterpretation as an argument delimiter. + +2003-04-08 <karl@gnu.org> + + * makeinfo/makeinfo.c (usage): avoid double blank line. + +2003-04-05 <karl@gnu.org> + + * Makefile.am (all of them): use $(VAR) instead of @VAR@, since + automake now emits definitions for all substituted variables. + + * makeinfo/makeinfo.h (DEFAULT_SPLIT_SIZE): increase to 300,000. + (SPLIT_SIZE_THRESHOLD): increase to 500,000. + Implicit suggestion via Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>. + +2003-04-04 <karl@gnu.org> + + * util/texi2dvi (replace_empty): new variable to do the empty path + element detection; don't hardwire path separator as :. + +2003-04-02 <karl@gnu.org> + + * doc/txi-pl.tex: new file, from polak@gnu.org. + * doc/Makefile.am (TXI_XLATE): add it. + +2003-04-01 <karl@gnu.org> + + * makeinfo/makeinfo.c (main): correct wording of html/no-headers/split + error message, and don't complain if output is to stdout. + + * makeinfo/insertion.c (end_insertion): for @end menu html output, + don't output </ul> if no_headers. Report from: Jesper + Harder <harder@ifa.au.dk>, 01 Apr 2003 00:00:37 +0200. + + * info/infomap.c (fetch_user_maps): don't complain if .info + doesn't exist. + +2003-03-31 <karl@gnu.org> + + * makeinfo/lang.c (iso8859_2_map): new encoding map. + (encoding_table): enable it. + + * info/pcterm.c (pc_up_line): use MAX instead of max (no longer + defined). Reported by Richard Dawes. + + * doc/texinfo.txi (documentencoding): mention that all processors + recognize the command. + +2003-03-30 <karl@gnu.org> + + * makeinfo/lang.c (cm_special_character): incorrectly added html + sequences for @oe and @OE even in info output. + +2003-03-25 <karl@gnu.org> + + * util/srclist.txt (COPYING): get from gnulib/doc, not gnulib. + +2003-03-24 <karl@gnu.org> + + * TODO: need to write real definition of Info format. + + * makeinfo/node.c (cm_node): use instead of ` ', to avoid + line breaks. + +2003-03-22 <karl@gnu.org> + + * makeinfo/node.c (cm_node): output a space after the Node: and + similar headers, since Bob wants one. + + * info/pcterm.c (MIN,MAX): moved to system.h. + * info/session.c (MIN): moved to system.h. + * makeinfo/sectioning.c (MIN): move to system.h. + * lib/system.h (MIN,MAX): define here. + + * makeinfo/sectioning.c (sectioning_html): don't go smaller than <h3>. + Reported by Bob. + (MIN): new macro. + + * info/session.c (MIN) [MIN]: #undef first if already #define'd. + + * doc/texinfo.tex (\nodexxx): use a control sequence instead of + brackets to parse the parts of @node. Otherwise node names with + brackets cause spurious output. Reported by Bob. + (\xrefprintnodename): separate this out from + \xrefX, for easier redefining by Bob. + +2003-03-18 <karl@gnu.org> + + * makeinfo/insertion.c (cm_item): ensure we don't go off the end + of the string when using strncmp. From: Peter N Lewis + <peter@stairways.com.au>, 13 Mar 2003 16:08:27 +0800. + + * doc/texinfo.txi (Raw Formatter Commands): mention using \gdef + within @tex, not \def. + +2003-03-12 <karl@gnu.org> + + * doc/texinfo.txi (Preparing for TeX): mention extra colons. + +2003-03-07 <karl@gnu.org> + + * doc/texinfo.tex (\/): new command to allow a line break. + (\ptexslash): for saving/restoring primitive \/ in @tex. + * makeinfo/cmds.c (command_table): add "/" (as cm_no_op). + * makeinfo/makeinfo.c (self_delimiting): add /. + * doc/texinfo.txi (Line Breaks, Command Summary): document it. + Suggestion from wl. + + * doc/texinfo.tex (\hyphenation): time-stamp. + +2003-03-06 <karl@gnu.org> + + * info/session.c (nearest_xref): new fn. + (info_menu_or_ref_item): call it when we are + searching for xrefs, instead of just looking on + the current line. + * info/info-utils.c (info_copy_reference): new fn. + * info/info-utils.h (info_copy_reference): declare. + Bug report from: rich@phekda.freeserve.co.uk, + 04 Mar 2003 17:51:47 +0000. + + * */.gdbinit: set env MALLOC_CHECK_. + + 2003-03-06 Ralph Schleicher <rs@nunatak.allgaeu.org> + * makeinfo/files.h (get_file_info_in_path): Declare function. + * makeinfo/files.c (get_file_info_in_path): Remove static keyword. + * makeinfo/makeinfo.c (cm_image): Lookup image file name in the + search path for include files. + +2003-03-05 <karl@gnu.org> + + * makeinfo/makeinfo.c (insert_toplevel_subdirectory): always make + subdirectory for html. Before, if the current directory happened + to be named `foo' and the @setfilename was foo.info, we would + write the split html files into the current directory. Reported + by rich@phekda.freeserve.co.uk, 01 Mar 2003 12:03:13 +0000. + + * makeinfo/files.c (filename_part): simplify assignment. + +2003-02-24 <karl@gnu.org> + + * makeinfo/insertion.c (get_item_function): check for @item in + argument to @itemize. Report from: Dumas Patrice + <dumas@centre-cired.fr>, 24 Feb 2003 13:13:52 +0100. + + * makeinfo/makeinfo.c (remember_brace): say `braces' instead of + `{...}', since often we don't actually expect text inside the + braces. + +2003-02-21 <karl@gnu.org> + + * aclocal.m4: automake 1.7.3. + +2003-02-19 <karl@gnu.org> + + * doc/info-stnd.texi: omit all node pointers. + +2003-02-18 <karl@gnu.org> + + * util/texindex.c (maketempname): use already-set `tempdir' instead + of half-redoing the logic. + (concat): only need two args, not three; change callers. + (perror_with_name): really call perror, putting + the name first a la gcc. + (pfatal_with_name): call perror_with_name. + + * util/texi2dvi (get_xref_files): a file whose first line is + \input texinfo is not an index file. Report from: Anton Ertl + <anton@a0.complang.tuwien.ac.at>, 18 Feb 2003 14:41:47 +0100. + +2003-02-16 <karl@gnu.org> + + * makeinfo/index.c (init_indices): don't try to free indexes that + undefindex already freed. Report from: Arkadiusz + Miskiewicz <misiek@pld.ORG.PL>, + 15 Feb 2003 13:22:49 +0100. + + * configure.ac (curses): forgot to quote arg to AC_TRY_LINK. + From vojta and te, 16 Feb 2003 01:37:09 +0100. + +2003-02-13 <karl@gnu.org> + + * makeinfo/insertion.c (begin_insertion): for html cartouche + output, add class="cartouche". Suggestion from Stephen. + +2003-02-11 <karl@gnu.org> + + * Installed patch: + 2003-02-10 Peter Breitenlohner <peb@mppmu.mpg.de> + * info/indices.c, info/info.c, info/info.h, info/nodemenu.c, + info/session.c, info/window.c, makeinfo/defun.c, makeinfo/html.c, + makeinfo/index.c, makeinfo/insertion.c, makeinfo/makeinfo.c, + makeinfo/makeinfo.h, makeinfo/node.c: declare all constant + strings as such in order to avoid lots of gcc warnings (for + --disable-nls and maybe without that as well). + + * doc/texinfo.tex (\registeredsymbol): new command for Arnold. + + * util/dir-example: dc to basics. + + * doc/texinfo.txi (Defining Macros): document new requirements on + macro names. Report from: Alper Ersoy + <dirt@gtk.org>, 11 Feb 2003 05:11:35 +0200. + +2003-02-07 <karl@gnu.org> + + * makeinfo/insertion.c (begin_insertion): output a table with a border + for @cartouche. + (end_insertion): end the table. + From: Joshua N Pritikin <vishnu@pobox.com>, + 7 Feb 2003 21:59:49 +0530. + +2003-02-05 <karl@gnu.org> + + * info/info.c (short_options): add h. + (main): treat -h same as --help. + From: rwhron@earthlink.net, 31 Aug 2002 19:56:57 -0400. + + * info/session.c (show_isearch_prompt): compute length of + translated "Failing ", don't assume 20 is enough. + (It's 21 bytes in UTF-8 Russian.) + Report from: varg@thsun1.jinr.ru, + 25 Jul 2002 15:26:42 +0400. + + * info/display.c (display_update_one_window): don't derefence null + `entry' (if the screen is very small). + From: Danny Yoo <dyoo@hkn.eecs.berkeley.edu>, + 8 Jul 2002 15:21:14 -0700. + + * doc/.cvsignore: ignore *.info and texput.log. + +2003-02-04 <karl@gnu.org> + + * Version 4.5 (that info bug was a killer). + + * configure.ac (AC_CHECK_HEADERS): test for sys/stream.h. + (sys/ptem.h): write separate test since it needs + sys/stream.h on Solaris. From: Lars Hecking + <lhecking@nmrc.ucc.ie>, 4 Feb 2003 19:47:54 +0000. + + * doc/texinfo.txi: comment about using @example instead of + @verbatim due to automake doesn't apply any more. + +2003-02-03 <karl@gnu.org> + + * doc/texinfo.tex (\verbatiminclude): use \other instead of 12. + +2003-02-02 <karl@gnu.org> + + * doc/texinfo.tex (\cartouche): explicit \par, as @cartouche does + not work inside a paragraph. + Bug report from: Stephen Gildea <gildea@intouchsys.com>, + 15 Oct 1999 09:25:31 EDT. + +2003-02-01 <karl@gnu.org> + + * util/fix-info-dir, util/gen-dir-node, util/install-info-html, + util/tex3patch, util/txitextest: test && test instead of test -a, etc. + From: Paul Eggert <eggert@twinsun.com>, + 31 Jan 2003 22:59:35 -0800. + +2003-01-31 <karl@gnu.org> + + * doc/texinfo.tex (\groupbox): \newbox. + (\vfilllimit): new \def. + (\group): insert an explicit \page if the group is + big, and doesn't fit on the current page. + Otherwise, the previous page gets stretched unreasonably. + From: Werner LEMBERG <wl@gnu.org>, + 31 Jan 2003 19:19:33 +0100. + + * doc/texinfo.tex (\defargscommonending): insert \penalty10002. + (\parsebodycommon): check for \penalty10002 to + allow a breakpoint between @def's, not 10000. + + * doc/texinfo.tex (\defargscommonending): new macro. + (\defunargs, etc.): call it, instead of repeating code. + (No functional change.) + + * info/filesys.c (extract_colon_unit): return last colon unit + before claiming we're done. Report from: Alexandre Duret-Lutz + <duret_g@lrde.epita.fr>, 31 Jan 2003 18:18:22 +0100. + + * Version 4.4. + +2003-01-30 <karl@gnu.org> + + * doc/texinfo.tex (\dosubind): need full expansion of the index + sort string. + + * doc/texinfo.tex (\startcontents,\contents,\shortcontents): + assignments to \pageno must be \global; otherwise + if it's run inside a group, as in + @ifnothtml + @contents + @end ifnothtml + the rest of the pages in the document get roman numerals. + Reported by rlp. + + * doc/texinfo.tex (\dosubind): need space between entry and + subentry in printed output. Bug report from: Robin Lee Powell + <rlpowell@digitalkingdom.org>, 30 Jan 2003 15:13:48 -0800. + (\defophead, \defcvarhead, \defivarheader): show + method name in \code. + + * doc/texinfo.tex (\dosubind): need to \vskip-\skip0, not + -\lastskip, since \lastskip gets cleared by the \nobreak. Bug + report from: Werner LEMBERG <wl@gnu.org>, 29 Jan 2003 09:18:16 + +0100. + +2003-01-29 <karl@gnu.org> + + * info/signals.c (initialize_info_signal_handler): initialize the + sigaction struct here, not statically, since we can't rely on the + ordering of the elements; it's different on IRIX and FreeBSD, at + least. Patch from: ezra peisach <epeisach@med-xtal.bu.edu>, 28 + Jan 2003 13:09:18 -0500 (EST). + +2003-01-28 <karl@gnu.org> + + * util/dir-example: bring emacs section up to date. + +2003-01-27 <karl@gnu.org> + + * configure.ac: pretest version 4.3d. + + More changes to use @ fully in the .aux file, otherwise something + as simple as: + @node foo + @section @code{foo} + was broken. + * doc/texinfo.tex (\setref): call \atdummies. + (\atdummies): new macro, based on \indexdummies. + (\commondummies): separate out common redefinitions. + (\lbraceatcmd,\rbraceatcmd): @{ and @}, as strings. + + * configure.ac (AC_CHECK_FUNCS): add sigaction. + * info/signals.c (set_termsig) [HAVE_SIGACTION]: second arg to + sigaction is a pointer, not a struct. + + From: AIDA Shinra <aida-s@jcom.home.ne.jp>, 25 Jan 2003 18:53:19 +0900: + * info/signals.c (mask_termsig,set_termsig,restore_termsig): new fns. + (initialize_info_signal_handler): use sigaction if we have it. + (info_signal_proc): reread window size in case it has changed + while we were suspended. + + Mon Jan 27 08:09:07 CET 2003 Stepan Kasal <kasal@math.cas.cz> + * doc/texinfo.tex (\acuteaccent): the workaround is no longer needed. + (\xrefX): \normalturnoffactive changed to \turnoffactive, since + we \otherbackslash right afterwards anyway. + +2003-01-24 <karl@gnu.org> + + * doc/texinfo.tex: These changes allow ' in node and anchor names: + (\internalsetq): use @ instead of ' as the escape + character for .aux files. + (\xrdef): don't need to play games with \ now. + (\readauxfile): don't set catcode' to 0, and do + set catcode@ to 0. + + These changes allow \ in node and anchor names + (this worked once, but we broke it somewhere along the line): + (\setref, \xrefX, \dosetq, \refx): call \otherbackslash. + (\otherbackslash): new macro to make an active + backslash expand to a literal `\' character with + catcode other. + + + * configure.ac: pretest version 4.3c. + + * doc/texinfo.tex (\smallenvironments): remove, and change callers. + (\small...x): rename to just \small... + (\smallexamplefonts): set to \smallfonts, not + \smallerfonts, at least until people complain again. + + The effect of these changes is to make the + @small... commands print in a smaller font (9pt) + for all formats, not just @smallbook and @afivepaper. + + + * info/filesys.c (extract_colon_unit): rewrite so that an empty + unit does not stop us from processing the rest. Report from: + Werner LEMBERG <wl@gnu.org>, 24 Jan 2003 07:01:09 +0100. + + + Date: Mon, 02 Dec 2002 01:06:37 +0900 + From: AIDA Shinra <aida-s@jcom.home.ne.jp> + + * "info infokey" says key bindings in .info take precedence over + the default mapping, but this is not true. Only bindings to + undefined keys take effects. + * Binding to "invalid" action results crash. + * No code to disable prefix keys. Some users might want to bind + escape or C-x to a non-prefix key, but this does not allowed. + ... It always allows '^h' in incremental + search. Some terminals map 'backspace' to '^h' by default. + + These are the changes: + * info/session.c (incremental_search): check for Control('h') as + well as DEL. + * info/infomap.c (find_function_keyseq, add_function_keyseq, + remove_function_keyseq): new fns. + (keymap_copy_keymap, keymap_discard_keymap): take + rootmap arg. + +Wed Jan 22 14:25:39 CET 2003 Stepan Kasal <kasal@math.cas.cz> + + * doc/texinfo.tex (\footnotezzz): the very beginning was moved + to \startfootins; + (\startfootins): new macro; + (\multitable, \dotable): redefine \startfootins to get footnotes + saved, use \crcrwithfootnotes; + (\crcrwithfootnotes): check for postponed footnotes each time a row + of a multitable is finished; + (\tab): no longer defined globally, just \let to & inside + @multitable. + +2003-01-22 <karl@gnu.org> + + * doc/texinfo.tex: doc fix. + * doc/texinfo.tex (\dofootnote): rename from \footnotezzz. + + Wed Jan 22 14:23:51 CET 2003 Stepan Kasal <kasal@math.cas.cz> + * doc/texinfo.tex (\cartouche, \footnotezzz): removed \long, it + has no effect for macros without a parameter; + (\fo@t, \f@@t, \f@t, \@foot): removed, local \def has no effect. + +2003-01-21 <karl@gnu.org> + + * doc/texinfo.txi (Output Formats): new section. + +2003-01-19 <karl@gnu.org> + + * configure.ac: pretest version 4.3b. + + * makeinfo/tests/include-value: need -I $srcdir. + + * util/texindex.c: + * util/install-info.c: + * info/infokey.c: + * info/info.c: + * makeinfo/makeinfo.c: + * util/texi2dvi: 2003. + +2003-01-18 <karl@gnu.org> + + * makeinfo/node.c: add `(perhaps incorrect sectioning?)' to some of + the error messages. Unfortunately we can't easily + determine when the error stems from actual + mistyped node pointers, and when from incorrect + menus causing the implicit pointer creation to fail. + +2003-01-17 <karl@gnu.org> + + Thu Jan 16 10:28:32 CET 2003 Stepan Kasal <kasal@math.cas.cz> + * doc/texinfo.tex (\refx): Set locally \indexdummies before expanding + the \csname, in case there are macros; foreign accents, for example. + Bug report from Dumas Patrice <dumas@centre-cired.fr>. + + * makeinfo/makeinfo.c (COMMAND_CHAR): new macro, and exclude ^ and + _ from command names. + (read_token): call it. + + * makeinfo/makeinfo.h (command_char): move to makeinfo.c, since + it's only used in one place. + +2003-01-16 <karl@gnu.org> + + * TODO: @else + +2003-01-12 <karl@gnu.org> + + * doc/texinfo.tex (\dounmacro): simplify method for removing from + macro list. From Stepan. (Also rename from \unmacroxxx.) + (\unmacrodo): new macro, called with new method. + + * doc/texinfo.tex (\dotChar, questChar, exclamChar, colonChar, + semiChar, commaChar, underChar): names for catcode chars, defined using + \chardef. From Stepan. + + * doc/texinfo.tex (\conditionalsucceed): back to the easy + definition, since @set is global now. From Stepan. + + * doc/texinfo.tex (\doifclear,\doifset): use \let\next instead of + \expandafter, so that we'll succeed on no + conditional text. From Stepan. + Also rename from \ifclearxxx and \ifsetxxx. + + * doc/texinfo.tex (\expandablevalue): give a \message if the + variable is not set. Based on patch from Stepan. + + * doc/texinfo.tex (\setuptable): insert an actual \space after + \unskip. From Stepan. + + * doc/texinfo.tex (\kbdinputstyle): give error if unknown argument, + and call the macro to set the default. From Stepan. + + * doc/texinfo.tex: typo from Stepan. + + * doc/texinfo.tex (\docenter): rename from \centerzzz and do \hfil + instead of using plain's \centerline and \hss. Also force line + breaks before and after in horizontal mode. + Based on patch from Stepan, 11 Apr 2000 19:44:31 +0200. + + * doc/texinfo.tex: use \other and \active consistently. + From: Stepan Kasal <kasal@suse.cz>, 11 Apr 2000 19:44:31 +0200. + + * makeinfo/cmds.c (handle_include): call text_expansion on the + filename, so @value constructs are expanded. + + * doc/texinfo.txi (verbatiminclude, Using Include Files): mention + @value expansion. + Also, update samples to be copyright 2003. + + * doc/texinfo.tex (\doverbatiminclude, \verbatimzzz): expand + @value(but nothing else). + Bug from: Alper Ersoy <aersoy@tfz.net>, + 6 Jan 2003 13:14:28 +0200. + +2003-01-11 <karl@gnu.org> + + * doc/texinfo.tex (\definedummyword): new macro. + (\indexdummies): call it, instead of defining each + command separately; many trailing spaces had been omitted. + Alternate implementation of a patch from: Stepan + Kasal <kasal@math.cas.cz>, 10 Jan 2003 22:42:05 +0100. + + * doc/texinfo.tex (\acuteaccent): new defn. + (\indexdummies): use it instead of \' in the aux file. + Variation of a patch from: Stepan Kasal <kasal@math.cas.cz>, + 10 Jan 2003 21:28:40 +0100. + + * doc/texinfo.tex: doc fix. + +2003-01-10 <karl@gnu.org> + + * doc/texinfo.tex (\indexnofonts, \indexdummies): handle more + accent commands. + (\indexdummyfont): not needed, use \asis instead. + + * doc/texinfo.tex (\indexdummies,\indexnofonts): indent, no other + changes. + + * doc/texinfo.tex (\chapter .. \subsubsection): indent the + definitions; no other change. + + * doc/texinfo.txi (Macro details): no multiple-line args is + another limitation. + + Fri Jan 10 07:12:23 CET 2003 Stepan Kasal <kasal@math.cas.cz> + * texinfo.tex (\writetocentry): The + common work on building the line for \write\tocfile was + moved into the macro itself and thus all callers has been changed. + +2003-01-09 <karl@gnu.org> + + * info/session.c (incremental_search): don't interpret the + `function' element as an InfoCommand when it's really a Keymap. + This caused arrow keys to be inserted literally under Solaris, but + not GNU/Linux. Bug report from: Jeremy Lin + <jjlin@OCF.Berkeley.EDU>, 5 Jan 2003 01:59:29 -0800. + + * info/infomap.c: add comment about strange pointer cast. + +2003-01-08 <karl@gnu.org> + + * doc/texinfo.tex (\ignoremorecommands): define \Edef... and + \def...x for all @def... commands, and use \empty + instead of \relax. Bug report from Paul Eggert + <eggert@twinsun.com>, 7 Jan 2003 22:29:07 -0800. + +2003-01-06 <karl@gnu.org> + + * doc/texinfo.txi (table): mention @option as a useful indicating + command, and need for blank lines before and + after. Suggestion from: Kevin Ryde + <user42@zip.com.au>, 03 Jan 2003 10:02:55 +1000. + +2003-01-05 <karl@gnu.org> + + * util/texi2dvi: make egrep a variable (EGREP). Suggestion from: + Kurt Hornik <hornik@ci.tuwien.ac.at>. + Also, replace fgrep with grep. + + * doc/Makefile.am (TXI_XLATE): include txi-tr.tex from Alper Ersoy + <dirt@gtk.org>. + +2003-01-02 <karl@gnu.org> + + * makeinfo/insertion.c (end_insertion): in table case, call + close_insertion_paragraph. Bug report from: Kevin + Ryde <user42@zip.com.au>, 03 Jan 2003 08:09:54 +1000. + + * doc/texinfo.tex: remove spurious CTRL-G. + + * util/srclist.txt: more m4 files from gnulib now. + +2003-01-01 <karl@gnu.org> + + * doc/texinfo.tex (\_): more space afterwards, so __ comes out + better. Noticed in the gcc manual. + +2002-12-31 <karl@gnu.org> + + * makeinfo/makeinfo.c (usage): omit all the help message when something + goes wrong in argument parsing, as intended. + +2002-12-26 <karl@gnu.org> + + * doc/texinfo.tex (\insertcopying): ignore @c, @comment, and + @ignore...@end ignore as best we can. Report from + "Joseph S. Myers" <jsm28@cam.ac.uk>, 24 Dec 2002 + 18:08:10 +0000 (GMT), for the gcc manual, which + uses these constructs for automatic man page generation. + +2002-12-23 <karl@gnu.org> + + * doc/texinfo.txi (example): note that Texinfo commands are + expanded, plus other changes. Suggestion from Nelson Beebe. + +2002-12-20 <karl@gnu.org> + + * config.guess: update from prep. + +2002-12-17 <karl@gnu.org> + + * makeinfo/texinfo.dtd (indexterm): index not INDEX. + (node): only any block, not just para|menu. + * makeinfo/xml.c (texinfoml_element_list): format and like can + contain para. + From: Alper Ersoy <aersoy@tfz.net>. + +2002-12-14 <karl@gnu.org> + + * doc/texinfo.txi (makeinfo in Emacs): does not prompt for + filename. + From: Kevin Ryde <user42@zip.com.au>. + +2002-12-13 <karl@gnu.org> + + * doc/texinfo.txi: short sample needs @top (from jas), gnu sample + can use @verbatim (automake fix). + +2002-12-11 <karl@gnu.org> + + * doc/texinfo.txi: typos. + +2002-12-07 <karl@gnu.org> + + * makeinfo/xml.c: use lowercase, allow more chars in id's. From: + Jaime Davila <jdavila@engr.uconn.edu>, 6 Dec 2002 11:00:25 -0500. + +2002-12-05 <karl@gnu.org> + + * util/dir-example: alphabetize make. + + * NEWS: change texinfo.tex url. + + * doc/texinfo.tex (\obstexwarn): fix url's to TeX.README and + texinfo.tex. + +2002-12-02 <karl@gnu.org> + + * doc/texinfo.txi (Line Breaks): fixes. + +2002-12-01 <karl@gnu.org> + + * configure.ac: pretest version 4.3a. + +2002-11-30 <karl@gnu.org> + + * doc/Makefile.am (texinfo): restore rule since this won't quite + be fixed until automake 1.7.2 or later. + +2002-11-29 19:19 feloy + + * makeinfo/xml.c: Fix the <para>< bug in XML, reported by K. + Ryde + +2002-11-29 <karl@gnu.org> + + * lib/strdup.c: gnulib update. + +2002-11-29 Alexandre Duret-Lutz <adl@gnu.org> + + * doc/Makefile.am (.texi.info, texinfo): Remove. Automake 1.7+ + no longer output info files in the source tree. + +2002-11-26 <karl@gnu.org> + + * makeinfo/insertion.c (cm_insertion_copying): flush_output, so that + output_position gets updated, which in turn makes + the tag table positions reflect the copying text. + Report from: "W. L. Estes" <wlestes@uncg.edu>, 15 + Nov 2002 15:57:04 -0500. + + * makeinfo/index.c (init_indices): undefindex after we know + name_index_alist[i] is not null. + From: "Ronald F. Guilmette" <rfg@monkeys.com>, 26 Nov 2002 + 01:08:04 -0800. + + * doc/Makefile.am (texinfo): depend on version + files. Report from: Kevin Ryde + <user42@zip.com.au>, 27 Nov 2002 07:52:57 +1000. + +2002-11-25 <karl@gnu.org> + + * makeinfo/cmds.c (cm_verb): use <tt> not <pre>, as this is an + inline construct. Also, decrement + in_fixed_width_font, else the next paragraph does + not get a <p>. + Report from: Torsten Bronger <bronger@physik.rwth-aachen.de> + 26 Nov 2002 00:37:35 +0100. + + * doc/texinfo.tex (\dospecials): must include all other characters + that we set active, namely <>|_", or they got + mysteriously lost as the first character on a + verbatim line. + Report from: Torsten Bronger <bronger@physik.rwth-aachen.de> + 25 Nov 2002 18:26:12 +0100. + + (\doverbatim): ignore everything up to the first + ^^M, to avoid an extra blank line in the output. + + * lib/getopt*, strdup.c, tempname.c: update from gnulib (bruno + changes + gpl). + +2002-11-24 <karl@gnu.org> + + * doc/texinfo.txi (Multiple Spaces): xref tie rather w for + unbreakable spaces. + +2002-11-22 <karl@gnu.org> + + * doc/texinfo.txi: editorial changes from Max's editor. + +2002-11-21 <karl@gnu.org> + + * doc/texinfo.txi (Conventions): add item for blank lines as + paragraph separator. Report from: Maxim Masiutin + <max@ritlabs.com>, 21 Nov 2002 00:03:07 +0200. + +2002-11-19 <karl@gnu.org> + + * util/install-info.c (ensure_dirfile_exists): don't translate the `* + Menu' keyword. Report from: Ingo Krabbe + <i.krabbe@dokom.net>, 19 Nov 2002 09:24:45 +0100. + +2002-11-18 <karl@gnu.org> + + * po/.cvsignore: exclude *.gmo instead of listing each individually. + From: Frédéric L. W. Meunier <0@pervalidus.net>, + 15 Nov 2002 20:16:09 -0200 (BRST). + + * configure.ac (--enable-multiplatform): new option for teTeX and + TeX Live. From te. + +2002-11-14 <karl@gnu.org> + + * configure.ac, util/texi2dvi, NEWS: release version 4.3. + + * util/texi2dvi, mkinstalldirs: use `for var<newline>do"' instead + of `for var; do', for Solaris. + + * doc/texinfo.txi (math): emphasize that makeinfo does not interpret + the arg. + + * config.{guess,sub}: update from prep. + +2002-11-13 <karl@gnu.org> + + * configure.ac: pretest version 4.2f. + + * makeinfo/xml.c (INDEX_SEP): define as a string that will never + appear, so that we don't try to break index terms + at commas. Idea from: Stepan Kasal + <kasal@math.cas.cz>, problem reported by José + Fonseca <j_r_fonseca@yahoo.co.uk>. + +2002-11-12 <karl@gnu.org> + + * makeinfo/makeinfo.c: make sure command is non-null, for sake of bogus + input (\def\x{}). Report from + Neil.Turton@broadcom.com, debian bug#168689. + + * makeinfo/Makefile.am (makeinfo_SOURCES): remove docbook.[ch], + per feloy the docbook stuff is in xml.[ch] now. + +2002-11-12 19:48 feloy + + * makeinfo/: lang.c, makeinfo.c: (docbook) Entities for accented + characters are written correctly + +2002-11-12 19:34 feloy + + * makeinfo/xml.c: (docbook) Do not expand @set contents + +2002-11-11 18:14 feloy + + * makeinfo/xml.c: Better <bookinfo> support + +2002-11-11 13:37 feloy + + * makeinfo/: cmds.c, insertion.c, xml.c, xml.h: Better use of + <bookinfo> and <abstract> with docbook output + +2002-11-11 01:57 feloy + + * makeinfo/: defun.c, xml.c, xml.h: Removed all references to + docbook.[ch] which was the old sources for docbook output, replaced + by xml.[ch] + +2002-11-10 23:31 feloy + + * makeinfo/: insertion.c, xml.c, xml.h: Some bugfixes in docbook + output + +2002-11-09 18:47 feloy + + * makeinfo/insertion.c: In Docbook, Copying paragraph is not + inserted at @copying/@end copying point. + +2002-11-08 21:01 feloy + + * makeinfo/xml.c: take care of indexterm at beginning of table + +2002-11-08 20:52 feloy + + * makeinfo/xml.c: Text before first @item in @table is inserted as + the <title> of <variablelist> + +2002-11-08 20:24 feloy + + * makeinfo/xml.c: subsubheading is simplesect and not sect3 + +2002-11-08 19:13 feloy + + * makeinfo/: makeinfo.c, xml.c, xml.h: makeinfo/xml.c (xml_id): + Added more forbidden characters makeinfo/{xml.c,xml.h,makeinfo.c}: + Defined xml_in_xref_token variable + +2002-11-07 <karl@gnu.org> + + * makeinfo/sectioning.c: doc. + * makeinfo/sectioning.c: revert last change, it breaks gcc. + + * makeinfo/xml.c (xml-add_char): don't insert BOOKINFO and ABSTRACT + if executing_string. From Jos? Fonseca. + + * configure.ac: pretest version 4.2e. + + From: José Fonseca <j_r_fonseca@yahoo.co.uk>, + 7 Nov 2002 00:31:28 +0000. + * makeinfo/index.c (cm_printindex): in docbook case, pass the + unexpanded index term. + * makeinfo/xml.c (xml_insert_indexterm): execute_string instead of + insert_string. + (Otherwise, <>& are not escaped in the docbook index output.) + + * util/dir-example: sed. + + * makeinfo/lang.c: copyright. + * makeinfo/lang.h: copyright. + +2002-11-07 Stephen Gildea + + * makeinfo/sectioning.c (sectioning_html): have A tag enclose + section name rather than preceding it. + + * makeinfo/toc.c (contents_update_html): put name attribute into + existing A tag rather than making a separate tag for it. + +2002-11-07 Stephen Gildea + + * makeinfo/lang.c: support @documentencoding US-ASCII: + Put NULL at end of map tables so they can be of varying lengths. + (us_ascii_map): new iso_map_type table. + (encoding_table): add US_ASCII. + (cm_search_iso_map): don't assume all maps are the same length. + (cm_documentencoding): don't assume ISO_8859_1 is first table entry. + * makeinfo/lang.h (encoding_code_type): add US_ASCII. + +2002-11-05 <karl@gnu.org> + + * doc/info-stnd.texi: untabify. + * doc/info-stnd.texi: document that. + * info/footnotes.c (auto_footnotes_p): turn off by default. + + * info/infodoc.c (info_internal_help_text): had + scroll-{forward,backward} twice instead of {next,prev}-line. + * info/infodoc.c: untabify. + + * util/texi2dvi: untabify. + * doc/texinfo.tex: untabify. + * util/texindex.c: untabify. + * util/install-info.c: untabify. + * makeinfo/makeinfo.c: indentation fix. + * makeinfo/cmds.c: doc fix. + +2002-11-04 <karl@gnu.org> + + * configure.ac: pretest version 4.2d. + * doc/fdl.texi: better line break to avoid overfull hbox. + +2002-11-04 Stephen Gildea + + * makeinfo/{footnote.c,cmds.c,html.c,index.c,insertion.c, + makeinfo.c,node.c,toc.c,sectioning.c}: add a class attribute + to tags generated in special circumstances that wouldn't be + obvious to a user agent. + + Quote all attribute values (for XHTML). + +2002-11-04 <karl@gnu.org> + + * doc/texinfo.txi (File End): grammar. + + These changes from gildea: + * makeinfo/cmds.c (cm_titlepage): new fn, and use it for @titlepage. + + * makeinfo/cmds.h (titlepage_cmd_present): new global. + * makeinfo/html.c (html_output_head): check titlepage_cmd_present + before outputting the <h1>. + + * makeinfo/html.c (html_output_head): put a class on the <h1> from + settitle. + + * makeinfo/cmds.c (cm_titlefont): put the class directly on the h1 + rather than a separate <span> element. + +2002-10-31 <karl@gnu.org> + + * doc/texinfo.tex (\mathactive): new fn. + (\math): call it, to change definitions of active characters. + (\ptex{gtr,hat,less,plus}): save original characters. + Report from wl. + + * doc/texinfo.tex (\itemzzz): \penalty10001 instead of 10000 + before the putative \parskip. + (\aboveenvbreak): insert \parskip if penalty!=10000, + rather than <10000. Otherwise, @item some long item label / + @example has too little spacing. + Report from: Werner LEMBERG <wl@gnu.org>, + 26 Apr 2002 08:37:41 +0200 (CEST). + + * makeinfo/makeinfo.c (executing_macro): new static. + (read_command): set it, if we execute a macro. + (add_char): if it is set, call html_output_head. + This is so if a macro expansion is first in the document body, the + html head gets written before the macro body. + Report from: Stephen Gildea <gildea@stop.mail-abuse.org>, + 10 Jul 2002 13:35:13 -0400. + + * makeinfo/html.c (html_title_written), + * makeinfo/html.h (html_title_written): make available. + * makeinfo/cmds.c (cm_titlefont): set html_title_written for html + output. + + * util/texindex.c: texindex.c (need_initials, first_initial): New + globals. + (main): Clear them for each index. + (parsefile): Set need_initials when there is more than one + initial in this index. + (indexify): Do not emit \initial commands unless need_initials + is set. Use toupper. + + From: Zack Weinberg <zack@codesourcery.com> + Date: Tue, 26 Mar 2002 17:20:06 -0800 + + * lib/system.h: doc fix from gildea. + +2002-10-30 <karl@gnu.org> + + (Following reported by Bob Wilson.) + + * doc/texinfo.tex (\sectionheading): add either + \normalbaselineskip or \parskip after the heading, whichever is + larger, instead of hardwiring 10pt. + + * doc/texinfo.tex (\defxbodycommon): new defn, including a + potential breakpoint if we have multiple consecutive @def...x commands. + (\def*parsebody): use it. + + * doc/texinfo.tex (\singlespace): remove, since we fixed the + regular line spacing a long time ago to not be double-spaced. + In @smallbook mode, it ironically caused excessive line spacing. + (\nonfillstart, \quotation): don't call it. + + * doc/texinfo.tex (\smartslanted, \smartitalic): use \ttsl if in + typewriter. + From: Bob Wilson <bwilson@tensilica.com>. + + * doc/texinfo.tex (\defmethparsebody): pass \empty to \smallsplit + to keep a brace-delimited argument to @deffn from having the braces + stripped. + (Report from: Han-Wen Nienhuys <hanwen@cs.uu.nl>.) + +2002-10-28 <karl@gnu.org> + + * doc/texinfo.tex (\loggingall): rewrite to minimize log file + output (ideas from Frank Mittelbach's trace.sty) and explicitly + show the etex changes. + + * configure.ac: pretest version 4.2c. + + * NEWS: mention Werner's fixes. + +2002-10-27 Werner Lemberg <wl@gnu.org> + + * makeinfo/html.c (insert_html_tag): Fix handling of nested, + identical tags. + +2002-10-27 <karl@gnu.org> + + * configure.ac (AM_INIT_AUTOMAKE): add dist-bzip2 option. + +2002-10-26 <karl@gnu.org> + + * 2002-10-24 Werner Lemberg <wl@gnu.org> + Fix html font tags, i.e., make the output similar to + texinfo.tex. The main idea is to avoid nested font tags. + + * makeinfo/html.c (push_tag, pop_tag): New functions. + (insert_html_tag): Use them. + Don't emit more than a single font attribute. + + * makeinfo/html.h (HSTACK): New structure. + + * makeinfo/defun.c: Include cmds.h and html.h. + (process_defun_args): Don't apply <i>...</i> to parentheses + and brackets. + (defun_internal): Use insert_html_tag for emitting font tags. + + * makeinfo/cmds.c (cm_url): Use insert_html_tag for emitting + font tag. + (cm_r): Simplify. + +2002-10-25 Alexandre Duret-Lutz <adl@gnu.org> + + * util/texi2dvi: Preserve empty components when expansing + TEXINPUTS and INDEXSTYLE. + +2002-10-24 <karl@gnu.org> + + * doc/info-stnd.texi: missing period. + + * m4/{check-decl.m4,mkstemp.m4,prereq.m4}: new files from gnulib. + * lib/mkstemp.c, lib/tempname.c: likewise. + * aclocal.m4, configure.ac: support for mkstemp instead of mktemp. + * util/texindex.c: use mkstemp instead of mktemp. + + 2002-10-24 Alexandre Duret-Lutz <adl@gnu.org> + * util/texi2dvi: Turn relative entries $TEXINPUTS and $INDEXSTYLE + into absolute paths. (Allows --clean to work with relative dirs + in TEXINPUTS, etc.) + + * doc/texinfo.tex: update \texinfoversion timestamp. + +2002-10-22 <karl@gnu.org> + + 2002-10-16 Werner Lemberg <wl@gnu.org> + + * texinfo.tex (\appendixbox): New macro to compute a + fixed-width box for the appendix entry in the TOC. + (\appendixzzz, \appendixentry): Use it. + + (\shortconttt): New font. + (\summarycontents): Use it to set the font size of the \tt + font properly. + + (\authortt): New macro. + (\authorfont): Use it to provide a proper font size for + @email used within @author. + +2002-10-21 <karl@gnu.org> + + * automake 1.7.1. + +2002-10-18 <karl@gnu.org> + + * doc/texinfo.tex (\defname): get rid of the unused + \deftypemargin; typeset the function type word flush right, in + brackets. Partially suggested by bob. + +2002-10-16 <karl@gnu.org> + + * makeinfo/html.c: Just > after all on <meta> and <link> to + appease HTML 4.01 (and break XHTML). From Janis. + +2002-10-15 <karl@gnu.org> + + * configure.ac: pretest version 4.2b. + + * makeinfo/cmds.c (cm_dots, cm_enddots): don't use small if + in_fixed_width_fonts; this violates the html specs, which don't + want you to change fonts within <pre>. (Argh.) + Report from: Janis Johnson <janis187@us.ibm.com>, + 14 Oct 2002 15:59:16 -0700. + +2002-10-14 Alexandre Duret-Lutz <adl@gnu.org> + * util/texi2dvi (common, txincludes): Fix definitions so that + an empty $txincludes doesn't result in a empty path element + in TEXINPUTS. + +2002-10-14 <karl@gnu.org> + + * info/infokey.c: copyright 2002 not 02. + * makeinfo/lang.c: copyright 2001 not 01. + + * makeinfo/insertion.c (begin_insertion): for enumerate, set + in_paragraph=0 as we do for itemize. + Otherwise a </p> gets inserted at the next @item, which is wrong. + + Report from: Janis Johnson <janis187@us.ibm.com>, 14 Oct 2002 + 12:35:30 -0700. + +2002-10-13 <karl@gnu.org> + + * util/install-info.c (longopts): make --infodir a synonym for + --info-dir, for some compatibility with the Debian install-info. + Reported by Bob Chassell, Yves Codet <ycodet@club-internet.fr>, + and many others. + + * doc/texinfo.txi (makeinfo advantages): document various options + that have crept in to the source. (Werner Lemberg noted that + --iftex and companions were missing.) + +2002-10-10 <karl@gnu.org> + + * makeinfo/cmds.c (cm_tie): new fn for new cmd @tie{}. + * doc/texinfo.txi: document it. + +2002-10-09 <karl@gnu.org> + + * doc/texinfo.txi: recommend free software directory categories + (suggestion from rms), + more info about @noindent (fut_nis@d3.dion.ne.jp and ryk@dspwiz.com), + version specification (spectorhome@rcn.com). + + * makeinfo/{cmds,footnote,html,insertion,makeinfo,multi,node}.c: + use <br /> instead of plain <br>, for the sake of XHTML. Likewise + with <hr /> and <meta />, and quote all <meta> values. + Suggestion (and assurance of compatibility) from + Janis Johnson <janis187@us.ibm.com> + and Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + (the gcc web page maintainers). + + * util/infosrch: new contrib script. + * util/Makefile.am (EXTRA_DIST): add infosrch. + +2002-10-04 <karl@gnu.org> + + * configure.ac: pretest version 4.2a. + + * TODO: more info on dir categories. + +2002-10-02 <karl@gnu.org> + + * doc/.cvsignore: ignore tex output files. + + * util/dir-example: remove unused categories, etc. + +2002-10-01 <karl@gnu.org> + + * doc/texinfo.tex (\xml,\ifxml): more \doignore's. + (\copying,\insertcopying): new implementation to save the uninterpreted + tokens instead of typesetting a box, so that the page size, fonts, + etc., don't have to be defined before @copying is run. + + These changes from Werner Lemberg <wl@gnu.org>: + (\internalpagesizes): take two new arguments for the physical paper + height and width. + (\smallbook,\afourpaper,\afivepaper,\letterpaper,\afourwide, + \pagesizes): pass them. + +2002-09-30 <karl@gnu.org> + + * util/texi2dvi: doc fixes. + + * README: mention autoreconf. + +2002-09-29 <karl@gnu.org> + + * doc/texinfo.tex (\pdfmakeoutlines): call \turnoffactive to handle all special characters + except \{}. + (\normalturnoffactive): call \turnoffactive instead of repeating all the + redefinitions. + + * doc/texinfo.tex (\afourpaper, \afourlatex, \afourwide): new + formatting values. + From: Eric.Belpaire@equant.com, 30 Aug 2002 19:03:30 +0200. + + * aclocal.m4: $Id now omitted. + + * doc/texinfo.txi: document @xml and @ifxml. + + * makeinfo/makeinfo.c (usage): mention the new options. + * info/Makefile.am (BUILT_SOURCES): define this unconditionally, + no more TEXINFO_MAINT. We handle it in the top-level + Makefile.am by defining distcleancheck_listfiles. + + * acinclude.m4: can't have $Id, then it gets propagated to + aclocal.m4. + + From: Philippe Martin <feloy@free.fr>, 11 Aug 2002 20:17:44 +0200. + * makeinfo/cmds.c: new commands @ifnotxml, @ifxml, @xml. + * insertion.c: likewise. + (cm_ifxml, cm_ifnotxml): new functions. + * insertion.h: likewise. + * makeinfo.c: new options --ifxml, --no-ifxml. + (cm_image): better xml output. + * makeinfo.h (process_xml): new global. + * xml.c: call xml_close_sections. + +2002-09-28 <karl@gnu.org> + + * makeinfo/insertion.c (begin_insertion): only do <pre>, not + <br><pre>; suggestion from Werner. + + * info/infodoc.c: document the bug regarding where_is_rep_index, + but don't fix it since it's in the [!INFOKEY] code. + + 2002-05-18 Eli Zaretskii <eliz@is.elta.co.il> + These changes make @example be indented in HTML output, and make + @exdent work inside an @example in HTML. + + * makeinfo/insertion.c (begin_insertion) <example>: Insert spaces + after <pre> to produce indentation of the first line in HTML mode. + + * makeinfo/makeinfo.c (indent): Do indent even in HTML mode. + + These patches from: Thierry Vignaud <tvignaud@mandrakesoft.com>, + 24 Apr 2002 20:52:37 +0200. + + * makeinfo/insertion.c: doc fix. + + * info/infomap.c: had h and l functions reversed in vi mode. + + * util/install-info.c: bzip2 support. + + * util/texi2dvi: don't allow whitespace as one of the ?'s around + the o in foo.?o?, that could lead to misparsing. + +2002-09-27 <karl@gnu.org> + + * doc/Makefile.am (*.1): call the binary, not the source file. + + * util/texindex.c (sort_in_core): int not off_t. + (main): cast argument to sort_in_core to int. + (sort_offline): nfiles parameter is not actually passed (or used); + need to pass &tempfiles[i] to sort_in_core. + From: Christopher League <league@contrapunctus.net>, + 26 Apr 2002 22:45:45 -0400. + + * doc/texinfo.tex (\unnumb...entry): make analogous to \...entry + (except when actually outputting the text, of course), so pdf + bookmarks can go to the right level. + From: Christopher League <league@contrapunctus.net>, + 25 Apr 2002 15:29:24 -0400. + + * install-sh: update from gnulib. + + * makeinfo/insertion.c (handle_verbatim_environment): need to + quote & and <. + From: Philippe Martin <feloy@free.fr>, 18 Aug 2002 15:39:10 +0200. + + 2002-06-04 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/cmds.c (cm_exdent): Call start_paragraph to restore + previous indentation of text. (exponent.tex test.) + + 2002-05-11 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/node.c (remember_node): If the argument FNAME is NULL, + as it happens for "Top", use the basename of current_output_filename. + +2002-09-26 <karl@gnu.org> + + * lib/system.h [MIKTEX]: include gnu-miktex.h, define S_ISDIR. + [! MIKTEX]: declare substring. + From: Stephen Gildea <gildea@stop.mail-abuse.org>, + 08 May 2002 18:12:58 -0400. + + * doc/texinfo.tex: spurious \let when setting \mainmagstep. + From: Stephen Gildea <gildea@stop.mail-abuse.org>, + 08 May 2002 08:38:39 -0400. + + * doc/texinfo.txi: copyright symbol: use @code{@copyright@{@}}, + with the braces in the @code. + From: Paul Eggert <eggert@twinsun.com>, 1 Apr 2002 11:37:52 -0800. + + * info/infodoc.c (replace_in_documentation): always allocate at + least one byte for replen, otherwise things crash when MALLOC_CHECK_=2. + From: "Andreas Herrmann" <AHERRMAN@de.ibm.com>. + + * lib/Makefile.am (libtxi_a_SOURCES): include xalloc.h. + + * doc/Makefile.am (EXTRA_DIST): skip macro.texi and userdoc.texi now. + (common_mandeps): new var. + (*.1): use that, and depend on the source files with the version strings + instead of the binaries. Suggestion from Alexandre. + + * util/Makefile.am (bin_PROGRAMS, ginstall_info_SOURCES, + transform): build as ginstall-info, to avoid clashing with the + install-info target inserted by Automake. (Suggestion from Akim.) + + * Makefile.am (distcleancheck_listfiles): new definition so + distcheck doesn't complain about our generated files in info/, + which are conditionalized on TEXINFO_MAINT. + + * lib/gettext.h: update from gettext 0.11.5. + +2002-09-24 <karl@gnu.org> + + * util/srclist.txt: m4 files from aclocal rather than gnulib. + + * Makefile.am, util/Makefile.am, dir-example: move dir-example to util. + +2002-09-23 <karl@gnu.org> + + * INSTALL.generic: update from autoconf 2.54. + +2002-09-20 gettextize <bug-gnu-gettext@gnu.org> + + * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.11.5. + +2002-09-12 <karl@gnu.org> + + * util/srclist.txt: INSTALL to INSTALL.generic. + +2002-08-04 <karl@gnu.org> + + * doc/texinfo.5: + * lib/system.h: + * doc/texinfo.tex: + * doc/info-fr.texi: + * configure.ac: non-copyright notice. + * doc/info-fr.texi: + * doc/info-stnd.texi: + * doc/texinfo.txi: copyright years should be written out in full. + +2002-07-23 <karl@gnu.org> + + * doc/texinfo.txi: verbatim license sample per rms and chassell. + +2002-07-19 <karl@gnu.org> + + * doc/texinfo.txi: + +2002-06-05 <karl@gnu.org> + + * doc/Makefile.am (TXI_XLATE): txi-it.tex from Paolo Bonzini + <bonzini@gnu.org>. + +2002-06-04 <karl@gnu.org> + + * doc/texinfo.tex (\defparsebodycommon): do \penalty0 if the last + item was a \nobreak, since that means we have two function headers + in a row. Report from: Brian Gough <bjg@network-theory.co.uk>. + + (\defparsebody,...): use \defparsebodycommon instead of repeating code. + +2002-05-09 <karl@gnu.org> + + * doc/texinfo.5: lowercase NAME to `texinfo' for Solaris man. + From gildea. + +2002-04-29 <karl@gnu.org> + + * doc/texinfo.txi: mention it. + * util/texi2dvi: allow -E as well as -e. + +2002-04-10 <karl@gnu.org> + + * doc/texinfo.txi: + +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. + * util/texi2dvi: version. + + * doc/texinfo.txi: @settitle is used in html output (from Eli), + various underfull hbox fixes. + +2002-03-02 <karl@gnu.org> + + * configure.ac: pretest 4.0k + + * info/info.c: declare add_file_to_directory to avoid warning. + + * doc/info-stnd.texi: info standalone so as not to collide with + `standards' in dir. + +2002-03-01 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/insertion.c (end_insertion): Insert the /td and /tr + directives in lower case. From Per Bothner <per@bothner.com>. + + * makeinfo/macro.c (cm_alias): Ignore whitespace around the alias + name, like the manual promises. + + * doc/texinfo.txi (Invoking Macros, Macro Details): Document that + commas in macro arguments don't work in TeX. Advise texi2dvi -e + when macros don't work with TeX. + + * doc/texinfo.txi (Node Line Requirements): Add restrictions about + parens and some punctuation characters in node names. + (Def Cmd Template): Document that macros are not expanded. + + The following two changes allow to say "info foo" if there's an + Info file `foo' somewhere along INFOPATH. + + * info/info.c (add_file_directory_to_path): New function, code + moved from `main'. + (main): Use add_file_directory_to_path. + + * info/session.c (info_follow_menus): If the first menu entry + couldn't be found as an item in DIR's menu, try it as a file name. + + 2001-06-19 Mark Montague <markmont@umich.edu> + + * info/filesys.c: Fix for sparc64 (offsets should be "long"s). + + * info/session.c: Fix typos in function calls. + + 2001-08-23 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/footnote.c (cm_footnote): Don't allow footnotes inside + footnotes. + (output_pending_notes): Increment already_outputting_pending_notes + in the HTML case as well, to protect execute_string from + recursively entering output_pending_notes. + +2002-03-01 <karl@gnu.org> + + * doc/texinfo.tex: fix mismatched $'s for sake of emacs font-lock. + From: Stephen Gildea <gildea@stop.mail-abuse.org>. + +2002-02-27 <karl@gnu.org> + + * configure.ac: pretest 4.0j. + + * info/infodoc.c: 1scroll-forward typo. + +2002-02-26 <karl@gnu.org> + + * lib/system.h [! ENABLE_NLS]: let's not go const. + +2002-02-26 Eli Zaretskii <eliz@is.elta.co.il> + + * djgpp/config.sed: Add tweaking of file names in "install-info" + and "uninstall-info" targets. + + * doc/inf-stnd.texi (Custom Key Bindings, Invoking infokey): + Add footnotes about DOS file names. + + * info/infokey.c (main) [__MSDOS__]: If HOME is not defined, + default to the current directory. + +2002-02-26 <karl@gnu.org> + + * lib/system.h (LC_MESSAGES) [! LC_MESSAGES]: need this after all. + +2002-02-25 <karl@gnu.org> + + * doc/info-stnd.texi: contents at top, avoid overfull hbox. + * lib/Makefile.am (libtxi_a_sources): include gettext.h. + + * lib/system.h (LC_MESSAGES): don't need conditional, Bruno says + that locale.h or libintl.h does so. + + * configure.ac: pretest 4.0i. + + * dir-example: infokey. + * doc/info-stnd.texi: invoking infokey. + * info/infokey.c (short_help): reorganize slightly. + + * lib/system.h: use "gettext.h" instead of <libintl.h> per gettext + 0.11 recommendation. + +2002-02-25 gettextize <bug-gnu-gettext@gnu.org> + + * Makefile.am (SUBDIRS): Add intl. + * configure.ac (AC_CONFIG_FILES): Add intl/Makefile. + +2002-02-25 <karl@gnu.org> + + * util/Makefile.am (LDADD): + * makeinfo/Makefile.am (LDADD): + * info/Makefile.am (LDADD): @LIBINTL@ per gettextize. + + * configure.ac: gettextize changes. + * Makefile.am: gettextize changes. + +2002-02-25 gettextize <bug-gnu-gettext@gnu.org> + + * Makefile.am (SUBDIRS): Add m4. + (SUBDIRS): Remove intl. + (ACLOCAL_AMFLAGS): New variable. + (EXTRA_DIST): Add config.rpath. + * configure.ac (AC_CONFIG_FILES): Add m4/Makefile. + (AC_CONFIG_FILES): Remove intl/Makefile. + +2002-02-23 <karl@gnu.org> + + * pretest 4.0h. + + * 2002-02-23 Eli Zaretskii <eliz@is.elta.co.il> + * doc/info-stnd.texi (Invoking Info): Add a reference to the + description of index-apropos and index-search. Document the + --raw-escapes option. + (Searching Commands): Describe index-search and index-apropos. + + * info/man.c (clean_manpage): If raw_escapes_p is not set, remove + ANSI escape sequences from the man page. + + * info/info.h: Declare raw_escapes_p. + + * info/info.c: <raw_escapes_p>: New variable. + New option --raw-escapes or -R. + (main): Handle it. + (info_short_help): Document it. + (main): Honor --output together with --usage, by dumping the node + we found to the named file. + + 2002-02-23 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/html.c (nodename_to_filename): Call + nodename_to_filename_1 with the last argument 1, not 0. + + * makeinfo/toc.c (shortcontents_update_html) + (contents_update_html): Don't omit the entry for the Top node. + + * 2002-01-30 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/node.c (cm_node): Don't condition splitting on + top_node_seen being non-zero. If current_node is NULL, use the + current output file name to get at the file name for the previous + node. Don't compute a new file name for a node if we didn't close + the current file. + + 2002-02-01 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/node.c (cm_node): Call html_output_head whenever we + create a new split-HTML file. + + * makeinfo/html.c (html_output_head): Make html_title static. + Compute it only once, and don't free it. Output the <h1> title + header only once per run. + + 2002-02-02 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/toc.c (contents_update_html): Fix the condition for + omitting duplicate TOC entries. Fix comparison with the TOC entry + for "Top". + +2002-02-14 <karl@gnu.org> + + * doc/Makefile.am (DISTCLEANFILES): use this variable instead of + the distclean-aminfo target, which apparently is no longer used. + + * pretest 4.0g. + + * doc/texinfo.tex (\appendixentry): new macro for typesetting + appendix toc entries. + (\appendixzzz, \summarycontents, \pdfoutlines): use it, instead of + usurping \chapentry. This allows the bookmarks in the pdf output + to come out right. Report from: Kurt Hornik + <Kurt.Hornik@ci.tuwien.ac.at>. + +2002-02-13 <karl@gnu.org> + + * configure.ac: ALL_LINGUAS is deprecated as of gettext 0.11. + * doc/texinfo.tex (\image): remove spurious \loggingall. + + * doc/texinfo.txi: @math now implies @tex. + * doc/texinfo.tex (\math): imply @tex. + +2002-02-11 <karl@gnu.org> + + * makeinfo/insertion.c (handle_verbatim_environment): save and + restore filling_enabled and inhibit_paragraph_indentation. Bug + report from: Alexandre Duret-Lutz <duret_g@lrde.epita.fr>. + + * makeinfo/makeinfo.c (reader_loop): don't worry about bare braces + inside @math. + +2002-02-08 <karl@gnu.org> + + * info/infodoc.c: keep underlines with the text they refer to, for + translation purposes. + Pointed out by Christian Rose <menthos@menthos.com>, 20 nov 2001. + + * doc/info.texi: recommend setting INFOPATH. + + * doc/Makefile.am (install-tex): need $(srcdir) for install. + From: istry <istry@mail.ru>. + + * doc/texinfo.tex: replace $$$ delimiter with $.$, for sake of + font-lock in Emacs 21.1. Suggestion from: Stephen Gildea + <gildea@stop.mail-abuse.org>. + + 2002-01-26 Eli Zaretskii <eliz@is.elta.co.il> + * info/infomap.c (default_emacs_like_info_keys) + (default_emacs_like_ea_keys, default_vi_like_info_keys) + (default_vi_like_ea_keys): Fix default keybindings to be + consistent with non-INFOKEY branch. Add bindings for Home, End, + and Delete keys. + + 2002-01-23 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/toc.h <TOC_ENTRY_ELT>: New member html_file. + + * makeinfo/toc.c (toc_add_entry): Compute and set the html_file + member. + (shortcontents_update_html): Produce the toc_* links correctly, + without duplicating the link text. Fix comparison with "Top". + Handle the case when there's @shortcontents, but no @contents. + (contents_update_html): Fix the way toc_* anchors are produced + from toc_entry_alist[i]->name: take only the node name from the + string in toc_entry_alist[i]->name. Fix comparison with "Top". + + * makeinfo/sectioning.c (sectioning_html): Take the toc_anchor + substring before closing the anchor with </a>. Fix the closing + </hN> tag--add 2 to level, not 1. Use sizeof instead of a magic + value of 9. + + * makeinfo/cmds.c: Make @summarycontents call cm_shortcontents, as + promised by the docs. + + 2002-01-19 Eli Zaretskii <eliz@is.elta.co.il> + * djgpp/config.sed: Fix a problem with AC_CONFIG_LINKS that + prevented building from a directory on another drive. + + * djgpp/config.bat: Fix problems with long --srcdir diectory names. + + * djgpp/README: Update. + +2002-01-31 <karl@gnu.org> + + * doc/texinfo.txi: mention dvips + +2002-01-28 <karl@gnu.org> + + * configure.ac (ALL_LINGUAS): add hr. + +2002-01-22 <karl@gnu.org> + + * makeinfo/defun.c (defun.c): only warn about ( immediately + following a defun name, since the groff manual needs other + characters there where whitespace is incorrect. + Reported by Werner Lemberg <wl@gnu.org>. + + * doc/info-stnd.texi: alphabetize variable list. + + * doc/texinfo.txi: no :'s in index entries, index @page/@group + some more. + + * makeinfo/index.c (index_add_arg): warn if index entry contains a + colon. From: Kenneth Lorber <keni@his.com>. + +2002-01-21 <karl@gnu.org> + + * makeinfo/insertion.c: </pre not /<pre, reported by Mike + Benefield <mike@duckbrain.com>. + +2002-01-18 <karl@gnu.org> + + * configure.ac: pretest 4.0f. + + * util/texindex.c: + * util/install-info.c: + * makeinfo/makeinfo.c: + * info/info.c: it's 2002. + + * info/session.c: pass right args to info_scroll_half_screen_up. + From Eli. + +2002-01-18 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/multi.c (multitable_item): Always return a value. + + * util/install-info.c (xmalloc, xrealloc, pfatal_with_name) + (open_possibly_compressed_file, parse_input): Call `fatal' with 3 + arguments, to avoid compiler warnings. + (main): Call `fatal', `error', and `warning' with the right number + of arguments. + + * makeinfo/makeinfo.c (main): Remove extraneous first arg of + usage(). + + * info/window.c (build_message_node): Supply a 4th argument to + build_message_buffer. + + +2002-01-18 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/sectioning.c (sectioning_html): End the anchor properly + with a </a>. + + * info/session.c (info_menu_or_ref_item): If we didn't find a + cross-reference on this line, try the one before. + + * info/infomap.c (fetch_user_maps): Provide two different + translations for ``file too small'' and ``file too big'' error. + + * info/info.c (info_short_help): Print the --speech-friendly + option together with the other options, not at the end of the help + screen. + +2002-01-18 Andreas Schwab <schwab@suse.de> + + * makeinfo/html.c (escape_string): When string is empty don't read + past end of it. + +2002-01-17 <karl@gnu.org> + + * doc/info-stnd.texi: overfull box in table. + +2002-01-16 <karl@gnu.org> + + * configure.ac: pretest 4.0e. + + * doc/info.texi: update from emacs. + +2002-01-03 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (file_line_error): New function. + + * makeinfo/insertion.c (discard_insertions): Call file_line_error + instead of changing global variables. + + * makeinfo/sectioning.c (cm_top): Ditto. + + * makeinfo/node.c (validate_file): Ditto. + + * makeinfo/makeinfo.c (discard_braces, handle_variable_internal): + Ditto. + + * makeinfo/macro.c (define_macro): Ditto. + + 2001-12-31 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/node.h (TAG_ENTRY): New struct member html_fname. + + * makeinfo/node.c (find_node_by_fname): New function. + (remember_node): Accept an additional argument FNAME, the node's + file name, and record it in the list of nodes; callers changed. + (cm_node): Call find_node_by_fname to see if this node's file name + clashes with another node or anchor. If it clashes with another + node, append the new node to the same file instead of erasing the + other node. If it clashes with an anchor, print an error message + and overwrite the anchor's file. + (cm_anchor): If this anchor's file name clashes with another + anchor or node, print an error message and ignore the anchor. + + * makeinfo/files.c (normalize_filename): New function. + + * makeinfo/files.h <normalize_filename>: Add declaration. + + * makeinfo/html.c (nodename_to_filename_1): Call + normalize_filename before returning the file name to the caller. + Disable the code which adds #Nodified-filename to the file name we + produce. + + * makeinfo/makeinfo.c (add_char): Don't replace whitespace with + if we are producing an HTML directive. + (add_html_elt): New function. + (cm_xref, cm_inforef, cm_uref, cm_email, cm_image): Use + add_html_elt instead of add_word, where appropriate. + + * makeinfo/html.c (add_link): Ditto. + + * makeinfo/footnote.c (cm_footnote): Ditto. + + * makeinfo/defun.c (defun_internal): Ditto. + + 2001-12-27 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/node.c (cm_node): Don't omit links to (DIR) from the + navigation bar, add_anchor_name will DTRT now. + + * makeinfo/makeinfo.c (cm_xref): Produce a split-HTML file name + from arg1, the node name, not from arg3 or arg2, which are the + reference name. Use arg2 or arg3 for the text to be displayed as + a link between ">" and "</a>". Use add_anchor_name instead of + add_nodename_to_filename. + (cm_inforef): Use add_anchor_name instead of + add_nodename_to_filename. Handle the case of a missing second + argument in @inforef. + + * makeinfo/html.c (add_anchor_name): Always add # and the anchor + name, even if we are splitting. If the node is "(dir)", treat it + as if it were "dir". + (nodename_to_filename_1): Don't append #Top for the Top node. + (add_link): Don't punt if nodename is "(dir)". Output "</a>" + after the link. + + 2001-12-25 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (cm_xref, cm_inforef): Output the target + file name via add_nodename_to_filename. + + 2001-12-20 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/html.c (nodename_to_filename_1): Make references to Top + to refer to index.html#Top. + (add_nodename_to_filename): Accept additional argument HREF; + callers changed. + + * makeinfo/toc.c (rewrite_top): If the filename to rewrite is + stdout or the null device, do nothing. + + * makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use + FILENAME_CMP instead of strcmp. Search for a period forward, not + backward. Make index_name[] a static const array, and its len + computed at compile time. + (convert_from_loaded_file): If output_filename is the null device, + turn off HTML splitting. + (cm_xref): Use add_anchor_name, rather than add_escaped_anchor_name, + in the 5-argument case in HTML mode. + (cm_inforef): Fix external references in HTML mode. + + * makeinfo/node.c (cm_node): Use FILENAME_CMP instead of strcmp. + Don't open a new file if the new node's name is empty. Take the + directory part of split-HTML files from current_output_filename, + not from toplevel_output_filename (the latter doesn't include the + manual's subdirectory part). + + * makeinfo/html.c (nodename_to_filename_1): Use FILENAME_CMPN + instead of strncmp. Support *.inf files in references. + +2001-12-11 Eli Zaretskii <eliz@is.elta.co.il> + + * djgpp/config.bat, djgpp/config.sed, djgpp/config.site: Update + for Texinfo 4.0d. + + * makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use IS_SLASH + instead of literal `/'. + (convert_from_loaded_file): Flush the output stream before + creating the TOC. + + +2002-01-14 <karl@gnu.org> + + * info/info.c: translate --speech-friendly (from Eli). + * makeinfo/index.c: formatting. + + 2001-12-24 Eli Zaretskii <eliz@is.elta.co.il> + * info/infomap.c (initialize_info_keymaps): Bind the user-defined + keys on top of the default ones, not the other way around. + +2002-01-11 <karl@gnu.org> + + * info/info.c: can't do #ifdef inside of printf any more. + From: Tyler <tyler@zerodivide.cx> + + * configure.ac (ALL_LINGUAS): add he, from Eli. + +2002-01-09 Eli Zaretskii <eliz@is.elta.co.il> + + * info/window.c (calculate_line_starts): Cast node->contents[i] to + unsigned char. + +2002-01-04 <karl@gnu.org> + + * doc/texinfo.tex (\footnotezzz): \noindent=\relax. + +2002-01-03 <karl@gnu.org> + + * doc/texinfo.tex (\imagexxx): handle pdf and dvi cases the same. + (\dopdfimage): need \immediate to avoid seg fault when including the + same image twice. + Bug reports from Alexandre Duret-Lutz <duret_g@lrde.epita.fr>. + +2001-12-31 <karl@gnu.org> + + * makeinfo/makeinfo.c (cm_image): check *ext_arg as well as + ext_arg when computing length of fullname. + + * makeinfo/defun.c: docbook changes. + * makeinfo/docbook.c (docbook_punctuation): remove deprecated + default: at end of statement. + + * makeinfo/docbook.c: initial. + * makeinfo/docbook.h: initial. + * makeinfo/Makefile.am (makeinfo_SOURCES): add docbook.[ch]. + * makeinfo/makeinfo.c (add_char): use in docbook case. + + * doc/texinfo.tex (\footnotezzz): use \everypar={\hang} instead of + just \hang in case a footnote extends for multiple paragraphs. + +2001-12-18 <karl@gnu.org> + + * info/Makefile.am (BUILT_SOURCES): include $(EXEEXT) on makedoc + dependency since automake doesn't do it. + + 2001-12-11 Eli Zaretskii <eliz@is.elta.co.il> + + * djgpp/config.bat, djgpp/config.sed, djgpp/config.site: Update + for Texinfo 4.0d. + + * info/infomap.c (fetch_user_maps): Initialize `filename' to NULL + and don't try to call `open' if `filename' is NULL. + [__MSDOS__]: Try the current directory if neither $INFOKEY nor + $HOME are defined. + + * makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use IS_SLASH + instead of literal `/'. + (convert_from_loaded_file): Flush the output stream before + creating the TOC. + + 2001-12-10 Eli Zaretskii <eliz@is.elta.co.il> + + * info/infokey.c (main): Use FOPEN_WBIN instead of "w". + + * info/infokey.h (INFOKEY_SRCFILE, INFOKEY_FILE) [__MSDOS__]: + Special definitions for MS-DOS. + + 2001-12-09 Eli Zaretskii <eliz@is.elta.co.il> + + * lib/system.h: Condition inclusion of libintl.h on ENABLE_NLS. + (gettext, bindtextdomain, textdomain) [!ENABLE_NLS]: Provide + trivial definitions for when NLS is not used. + (LC_MESSAGES) [!ENABLE_NLS]: Define if undefined by locale.h. + +2001-12-18 Eli Zaretskii <eliz@is.elta.co.il> + + * info/infomap.c (decode_keys): Change the return type to int; + callers changed. Return zero if some of the special keys in SRC + are not defined by the terminal; return non-zero otherwise. + (section_to_keymaps): If decode_keys returns zero, don't bind the + key sequence. + +2001-12-18 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/xml.c (xml_insert_element_with_attribute) + (xml_insert_element): Rename the argument `element' to `elt'. + + * info/infokey.c (compile): Use \033 instead of (non-standard) \e. + +2001-12-17 <karl@gnu.org> + + 2001-12-16 Eli Zaretskii <eliz@is.elta.co.il> + + * info/pcterm.c (pc_initialize_terminal) [INFOKEY]: Store term_kh, + term_ke, term_ki, and term_kx sequences. + (DJGPP_keytab): Map Home, End, and Insert to escape sequences, not + to C-a, C-e, etc. + + * info/infomap.c (default_emacs_like_info_keys) + (default_emacs_like_ea_keys, default_vi_like_info_keys) + (default_vi_like_ea_keys): Add the leading suppress-default flag, + to be consistent with the table which comes from a file. + + * info/session.c (info_do_lowercase_version): Add a doc string. + + * info/infodoc.c (describe_key) [INFOKEY]: If keystroke is bound + to do-lowercase-version, but its lower-case variant is undefined, + say that keystroke is also undefined. + + +2001-12-12 <karl@gnu.org> + + * makeinfo/files.c (find_and_load): remove conditionals on + VMS|O_BINARY, always just read as many bytes as we can. + + 2001-12-11 Eli Zaretskii <eliz@is.elta.co.il> + * new files for djgpp/. + + 2001-09-09 Eli Zaretskii <eliz@is.elta.co.il> + * info/echo-area.c (build_completions): Look for a candidate + completion which matches user's request including the letter-case, + use that as the value of LCD_completion. + + 2001-12-06 Eli Zaretskii <eliz@is.elta.co.il> + * info/echo-area.c (build_completions): When looking for the best + completion candidate, only compare as much characters as the user + typed. + + +2001-12-04 <karl@gnu.org> + + * doc/texinfo.tex (\pdfmkpgn): remove trailing @ in link names + again. Also from Kurt. + + * doc/texinfo.tex (\image): need five commas to ignore additional + optional args to @image. From Kurt.Hornik@ci.tuwien.ac.at. + + * doc/texinfo.tex (\afourlatex): reset \globaldefs=0 explicitly. + From Trond Endrestøl <trond@ramstind.gtf.ol.no>. + +2001-12-01 <karl@gnu.org> + + * makeinfo/files.c (find_and_load): remove O_BINARY from open + call, this messes up under Windows. From eli. + +2001-11-20 <karl@gnu.org> + + * makeinfo/makeinfo.c (cm_image): reword error messages. + +2001-11-19 <karl@gnu.org> + + * Pretest 4.0d. + * doc/texinfo.txi: index ragged right/left. + + * info/window.c (build_message_buffer): handle %1$s as used in + ja.po. From Fumitoshi UKAI <ukai@debian.or.jp>. + + * configure.ac (ALL_LINGUAS): add sv. + +2001-11-16 <karl@gnu.org> + + * Makefile.am (EXTRA_DIST): add COPYING.DOC. + + 1999-10-30 Andrew Bettison <andrewb@zip.com.au> + + All these changes are to implement user-configurable key mapping + using the new 'infokey' program. For the time being, the new + code is conditional on [INFOKEY] and the old code is still there + in case we want to revert. + + * info/session.c (incremental_search): test for printable chars + _before_ isearch command keys -- makes a difference if the + isearch commands are bound to printable chars. + + * info/doc.h, + * info/infodoc.c, + * info/infomap.c, + * info/m-x.c, + * info/session.c: New typedef InfoCommand, plus a bunch of + supporting macros, to abstract a "command" away from being a + function pointer. + + * info/doc.h (pretty_keyseq), + * info/infodoc.c (pretty_keyseq), + * info/session.c (pretty_keyseq): Moved definition from + session.c into infodoc.c, and rewrote to recognise special + terminal sequences (PgUp, PgDn, etc.). + + * info/infodoc.c (create_internal_info_help_node, + replace_in_documentation, info_where_is), + * info/m-x.c (info_execute_command): Cleaned up references to + hardwired keystrokes. + + * info/infodoc.c (replace_in_documentation): + Extended the \\[foo] syntax to recognise \\%-X.Y[foo], which + causes the replacement text to be inserted using sprintf("%-X.Ys"). + + * info/session.c (_scroll_forward, _scroll_backward, + scroll_forward_page_only, scroll_backward_page_only, + scroll_forward_page_only_set_window, + scroll_backward_page_only_set_window): New functions, eliminating + need for SPC and DEL hack. + + * info/session.c (scroll_forward, scroll_backward, + scroll_forward_set_window, scroll_backward_set_window): Call + _scroll_forward and _scroll_backward to do all the work. + + * info/infomap.c (initialize_info_keymaps)[!INFOKEY]: set 'v' + and Control('v') key bindings to info_scroll_backward_page_only + and info_scroll_forward_page_only respectively. + + * info/Makefile.am (bin_PROGRAMS): Added new executable `infokey'. + (infokey_SOURCES): Defined. + (EXTRA_DIST): Added `sample_infokey'. + (BUILT_SOURCES): Added `key.c'. + + * info/infokey.h, + * info/infokey.c: Created, for new program `infokey' which + creates a $HOME/.info file by compiling a text source file with + syntax very similar to that used by `lesskey' in less 3.4.0. + + * info/makedoc.c: Generate new file `key.c' defining an array to + map command names to codes. + + * info/key.h: Created, to define contents of new `key.c' now + created by makedoc. + + * info/info.h (INFOKEY): Define, to enable all following changes. + (set_variable_to_value)[INFOKEY]: Declare new function. + + * info/makedoc.c [INFOKEY]: Write '#define A_' numeric command + code definitions into `funs.h' to support new key binding system. + + * info/session.c (info_dispatch_on_key, info_numeric_arg_digit_loop) + [INFOKEY], + * info/infomap.c [INFOKEY], + * info/infodoc.c (function_documentation, function_name, + describe_key, pretty_keyname, pretty_keyseq_internal, + where_is_internal)[INFOKEY], + * info/terminal.h (term_kh, term_ke, term_kx, term_ki)[INFOKEY], + * info/terminal.c (term_kh, term_ke, term_kx, term_ki, + terminal_initialize_terminal)[INFOKEY], + * info/variables.c (set_variable_to_value)[INFOKEY], + * info/sample_infokey: Added infokey functionality, copied more + or less wholesale from 'lesskey' in GNU Less 3.4.0. Added a new + typedef struct FUNCTION_KEYSEQ, and a new element `keys' to + typedef struct FUNCTION_DOC, to give the user some control over + the keystrokes that appear in the documentation node generated + by get-help-window, and to improve efficiency a little. + + * info/infodoc.c (info_internal_help_text, + create_internal_info_help_node)[INFOKEY]: Rewrote all code that + assumes fixed keystrokes, replacing %10s sequences with \\%10[foo] + sequences instead. + + * doc/info-stnd.texi: Documented above changes. + +2001-09-19 <karl@gnu.org> + + * makeinfo/cmds.c: </ not /<, duh :). From janneke. + +2001-09-12 <karl@gnu.org> + + * configure.ac (AC_SYS_POSIX_TERMIOS, AC_HEADER_TIOCGWINSZ): use + these new autoconf macros instead of the old automake ones. + + * info/terminal.c: remove unconditional include of sys/ioctl.h. + * info/termdep.h: <sys/ioctl.h> [GWINSZ_IN_SYS_IOCTL]: include outside of HAVE_TERMIOS_H, + per autoconf manual. + + * doc/Makefile.am (install-info-am): remove override of automake's + target, instead enable looking in . for info files within automake. + + * doc/info-stnd.texi: include separate version-stnd.texi + * configure.ac: autoconf 2.52, and rename to configure.ac. + +2001-09-11 <karl@gnu.org> + + * doc/texinfo.txi: recommend against using - and _ in @set names, + * and rearrange that section. + + * info/infodoc.c (replace_in_documentation): free fun_name to fix + memory leak. + From: "Art Haas" <ahaas@neosoft.com>, Sat, 4 Aug 2001 08:34:31 -0500. + + * makeinfo/lang.c: encoding support for info output from kama. + * makeinfo/lang.h: encoding support for info output from kama. + + * makeinfo/html.c: include document encoding code unless + no_encoding. + * makeinfo/insertion.c (cm_direntry): don't call begin_insertion + if ignoring. + (cm_documentdescription): moved here, and likewise. + (begin_insertion): don't need output format conditionals here. + + * makeinfo/cmds.c (cm_documentdescription): move to insertion.c. + * makeinfo/makeinfo.h (enable_encoding): new global. + * makeinfo/makeinfo.c: new option --enable-encoding, rearrange help. + + Sun Oct 31 18:44:24 UTC 1999 Karl Heinz Marbaise <kama@hippo.fido.de> + + - lang.{c,h}: + o added translation map between HTML markups and 8-Bit + (ISO-8859-1 codes; supplemental is Unicode for the future). + o added cm_search_iso_map: + search for characters based on HTML markup names for + translation 8-Bit code. + o recognizing of @documentencoding improved. + now we can recognize things like ISO-8859-{1...15} + + - makeinfo.{c,h}: + o added two command line switches. + + info-encoding to activate the encoding for info output + which is correctly shown by info. Default is NOT to + encode the output to be compatible with earlier versions. + + no-encoding to suppress encoding e.g. while producing + ASCII output (--no-headers) results in that you get + "A for Ä as before. + o help output changed to document the switches. + + - html.c: + charset encoding in html based on @documentencoding. + + +2001-07-31 <karl@gnu.org> + + * doc/texinfo.txi: mention pdfcolor.tex. + * doc/texinfo.tex: doc. + * doc/Makefile.am (install-tex): install pdfcolor.tex too. + * doc/pdfcolor.tex: new file, since Kurt.Hornik@ci.tuwien.ac.at + reports that not all pdftex installations include it. + +2001-07-25 <karl@gnu.org> + + * doc/texinfo.tex (\Etitlepage): need \HEADINGSon before the + \...aftertitlepage checks to get page numbers. Report from + 3diff@gnu.org. + +2001-07-06 <karl@gnu.org> + + * doc/texinfo.txi: mention http://docbook2X.sourceforge.net/. + +2001-06-29 <karl@gnu.org> + + * makeinfo/makeinfo.c: make output to stdout imply --no-split for + HTML, too. + + * makeinfo/html.c (html_output_head): use documentdescription if set. + * makeinfo/insertion.h (insertion_type): new case documentdescription. + * makeinfo/insertion.c (begin_insertion, end_insertion, + insertion_type_names): new case for documentdescription. + * makeinfo/cmds.c (cm_documentdescription): new fn. + * makeinfo/makeinfo.h (document_description): new global. + * doc/texinfo.txi: @documentdescription. + @documentdescription implementation from patches by Will Estes. + +2001-06-26 <karl@gnu.org> + + * doc/texinfo.txi: documentdescription + * doc/texinfo.tex: Ignore @documentdescription ... @end + documentdescription. + + * doc/texinfo.txi: document sequential punctuation in @footnote is + normal, suggested by rms. + +2001-06-21 <karl@gnu.org> + + * doc/texinfo.tex (\textfonts): call \setleading here, so that we can + switch font sizes back and forth inside @tex with \globaldefs=1 + and not lose the leading. + + * doc/texinfo.txi: allow @smallbook to run without overfull or + underfull boxes. + +2001-06-19 <karl@gnu.org> + + * doc/texinfo.tex (\imagexxx): ignore new optional args to @image. + + * makeinfo/html.c (html_output_head): include <h1>title</h1> at + beginning of document. + * makeinfo/sectioning.c (cm_top): don't include explicit links in + HTML output, the regular code for @node will do it. + (sectioning_html): use <h2> for chapter instead of <h1>, etc. + * makeinfo/node.c (cm_node): do not include code to output the + HTML <head>, we do that elsewhere now. + + 1999-11-26 W. L. Estes <will@fumblers.org> + * makeinfo/insertion.c (begin_insertion): add an explicit <br> + before beginning a <pre> block. for flushleft and flushright, use + <div> tag with an align attribute set. + * makeinfo/insertion.c (end_insertion): for flushleft and + flushright, end the </div> block. + + * makeinfo/makeinfo.c (cm_image): new variable, alt_arg now allows + user-supplied alt attribute value and + ext_arg allows user-supplied extension for image files. + + * makeinfo/toc.c (contents_update_html): add anchors at chapter + level entries + (shortcontents_update_html): hrefs in shortcontents point to the + above anchors in the detailed contents + + * doc/texinfo.txi: document changes to @image and the new behavior + of shortcontents entries + +2001-06-14 <karl@gnu.org> + + * makeinfo/node.c: no need for size_t. + +2001-06-13 <karl@gnu.org> + + * texinfo.tex (\pdfmkdest): \normalturnoffactive, so refs and + defs match. + (\xrefX): pdf link defs no longer use @, so link refs shouldn't use @ + either. (All xrefs in pdf were failing.) + (\mkpgn): remove redundant second definition. + + * texinfo.tex (\smallerfonts): new font size. + (\smallexample, et al.): use it, in all cases, not just @smallbook. + + 1999-11-30 Andreas Schwab <schwab@suse.de> + * doc/texinfo.tex (\xrefX): Turn off active characters when writing + out the link name for pdf. + +2001-06-13 <karl@gnu.org> + + * doc/texinfo.txi: document that @smallexample is smaller in all + page formats now. + +2001-06-11 <karl@gnu.org> + + * 4.0c. + * util/Makefile.am: Don't need automake patch any more, with + automake 1.4p4. + + * configure.in (AC_FUNC_SETVBUF_REVERSED): only needed on + pre-sysvr3 systems that nobody has anymore? Or so Russ Allbery + informs me ... + +2001-06-08 <karl@gnu.org> + + * makeinfo/Makefile.am (EXTRA_DIST): include texinfo.{dtd,xsl}. + + * util/Makefile.am: automake-1.4p3 now. + +2001-06-07 <karl@gnu.org> + + * util/texi2dvi: comment out conditional text, from Werner LEMBERG + <wl@gnu.org>. + + 2001-06-02 Eli Zaretskii <eliz@is.elta.co.il> + * info/echo-area.c (info_read_completing_internal): If there are + no completions, say that instead of "Not complete". + + * configure.in (ALL_LINGUAS): add da + + * makeinfo/Makefile.am (pkgdata_DATA): include texinfo.xsl. + + * configure.in: update for autoconf 2.50. + +2001-06-04 <karl@gnu.org> + + * util/Makefile.am (EXTRA_DIST): automake-14p2.patch now. + * util/automake-14p2.patch: rename from 14p1. + +2001-05-22 <karl@gnu.org> + + * changes from feloy for lowercase xml names, etc. + +2001-05-21 <karl@gnu.org> + + * util/Makefile.am (EXTRA_DIST): add automake-14p1.patch. + * makeinfo/Makefile.am (pkgdata_DATA): define to install + texinfo.dtd. + + 2001-05-17 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/makeinfo.c (cm_xref, cm_inforef): Don't allow empty + first arguments in cross references. + + * makeinfo/makeinfo.c: redo --help, basic patch from ke@suse.de. + +2001-05-03 <karl@gnu.org> + + * doc/info.texi: move help-cross to be subnode of cross-refs, + instead dangling out in space. + * doc/info.texi: update from eli + +2001-05-02 <karl@gnu.org> + + * makeinfo/xml.c (xml_push_current_element): need to select the + `name' member. + +2001-05-01 <karl@gnu.org> + + * configure.in: 4.0b + + * doc/info.texi (Help-Cross): subsection of Cross-refs. + + * lib/system.h (va_alist, etc.): moved from makeinfo.c. + * makeinfo/makeinfo.c (va_alist, etc.): move to system.h + + * makeinfo/xml.[ch]: new files from Philippe Martin <feloy@free.fr>. + * pretty much all files also modified for XML/DocBook output. + * doc/texinfo.txi: minimally mention --xml and --docbook. + * makeinfo/xml.c: convert to K&R until we can do ansi2knr. + + * util/texindex.c, + * util/install-info.c, + * info/info.c: it's 2001. + +2001-04-15 <karl@gnu.org> + + * doc/info.texi: major update from eli. + +2001-04-13 <karl@gnu.org> + + 1999-10-16 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/node.c (cm_node): Don't generate cross-references to + "(DIR)". + * makeinfo/html.c (add_link): Likewise. + + 1999-10-16 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/makeinfo.c (insert): Don't call html_output_head here. + (add_char): Call html_output_head here... + * makeinfo/cmds.c (cm_sp): ...and here... + * makeinfo/toc.c (cm_contents, cm_shortcontents): ...and here... + * makeinfo/node.c (cm_anchor): ...and here. + + * makeinfo/html.c (html_output_head): `free' html_title if + expanded. Make <head> and <body> stand out. + +2001-04-12 <karl@gnu.org> + + 1999-12-26 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/defun.c (defun_internal): Use execute_string instead + add_word_args to expand defined_name, type_name and category (in + HTML mode). + +2001-03-29 <karl@gnu.org> + + * Makefile.am: simple license. + +2001-02-27 <karl@gnu.org> + + 1999-12-17 Yoshiki Hayashi <t90553@mail.ecc.u-tokyo.ac.jp> + * info/terminal.h, info/terminal.c (term_kh, term_ke, term_kD): + New variables to hold Home, End, Delete key sequences. + * info/infomap.c (initialize_emacs_like_keymaps, + initialize_vi_like_keymaps): Set them. + + * makeinfo/makeinfo.h, + * makeinfo/makeinfo.c: --split-size option from Yoshiki: + 1999-12-09 Yoshiki Hayashi <t90553@mail.ecc.u-tokyo.ac.jp> + * makeinfo/makeinfo.h (split_size): New option. + * makeinfo/makeinfo.c (long_options): Add split_size. + (usage): Ditto. Suggested by Richard Y. Kim. + + * util/texi2dvi: -o support from Akim. + +2001-02-02 <karl@gnu.org> + + * dir-example: don't need zsh twice. + + From: Nishio Futoshi <fut_nis@d3.dion.ne.jp>, 02 Apr 2000. + * doc/texinfo.txi: capitalization fixes. + * doc/info.texi: up pointer fixes. + * doc/texinfo.txi: installing an info file. + + * makeinfo/makeinfo.c: --output is for split html, not non-split. + From: Karl Eichwalder <keichwa@gmx.net> + +2001-01-12 <karl@gnu.org> + + 1999-10-15 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/cmds.c (cm_sc): Don't print the warning about + all-uppercase argument in menus under --no-headers. + + * makeinfo/files.c: pass O_BINARY flag to open, suggested by bfox. + +2001-01-11 <karl@gnu.org> + + * info/terminal.c [HAVE_TERMIOS_H && TCOON]: tcflow TCOOFF/TCCON + to resume output if user presses CTRL-S at the beginning of + things. + [HAVE_TERMIO_H && TCXONC]: ditto. + From Kevin Ryde <user42@zip.com.au>, 16jun2000; + cf. emacs/src/sysdep.c. + +2001-01-08 <karl@gnu.org> + + * makeinfo/cmds.c: afivepaper, afourwide, afourlatex. + * doc/texinfo.txi: afivepaper + +2001-01-05 <karl@gnu.org> + + * doc/info.texi: typo from: Martin Buchholz <martin@xemacs.org>. + * doc/info.texi: typo fixes from meyering. + +2001-01-02 <karl@gnu.org> + + * makeinfo/makeinfo.c (remember_brace_1): don't assume command is + non-null, an (erroneous) input line like \hbox to7in{ passes in a + null. + + * makeinfo/toc.c: fix from jan + * makeinfo/html.c: fix from jan for top-level references. + +2000-12-22 <karl@gnu.org> + + * makeinfo/makeinfo.c: --help changes. + * doc/texinfo.txi: -o means the directory name for HTML output. + +2000-12-21 <karl@gnu.org> + + * doc/texinfo.txi: switch to fdl + + * makeinfo/html.c: doc fix. + * makeinfo/insertion.c: no space after _ I guess. + * makeinfo/cmds.c: no space after _ I guess. + + * makeinfo/html.c (nodename_to_filename_1): fix up external + * top-node references. + +2000-12-20 <karl@gnu.org> + +* HTML table patch from Jan: + 2000-12-19 Jan Nieuwenhuizen <janneke@gnu.org> + + * makeinfo/multi.c (multitable_item), + (cm_tab): close html table columns. Also, align cell contents to + top, which is probably the most sensible thing to do for text. + + +2000-12-19 <karl@gnu.org> + + * makeinfo/makeinfo.c (insert_toplevel_subdirectory): try + name.html if just name doesn't work. + + * doc/texinfo.txi: document html output in .html directory + sometimes. + + * util/Makefile.am (EXTRA_DIST): add install-info-html. + + * util/texindex.c: 2000 + * util/install-info.c: 2000 + * info/info.c: 2000 + * configure.in: 4.0a + + * lib/system.h: include limits.h + + * Applied HTML splitting changes from Jan: + 2000-11-10 Jan Nieuwenhuizen <janneke@gnu.org> + + * makeinfo: removed code for numbered split HTML output, removed + SPLIT_JCN conditional. + + 2000-11-09 Jan Nieuwenhuizen <janneke@gnu.org> + + * makeinfo/html.c: prepared nodifying filename functions for + linking not non-spit HTML documents, by adding ``#anchor'' to + external refernces. + + * doc/texinfo.txi (Installing HTML info): updated doco for --html + option, added node Installing HTML info. + + * util/install-info-html.in: new script. The bare minimum + required for generating HTML index. + + * lib/system.h: compilation fix. + + 2000-11-08 Jan Nieuwenhuizen <janneke@gnu.org> + + * makeinfo/makeinfo.c (convert_from_loaded_file): [SPLIT_JCN]: + overloaded already way too hairy function with logic to put split + html output into subdirectory with basename of toplevel output + file. + + * makeinfo/html.c (fix_filename): new function. + + 2000-11-07 Jan Nieuwenhuizen <janneke@gnu.org> + + * toc.c (toc_add_entry): + (contents_update_html): + (shortcontents_update_html): [SPLIT_JCN]: use hrefs for nodename based + html files. + + * node.c (cm_node): [SPLIT_JCN]: create html filename based on + nodename (instead of a numbered node<num>.html filename). + + * makeinfo/makeinfo.c (main): [SPLIT_JCN]: enable splitting of + html output. + + * makeinfo/html.c + (add_url_name,add_nodename_to_filename,nodename_to_filename): new + functions. + +2000-12-15 <karl@gnu.org> + + * configure.in (AC_CHECK_HEADERS): add limits.h explicitly. + +2000-11-10 <karl@gnu.org> + + * dir-example: update + * info/nodes.c: doc fixes, etc. + + * incorporated verbatim patch from janneke: + 2000-04-14 <janneke@gnu.org> + + * applied texinfo-3.12s.jcn4 patch + + 1999-09-02 <janneke@gnu.org> + + * makeinfo/cmds.c, + * makeinfo/insertion.c: @verbatiminclude file + * doc/texinfo.tex: @verbatiminclude file + * doc/texinfo.txi: @vebatiminclude file doco + * NEWS: added @verbatiminclude to Language section + + 1999-09-01 <janneke@gnu.org> + + * makeinfo/makeinfo.c: bf: @exdent (urg6.texi) -- Rolled into 4.0 + * NEWS: added verb* to Language section + * doc/texinfo.txi: @verb, @verbatim doco + * doc/texinfo.tex: tricky tex-fix for @verb{<char>..<char>} + * doc/texinfo.tex: real tab expansion for @verbatim mode + * doc/texinfo.tex: proper start of environment, no indentation + + 1999-08-31 <janneke@gnu.org> + + * makeinfo/cmds.c: + * makeinfo/insertion.{c,h}, + * makeinfo/makeinfo.{c,h}: redo of @verbatim, @verb{<char>..<char>} + * doc/texinfo.tex: fixed @verb{<char>..<char>} + + 1999-08-30 Jan Nieuwenhuizen <janneke@gnu.org> + + * makeinfo/cmds.c, + * makeinfo/insertion.{c,h}, + * makeinfo/makeinfo.{c,h}: added @verbatim (and preliminary @verb) + support + * doc/texinfo.tex: added @verbatim (and preliminary @verb) support + + 1999-08-24 Jan Nieuwenhuizen <janneke@gnu.org> + + * bf: empty node: makeinfo/node.c:cm_node () -- Rolled into 4.0 + + +2000-10-18 <karl@gnu.org> + + * doc/info.texi: eli update + +2000-09-22 <karl@gnu.org> + + * makeinfo/defun.c: warn if non-whitespace follows @defun'd name + (suggestion from Akim). + + Installed some patches: + + 2000-08-04 Paul Eggert <eggert@twinsun.com> + * makeinfo/multi.c (find_template_width): + Don't access before start of *PARAMS. + + 2000-08-21 Eli Zaretskii <eliz@is.elta.co.il> + * info/filesys.c (info_file_in_path): Reject FILENAME if it is + empty, or ".", or "..". + + 2000-08-23 Eli Zaretskii <eliz@is.elta.co.il> + * info/session.c (info_menu_or_ref_item): If the user have chosen + menu item or xref that's identical to defentry's label, use + defentry instead of looking for its label. Otherwise, select the + entry whose position is the closest to the window's point, in + case there's more than a single entry with that label. + +2000-09-12 <karl@gnu.org> + + * doc/texinfo.txi: it's 2000 now. + * doc/texinfo.txi: document the only real (and rare) reason for not using implicit pointer + creation. + +2000-09-06 <karl@gnu.org> + + * configure.in: test all termcap variables for existence. From + andy@rz.uni-karlsruhe.de. + + * configure.in (ALL_LINGUAS): include ja. + * lib/system.h [HAVE_IO_H]: make #include <io.h> conditional for + BeOS. Reported by Dan Moore, dan@moore.cx. + * configure.in (AC_CHECK_HEADERS): add io.h. + +2000-06-05 <karl@gnu.org> + + * doc/texinfo.txi: forgot to escape {}. + +2000-05-30 <karl@gnu.org> + + * info/filesys.c (is_dir_name): check all info suffixes as well as + the compression suffixes. Fixes segmentation fault on a dir.info + file ending after the * Menu. + +2000-05-28 <karl@gnu.org> + + * doc/texinfo.txi: Forgot {arg} in @rmacro example. From Olaf B. + +2000-05-27 <karl@gnu.org> + + * doc/txi-cs.tex: update from: Stepan Kasal <kasal@suse.cz>. + + * doc/Makefile.am (install-data-local): reformat warning per + François to hopefully make it more noticeable. + + 2000-02-08 Eli Zaretskii <eliz@is.elta.co.il> + * info/session.c (incremental_search): Don't retain RET when + exiting isearch. Suggested by Hrvoje Niksic <hniksic@iskon.hr>. + +2000-05-22 <karl@gnu.org> + + * doc/texinfo.txi: pageparams -> pagesizes + +2000-05-18 <karl@gnu.org> + + * makeinfo/lang.c (cm_accent_tilde): need N in list. + From: kama@hippo.fido.de (Karl Heinz Marbaise) + + * makeinfo/files.c (find_and_load): read only the number of bytes + available in the buffer. Also, remove one-byte-at-a-time reading + in the WIN32 case. + From: "J. David Bryan" <dbryan@bcpl.net> + + * info/man.c: use eli's patch after all, we re-increment j at the + top of the loop. + +2000-05-16 <karl@gnu.org> + + * info/man.c (clean_manpage): don't write before the beginning of + newpage. + (based on patch from Eli). + +2000-02-03 <karl@gnu.org> + + * doc/texinfo.txi: remove spurious space. from kaja. + +1999-10-12 Karl Berry <karl@gnu.org> + + * doc/Makefile.am (install-tex): install all txi-?? files. + +1999-10-01 W. L. Estes <will@fumblers.org> + + * makeinfo/cmds.c: dont treat @center as separate paragraph, + use div element to output center + +1999-09-29 Eli Zaretskii <eliz@is.elta.co.il> + + * djgpp/README: Say `dir-example', not DIR. + + * lib/system.h (DEFAULT_INFOPATH) [__DJGPP__]: Define. + +1999-09-28 Karl Berry <karl@gnu.org> + + * configure.in, + util/texi2dvi: version 4.0. + * doc/texinfo.txi: New isbn. + +1999-09-24 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Fixes from Oleg. + +1999-09-20 Karl Berry <karl@gnu.org> + + * makeinfo/node.c: Don't write region at an anchor. + From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de> + + * info/terminal.c: Only set dumb terminal if tgetent returns < 0, + not 0. + For HP-UP 11. + From jeff.hull@state.co.us. + + * makeinfo/footnote.c: Don't translate the `Footnotes' string + according to LANG, it should be according to + @documentlanguage, which isn't implemented yet. + From: Jan Nieuwenhuizen <janneke@gnu.org> + + * doc/texinfo.txi: @end direntry from kama. + +1999-09-19 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: \ninett is now \smalltt. + + * doc/texinfo.txi: arnold changes + + 1999-09-03 Akim Demaille <akim@epita.fr> + * texi2dvi (getopt): batch has to be assigned `eval', not `echo'. + (bibtex): Launch BibTeX also when the LOG file complains that + there are no BBL file. + + * doc/texinfo.txi: Document that @anchor ignores spaces. + + * makeinfo/cmds.c (cm_shyph): remove, ­ is not supported in + browsers. + From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de> + + * makeinfo/makeinfo.c: Don't crash if current_indent = 0. + From: Jan Nieuwenhuizen <janneke@gnu.org> + + * makeinfo/makeinfo.c: Avoid blank lines between @menu entries. + * configure.in: 3.12t + + 1999-08-31 Eli Zaretskii <eliz@is.elta.co.il> + * info/info.c (info_short_help): Document --apropos. + +1999-09-18 Karl Berry <karl@gnu.org> + + * makeinfo/html.c (html_output_head): use text for <title>, not + html markup. From François. + * makeinfo/makeinfo.c (text_expansion): new routine. + * makeinfo/cmds.c (cm_settitle): don't expand the title here, + we'll do it later. + + * makeinfo/makeinfo.h (text_expansion): declare. + + * info/indices.c, + * info/infodoc.c, + * info/session.c, + * info/footnotes.c: translate errors. + * info/info.h: Use `' instead of "" in errors. + +1999-09-06 Karl Berry <karl@gnu.org> + + +1999-08-24 Jan Nieuwenhuizen <janneke@gnu.org> + * makeinfo/node.c:cm_node: don't compare current_node when null. + + 1999-08-23 W. L. Estes <will@fumblers.org> + * makeinfo/node.c (cm_node): write <a name=> tags even + ifusing --no-headers + + * configure.in: ospeedlib -> trylib + From: Andreas Schwab <schwab@suse.de> + + * makeinfo/makeinfo.c (read_command): add explicit 0 to return if + enclosure command. From: Andreas Jaeger <aj@arthur.rhein-neckar.de>. + +1999-08-19 Karl Berry <karl@gnu.org> + + * configure.in: add missing quotes, logic in new termcap library + check. + +1999-08-17 Karl Berry <karl@gnu.org> + + * makeinfo/multi.c, + * makeinfo/sectioning.c, + * makeinfo/node.c, + * makeinfo/macro.c: omit unused vars + * info/session.c (info_goto_invocation_node): omit unused decl. + + * configure.in: Check for extra termlib variable necessary on + HP-UX 9. + From: Olaf Bachmann <obachman@mathematik.uni-kl.de> + + 1999-08-16 Andreas Schwab <schwab@suse.de> + * info/terminal.c (terminal_initialize_terminal): Try tcgetattr + and cfgetospeed in preference to TIOCGETP. + (original_tchars, original_ltchars): Define them only if needed. + +1999-08-16 Karl Berry <karl@gnu.org> + + * info/infodoc.c (create_internal_info_help_node): rename arg. + (info_find_or_create_help_window): avoid deref of null eligible. + + * info/terminal.c (TIOCGETP, TIOCGETC, TIOCGLTC) [alpha && linux]: + #undef. Useless stubs are present. + +1999-08-15 Karl Berry <karl@gnu.org> + + * info/nodes.c: Remove reference to nonexistent RFC for Info + files. + +1999-08-11 Eli Zaretskii <eliz@is.elta.co.il> + + * info/nodes.c (info_find_file_internal): If the file's contents + were gc'ed since last time it was loaded, reload the file. + +Wed Aug 11 06:42:47 1999 Karl Berry <karl@gnu.org> + + * doc/Makefile.am (EXTRA_DIST): add txi-pt.tex from Lalo. + +Mon Aug 9 16:28:18 1999 Karl Berry <karl@gnu.org> + + * util/texi2dvi: Support preloaded texinfo.tex, from Stephen. + + * makeinfo/makeinfo.c (add_char): restore ugly check for first + character being <. + + * makeinfo/cmds.c (cm_kbd): Increment in_fixed_width_font for + html. + + * doc/texinfo.txi: effect not affect + + * makeinfo/makeinfo.c: Rearrange help. + + * makeinfo/toc.c: Cast %* arguments to (int) to placate gcc + -Wformat. + +Fri Aug 6 13:03:14 1999 Karl Berry <karl@gnu.org> + + * util/install-info.c: Hardwire the File: dir, Node: top part of + the skeleton dir file. + Report from: Stanislav Brabec <utx@k332.feld.cvut.cz> + + * info/Makefile.am (BUILT_SOURCES): rm -f $(BUILT_SOURCES), a + kludge. + + 1999-07-28 Karl Eichwalder <ke@gnu.franken.de> + + * makeinfo/makeinfo.c: Fix help string (-o). + + 1999-07-30 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (cm_uref, cm_email): Don't collapse -- and + `` in the URL part of the reference. + + 1999-08-03 Eli Zaretskii <eliz@is.elta.co.il> + + * util/install-info.c (main): For entries given on command line, + set entry_sections and entry_sections_tail members to NULL, and + set text_len member to the entry length. After processing the + Info file, update the entry_sections pointers of all entries that + came from the command line. + + * util/texindex.c (sort_offline, sort_in_core): use off_t rather + than long. + Found on FreedBSD 2.2.8 by "Trond Endrestol" <endrestol@hotmail.com>. + +Mon Jul 19 17:16:46 1999 Karl Berry <karl@gnu.org> + + * configure.in: 3.12n + + * makeinfo/makeinfo.c (add_char): Don't insert <p> if we're in + @html. + + * makeinfo/html.c (add_escaped_anchor_name), + * makeinfo/toc.c (toc_add_entry): use URL_SAFE_CHAR. + * makeinfo/makeinfo.h (HTML_SAFE, URL_SAFE_CHAR): new macros. + +Sun Jul 18 14:47:40 1999 Karl Berry <karl@gnu.org> + + * dir-example: Add bzip2. + + * configure.in: 3.12m. + + * doc/texinfo.txi (@afourlatex,@afourwide): add to command list. + +1999-07-17 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (cm_xref): Don't collapse `` and -- while + expanding node names. Generate a terminating period for + @pxref, when it has more than a single argument. + + * makeinfo/index.c (cm_printindex): Don't collapse `` and -- while + expanding node names. + +Sat Jul 17 16:33:45 1999 Karl Berry <karl@gnu.org> + + * 3.12l. + + * doc/texinfo.txi: @alias, @definfoenclose, etc. + + * util/texindex.c (indexify): error message instead of abort(2) + when no page number. + +Fri Jul 16 18:00:26 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Overfull boxes, help2man, etc. + + * util/Makefile.am (EXTRA_DIST): texi-outline.gawk is really + outline.gawk, add fixref.gawk and prepinfo.awk and + texi-docstring-magic.el. + +Thu Jul 15 18:57:54 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: .fmt, etc. + * doc/texinfo.txi: More macro docs, etc. + +Wed Jul 14 19:58:47 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Give good quote. + + * util/Makefile.am (EXTRA_DIST): add texi-outline.gawk. + + From: kama@hippo.fido.de (Karl Heinz Marbaise) + * makeinfo/toc.c (contents_update_html): go back to start level. + * doc/texinfo.txi: deftypeop + + From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu> + * makeinfo/toc.c (toc_add_entry): don't assume sprintf return type + is int. + * makeinfo/sectioning.c (insert_and_underscore): declare more + unsigned char *. + * makeinfo/macro.h (itext_info, itext_size): remove declarations, + they're defined static. + * makeinfo/makeinfo.c: Split up help string even more. + +Tue Jul 13 17:16:18 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Document @rmacro. + * makeinfo/macro.c (cm_rmacro): new command to do @allow-recursion + by default. + (define_macro): split off from cm_macro. + + * makeinfo/macro.h (cm_rmacro): declare. + * makeinfo/macro.h (delete_macro): do not need to export. + * makeinfo/cmds.c (rmacro): new command. + + * makeinfo/html.c, + * makeinfo/toc.c, + * makeinfo/lang.c, + * makeinfo/makeinfo.c: Use strchr instead of member. + +Mon Jul 12 08:01:19 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: document this. + * makeinfo/macro.c (apply): warn if \ in macro body is not + followed by a parameter name or \, instead of silently + accepting it, for compatibility with TeX. + + * makeinfo/macro.c: Doc fix. + +Sun Jul 11 12:49:50 1999 Karl Berry <karl@gnu.org> + + * makeinfo/macro.c (cm_macro): do @quote-arg implicitly if single + argument to macro. + * doc/texinfo.txi: Document this. + + * doc/texinfo.txi (Smallcaps): Document makeinfo warning if arg is + all uppercase. + * makeinfo/cmds.c (cm_sc): warn if arg is all upper (suggested by + Jim Meyering). + + * makeinfo/cmds.c (cm_var): warn if argument contains any of ,[]() + which are unlikely to be allowable in real variable names. + Suggested by rms. + + * makeinfo/makeinfo.h (member): remove weird masking macro. + + * doc/texinfo.txi: Probably ok to indent @example. + + * configure.in: 3.12k. + + * makeinfo/html.c (add_escaped_anchor_name): Cast to unsigned char + for 8-bit chars. From Yoshiki. + + * makeinfo/makeinfo.c: complain -> warn for sake of <80 chars. + +1999-07-09 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/multi.c (multitable_item): Quote the value of align= + property. + + * makeinfo/defun.c (defun_internal): Ditto. + + * makeinfo/cmds.c (cm_center): Ditto. + + * makeinfo/toc.c (toc_add_entry): New argument ANCHOR; all callers + changed. In HTML mode, expand NODE_NAME, or use ANCHOR, if + non-NULL, and save it together with the TOC name in the name + member of the TOC entry. + (toc_add_entry, toc_find_section_of_node): Add a warning in a + comment that the NODE argument must be unexpanded. + (contents_update_html): Terminate the TOC entry with </a>. + + * makeinfo/sectioning.c (sectioning_html): If the sectioning + command is outside any node, generate explicit anchor and pass it + to toc_add_entry. + + * makeinfo/node.c (expand_node_name): Now external instead of + static. + (cm_node): Output expanded node name in the navigation bar. + + * makeinfo/node.h: Declare expand_node_name. + + * makeinfo/index.c (cm_printindex): Produce valid HTML links, even + if index->node is NULL or empty. Fix format of index under + --no-headers. + +Fri Jul 9 18:09:28 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Pair @end html properly. From Olaf B. + + * doc/Makefile.am (EXTRA_DIST): add txi-nl.tex from Marcel van der Boom + <marcel@virtualprojects.org>. + + * doc/txi-en.tex: Doc fix. + +Wed Jul 7 16:07:44 1999 Karl Berry <karl@gnu.org> + + * doc/Makefile.am: Doc fix. + + * configure.in (txi_CHECK_DECLS): call this new macro (in + acinclude.m4). + * acinclude.m4: new file. + +Tue Jul 6 19:12:37 1999 Karl Berry <karl@gnu.org> + + * makeinfo/insertion.h, + * makeinfo/insertion.c, + * makeinfo/cmds.c, + * makeinfo/defun.c: new command @deftypeop. + Suggestion from: booth@us.ibm.com. + +1999-07-05 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (cm_value): Don't convert quotes and dashes + in the argument of @value, since @set doesn't. + +Mon Jul 5 16:43:23 1999 Karl Berry <karl@gnu.org> + + * makeinfo/insertion.c (get_item_function): return "@ " rather + than "@". (command_needs_braces): new fn. + (cm_item): handle @itemize markers that don't take braces. + Bug reported by Stephen, prototype fix from Yoshiki. + + * doc/texinfo.txi (Contents): @contents ignored at beginning when + outputting to stdout. + Installed this. +>1999-05-02 Eli Zaretskii <eliz@is.elta.co.il> +> * makeinfo/toc.c (cm_contents, cm_shortcontents): If writing to +> stdout, output the contents and short contents immediately, and +> assign NULL to contents_filename and shortcontents_filename, so +> that toc_update won't try to rewrite stdout. + + + * makeinfo/sectioning.c (sectioning_html): declare starting_pos + and ending_pos as unsigned char * since they're based on + output_paragraph. + + * makeinfo/insertion.c: Cast output_paragraph to char * for sake + of strncmp prototype (on IRIX 4). + From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu> + + + * info/man.c (get_manpage_contents): restore previous (default) + SIGCHLD handler so the pclose when gunzipping info files + doesn't fail with `No child processes' (because + reap_children reaped it). + From: Josip Rodin <jrodin@public.srce.hr> + njs@uclink4.berkeley.edu, 38063-forwarded@bugs.debian.org + +Fri Jul 2 14:26:22 1999 Karl Berry <karl@gnu.org> + + From gildea: + * info/terminal.c (TIOCGETC) [M_XENIX && TIOCGETC]: #undef. + * info/session.c (strncasecmp) [M_XENIX]: declare. + +Thu Jul 1 19:25:12 1999 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c (cm_value): erroneous capitalization in + error message. + + * makeinfo/insertion.c (end_insertion): @end html should turn html + escaping back on. From esr. + + * makeinfo/makeinfo.c (cm_pxref): No period needed to terminate + cross-reference. + +Sun Jun 13 16:12:41 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Remove some more node links. + +Sat May 1 16:01:36 1999 Karl Berry <karl@gnu.org> + + * info/info.c: Single space for option indent to match others. + + * makeinfo/makeinfo.c, + * util/texindex.c, + * util/install-info.c: Must indent option list for help2man. + + * info/infodoc.c [HELP_NODE_GETS_REGENERATED]: set to true. + (info_internal_help_text): put moving cmds first so they know how to go + forward in the help window. + (create_internal_info_help_node): can't always quit help with C-x 0. + (info_find_or_create_help_window): pass !one_window_p. + +1999-04-29 Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp> + + * makeinfo/makeinfo.c (cm_xref): Don't collapse --- to -- etc., + in references. + +Mon Apr 26 16:41:55 1999 Karl Berry <karl@gnu.org> + + * makeinfo/node.c (validate): arrange to translate the reference type. + Report from Sergio. + + * makeinfo/makeinfo.c (validate): should not be declared here. + + * makeinfo/index.c (cm_printindex): <ul compact> is not + translatable. From Yoshiki. + + * doc/Makefile.am (EXTRA_DIST): include new txi-es.tex from Adrian + Perez Jorge <alu1415@csi.ull.es>. And new txi-en.tex. + +Sun Apr 25 16:08:27 1999 Karl Berry <karl@gnu.org> + + * makeinfo/cmds.c (cm_settitle): don't output html head here. + + * makeinfo/makeinfo.c: Move html routines to html.c. + * makeinfo/Makefile.am (makeinfo_SOURCES): add html.[ch]. + * makeinfo/html.[ch]: new files. + + * makeinfo/makeinfo.c: Restore -- in --output line. From Sergio. + +1999-04-23 Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp> + + * makeinfo/cmds.c (cm_center): Recover the previous state when + called with --html. + +1999-04-24 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/cmds.c (cm_bye): Flush the output, in case some command + produced it immediately before @bye. + + * makeinfo/toc.h (TOC_ENTRY_ELT): New member: containing_node. + + * makeinfo/toc.c (lots_of_stars): New variable. + (toc_add_entry): Add a new parameter node_name; all callers + changed. Record the name of the node containing the section. + (toc_find_section_of_node): New function. + (toc_free): Free the new containing_node member. + (contents_update_info, shortcontents_update_info): Underline the + title with stars. Output two empty lines after the TOC. + (contents_update): Fix off-by-one error in writing the rest of the + file after updating the TOC. + + * makeinfo/index.c (cm_printindex): Save and restore line_number + and input_filename. Don't output the "* Menu" header when + --no-headers is in effect. Make the fake node name for index + entries that are outside any node be more explanatory, and emit an + error for such index entries. Under --no-headers, output a + reference to the section name, as returned by a call to + toc_find_section_of_node, instead of a node name. + +1999-04-24 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/index.c (struct index_elt): Add a new member + entry_text. + (free_index, make_index_entries_unique): Free the entry_text + member. + (index_add_arg): Don't HTML-escape the index entry here. + (index_add_arg): Initialize the entry member to NULL. Put the + entry text into the entry_text member. + (sort_index): Expand the index entries as if in non-HTML mode. + Put the expansion into the entry member of struct index_elt. + (cm_printindex): Allocate the line[] array in Info mode only. + In HTML mode, escape and expand the original index entry text, + don't use the results of expansion inside sort_index. + + * makeinfo/cmds.c (cm_r): Undo the effect of @code while printing + one of the "code"-style indices in HTML mode. + +1999-04-23 Eli Zaretskii <eliz@is.elta.co.il> + + * info/infomap.c (initialize_vi_like_keymaps): Bind DEL in echo + area to ea_rubout, except for __MSDOS__. + + * doc/info-stnd.texi (Node Commands): Document that `I' only + produces its effect for programs documented in the current Info + file. Tell them to invoke `I' from DIR if it doesn't work from + current place. + +Thu Apr 22 09:59:02 1999 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c, + * info/info.c: Rewrite help string a little more. + + * doc/info-stnd.texi: Change chapter name to match node name, + * other changes. + + * makeinfo/cmds.c (cm_bye): call discard_braces. + + * makeinfo/cmds.c (cm_settitle): output more meta and link tags. + + * configure.in (ALL_LINGUAS): add eo. + + * util/install-info.c [STRIP_DOT_EXE]: #if not #ifdef + +Wed Apr 21 19:40:51 1999 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c: Doc fix. + + * makeinfo/sectioning.c (insert_and_underscore): do not output + html anchor here. + * makeinfo/node.c (cm_node): do anchor at node name not sectioning + title. + + * makeinfo/node.c: Newlines on node lines. + +Tue Apr 20 13:02:46 1999 Karl Berry <karl@gnu.org> + + * info/man.c (get_manpage_contents): freopen stdin and stderr to + /dev/null rather than closing them. http://bugs.debian.org/14787 + +Mon Apr 19 14:12:09 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Document possibility of `titlepage' stuff for + plain text output using @ifinfo. + Report from: Kurt Hornik <Kurt.Hornik@ci.tuwien.ac.at>. + + * makeinfo/cmds.c: Screw that. + * doc/texinfo.txi: Fix up frontmatter a bit. + + * dir-example: Spaces not tabs. + * dir-example (R FAQ): add. + + * makeinfo/makeinfo.c: Lowercase makeinfo in first line. + + * doc/info.texi (The node reached...): is a @subsection not a + @subsub. + + * doc/texinfo.txi: Document option rename. + * makeinfo/makeinfo.c: Rename option to commands-in-node-names. + + * makeinfo/index.h (index_compare_fn): declare. + * makeinfo/index.c (index_element_compare): call through new + variable index_compare_fn, and set it to strcoll if + @documentlanguage was used and LANG != en. + #include lang.h. + +Sat Apr 17 14:46:47 1999 Karl Berry <karl@gnu.org> + + * makeinfo/insertion.c (current_item_function, cm_item): rewrite + to skip all conditionals. + (cm_item): use current_item_function rather than current_insertion_type + to check what to use for @item, so @ifset etc. can be used around + @items. + Report from: "W. L. Estes" <wlestes@br20920.uncg.edu>. + + * makeinfo/makeinfo.c (current_insertion_type): no need to + declare. + + * makeinfo/makeinfo.c: Add examples to help message. + + * util/texindex.c (usage): Rearrange --help, avoid extra newline. + + * info/info.c: Sort --help in the usual place. + + * makeinfo/makeinfo.c: Reindent help message, rename + --expensive-validation to --commands-in-nodes. + +Fri Apr 16 17:53:48 1999 Karl Berry <karl@gnu.org> + + * makeinfo/cmds.c (cm_ignore_arg): new routine. + (cm_ignore_line_no_op): remove, can use cm_ignore_line. + +Tue Apr 13 16:45:39 1999 Karl Berry <karl@gnu.org> + + * doc/info-stnd.texi: Frontmatter changes. + + * doc/info.texi: Remove advanced remark in first node. + + * doc/texinfo.txi: Texinfo.tex does macros now. From Eli. + + * doc/texinfo.txi: Document @w{ } to produce an unbreakable space. + + * util/texi2dvi: Update from Akim, avoid Solaris ucb echo weirdness. + + * info/infodoc.c: Parenthesize function calls, don't depend on + gettext being there. Report from: Doug Semler + <doug@seaspace.com>. + +1999-04-12 Eli Zaretskii <eliz@is.elta.co.il> + + * info/infomap.c (initialize_vi_like_keymaps): Initialize the echo + are keymap *before* it is filled up with keys. + +1999-04-10 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/macro.c (execute_macro): Reset the line number to where + the macro argumenst begin, before executing its expansion. + + * makeinfo/makeinfo.c (cm_xref): Expand the name of arguments + before writing them in HTML mode. + (handle_menu_entry): Expand the name of the gleaned node before + writing it in HTML mode. + + * makeinfo/sectioning.c (sectioning_html): Expand the name of the + current node when producing the <a name=... anchor. + + * makeinfo/node.c (cm_node): Expand the name of node and its links + before outputting them in HTML mode. + + * makeinfo/index.c (cm_printindex): Expand node names to which the + index points. + + * makeinfo/footnote.c (cm_footnote): Call execute_string instead + of add_word_args, since current_node needs to be expanded. Expand + the name of the Footnotes node before calling + remember_node_reference. + + * makeinfo/tests/node-expand.txi: New test, for testing how node + names are expanded in @node, @menu, cross-references, and + indices. + + * makeinfo/makeinfo.c (add_char): If we output <p>, adjust the + affected brace positions by 3, so cm_xxx functions get what they + expect in START and END. + (insert_html_tag): Likewise. + + * makeinfo/cmds.c (cm_sc): Remove the kludge that looks for the + beginning of <small>, it is no longer needed. + + * makeinfo/macro.c (cm_definfoenclose): Don't stop at the first + blank after the second comma: the blank may belong to the second + delimiter. + + * makeinfo/tests/htmlpara.txi: New test, for the commands affected + by the <p> output at paragraph beginning. + + * makeinfo/makeinfo.h (expensive_validation): New option. + + * makeinfo/makeinfo.c (long_options): Add expensive_validation. + (usage): Likewise. + + * makeinfo/node.c (find_node): If NAME isn't found verbatim, try + expanding it and every node name in tag table, before comparing + them, but only if expensive_validation is non-zero. + (find_node_reference): Likewise. + (cm_node): Don't expand node name and its links here. + (validate_file): If direct comparisons fail, try expanding the + comparees before giving up, unless expensive_validation is zero. + Switch the order of NODE and UP in error message about a lacking + menu item. + +1999-04-07 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/index.c (cm_printindex): Don't output "Menu" header. + + * makeinfo/node.c (get_node_token): Collapse whitespace in node + names. + (glean_node_from_menu, expand_node_name): Likewise. + + * info/infomap.c (initialize_vi_like_keymaps): Bind all the 256 + keys to ea_insert, like the Emacs-like case does. + + * doc/info-stnd.texi (Invoking Info): Document support for files + compessed with bzip2, and the --vi-keys option. + (Many places): Document key bindings under --vi-keys. + +1999-04-06 Eli Zaretskii <eliz@is.elta.co.il> + + * info/session.c (info_last_node, info_first_node): With a numeric + argument, go to ARGth node counting from the beginning. Skip + anchor tags when looking for the target node--the last tag can be + an anchor, for example. + (last_search_direction, last_search_case_sensitive): New + variables. + (last_search_for_string): Remove variable. + (info_search_internal): Always move point by one notch before + beginning the search, to avoid complications in repeated search + commands. When looking for the next node tag, skip any anchor + tags. + (info_search_1): Accept a 5th argument ASK_FOR_STRING, and only + prompt for search string if it's non-zero. All callers changed. + Look for the COUNTth occurence of the string. + (info_search, info_search_backward, info_search_case_sensitively): + Set last_search_direction and last_search_case_sensitive. + (info_search_next, info_search_previous): New commands, repeat + last search in the same or reverse direction without prompting the + user for the string. + + * info/infomap.c (initialize_emacs_like_keymaps): Bind `C-x n' to + info_search_next and `C-x N' to info_search_previous. + (initialize_vi_like_keymaps): Bind `n' to info_search_next and `N' + to info_search_previous. + +1999-04-04 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (get_rest_of_line): Don't expand non-macros, + so that macro-expanded output will still have them. + +1999-04-03 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/node.c (cm_node): Expand the node name and its links + completely before using them, so that they could use e.g. @value{} + etc. + + * makeinfo/makeinfo.c (replace_with_expansion): Don't + remember_itext if we are executing_string. + + * makeinfo/sectioning.c (sectioning_html): Remove #ifdef + HAVE_MACROS. Don't call me_execute_string if already + executing_string. + + * makeinfo/toc.c (toc_add_entry): Expand macros in TOCNAME right + here, since the macro can be later redefined. + (contents_update_html, contents_update_info, + shortcontents_update_html, shortcontents_update_info): Use stdio + functions for output instead of add_word etc. + (rewrite_top, contents_update, shortcontents_update, toc_update): + New functions, replace the TOC placebo with the actual TOC. + (cm_contents): Output a placebo instead of writing the TOC. + (cm_shortcontents): Output a placebo instead of writing the short + TOC. + + * makeinfo/makeinfo.c (convert_from_loaded_file): Call toc_update + if appropriate. + + * makeinfo/sectioning.c (cm_top): Don't output the HTML header + here, since the Top node might be preceeded by other commands, + like @contents. + + * makeinfo/cmds.c (cm_settitle): Output the HTML header here. + + * makeinfo/node.c (set_current_output_filename): New function, + saves the name of the actual file we are now writing, including in + the case of split-HTML output. + (cm_node): Call it to record the name of output file. + + * makeinfo/footnote.c (free_pending_notes): Re-initialize + current_footnote_number to 1. + + * makeinfo/index.c (index_add_arg): Remove redundant xstrdup. + (cm_printindex): Don't free index->entry: it is freed in + free_index, if, e.g., there's more than one file to convert. + + * makeinfo/makeinfo.c (init_internals): Call toc_free. + +Mon Apr 5 16:53:33 1999 Karl Berry <karl@gnu.org> + + * doc/Makefile.am: Texmf_{texinfo,dvips}: dirs not files. From + Kurt Hornik. + +Wed Mar 31 13:50:09 1999 Karl Berry <karl@gnu.org> + + * Pretest 3.12h. + + * makeinfo/node.c (last_node_p): new fn. + (split_file): call it, instead of assuming no more entries means + no more nodes. (Loses with anchors.) + Report from: "Oleg S. Tihonov" <ost@benetnash.ffke-campus.mipt.ru>. + + * makeinfo/index.c (sort_index): whether an entry is @code or not + depends on the element, not the index, because of synindex. + + * doc/Makefile.am (install-tex): Must use $(TEXMF), do + $(mkinstalldirs) on tex dirs. + From: Nathan Sidwell <nathan@acm.org>. + + * doc/texinfo.txi: Document need for blank line before @image if + you want space. + + * Install changes from Eli: + + 1999-03-09 Eli Zaretskii <eliz@is.elta.co.il> + + * info/infodoc.c (info_internal_help_text): Remove hard-wired key + names, use %-10s instead. + (info_help_keys_text): New variable, holds two variants of keys + that invoke basic commands, indexed by vi_keys_p. + (create_internal_info_help_node): Use info_help_keys_text[]. + + * info/window.c (build_message_buffer): Support more general + format strings, like %-10.15s, %+4d etc. + + * info/infomap.c (initialize_vi_like_keymaps): Bind ESC-h, ESC-t, + C-x LFD and C-x RET. + + 1999-03-08 Eli Zaretskii <eliz@is.elta.co.il> + + * util/install-info.c (output_dirfile): Sort the entries and + output them in alphabetic order. Output each entry only in those + sections where it belongs. + (parse_input): New function, code moved from main. Process + sections and entries in a single loop, and record with each entry + the list of sections where that entry belongs. Record each entry + separately, not all of them together as a single block. + (parse_dir_file): New function, code moved from main. + (main): Move code to parse_input and parse_dir_file. Put the new + entries only into sections where they belong. + (compare_entries_text): New function, called when sorting new + entries. + + * info/infomap.c (initialize_vi_like_keymaps): New function. Bind + keys a-la Less, including new functions from session.c below. + (initialize_emacs_like_keymaps): New function, with the guts of + initialize_info_keymaps. + + * info/session.c (info_scroll_forward, info_scroll_backward): If + default_window_size is non-negative, use it as the default number + of lines to scroll. + (info_scroll_forward_set_window, info_scroll_backward_set_window, + info_down_line, info_up_line, info_scroll_half_screen_down, + info_scroll_half_screen_up, info_search_backward): New functions, + for Less-like look and feel. + +Tue Mar 30 16:44:53 UTC 1999 Karl Heinz Marbaise <kama@hippo.fido.de> + + * doc/txi-de.tex: + - added additional putwordin + * doc/texinfo.txi: + - changed defivar into deftypeivar + * makeinfo/sectioning.c: + - changed output of anchors based on problems with ie. + * makeinfo/defun.c: + - output in HTML mode changed to be on previous state. + * makeinfo/insertion.c: + - fixed up HTML output for deftypeivar. + +1999-03-30 Akim Demaille <demaille@inf.enst.fr> + + * texi2dvi ($tmpdir): Avoid security holes. + +Fri Mar 26 17:06:55 1999 Karl Berry <karl@gnu.org> + + * makeinfo/cmds.c (cm_exdent): rewrite to preserve blank lines. + Bug from: "Oleg S. Tihonov" <ost@benetnash.ffke-campus.mipt.ru>. + + * makeinfo/cmds.c (cm_exdent): arg is in `roman'. + +Thu Mar 25 16:21:27 1999 Karl Berry <karl@gnu.org> + + * makeinfo/insertion.c, + * makeinfo/defun.c, + * makeinfo/insertion.h (insertion_type): add deftypeivar. + * makeinfo/defun.h (cm_defun): declare here. + * makeinfo/cmds.c (defun.h): include. + * doc/texinfo.txi (deftypeivar[x]): new commands. + * makeinfo/cmds.c (deftypeivar[x]): new commands. + + * makeinfo/cmds.c (cm_exdent): save, set and restore + in_fixed_width_font. + + * doc/texinfo.txi (uref): rewrite. + + * info/info.c (info_short_help): more spaces for new help2man. + + * makeinfo/node.c (cm_node): output node name in html, change + navbar punctuation. + + * doc/texinfo.5: Fix URL. + + * Finally installed this: + 1998-05-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + * makeinfo/makeinfo.c (convert_from_loaded_file): When the file + contains no @setfilename then always look for \input (not + \include) in the first line and skip that. Don't skip the first + line if no \input was found. + +1999-03-24 Akim Demaille <demaille@inf.enst.fr> + + * configure.in (AC_HEADER_STAT): Added. + * util/texindex.c (main): Check infiles are not directories. + +1999-03-24 Akim Demaille <demaille@inf.enst.fr> + + * texi2dvi (index_files): Don't use `!' to run sed -e "s!foo$!!" + since the shell will interpret `$!'. + +Tue Mar 23 16:41:08 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (uref): rewrite to make HTML output read more + nicely. From Tim S. + + * info/info.c (info_short_help): include examples. + + * makeinfo/makeinfo.c (close_paragraph_with_lines): move earlier + so can be static. + + * makeinfo/sectioning.c, + * makeinfo/node.c, + * makeinfo/makeinfo.h, + * makeinfo/makeinfo.c, + * makeinfo/macro.c, + * makeinfo/insertion.c, + * makeinfo/cmds.c, + * makeinfo/files.c, + * makeinfo/footnote.c (size_of_input_text): rename to + input_text_length. + + * makeinfo/makeinfo.c (cm_xref): make wrong-char-following a warning. + (replace_with_expansion): remove bogus conditional that was duplicated + unconditionally. + From: Hans-Bernhard Broeker <broeker@physik.rwth-aachen.de> + +Mon Mar 22 14:39:59 1999 Karl Berry <karl@gnu.org> + + * doc/Makefile.am (install-tex): parenthesize. + + * Makefile.am (dist-hook): remove, it uses hard links so we chmod + all our sources. + + * makeinfo/toc.c, + * makeinfo/defun.c, + * makeinfo/sectioning.c: Use _, not N_. + + * info/Makefile.am (ginfo_SOURCES): include $(BUILT_SOURCES) + explicitly. + + * makeinfo/lang.c, + * makeinfo/lang.h: ISO-639 updates. + + * makeinfo/cmds.c: exampleindent changes. + + * info/info.c (info_short_help): reformat somewhat, and don't say + info info options any more. + + * doc/info-stnd.texi (Invoking): make description format somewhat + more standard. + + * info/infomap.c (Initialize_info_keymaps): do ea_insert bindings + first so subsequent bindings (e.g., for ESC) override. + +Sun Mar 21 17:31:00 1999 Karl Berry <karl@gnu.org> + + * makeinfo/multi.c (output_multitable_row): remove unnecessary + trailing whitespace from output, output blank row for blank @item. + + * doc/texinfo.txi: Remove extra @item in language multitable. + +Sat Mar 20 12:30:25 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Update language table from ISO 639: + http://www.iro.umontreal.ca/contrib/po/iso-639. From kama. + + * doc/texinfo.txi (exampleindent): document. + + * doc/texinfo.txi (Creating an Info File): use this for the node name. + + * doc/info.texi: Make Texinfo references consistent, etc. + +1999-03-18 Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp> + + * makeinfo/makeinfo.c (set_default_indentation_increment): new + routine. + * makeinfo/insertion.c (cm_exampleindent): new routine. + Call set_default_indentation_increment. + +Mon Mar 15 17:06:15 1999 Karl Berry <karl@gnu.org> + + * info/Makefile.am (ginfo_SOURCES): Remove doc.c and funs.h in + hopes they then won't be distributed. Report from Andreas. + + * makeinfo/cmds.c (cm_sp): close paragraph and disable filling to + produce blank lines in info. + Report from: Michael Vanier <mvanier@bbb.caltech.edu>. + + * doc/texinfo.txi: Attempt to get Edition info on one line. + + * makeinfo/makeinfo.h (cr_or_whitespace): use whitespace and check + for \r. (skip_whitespace_and_newlines, command_char): use it. + Report from bonzini@gnu.org. + + * makeinfo/cmds.c (cm_center): save and restore filling_enabled, + so @center can be used inside an @example. Bug from kama. + +1999-03-13 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/footnote.c (cm_footnote): In separate footnote style, + generate a reference to "foo-Footnote-NN" for each footnote. + (output_pending_notes): In separate footnote style, generate an + anchor "foo-Footnote-NN" for each footnote, so that the link in + the parent node would lead directly to the footnote. + + * info/footnotes.c (make_footnotes_node): Recognize the new + "foo-Footnote-NN" style of footnote references. + +1999-03-09 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> + + * configure.in (AC_OUTPUT): Remove command to create po/Makefile, + already done by AM_GNU_GETTEXT. + +Tue Mar 9 17:48:46 1999 Karl Berry <karl@gnu.org> + + * Makefile.am (dist-hook): make distribution directory writable. + + * Installed these changes: + + 1999-03-04 Akim Demaille <demaille@inf.enst.fr> + + * texi2dvi (bibtex): Allow several runs of bibtex, this can be + used if bibentries reference other bibentries. Moreover, looking + for `Citation' in the LOG should be enough to avoid uneless runs. + + Sun Mar 7 15:15:00 1999 UTC Karl Heinz Marbaise <kama@hippo.fido.de> + + * makeinfo/sectioning.{c,h}: + - using defines instead of literals. + - cleaned up some stylistic matters like Karl Berry + suggested. Handling of things like: + @unnumbered .. + @section ... + now it works correct. + + * makeinfo/toc.{c,h} + - addTocEntry, freeToc changed into toc_add_entry + toc_free. stylistics changed. + + * makeinfo/iso2cht.pl,iso-639: script, table from the web. + - perl script converting the iso-639 table from the web + into the appropiate files (isoenum.h, isotab.c and + iso.texi) which can be inserted directly into + lang.c, lang.h and texinfo.txi. + +Tue Mar 9 17:47:59 1999 Karl Berry <karl@gnu.org> + + * configure.in: Bump to 3.12g. + +Sun Mar 7 07:01:19 1999 Karl Berry <karl@gnu.org> + + * info/infomap.c: Don't do isprint, just bind everything. + +Fri Mar 5 14:31:42 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi, + * makeinfo/makeinfo.c: Document that --no-headers writes to stdout + by default. + + * doc/texinfo.txi: @setchapternewpage doesn't change + \bindingoffset, just headers. Recommend not including it in the + manual source at all. + + * makeinfo/node.c (write_tag_table_internal): set + in_fixed_width_font while constructing this so --- doesn't + collapse to --, etc. Bug report from Sergio. + + * dir-example: Add a2ps stuff. + + * info/session.c: Allow any character in search string. + + * info/infodoc.c (describe_key): don't assume non-latin1 + characters are undefined. + + * info/infomap.c (initialize_info_keymaps): make all characters + insertable by default in echo area. From Eli. + + * Installed these changes: + + Wed Feb 23 22:00:00 1999 Karl Heinz Marbaise <kama@hippo.fido.de> + + * makeinfo/sectioning.{c,h}: + - added to hold complete handling of sectioning + a little step towards modularization ;-) + + * makeinfo/cmds.c: + - sectioning_alist moved to sectioning.c and + added information about enumerated chapter, + section ..., appendix or not. Everything + which has any relationship with sectioning + moved to sectioning.{c,h} I hope I have found + all. + + * makeinfo/toc.{c,h}: + - added for complete handling of "table of contents" + "short contents". Better ASCII only support + (--no-headers) so no Text "Menu" is printed. + May be we can do more. + + * makeinfo/makeinfo.{c,h}: + - added new command line switch --number to enumerate + chapter, sections etc. + + * doc/texinfo.txi: + - --number option documented. + + 1999-02-28 Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp> + + * makeinfo/insertion.c (in_paragraph): New variable. + (cm_item): Add </p> only if <p> is open. + * makeinfo/makeinfo.c (handle_menu_entry): Ditto. + + * makeinfo/insertion.c (begin_insertion), + * makeinfo/makeinfo.c (handle_menu_entry): If commentary + precedes first menu item, put them outside of <ul>. + Put <p> and </p> correctly. + + 1999-02-27 Eli Zaretskii <eliz@is.elta.co.il> + + * info/info.c (info_short_help): Document --show-options and + --usage. + + 1999-02-26 Eli Zaretskii <eliz@is.elta.co.il> + + * info/makedoc.c (main) [STRIP_DOT_EXE]: Strip the .exe suffix, so + that doc.c says "./makedoc.c", not "./makedoc.exe.c". + + * info/info.c (goto_invocation_p): New variable. + (long_options): New options --show-options and its alias --usage. + (main): Don't update the display until we find the first node to + be displayed, to avoid flushing incorrect display. If user wants + to see the command-line options node right away, display whatever + info_intuit_options_node finds. + + * info/session.c (info_intuit_options_node): New function, uses + heuristics to find the node which describes program's invocation. + (info_goto_invocation_node): New command, asks for a program's + name and displays the invocation node of that program. + (entry_in_menu): New function, fuzzily looks for a menu entry in a + node's menu. + (program_name_from_file_name): New function, suggests a program + name given a name of its Info file. + (info_search_in_node): Accept an additional argument: a flag to + search case-sensitively; all callers changed. If case-sensitive + search is required, don't turn on the case-fold flag in the search + binding. + (info_search_internal): Accept an additional argument: a flag to + search case-sensitively; all callers changed. Share the last + search string between normal and case-sensitive search commands. + (info_search_1): New function, with the guts that previously + belonged to info_search. If the search is case-sensitive, + mentions that in the prompt for the search string. If the search + string includes upper-case characters, searches case-sensitively. + (info_search): Calls info_search_1 with zero case-sensitivity + flag. + (info_search_case_sensitively): New command, calls info_search_1 + with non-zero case-sensitivity flag. + (incremental_search): If the search + string includes upper-case characters, searches case-sensitively. + + * info/search.c (search_backward): Fix bug in case-sensitive + search. + + * info/infomap.c (initialize_info_keymaps): `-' in info window map + produces negative arguments. `S' invokes case-sensitive search. + `O' and `I' invoke goto-invocation. + + * doc/info-stnd.texi (Invoking Info): Document --show-options. + (Node Commands): Document `O', goto-invocation. + (Searching Commands): Document `S' and the case-sensitive search + when the search string includes upper-case letters. Document `/' + as a synonym for `s'. + (Miscellaneous Commands): Document `M--' and `-'. + + 1999-02-25 Eli Zaretskii <eliz@is.elta.co.il> + + * info/info.c (main): Under --index-search, search indices *after* + following menus, so that we don't look for an index in DIR. + + +Wed Mar 3 17:20:07 1999 Karl Berry <karl@gnu.org> + + * makeinfo/cmds.c: Do not output <small> in info mode. + From: Eli Zaretskii <eliz@is.elta.co.il>. + + * makeinfo/insertion.c (enum_html): Remove unused var temp. + From: Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp> + + * info/infodoc.c: Avoid translation of blank lines. + + * info/tilde.c, + * info/man.c, + * makeinfo/index.c (index_add_arg): avoid use of alloca. + + * info/echo-area.c: Don't pause for an additional 75 microseconds. + Noted by Eli. + + * configure.in: Bump to 3.12f. + + * doc/texinfo.txi: findex enddots. From Eli. + +1999-03-01 Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp> + + * makeinfo/makeinfo.c (insert_html_tag): Add <p> when + paragraph is not opened. + (sectioning_html): Call close_paragraph so that paragraph + will be started. + +1999-02-26 Akim Demaille <demaille@inf.enst.fr> + + * texi2dvi (get_xref_files): Take $filename_noext as $1. + (get_xref_files): Look for $1.idx only, not *.idx. + (get_xref_files): Look for $1.cb files (\usepackage{changebar}). + * texi2dvi: Look for rerun requests in LOG files in addition to + xref files comparison. + (bibtex): Remove useless `./' (already added in + command_line_filename). + (filename_dir): Smarter sed expression that handles file names + with no directory part. + (txiversion): Removed useless () (`` already guarantee a subshell). + +1999-02-25 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> + + * makeinfo/multi.c (find_template_width): Fix operator precedence. + +Tue Feb 23 10:35:53 1999 Karl Berry <karl@gnu.org> + + * dir-example: ccmode not cc-mode. From hds. + +Mon Feb 22 07:34:00 1999 Karl Berry <karl@gnu.org> + + * makeinfo/lang.c, + * doc/texinfo.txi: Fix kazakhkh typo. + +1999-02-21 Eli Zaretskii <eliz@is.elta.co.il> + + * djgpp/config.sed: Add pcterm.c to terminal.o dependencies. + +1999-02-21 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> + + * makeinfo/lang.c (cm_accent_generic): Emit the accent character + only once, after the argument. + +Sun Feb 21 16:36:14 1999 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c (handle_menu_entry): new routine. + (reader_loop): call it, allowing for comments in menus. + + * makeinfo/node.c: Rearrange functions to make static, etc. + + * doc/Makefile.am (EXTRA_DIST, install-tex): Add txi-cs and txi-no. + +1999-02-20 Eli Zaretskii <eliz@is.elta.co.il> + + * util/install-info.c (open_possibly_compressed_file): Output + explicit message about empty input files. + (insert_entry_here): Insert multiple entries in alphabetical order. + +Fri Feb 19 09:13:28 1999 Karl Berry <karl@gnu.org> + + * makeinfo/insertion.c (enum_html): new routine. + (begin_insertion): call it. + Based on code from: Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>. + + * lib/xexit.c (EXIT_FAILURE) [!defined EXIT_SUCCESS && VMS]: weird + long value. + From: Lars Hecking <lhecking@nmrc.ucc.ie> + +Thu Feb 18 16:42:10 1999 Karl Berry <karl@gnu.org> + + * makeinfo/node.h (remember_node_reference): decl. + * makeinfo/makeinfo.c (find_unused_reference): dump unused decl. + +1999-02-18 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/cmds.c (cm_dots, cm_enddots): Don't produce … for + HTML, as too many browsers don't support it; use "..." in a + smaller font (with <small>). + (cm_top): Output the lang= attribute inside <html>. + + * makeinfo/node.c (cm_node): Output the lang= attribute inside + <html>. + + * makeinfo/footnote.c (output_pending_notes): Generate <ol> + instead of <dl compact>. Make the text of each footnote start a + new paragraph. + +1999-02-17 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/insertion.c (cm_item): Remove <dd> when immediately + followed by a <dt>. Add a <br> before every <dt>, except if we + are converting @itemx, or in the first item after <dl>. + (begin_insertion): Use <dl> for tables, to make it look closer to + the Info output. Don't output a newline after a <pre>. + +1999-02-17 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (handle_variable): Don't backup input + pointer if we hit the end of text (usually, inside + execute_string). + * makeinfo/insertion.c (get_item_function): Likewise. + +Wed Feb 17 15:09:06 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Better indexing of space entries. + + * makeinfo/multi.c (find_template_width): new routine to really + parse @multitable {...} templates. + (setup_multitable_parameters): call it. + Bug report from: Sergio Pokrovskij <pok@nbsp.nsk.su>. + + * lib/system.h (substring): declare. + + * lib/Makefile.am (libtxi_a_SOURCES): add substring.c. + + * makeinfo/defun.c: Move substring to lib. + + * util/texindex.c (tempcopy): no longer used. + (maketempname): make static. + + * Installed these changes: + +1999-02-13 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/cmds.c (cm_acronym): New function, makes @acronym + produce a smaller font size in HTML mode. + (cm_sc): Produce smaller font size in HTML mode. + + * makeinfo/footnote.c (cm_footnote): In HTML output, make the + footnote number be a superscript; remove [] around the link. + + * makeinfo/cmds.c (cm_var_sc): Separated into two functions: + cm_var and cm_sc, since @var and @sc have different effects in + HTML output. + + * makeinfo/makeinfo.c (cm_xref, cm_inforef): Don't put "[]" around + HTML links. + + * info/pcterm.c (DJGPP_keytab): Add translation for Alt-PgUp and + Alt-PgDn, to support the new M-prior key. + +Wed Feb 17 11:50:46 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Don't mention texi2roff so prominently. + + * makeinfo/makeinfo.c: Pass enclose_expand to remember_brace + rather than enclose_command. From Eli. + + * makeinfo/macro.c (cm_alias, cm_definfoenclose): Expand macros in + first call to get_until_in_line. From Eli. + + * info/makedoc.c, + * info/session.c, + * info/man.c, + * info/tilde.c, + * info/info.c, + * makeinfo/files.c, + * makeinfo/multi.c, + * makeinfo/node.c, + * makeinfo/makeinfo.c: Use xexit. + * makeinfo/makeinfo.h (NO_ERROR, FATAL, SYNTAX): remove. + + * info/terminal.c: Avoid sleep unless on sun-cmd terminal. + + * lib/xexit.c (EXIT_FAILURE) [!EXIT_FAILURE]: #define to 1 to fix + Sony NEWS-OS 4.0C lossage. From Akim. + + * info/infodoc.c: Translate where is doc string, underline lines + in help. + From: Trond Endrestol <trond@agamemnon.gtf.ol.no> + + * makeinfo/cmds.c (cm_dots, cm_enddots): go back to ... and ...., + … apparently doesn't work widely enough. + +Tue Feb 16 07:37:54 1999 Karl Berry <karl@gnu.org> + + * configure.in (ALL_LINGUAS): add de_AT. + + * util/texi2dvi: Redirect cd output to /dev/null when determining + txiversion. + +Mon Feb 15 13:43:37 1999 Karl Berry <karl@gnu.org> + + * util/install-info.c, + * util/texindex.c: Call xexit instead of exit. + + * lib/system.h (xexit): Declare. + + * lib/Makefile.am (libtxi_a_SOURCES): Add xexit.c. + + * doc/texinfo.txi: Document that @documentencoding is used in the + HTML output. + + * makeinfo/cmds.c (cm_top): use document_encoding if set. + (command_table): call cm_documentencoding instead of no-op. + * makeinfo/lang.c (document_encoding, cm_documentencoding): define. + * makeinfo/lang.h (document_encoding, cm_documentencoding): declare. + + * makeinfo/insertion.c: Restore </p> before <li>. + + * util/texi2dvi: If texinfo.tex version is too low for macros, use + makeinfo. + + * makeinfo/cmds.c (cm_center): save and restore value of + indented_fill, otherwise @center within an @enumerate (say) + also closes the indentation. + Bug from: Sergio Pokrovskij <pok@nbsp.nsk.su>. + +Sun Feb 14 15:25:02 1999 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c: Doc fix. + + * doc/texinfo.txi: Be enthusiastic if people want to implement + more output formats, but use makeinfo to do the job. + + * makeinfo/index.c (index_element_compare): Use strcoll if it's + available. + * configure.in: Call AC_FUNC_STRCOLL. + * makeinfo/makeinfo.c (main): Use LC_CTYPE and LC_COLLATE + categories. Suggestion from Oleg. + + * lib/system.h (setlocale) [!HAVE_SETLOCALE]: #define away. + Suggestion from Akim. + + * doc/texinfo.txi: Document @paragraphindent working in TeX now. + + * doc/texinfo.txi, + * makeinfo/lang.c, + * makeinfo/lang.h (language_code_type): abbrev changes from Oleg. + + * makeinfo/cmds.c, + * makeinfo/node.c: Only translate `Next:', `Previous:', and `Up:', + not the whole href. From Eli. + + * doc/texinfo.txi: Document that only unsplit html output is + supported in this release. + +Sat Feb 13 17:55:30 1999 Karl Berry <karl@gnu.org> + + * configure.in: Check for termlib before termcap for sake of + Solaris (judging from less-332 configure.in) and maybe + HP-UX 11. + + * doc/texinfo.txi (Footnote commands): incoherency reported by Aharon. + Language vs country fixes from Oleg. + +1999-02-13 Karl Eichwalder <ke@gnu.franken.de> + + * makeinfo/node.c (cm_node): Tag navigation links as translatable. + * makeinfo/cmds.c (cm_top): Ditto. + +Wed Feb 10 22:00:00 1999 Karl Heinz Marbaise <kama@hippo.fido.de> + + * makeinfo/defun.h: + - new because we need get_base_type-function + accessible in insertion.c + + * makeinfo/defun.c: + - complete HTML handling of the @def... things. + + * makeinfo/Makefile.am: + - defun.h added as part of makeinfo. + + * makeinfo/makeinfo.c: + - define looking_at moved into header-file, because + we need it in defun.c + + * makeinfo/insertion.c: + - some minor changes made to support the @def... + things in HTML. + + * makeinfo/lang.c: (cm_accent_generic) + - bug fixed. Using umlaut (accent ...) + would produce &A only if an umlaut follows + an empty line. + - bug fixed. Because things like ˜ ` + and ˆ do not exist as standalone characters + in HTML. + - cm_special_char now produce correct HTML for + @O{} and @o{}. + - warning using _("Text") instead "Text" (gettext). + + * makeinfo/cmds.c: + - @url fixed. Display the given Text. + + * doc/texinfo.txi: + - corrected the references for @uref, because + they were given as "url" instead of "uref". + @uref has three arguments, so show them in + command list. + +Wed Feb 10 17:27:58 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Rewrite for overfull box. + +Tue Feb 9 19:03:16 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Document more HTML output stuff. Based on esr + changes. + * makeinfo/macro.c, + * makeinfo/macro.h, + * makeinfo/makeinfo.c: Do alias and definfoenclose expansion. + From esr. + +Mon Feb 8 14:41:07 1999 Karl Berry <karl@gnu.org> + + * makeinfo/cmds.c: New commands @alias and @definfoenclose. + From: "Eric S. Raymond" <esr@snark.thyrsus.com>. + + * doc/texinfo.txi: Document @documentlanguage and + @documentencoding. + + * makeinfo/cmds.c: Move accent support to lang.c. + + * makeinfo/makeinfo.c (add_char): add rather than an 8-bit + char for html. + + * makeinfo/Makefile.am (makeinfo_SOURCES): add lang.[ch]. + + * doc/texinfo.txi: Be even more emphatic that @url is not + typically what you want. + * doc/texinfo.txi: Document that macro calls must use empty + braces. + + * info/session.c: Do not translate node pointers. From Karl E. + + * makeinfo/cmds.c (cm_dfn): Use <dfn>. Suggestion from Eli. + +Sun Feb 7 07:00:08 1999 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c: Make --html imply --no-split. + + * makeinfo/cmds.c (cm_top): don't core dump if the top node has no + next. + + * makeinfo/makeinfo.c (replace_with_expansion): compare length + after expansion with length of full input text before + expansion, not just the length of the expanded text. + Bug (contents2) reported by kama. + + * info/infodoc.c (create_internal_info_help_node): gettext calls + to help msg strings. From Ulrich. + +Fri Feb 5 17:35:13 1999 Karl Berry <karl@gnu.org> + + * util/texi2dvi: set makeinfo= for latex case. + + * doc/texinfo.txi (@deftp summary): ref Data Types node that + actually describes it. From kama. + +Thu Feb 4 07:39:10 1999 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c: Take it back. Emacs info needs that text + before the CTRL-_. + * makeinfo/makeinfo.c: Don't bother to output the header (This is + -, produced ...) to stdout. + + * doc/texinfo.txi (Other Info Directories): Mention that dir files + must be named dir. + + * makeinfo/makeinfo.c (cm_uref): implement optional third + argument. + * doc/texinfo.txi (uref): document it. + Suggestion from: Charles Karney <karney@pppl.gov> + + * doc/Makefile.am (info_TEXINFOS): put texinfo.txi first so + UPDATED reflects its modtime, rather than info-stnd's. + + * makeinfo/files.c (full_pathname) [!WIN32]: #endif in wrong place. + From: Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp> + + * makeinfo/cmds.c (cm_url): Remove URL: from output. It's ugly. + +Wed Feb 3 16:05:03 1999 Karl Berry <karl@gnu.org> + + * info/infodoc.c: Doc fix, zero not oh. + + * makeinfo/makeinfo.c (add_char): don't ignore if + only_macro_expansion, even in no_headers case. + Otherwise menu items don't get remembered and defaulting + doesn't work. Macros suck! + + * util/texi2dvi (common): include orig_pwd. + (language): reguess for each file if not explicitly set. + +Tue Feb 2 16:22:32 1999 Karl Berry <karl@gnu.org> + + * configure.in: Bump to 3.12d now. + +Mon Feb 1 14:46:45 1999 Karl Berry <karl@gnu.org> + + * makeinfo/insertion.c (cm_item): For itemize and enumerate, do + </p> before the <li> for html. Bug from Eli. + + * makeinfo/index.c: Installed change in index.c: + Mon Dec 28 12:50:14 1998 Matthew Fredette <fredette@mit.edu> + * makeinfo.c (index_add_arg): Use xstrdup on input_filename + when saving it in the new index entry. + + * util/texi2dvi: cd / before cd $orig_pwd in case of DOS drive + change. + +Sun Jan 31 16:39:01 1999 Karl Berry <karl@gnu.org> + + * util/texi2dvi: Used sed to expand only the @{if,}tex parts of + the source since makeinfo's conditional options aren't ready yet + (from Akim). + Also use ${1+"$@"} for Digital Unix "$@" expansion bug (from Noah). + + * util/install-info.c: Doc fix from Eli. + + * doc/texinfo.txi: Oops, said we looked for .png twice. + +Sat Jan 30 17:18:14 1999 Karl Berry <karl@gnu.org> + + * info/session.c (forward_move_node_structure): remove tangled + code to merely print words instead of numbers; too hard to translate. + + * info/session.c: Missing _'s for more i18n. From Trond. + + * doc/Makefile.am (EXTRA_DIST): Include txi-no.tex from Trond. + +Sun Jan 24 09:28:12 1999 Karl Berry <karl@gnu.org> + + * Makefile.am (EXTRA_DIST): Use djgpp by itself instead of listing + each file separately (new feature in automake 1.4). + + * makeinfo/insertion.c (begin_insertion): for quotation, always + increment current_indent even if html output, why not. + (Otherwise must not decrement current_indent in end_insertion.) + + * doc/texinfo.txi: More overfull box fixes. + + * makeinfo/insertion.c: Add some assertions and the beginnings of + handling @tex. + + * doc/texinfo.txi: Fix overfull boxes, but tables of contents at + the front. + + * util/texi2dvi: Can't pass --no-ifinfo --iftex to makeinfo yet, + it's not ready. + +Sat Jan 23 10:22:16 1999 Karl Berry <karl@gnu.org> + + * util/texi2dvi: Pass --no-ifinfo --iftex to makeinfo. + +Fri Jan 22 19:09:49 1999 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Include version.texi before @settitle so + @value{VERSION} gets expanded in the html title. From kama. + + * These patches from Tim Singletary <talon@clark.net>. + * makeinfo/makeinfo.c: Simplify and improve html menus. + * makeinfo/insertion.c (begin_insertion): simplify html menu case + and set had_menu_commentary. + * makeinfo/insertion.h (had_menu_commentary): declare new global. + * makeinfo/node.h (glean_node_from_menu): declare. + * makeinfo/node.c (glean_node_from_menu): new arg to specify what + type of reference to remember as. + + Date: Sun, 29 Nov 1998 09:21:01 -0500 (EST) + From: Tim Singletary <tsingle@talon.clark.net> + To: texinfo-pretest@tug.org + Subject: explanation of previous patches + + > These diffs introduce some non-trivial changes into very + > sensitive parts of makeinfo, and it is hard to judge them without + > knowing what exactly do they solve. + + At a high level, these patches fix (or at least significantly improve) + the html conversion of menus. Specifically, they fix bugs in the + conversion of menu commentary and detailmenu entries. + + The menu commentary fixes require some justification: The unpatched + makeinfo attempts, with many bugs, to place menu commentary outside + the <menu> by adding </ul> and <ul> tags. While I understand the + motivation for this, that there might be browsers that don't support + <p> within <menu>, I'm not aware of any such browser and don't see any + compelling reason to continue the </ul> kludge. + + Certainly + <menu> + <li>First paragraph. + <p>Second paragraph. + <li>Second item. + </menu> + is valid html! + + Anyway, here's what my patches do: + + 1) Deleted the `<h4>Menu</h4>' at the beginning of each menu. Using + `<h4>' is wrong since menus don't usually come after an `h3' + header. `<b>' looks the same on most browsers, but my opinion is + that there's no need for any header at all! + + 2) Deleted the `<li>' kludge at the begining of each menu. It's no + longer needed since I'm deleting the </ul> kludge. + + 3) Replace `in_menu_para', declared static in makeinfo.c:add_char() + with `had_menu_commentary', declared globally. Modified + insertion.c:begin_insertion() to initialize had_menu_commentary to + 1 when beginning a menu. Now there's enough state information for + menu commentary to be processed within <menu> ... </menu>; the + commentary can be seperated from the rest of the menu by bracketing + it between <p>'s. + + Note that the first patch had a bug initializing + had_menu_commentary; the second patch fixes this bug. + + 4) Changed the semantics of the argument to + node.c:glean_node_from_menu(). Previously, glean_node_from_menu() + only called remember_node_reference() when the argument was + non-zero. But add_char() didn't call `glean_node_from_menu(1)' + when processing detailmenu entries. In other words, detailmenu + entries didn't get registered as references, which lead to the html + conversion of detailmenu entries not producing proper hrefs! + + The new semantics are that glean_node_from_menu always calls + remember_node_reference(), but calls it with `menu_reference' when + the first arg to glean_node_from_menu() is 1 and with + `followed_reference' otherwise. Now, detailmenu entries get + registered as `followed_reference' (normal menu entries still get + registered as `menu_reference') and the html conversion produces + proper hrefs. + + 5) The above changes made it possible to streamline the section of + add_char() that deals with html menu text. + + 6) In an otherwise unrelated change, rewrote a section of + glean_node_from_menu to no longer use `goto save_node;'. + + +Thu Jan 21 12:55:42 1999 Karl Berry <karl@gnu.org> + + * doc/info-stnd.texi: OK, let's try restoring the @include + version.texi with the new automake. + + * makeinfo/cmds.c: Improve HTML @pounds, @bullet, etc. + + * doc/Makefile.am (install-tex): new target. + (EXTRA_DIST): Include txi-??.tex. + txi-de.tex: new file from kama. + + * Makefile.am (AUTOMAKE_OPTIONS): Bump to 1.4. + (install-tex): new target. + + * util/texi2dvi: Restore "$@" for explicitness in main loop. + + * doc/Makefile.am (*.1) [TEXINFO_MAINT]: Conditionalize. + + * configure.in (AC_PREREQ): Bump to 2.13. + (TEXINFO_MAINT): Define this AM_CONDITIONAL. + + * doc/texinfo.txi: Document that the HTML output name is derived + from @setfilename. + + * makeinfo/makeinfo.c (convert_from_loaded_file): Use @setfilename + for basename of html output. + + * doc/texinfo.txi (url): Use example.org for the example. + + * makeinfo/cmds.c (cm_url): @url should not produce a link, sorry + to say. + +Wed Jan 20 16:31:55 1999 Karl Berry <karl@gnu.org> + + * util/texindex.c, + * util/install-info.c, + * makeinfo/makeinfo.c, + * info/info.c: It's 1999. + + * doc/info.texi (Advanced info commands): Fix typos from Gildea. + + * makeinfo/makeinfo.c (end_of_sentence_p): don't check negative + array offset. + From: Enrico Scholz <enrico.scholz@wirtschaft.tu-chemnitz.de> + +Sun Jan 17 16:42:16 1999 Karl Berry <karl@gnu.org> + + * util/texi2dvi: Restore --batch, handle changing escape character + more cleanly. From Akim (as always). + +Thu Jan 14 16:47:41 1999 Karl Berry <karl@gnu.org> + + * configure.in (ALL_LINGUAS): Add no. + From: Trond Endrestol <trond@agamemnon.gtf.ol.no> + + * util/texi2dvi: Doc fix from Akim and do not always exit 1 from trap. + And it's 1999. + + * doc/texinfo.txi (image): Document imagename.pdf. + + * Apply this change from Eli: + + 1998-11-20 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.h (meta_char_pos): New variable. + * makeinfo/makeinfo.c (init_paragraph): Initialize it. + (add_char): Use META to create a non-breakable space character. + (add_meta_char): New function. + (end_of_sentence_p): Don't handle characters at meta_char_pos as + normal sentence enders. + (flush_output): Only unMETA the non-breaking space character. + Reset meta_char_pos to zero. + (do_flush_right_indentation): Call adjust_braces_following. + (indent): Likewise. + (cm_value): Save and restore the value of meta_char_pos. + (expansion): Likewise. + * makeinfo/macro.c (me_execute_string_keep_state): Save and + restore the value of meta_char_pos. + * makeinfo/node.c (cm_node): Save and restore the value of + meta_char_pos. + * makeinfo/cmds.c (cm_accent): Make the dot we add due to + @dotaccent be a meta-character. + (cm_code, cm_dfn): Call add_meta_char to insert the closing + quote. + (cm_cite): Call add_char instead of add_word. + +Thu Jan 7 18:04:26 1999 Karl Berry <karl@gnu.org> + + * util/texi2dvi: Handle pdf files more cleanly. From Akim. + +Wed Jan 6 17:49:11 1999 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c (cm_image): Check for .png also. + +Sun Dec 20 07:54:47 1998 Karl Berry <karl@gnu.org> + + * util/texi2dvi: Add --pdf. + + * util/texi2dvi: New option -@ to use @input and @nonstopmode, in + case texinfo is preloaded. + From: Khimenko Victor <khim@sch57.msk.ru> + Date: Sun, 20 Dec 1998 02:04:12 +0300 (EET) + +Sat Dec 19 17:37:37 1998 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi (Multitable Column Widths): leading zero ok for + @columnfractions. + + * util/texi2dvi: New version from Akim, plus --quiet is like + --batch, etc. + +Fri Dec 18 17:22:44 1998 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Document that the Texinfo source can't be + arbitrarily ordered (for print) even if all pointers are supplied. + + * makeinfo/insertion.c (end_insertion): In itemize case, + close_insertion_paragraph so @end itemize cause a line break. + Report from: Sergei Pokrovsky <pok@nbsp.nsk.su> + Date: Sun, 22 Nov 1998 19:45:21 +0700 (GMT) + +Tue Dec 15 16:21:51 1998 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: More fixes from Oleg. + + * configure.in: Bump version to 3.12c for next pretest. + + * util/install-info.c (open_possibly_compressed_file) + [STRIP_DOT_EXE]: logic for compression_program assignment + was reversed. + From: wlestes@wlestes.uncg.edu + +Sat Dec 12 18:02:48 1998 Karl Berry <karl@gnu.org> + + * Merged these changes from Andreas: + +1998-12-06 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> + + * makeinfo/node.c (cm_node): When searching for @menu don't + require a space after it. + +1998-12-06 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> + + * makeinfo/cmds.c (cm_top): free top_name only after done using it. + +Sat Dec 12 15:40:13 1998 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Various typos and fixes from Oleg. + + * doc/texinfo.txi: Move @node's outside of @ifinfo for the sake of + HTML processing. + + * doc/texinfo.txi (titlepage): @pxref was not in parens. From Oleg. + +Sun Dec 6 16:49:09 1998 Karl Berry <karl@gnu.org> + + * dir-example: Amd is now am-utils. + + * doc/Makefile.am: Reinstate help2man invocations for development. + + * doc/texinfo.txi: Document @set...contentsaftertitlepage (from kama). + Fix incorrect sense for @image and Hungariam typo (from Oleg). + + * lib/system.h: #include libintl.h here instead of acconfig.h, so + the system include files have a chance to #define NULL + before it does. + * acconfig.h: Remove libintl.h and #defines from here. + From: "Philippe De Muyter" <phdm@macqel.be> + Date: Fri, 4 Dec 1998 00:56:25 +0100 (CET) + + * info/signals.c: Start #ifdef's in column one for cc on sysv68 + (m68k-motorola-sysv). + From: "Philippe De Muyter" <phdm@macqel.be> + Date: Fri, 4 Dec 1998 00:56:25 +0100 (CET) + + * info/filesys.c (is_dir_name): use strcpy instead of automatic + array initialization. + From: "Philippe De Muyter" <phdm@macqel.be> + Date: Fri, 4 Dec 1998 00:56:25 +0100 (CET) + + * configure.in (ALL_LINGUAS): add ru. + +Fri Dec 4 08:12:11 1998 Karl Berry <karl@gnu.org> + + * info/infodoc.c: Gettextize the help buffer string. + +Sun Nov 29 17:12:35 1998 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Use @ifnottex rather than @ifinfo for @top. + (makeinfo top): document this. + + * doc/info-stnd.texi, + * doc/info.texi: Use @ifnottex rather than @ifinfo for @top. + + * makeinfo/insertion.c (cm_menu): Implicitly insert @top command + so we can construct the node tree as usual when we see @menu + before @node. Probably this is when the input uses + @ifinfo instead of @ifnottex, as virtually all existing + manuals do. + + * makeinfo/insertion.c (discard_insertions): Let any conditional + cross node boundary. (So the @top node can be wrapped + in @ifnottex, for example.) + + * Installed these: + +1998-11-21 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (expansion): Save and restore + last_inserted_character and last_char_was_newline. + + * makeinfo/cmds.c (cm_dircategory): Kill any indentation before + INFO-DIR-SECTION. install-info relies on this. + +1998-11-20 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/multi.c (struct env): Add meta_char_pos member. + (select_output_environment): Save and restore meta_char_pos. + (out_char): Output characters by switching environment to #0 and + calling insert. Call flush_output when a newline is output. + (output_multitable_row): Update the current environment's + output_paragraph_offset as well, after removing trailing + whitespace. Fix typo in loop index. + (do_multitable): Call close_single_paragraph. + (end_multitable): Call close_insertion_paragraph. Don't output + an extra newline. + +1998-11-20 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.h (meta_char_pos): New variable. + * makeinfo/makeinfo.c (init_paragraph): Initialize it. + (add_char): Use META to create a non-breakable space character. + (add_meta_char): New function. + (end_of_sentence_p): Don't handle characters at meta_char_pos as + normal sentence enders. + (flush_output): Only unMETA the non-breaking space character. + Reset meta_char_pos to zero. + (do_flush_right_indentation): Call adjust_braces_following. + (indent): Likewise. + (cm_value): Save and restore the value of meta_char_pos. + (expansion): Likewise. + * makeinfo/macro.c (me_execute_string_keep_state): Save and + restore the value of meta_char_pos. + * makeinfo/node.c (cm_node): Save and restore the value of + meta_char_pos. + * makeinfo/cmds.c (cm_accent): Make the dot we add due to + @dotaccent be a meta-character. + (cm_code, cm_dfn): Call add_meta_char to insert the closing + quote. + (cm_cite): Call add_char instead of add_word. + +Sun Nov 29 16:30:06 1998 Karl Berry <karl@gnu.org> + + * info/info.h, + * info/footnotes.h (FOOTNOTE_LABEL), + * info/indices.c (APROPOS_NONE): Use N_ rather than _. + + * info/infodoc.c (create_internal_info_help_node, + function_documentation): Do not translate the empty string. + Date: Fri, 25 Sep 1998 15:09:42 +0400 + From: "Oleg S. Tihonov" <tihonov@ffke-campus.mipt.ru> + + * doc/info-stnd.texi: Mention PRIOR as another alias for + PREVIOUS/PageUp. + + * doc/texinfo.txi: @emph produces _emph_ not *emph*. Spurious + junk before makeinfo bison example. + From: tihonov@ffke-campus.mipt.ru. + +1998-11-16 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/defun.c (defun_internal): Don't expand the arguments to + @defun and its ilk. + + * makeinfo/makeinfo.c (expansion): Copy the name of the currently- + executing command and restore it after expansion. + +Sun Nov 15 17:40:51 1998 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c: Rearrange usage, allow -v for verbose, only + output `Making' line when verbose. + * makeinfo/makeinfo.h (process_html, process_info, process_tex): + declare. + * makeinfo/cmds.c: Use conditional commands. + * makeinfo/insertion.c (find_type_from_name): Handle rawhtml and + rawtex. + (conditional commands): Allow individual switching on and off. + + * makeinfo/insertion.h: Declare conditionals. + +1998-11-14 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/insertion.c (begin_insertion, end_insertion): Use <pre> + to convert @display and @smalldisplay into HTML. + + * makeinfo/cmds.c (cm_asterisk): Don't insert an extra newline in + HTML mode, since input includes a newline right after the @*. + (cm_sp): Output "<br><p>\n" as many times as the argument says. + (cm_url): Don't include "<a href=" in the anchor text in HTML + output. + + * makeinfo/makeinfo.c (cm_pxref): Don't add a period after @pxref + if in HTML mode. + (get_rest_of_line): Accept an additional argument EXPAND, and + expand the rest of line if it's non-zero. All callers changed. + (close_paragraph): When in HTML mode, honor the formatting of the + source paragraphs by generating "<p>" for every closed paragraph; + follow it by as many "<p>"'s as paragraph_spacing specifies. + +Sat Nov 14 17:38:27 1998 Karl Berry <karl@gnu.org> + + * makeinfo/insertion.c: Use <ul compact> instead of deprecated <menu>. + Omit extra <li> after the menu beginning. + + * makeinfo/index.c: Use <ul compact> instead of deprecated <menu>. + +Thu Nov 12 16:33:09 1998 Karl Berry <karl@gnu.org> + + * Makefile.am (EXTRA_DIST): add djgpp/config.sed. + + * info/terminal.c: #include <sys/ioctl.h> to define TIOCGWINSZ + under LynxOS. From: Marius Groeger <mag@sysgo.de>. + +1998-11-06 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> + + * makeinfo/insertion.c (begin_insertion): Correctly handle + ifnottex and ifnothtml. + (end_insertion): Likewise. + +Sun Nov 8 17:30:23 1998 Karl Berry <karl@gnu.org> + + * makeinfo/index.c, + * makeinfo/insertion.c: Menu is special to Info. + * makeinfo/node.c: Top is a special name, don't translate it. + * info/session.c (info_top_node): Top is a special name, don't + translate it. + From: "Oleg S. Tihonov" <tihonov@ffke-campus.mipt.ru>. + +Fri Nov 6 17:18:43 1998 Karl Berry <karl@gnu.org> + + * configure.in: Version 3.12b. + + * util/texi2dvi: Fixes from Eli and Christoph Martin. + + Mon Oct 5 13:58:53 1998 Dave Glowacki <dglo@ssec.wisc.edu> + * util/install-info.c: Fix off-by-one error in findlines() + + * util/texindex.c (usage): avoid trigraph until Ulrich fixes + po2tbl.sed.in. From Paul Eggert. + +1998-11-03 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (cm_xref): Don't bypass the test that an + xref ends with a period or a comma if the reference has a single + argument. + +1998-10-31 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/insertion.c (end_insertion): Don't decrement + in_fixed_width_font when leaving a menu, the previous value is + restored by pop_insertion. + + * makeinfo/makeinfo.c (add_char): Don't increment output_column + twice when a newline is inserted into the output. + + * doc/texinfo.txi (emph & strong): Document the use of underscores + for @emph in the Info output. + +1998-10-30 Eli Zaretskii <eliz@is.elta.co.il> + + * djgpp/config.bat: Make sure intl/po2tblsed.in exists before we + begin the configure boogie. + * djgpp/config.sed: Sed script, to be run by config.bat. + + * doc/info-stnd.texi (Node Commands): Document the new G command. + + * info/session.c (info_follow_menus): Step over a possible leading + space in a menu entry in menus[]. + (split_list_of_nodenames): Renamed from split_words. Split the + string on commas, not on spaces, since a menu entry can have + embedded whitespace. Get past the null byte after inserting it. + (info_menu_sequence): Don't crash if there's no DIR node; try + using Top of the current Info file, and if that doesn't work + either, throw an error. + + * util/texi2dvi: Use $path_sep in TEXINPUTS. Don't include any + dots in $tmpdir, 8+3 filesystems won't like that. + + * makeinfo/makeinfo.c (reader_loop): Expand any macros in a menu + entry when creating a <menu> item for HTML. Fix an off-by-one + error in counting input lines. + + * makeinfo/files.c (expand_filename): Don't treat .foo/bar as + absolute file name. + + * makeinfo/makeinfo.c (add_char): Use strncpy instead of memcpy, + since the buffers overlap. If the line being refilled includes + nothing but the indentation and the word being added, do NOT add + an extra newline. + + * util/install-info.c (strip_info_suffix, menu_item_equal, + open_possibly_compressed_file) [__MSDOS__]: Allow .inz and .igz as + suffuxes for compressed files. + (open_possibly_compressed_file): Return an indication whether we + opened a file or a pipe. Use FOPEN_RBIN from system.h. + [STRIP_DOT_EXE]: Use gzip.exe with an explicit .exe extension. + [O_BINARY]: If the file is not compressed, switch its stream to + text mode. + (readfile): Close the file or the pipe. + (output_dirfile): Call pclose to actually run the compressor. + +Thu Nov 5 08:33:06 1998 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: effect -> affect + From: Eric Hanchrow <offby1@blarg.net> + +Tue Nov 3 14:26:59 1998 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c (cm_image): Allocate enough space for the + zero byte. + + * doc/texinfo.txi: Document epsf.tex standard location. + +Tue Oct 27 10:45:47 1998 Karl Berry <karl@gnu.org> + + * Makefile.am (TEXINFO_TEX): add definition. + + * doc/info-stnd.texi: Avoid unnecessary overfull boxes from + examples. + + * doc/Makefile.am (install-data-local): missing ". + + * doc/Makefile.am: Don't try to run help2man in distribution. + +Mon Oct 26 13:43:53 1998 Karl Berry <karl@gnu.org> + + * configure.in (TEXMF): lose this whole block. It is too painful + to maintain with the different tex installations out there. + + * util/Makefile.am (EXTRA_DIST): update-info renamed to + fix-info-dir. + + * makeinfo/footnote.h: Doc fix. + + * makeinfo/multi.c: #include "insertion.h" + * makeinfo/cmds.c: #include "node.h" + * makeinfo/makeinfo.h, + * makeinfo/makeinfo.c: Move globals, functions for insertions and + nodes. + * makeinfo/defun.c: #include "insertion.h" + * makeinfo/Makefile.am: Add insertion.[ch], node.[ch]. + * node.[ch], insertion.[ch]: New files. + + * makeinfo/makeinfo.c, + * makeinfo/makeinfo.h: Move globals for cmds.h. + * makeinfo/index.h: Include cmds.h. + * makeinfo/Makefile.am (makeinfo_SOURCES): Add cmds.h, cmds.c. + * cmds.c, cmds.h: New files. + +Sat Oct 24 17:28:14 1998 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c, + * makeinfo/makeinfo.h: Globals for files.c. + * makeinfo/Makefile.am (makeinfo_SOURCES): add files.[ch]. + +Tue Oct 20 17:03:10 1998 Karl Berry <karl@gnu.org> + + * makeinfo/Makefile.am (makeinfo_SOURCES): add macro.c and + macro.h. + * makeinfo/makeinfo.c: Move macro code to macro.h and macro.c. + * makeinfo/makeinfo.h: Move macro stuff to macro.h, expose global + last_char_was_newline for macro.c. + * makeinfo/index.c, + * makeinfo/footnote.c: #include macro.h. + +Wed Oct 7 16:24:07 1998 Karl Berry <karl@gnu.org> + + * doc/info-stnd.texi: For now don't include version.texi due to + automake error. + + * makeinfo/index.h: #include makeinfo.h for sake of COMMAND type. + * makeinfo/index.c: No need to include makeinfo.h, index.h does + now. + + * makeinfo/makeinfo.c: Move footnote code to footnote.c. + * makeinfo/makeinfo.h: Globals for footnote.c. + * makeinfo/Makefile.am (makeinfo_SOURCES): add footnote.[ch]. + + * makeinfo/makeinfo.c: Move defun code to defun.c, necessary + global to makeinfo.h. + * makeinfo/makeinfo.h (default_indentation_increment): move here + for defun.c. + * makeinfo/Makefile.am (makeinfo_SOURCES): add defun.c. + + * Makefile.am: Doc fix. + + * configure.in (AC_OUTPUT): generate makeinfo/tests/Makefile. + + * makeinfo/makeinfo.c, + * makeinfo/makeinfo.h, + * makeinfo/Makefile.am (makeinfo_SOURCES): add index.[ch]. + +Fri Oct 2 17:42:26 1998 Karl Berry <karl@gnu.org> + + * lib/system.h (STREQ): new macro. + +Thu Oct 1 09:26:57 1998 Karl Berry <karl@gnu.org> + + * doc/texinfo.txi: Delete spare copy since out of date, + add makeinfo html to menu, + detailmenu doesn't take braces in summary. + +Wed Sep 30 14:38:21 1998 Karl Berry <karl@gnu.org> + + * makeinfo/makeinfo.c: Remove != NULL comparisons, + xmalloc/xrealloc casts, assignments in if statements. + +Wed Sep 30 14:16:01 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c: Remove NULL casts and parentheses in return + statements. + + * makeinfo/makeinfo.c (add_link): Don't add a link if the node is null. + (reader_loop): don't glean_node_from_menu if detailmenu, even if html. + Various formatting changes. + + * doc/help2man: Always exit successfully. + + * makeinfo/Makefile.am (SUBDIRS): add. + (makeinfo_SOURCES): no more html.h. + +Fri Sep 11 18:47:15 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c: Fiddle with html output. + +1998-09-07 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (maybe_update_execution_strings): Only + reallocate TEXT if the existing storage is too small, otherwise + leave TEXT alone. + (replace_with_expansion): Call maybe_update_execution_strings to + reallocate input_text if we are executing_string, since storage + for execution_string is assumed to be large enough to hold every + possible string. + (me_execute_string): xstrdup the argument, so callees could freely + relocate it as needed. + +1998-09-06 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (replace_with_expansion): Don't remember + macro-expansion pointers if we are executing_string. + +1998-09-05 Eli Zaretskii <eliz@is.elta.co.il> + + * info/filesys.c (info_suffixes): Put the empty suffix last in the + list, so that `foo.info' is found before `foo', if both exist. + +1998-09-05 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (maybe_update_execution_strings): New + function, updates an entry in execution_strings[] array after + input_text is relocated by replace_with_expansion. + (replace_with_expansion): Call it. + +1998-09-04 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (expand_macro): If a macro is called with + too many arguments, return NULL and print the line number where + the call begins. + (execute_macro): If expand_macro returns NULL, return + immediately. + +Sun Sep 6 19:11:28 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c, + * makeinfo/makeinfo.h, + * makeinfo/multi.c: Html output. Specifically, these changes: + + Fri Jul 4 22:58:29 1997 Dave Love <d.love@dl.ac.uk> + + * doc/makeinfo.texi: Document HTML output. + + * makeinfo/makeinfo.c: Wrap strings in _() in bits changed for + HTML. + (cm_image): Generate <img> for HTML. + + Sun Jun 22 22:50:07 1997 Dave Love <d.love@dl.ac.uk> + + * makeinfo/makeinfo.c (NAMED_NODE_ANCHORS): New define. + (title, outstanding_node, node_number, node_node_references, + escape_html, ifinfo_as_html): New variables. + (tentry.number, node_ref.number, fn.number): New fields. + (CommandTable): Various additions and alterations for HTML. + (long_options): Add html and no-info-as-html. + (main): Extra code for HTML. + (usage): Add HTML stuff. + (expand_filename): Deal with .html. + (escape_string): New procedure. + (convert_from_loaded_file): Extra code for HTML. + (init_internals): Call free_node_references, initialize + node_number. + (reader_loop): Process menu items for HTML hyperlinks. Escape + HTML special characters. + (add_char): Code for line breaks and paragraph insertions in + HTML. + (flush_output): Don't UNMETA for HTML. + (indent): Do nothing for HTML. + (current_item_function): Case for ifhtml. + (begin_insertion): Deal with HTML in various cases. + (insert_html_tag): new procedure. + (cm_asterisk, cm_copyright, cm_accent, cm_code, cm_kbd, + cm_angle_brackets, cm_var, cm_defn, cm_var, cm_emph, cm_string, + cm_cite, cm_top, cm_xref, cm_inforef, cm_uref, cm_direntry, + cm_ifinfo, cm_item, process_defun_args, defun_internal, cm_sp, + cm_dircategory, cm_center, cm_result, cm_expansion, cm_error, + cm_exdent, index_add_arg, make_index_entries_unique, + cm_printindex, cm_footnote, output_pending_notes, + me_execute_string): Code for HTML. + (cm_shyph): New procedure. + (cm_special_char): Add start, end args. Code for HTML. + (cm_email, cm_url, cm_i, cm_b, cm_r): New procedures. + (sectioning_html): New procedure. + (sectioning_underscore): Use it. + (add_link): New procedure. + (remember_node): Add number field and update node_number. Note + next, etc. nodes for HTML. + (add_escaped_anchor_name, add_anchor_name): New procedures. + (cm_node): New code for HTML. Move some other code to more + useful place. + (remember_node_reference): Add number field and update + node_number. + (remember_node_node_reference, free_node_node_references, + number_of_node): New procedures. + (cm_ifhtml, cm_html): New procedures. + (expansion): Take care of HTML escaping. + (cm_settitle): New procedure. + (remember_note): Set number field. + + Declare various procedures in advance. + + * doc/texinfo.txi: Makeinfo --html documentation from Dave Love. + Typo fixes from: Paul DuBois <dubois@primate.wisc.edu>. + +Thu Sep 3 11:11:01 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/Makefile.am (makeinfo_SOURCES): add html.[ch]. + +1998-08-28 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (cm_uref, cm_email): Use get_xref_token to + gather arguments. + (get_xref_token): Keep track of input line number when expanding + xref arguments. + +Tue Aug 25 14:36:44 1998 Karl Berry <karl@cs.umb.edu> + + * util/texi2dvi: Exit the script if TeX exits with bad status. + +1998-08-16 Eli Zaretskii <eliz@is.elta.co.il> + + * info/indices.c (info_index_apropos): In the *Apropos* + menu, print the label first, then the Info file name and + the node name. Make the Info file name part of the menu + entry, so that all entries are distinct. + (apropos_in_all_indices): Scan each Info file only once, thus + avoiding multiple identical entries in the *Apropos* menu. + Free xstrdup'ed buffer, to avoid leaking memory. + +Thu Aug 13 12:54:58 1998 Karl Berry <karl@cs.umb.edu> + + * configure.in: Set version to 3.12a. + + * Makefile.am (AUTOMAKE_OPTIONS): bump required version to 1.3, + add readme-alpha option. + + * util/texindex.c (program_name), + * util/install-info.c (progname), + * info/info.c (program_name), + * makeinfo/makeinfo.c (progname): hardwire per coding standards. + * doc/help2man: Remove ginfo special case. + +Tue Aug 11 17:41:15 1998 Karl Berry <karl@cs.umb.edu> + + * util/gen-dir-node: New version from drk@sgi.com. + +Mon Aug 10 13:55:37 1998 Karl Berry <karl@cs.umb.edu> + + * dir-example: Add entries from Linux. + + * info/info-utils.c (get_window_of_node): New fn. + * info/info-utils.h (get_window_of_node): New fn. + * (strchr,...) [!HAVE_STRCHR]: remove these #defines. + * info/infodoc.c (info_find_or_create_help_window): Call + get_window_of_node instead of get_internal_info_window. + This is so pressing ? repeatedly will always get to the same Help + window instead of popping up new ones. + From: "Brian J. Fox" <bfox@prospero.datawave.net> + + * info/signals.c: Ignore SIGWINCH if we're in the midst of it. + We might get a whole lot of them. Noticed on Afterstep. + From: "Brian J. Fox" <bfox@prospero.datawave.net> + +1998-07-25 Bruno Haible <bruno@linuix.math.u-bordeaux.fr> + + * install-info.c (findlines): Allocate room for one more line, + to avoid crash if dir file has exactly 512 lines. + +Tue Aug 4 07:14:35 1998 Karl Berry <karl@cs.umb.edu> + + * info/info.c: Improve help message. + + * dir-example: Add mtools. + +Fri Jul 31 13:29:52 1998 Karl Berry <karl@cs.umb.edu> + + * doc/help2man: Various hacks for texinfo. + + * doc/texinfo.txi: Make dir entries more consistent. + + * doc/Makefile.am: Generate man pages with help2man. + + * util/texi2dvi, + * util/install-info.c, + * makeinfo/makeinfo.c, + * util/texindex.c: Improve help message. + + * doc/info.5: Initial. + * doc/texinfo.5: Section 5. + +Thu Jul 30 17:31:42 1998 Karl Berry <karl@cs.umb.edu> + + * doc/info-stnd.texi, + * doc/texinfo.txi: Use Automake-standard VERSION and UPDATED. + +Wed Jul 29 17:34:41 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi: Describe macro limitations a bit more. + + * dir-example: Correct makeinfo link. + +Tue Jul 28 16:44:06 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (remember_brace_1): xstrdup command, since + we free it later. + +Mon Jul 27 16:27:30 1998 Karl Berry <karl@cs.umb.edu> + + * info/session.c (node_printed_rep): New fn. + Change calls. + + * info/session.c (info_set_node_of_window): Simplify by taking new + argument to say whether to call + set_remembered_pagetop_and_point. Change calls. + * info/indices.c: Change call. + + * info/info.c: Rewrite initial menu-sequence following stuff as a + function in session.c, and call it. + + * info/infomap.c: Define `G' as info_menu_sequence. + * info/session.h (info_menu_sequence, info_follow_menus): declare + new fns. + * info/session.c (info_follow_menus, split_words, + * info_menu_sequence): New functions for new command. + +Thu Jul 23 16:44:42 1998 Karl Berry <karl@cs.umb.edu> + + * info/session.c (info_scroll_other_window_backward): new command. + * info/infomap.c (initialize_info_keymaps): bind M-DEL and M-prior to + scroll-other-window-backward. + Report from: Vladimir Alexiev <vladimir@cs.ualberta.ca> + Date: Tue, 2 Dec 1997 14:54:30 -0700 + + * info/info-utils.c (printed_representation): If ISO_Latin_p, show + characters as-is. Don't assume iscntrl(x) returns false + for meta characters. + Report from: Francois Pinard <pinard@iro.umontreal.ca> + Date: 15 Jan 1998 17:48:51 -0500 + + * info/pcterm.c (pc_initialize_terminal): now no need to set it + here. + * info/info-utils.c (ISO_Latin_p): set to 1 by default. + + * doc/info-stnd.texi: Document SPC, add goto-node anchor. + +Wed Jul 22 18:58:38 1998 Karl Berry <karl@cs.umb.edu> + + * info/window.c (message_buffer_to_node), + * info/session.c (kill_node), + * info/nodes.c (info_get_node_of_file_buffer, + info_node_of_file_buffer_tags), + * info/man.c (manpage_node_of_file_buffer), + * info/footnotes.c (make_footnotes_node): set display_pos member + in new node. + +Tue Jul 21 14:04:52 1998 Karl Berry <karl@cs.umb.edu> + + (all of this is to make SPC/DEL not move outside the current + document, i.e., not up through dir) + * info/info-utils.h (info_label_was_found): Move from here. + * (info_prev_label_of_node): Don't use it any more. + * info/session.c (INFO_LABEL_WAS_FOUND): Move to here, add test + for filename not dir. + (forward_move_node_structure): Change calls, notice if no more nodes. + (backward_move_node_structure): Check for moving outside current + document to dir. + * info/filesys.c (compression_suffixes): Add bz2 for bunzip2. + (is_dir_name): New fn. + * info/filesys.h: Declare it. + * info/nodes.c (info_get_node, info_find_file_internal): Use it. + + * makeinfo/makeinfo.c: Set in_fixed_width_font to avoid munging + node names. + +Sat Jul 18 17:14:10 1998 Karl Berry <karl@cs.umb.edu> + + * info/man.c (reap_children): Call wait (NULL), since we don't + actually use the return status for anything. NEXTSTEP 3.3 + doesn't like an int * even though that is the POSIX + specification. + Date: Fri, 22 Aug 1997 13:55:42 +0200 + From: "Felix H. Gatzemeier" <fxg@imib.rwth-aachen.de> + Via: Thomas Esser <te@informatik.uni-hannover.de> + + * info/session.c (kill_node): Restore point when we go back. + +Thu Jul 16 18:54:04 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (BRACE_ELEMENT): Add `command' to the save + stack. + (MAYBE_BRACE_ARGS): New possibility, somewhat like TeX's + next-token-as-argument. + (command_table): Use cm_accent and MAYBE_BRACE_ARGS for all accents. + (read_command): Implement MAYBE_BRACE_ARGS. + (init_brace_stack): save current command. + (pop_and_call_brace): restore current command. + (cm_accent): move almost all accent characters to after the argument. + Suggested by Fran,cois. + + * info/info.c (version_string): Remove defn. + Change call for --version option. + * info/session.c (display_startup_message_and_start): Just use + VERSION. + * info/info.h (version_string): Remove decl. + +Tue Jul 14 16:46:58 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.h: Doc fix. + + * makeinfo/makeinfo.c (validate_file): Don't complain about + unreferenced anchors. + + * doc/texinfo.txi: Document @anchor. + +Sun Jul 12 14:14:50 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (remember_node): Only set `current_node' if + this is not an anchor. + + * info/nodes.c (get_tags_of_indirect_tags_table): Don't set + nodelen to -1 when fixing up the subfile entries, it might be 0 + from an anchor. + + * info/nodes.c (find_node_of_anchor): Offset display_pos for + anchor tags by the amount that node references are off by (- 1). + +Sat Jul 11 17:37:18 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (cm_anchor): Add output_column for anchors + embedded in a line. + +Fri Jul 10 16:28:21 1998 Karl Berry <karl@cs.umb.edu> + + * info/session.c (info_menu_or_ref_item): Don't search for the + xref text if it's an anchor. + * info/nodes.h (N_FromAnchor): New NODE flag. + * info/nodes.c (find_node_of_anchor): New fn. + (info_node_of_file_buffer_tags): Handle anchor case. + +Wed Jul 8 17:48:59 1998 Karl Berry <karl@cs.umb.edu> + + * info/window.c (window_set_node_of_window): Set window->point to + node->display_pos. + Remove unneeded casts. + +Tue Jul 7 08:06:14 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (add_word_args) [!VA_SPRINTF]: Use buffer, + not the undeclared temp_string. + From: Tobias Naehring <naehring@eeetw3.et.tu-dresden.de> + To: egcs-bugs@cygnus.com + Date: Mon, 6 Jul 98 13:51:55 +0200 + +Mon Jul 6 17:43:25 1998 Karl Berry <karl@cs.umb.edu> + + * info/nodes.h (NODE): Add display_pos member. + +Sun Jul 5 08:17:43 1998 Karl Berry <karl@cs.umb.edu> + + * info/nodes.h (INFO_REF_LABEL): Define. + + * util/texi2dvi: Rationalize use of `index' vs. more general + `xref'. + +Thu Jul 2 18:53:43 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c: Don't translate -Footnotes, it's a magic + cookie. From Eli. + +Wed Jul 1 08:42:41 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi (url): Missing word `command'. + +Tue Jun 30 10:35:48 1998 Karl Berry <karl@cs.umb.edu> + + * info/info.c: Missing \n in try --help msg. + + * makeinfo/makeinfo.c (cm_anchor): New fn for new cmd. + (TAG_FLAG_ANCHOR): New flag for tag entries. + (write_tag_table_internal): Handle anchor case. + (TAG_FLAG_{{PREV,NEXT,UP}_ERROR,NO_WARN,IS_TOP}): Add TAG_FLAG_ prefix + for clarity, change uses. + + * doc/texinfo.txi: Remove warning about footnotes with @item, that + works now. + +Mon Jun 29 10:17:50 1998 Karl Berry <karl@cs.umb.edu> + + * configure.in (AM_CONFIG_HEADER): Use second argument to be 8.3 + compliant. + * config.h.in: Rename to config.in. + + * info/Makefile.am (EXTRA_DIST), + * info/terminal.c [__MSDOS__]: Change #include to pcterm.c and + rename file. + +Sun Jun 28 14:29:27 1998 Karl Berry <karl@cs.umb.edu> + + * info/Makefile.am (EXTRA_DIST): Add pc_term.c. + + * makeinfo/makeinfo.c (HAVE_MACROS): Remove this conditional, we + always want macros now. + + * info/indices.c: Copyright. + +1998-06-26 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c: (only_macro_expansion): New variable, + suppresses all expansions except macros. + (replace_with_expansion): New function, replaces a portion of + input text with its expansion. Avoids moving the text around if + we are positive it will expand into itself. If the length of the + expanded text is the same as the length of the original text, just + replaces the original text without moving the rest. Resyncs the + remembered text pointers with the realloc'ed input_text, when it + is realloc'ed. + (reader_loop): When only_macro_expansion is non-zero, only handle + macros, but leave the rest of input intact. + (read_command): Now returns an int, zero means no known command or + macro is found after the prefix character; all callers changed. + Support operation under non-zero only_macro_expansion. + (cm_node): Expand only the macros in the @node line. Allocate and + generate the macro-expanded @node line in one swell whoop. + (glean_node_from_menu): Expand macros in menu entries. + (get_xref_token): A new argument EXPAND, when non-zero, means + expand macros in the entire brace-delimited argument before + looking for the next comma; all callers changed. + (expansion): Save and restore additional state variables important + for output generation machinery. Disable indentation and filling + during the recursive expansion, so that the output buffer offset + is not invalidated by filling. + (me_execute_string_keep_state): New function, calls + me_execute_string, but saves and restores state variables + important for output generation, so that -E doesn't change the + generated Info output. + (index_add_arg, cm_footnote): Call me_execute_string_keep_state. + (expand_macro): New function, returns the macro expansion as a + malloc'ed string. + (execute_macro): Call expand_macro. + (me_execute_string): Avoid memory leak by freeing input_filename. + (get_until_in_braces, replace_with_expansion, add_char, + cm_footnote, cm_macro, cm_unmacro, get_brace_args, + extract_colon_unit): Use the faster memcpy/memmove instead of + strncpy. + +Sat Jun 27 14:18:54 1998 Karl Berry <karl@cs.umb.edu> + + * doc/info.texi: Use @subsubsection instead of + @unnumberedsubsubsection, since it's in a numbered chapter. + + * Started installation of following DOS patches from Eli. +>1998-05-16 Eli Zaretskii <eliz@is.elta.co.il> +> +> * info/session.c (info_goto_node): Don't show the nodes of the +> current Info file twice in *Completions*. +> * info/echo-area.c (ea_possible_completions): Actually pass the +> number of completions to printf_to_message_buffer. +> +> * info/man.c (manpage_node_of_file_buffer): xstrdup the nodename +> member of manpage nodes, since the tags are freed and recomputed +> when a new man page is added to *manpages* file_buffer. +> (get_manpage_node): Recompute info_windows[]->nodes[] for all +> windows showing the man pages after nodes[]->contents are +> invalidated by reallocation of file_buffer->contents. +> +>1998-05-15 Eli Zaretskii <eliz@is.elta.co.il> +> +> * lib/system.h (DEFAULT_INFO_PRINT_COMMAND) [__MSDOS__]: Define to +> ">PRN". +> * info/session.c (print_node): Support ">printer" in +> INFO_PRINT_COMMAND, to mean write to the named file/device insead +> of piping to it as a program. +> (kill_node): Compare window in addition to the nodename, when +> looking for the node to kill. +> +>1998-05-09 Eli Zaretskii <eliz@is.elta.co.il> +> +> * lib/system.h (SET_SCREEN_SIZE_HELPER) [__MSDOS__]: Define a new +> macro. +> * info/m-x.c (set_screen_height): Use SET_SCREEN_SIZE_HELPER, if +> defined. If the screen size did'n change, redisplay the previous +> screen contents. +> +> * info/infomap.c (initialize_info_keymaps) [__MSDOS__]: Bind DEL +> to ea_delete in the echo-area keymap. +> * info/session.c (incremental_search): If the key is +> isearch_terminate_search_key, but buffered input is pending, don't +> gobble the ESC key. +> +> * info/info.c (main): Switch the order thet terminal_prep_terminal +> and terminal_clear_screen are called, to make it consistent with +> what initialize_info_session does when called with non-zero second +> argument. Call terminal_unprep_terminal last, after moving the +> cursor to the bottom of the screen. If user_filename is of the +> form "d:foo", add "d:." to the INFOPATH, not "d:". +> +> * info/signals.c (initialize_info_signal_handler): Save old +> SIGUSR1 handler. +> (info_signal_handler): Handle SIGUSR1. +> +> * info/indices.c (info_apropos): Print the results to stdout. +> +>1998-05-02 Eli Zaretskii <eliz@is.elta.co.il> +> +> * makeinfo/makeinfo.c (ALSO_NULL_DEVICE): New macro, for alternate +> null device name. +> +> * info/man.c (get_manpage_contents): Redirect stderr of the man +> page formatter to the null device. +> (executable_file_in_path): Use IS_SLASH. +> +> * info/session.c (info_gather_typeahead) [__DJGPP__]: Call +> pc_term_chars_avail to get the number of pending characters. +> +> * info/filesys.c (convert_eols): New function, converts DOS-style +> EOLs to a single Newline. +> (filesys_read_info_file, filesys_read_compressed): Call it. +> (filesys_read_compressed) [STRIP_DOT_EXE]: Use explicit .exe +> suffix. +> (filesys_read_compressed): Check return status of `pclose'. +> +>1998-05-01 Eli Zaretskii <eliz@is.elta.co.il> +> +> * info/filesys.c (filesys_read_info_file): Add additional +> parameter: is_compressed. All callers changed. +> +> * makeinfo/makeinfo.c (convert_from_loaded_file): Compare file +> names with FILENAME_CMP. Use NULL_DEVICE. +> (cm_node): Compare file names with FILENAME_CMP. +> * info/tilde.c (tilde_find_suffix, tilde_expand_word): Use +> IS_SLASH. +> +> * info/pc_term.c: New file, handles the PC terminal on MS-DOS and +> MS-Windows. +> * info/terminal.c [__MSDOS__]: Include pc_term.c. +> * info/Makefile.in (ginfo_SOURCES): Add pc_term.c +> Add pc_term.c to dependencies of terminal.o. +> +> * info/session.c (info_get_input_char): Reassign tty after EOF +> from a non-stdin input stream. +> +>1998-04-30 Eli Zaretskii <eliz@is.elta.co.il> +> +> * info/session.c (info_set_input_from_file): Use binary input. +> (info_gc_file_buffers): Compare file names with FILENAME_CMP. +> * info/search.c (skip_whitespace_and_newlines): Use +> whitespace_or_newline macro instead of reinventing the wheel. +> * info/nodes.c (info_find_file_internal): Use IS_ABSOLUTE and +> FILENAME_CMP. +> (info_load_file_internal): Call filename_non_directory to find out +> where the basename begins. +> (get_tags_of_indirect_tags_table): Call filename_non_directory. +> containing_dir of "d:foo" is "d:.", not "d:". +> (forget_info_file): Compare file names with FILENAME_CMP. +> * info/nodemenu.c (get_visited_nodes): Use FILENAME_CMP to find +> duplicate lines. +> +> * lib/system.h (PIPE_USE_FORK): New macro. +> * info/man.c (get_manpage_contents): Use it to determine whether +> to call pipe/fork/exec or popen/pclose to run the man page +> formatter. +> (executable_file_in_path): Search for the file with several known +> extensions such as .exe, where appropriate. +> +> * lib/system.h (NULL_DEVICE): A new macro. +> * info/makedoc.c (main): Use it. +> (maybe_dump_tags): Switch output strem to binary mode when +> appropriate. +> (process_one_file): Update file_size after reading the file. +> +> * info/infodoc.c: Add TAB, RET, and `i' to the list of important +> commands in info_internal_help_text. +> +> * info/info.c (main): Support the --speech-friendly option. Use +> PATH_SEP to separate directories. +> (info_short_help) [__MSDOS__]: Mention the --speech-friendly +> option. +> +> * info/info-utils.c (filename_non_directory): Use HAVE_DRIVE and +> IS_SLASH. +> * info/indices.c (do_info_index_search, index_entry_exists): Use +> FILENAME_CMP to compare file names. +> * info/filesys.c: Add ".inf" to the list of known extensions. +> Look for .z before .Z, for the sake of case-insensitive +> filesystems. Add DOS-specific extensions to work around 8+3 +> namespace restrictions. +> (info_absolute_file): New function. +> (info_find_fullpath): Call it for candidates which are absolute +> file names. Use IS_SLASH and IS_ABSOLUTE. +> (info_file_in_path): Use IS_SLASH. +> (extract_colon_unit, info_add_path): Use PATH_SEP instead of ":". +> (lookup_info_filename): Compare file names with FILENAME_CMP. +> (filesys_read_info_file): Read Info files in binary mode. +> (filesys_decompressor_for_file): Read Info files in binary mode. +> Compare file names with FILENAME_CMP. On MS-DOS, allow files +> whose names end with a `z' be decompressed with gunzip. +> * info/dribble.c (open_dribble_file): Open dribble file in +> FOPEN_WBIN mode. +> * info/dir.c (maybe_build_dir_node): Use IS_SLASH. +> * util/texindex.c (maketempname): Put the numeric suffix after the +> dot, to salvage 3 more characters on 8+3 filesystems. +> +>1998-04-29 Eli Zaretskii <eliz@is.elta.co.il> +> +> * util/texindex.c (main): Use IS_SLASH to find the basename of +> argv[0]. Lose the .exe suffix, if any. +> (decode_command): Look at $TEMP and $TMP in addition to $TMPDIR. +> Use DEFAULT_TMPDIR. +> * util/texi2dvi: Use either `:' or `;' as directory separator in +> TEXINPUTS, computed at run time. Save previous versions of index +> files in a separate backup directory. +> * util/install-info.c (main): Support backslashes in file names by +> using IS_SLASH. Avoid recomputing length of infile_basename +> unnecessarily. Use FILENAME_CMP for comparing file names +> case-insensitively, where appropriate. Allow foo.inf as well as +> foo.info to be an Info file name. +> * lib/system.h (PATH_SEP, STRIP_DOT_EXE, FILENAME_CMPN, +> DEFAULT_TMPDIR): New macros. +> +>1998-04-25 Eli Zaretskii <eliz@is.elta.co.il> +> +> * lib/system.h (O_BINARY, SET_BINARY, FOPEN_RBIN, FOPEN_WBIN, +> IS_SLASH, HAVE_DRIVE, IS_ABSOLUTE, FILENAME_CMP, PATH_SEP, +> HAVE_LONG_FILENAMES): New macros. +> * makeinfo/makeinfo.c (find_and_load): Use O_BINARY to decide when +> read returning a value different from what st_size says is not an +> error. Realloc the buffer after we've read the file. +> (skip_directory_part): New function, skips leading directory in a +> way that works on DOSISH systems. +> (filename_non_directory, pathname_part): Call it. +> (filename_part): Call filename_non_directory. +> (expand_filename, full_pathname): Use IS_ABSOLUTE and IS_SLASH. +> (convert_from_file): Check .txi extension first. +> (split_file): Support splitting output files on 8+3 filesystems. +> (main, extract_colon_unit): Use PATH_SEP instead of ':'. +> (get_file_info_in_path): Use IS_ABSOLUTE and IS_SLASH. + + + * doc/texinfo.txi: Changes from Eli for MS-DOS stuff. + * doc/info-stnd.texi: Fixes from Eli: he documented all the + missing keys and command-line options, corrected + inaccuracies (probably left-overs from previous versions), + and added some clarifications where I thought the manual + was not clear enough. + * Makefile.am (EXTRA_DIST): Add djgpp files. + + * makeinfo/makeinfo.c: New no-op commands @setcontentsaftertitlepage + and @setshortcontentsaftertitlepage. + * doc/texinfo.txi: Document the new @set{,short}contentsaftertitlepage + commands and the possibility of putting @contents and + @shortcontents after @end titlepage. + + * util/texi2dvi: Check that the toc file has not changed (as well + as .aux and .??). + +Thu Jun 25 16:58:46 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi: Document new commands @env, @command, @option. + + * makeinfo/makeinfo.c (option, command, env): New markup commands, same + as @code in info. + +Wed Jun 24 15:39:38 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c: New no-op command @acronym. + + * doc/texinfo.txi: Document new command @acronym. + + * util/install-info.c (strip_info_suffix, menu_item_equal): New fns. + (main): Call them instead of doing the filename test inline; all the + .info variations are too confusing to write out twice. + +Tue Jun 23 18:01:40 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi: Fix some overfull boxes. + +Mon Jun 22 19:22:17 1998 Karl Berry <karl@north> + + * configure.in: Remove AC_LINK_FILES call, that was an old gettext + thing, no longer necessary, and causes problems with Autoconf. + +Sun Jun 14 07:00:15 1998 Karl Berry <karl@cs.umb.edu> + + * util/texi2dvi: Indent options so help2man will work. From Akim. + +Sat Jun 13 10:45:25 1998 Karl Berry <karl@cs.umb.edu> + + * configure.in (ALL_LINGUAS): Add nl. + + * util/texi2dvi: Avoid tabs. + +Wed Jun 10 17:38:21 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (gen_defindex): Use xmalloc instead of alloca. + This was our only use of alloca, so also remove all the #if junk + at the beginning to define it. + + * makeinfo/makeinfo.c: Fix grammar in multiply-defined-node error + message. + +Tue Jun 9 17:53:54 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi: Document new commands @smallformat, + @smalldisplay. + + * makeinfo/makeinfo.c: New commands @smalldisplay and @smallformat. + Suggestion from: Eli Zaretskii <eliz@is.elta.co.il>. + + * makeinfo/makeinfo.h (insertion_type, insertion_type_names): + Declare smalldisplay and smallformat. + +Mon Jun 8 07:57:52 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi: Document possibility of combining @titlefont + and @title. From Eli. + + * util/texi2dvi: Set verbose to : instead of false by default. + + * util/texi2dvi: Missing \\ for sed with -t text. From Akim. + +Sun Jun 7 13:02:13 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi: Document @pagesizes and texidvi -t. + + * makeinfo/makeinfo.c: Define no-op @pagesizes and @afourpaper. + (major_version, minor_version): Remove these globals, just use the + Texinfo package version. + (print_version_info): Ditto. + +Fri Jun 5 17:54:16 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi: Change texi2dvi documentation a bit. + + * util/texi2dvi: Handle --option=argument style of specifying + arguments. + +Sat May 30 14:01:37 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi: More. + + * util/install-info.c (open_possibly_compressed_file): Finish + implementation. + + * doc/texinfo.txi: Document install-info compression support. + +Fri May 29 08:01:43 1998 Karl Berry <karl@cs.umb.edu> + + * util/install-info.c (open_possibly_compressed_file): Initial + implementation. + + * util/install-info.c (output_dirfile): Attempt to write dir.gz if + that's what we read. + (readfile): Pass back the actual opened filename, too. + + * info/indices.c: Check in Eli's patch. + +Thu May 28 17:09:45 1998 Karl Berry <karl@cs.umb.edu> + + * util/install-info.c (readfile): Set up to handle compressed + input (and output) files. Change callers. + Rearrange function order to avoid forward declarations. + + * configure.in: Remove check for libz, we'll fork gzip instead. + +Tue May 26 18:01:13 1998 Karl Berry <karl@cs.umb.edu> + + * util/install-info.c (print_help): Missing \n\ in help string. + + * makeinfo/makeinfo.c (POST_SENTENCE): Rename from post_sentence. + Change calls. + (flush_output): Strip 8th bit if post_sentence char as well as space. + (cm_code, etc.): Change add_char calls for post_sentence chars to set + 8th bit. + +1998-05-23 Eli Zaretskii <eliz@is.elta.co.il> + + * info/indices.c (info_next_index_match): Call + info_set_node_of_window to display the node, so that footnotes are + displayed as well. + +Thu May 21 11:05:50 1998 Karl Berry <karl@cs.umb.edu> + + * util/install-info.c (output_dirfile): New function, extracted + from the end of main. + + * makeinfo/makeinfo.c (begin_insertion): Ignore @group in all the + example-like environments, not just @example. Otherwise the first + line in the environment is not indented correctly. Reported by rms. + +Wed May 20 17:44:38 1998 Karl Berry <karl@cs.umb.edu> + + * util/install-info.c: Doc fixes. + + * util/install-info.c: Handle XEmacs-style dir entries: + * FILENAME::PROGRAM DESCRIPTION. + Date: Wed, 13 May 1998 13:58:28 +0900 + From: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp> + + Also, do not set something_deleted on continuation lines; they are only + deleted if the entry was deleted. + +Tue May 19 17:22:50 1998 Karl Berry <karl@cs.umb.edu> + + * util/install-info.c: Do not read the dir file if we are only + deleting -- it might not exist, and we don't actually need it. + From: David Kaelbling <drk@sgi.com> + Date: Tue, 12 May 1998 11:05:26 -0400 + + * util/gen-dir-node: + From: David Kaelbling <drk@sgi.com> + Date: Tue, 12 May 1998 16:05:16 -0400 - + - The "dir" moobler header is slightly different from the default + dir file. + - If all files in ${infofiles} appear in the skeleton the last one + is processed twice. + - INFO-DIR-SECTION data is ignored. + - Don't generate entries for directories. + +Sat May 16 17:16:56 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (cm_novalidate): New fn for new command + @novalidate, like --no-validate. + +Thu May 14 18:02:31 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi: Document the @novalidate command. + +Wed May 13 17:47:20 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi: Document limitation on @set/@value names in + index commands. + +Fri May 1 14:12:15 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi (Command List): @deftypevar out of order. + + * configure.in (ALL_LINGUAS): Add cs. + +Tue Apr 28 09:33:41 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (strcasecmp): This is in lib now. + +1998-04-26 Richard Stallman <rms@psilocin.gnu.org> + + * util/install-info.c (print_help): Doc clarifications. + +Sun Apr 19 15:55:10 1998 Karl Berry <karl@cs.umb.edu> + + * lib/system.h (strcasecmp, strncasecmp) [!HAVE_STR[N]CASECMP]: + Declare these. + + * info/search.h (str[n]casecmp): Remove decl from here. + + * configure.in (AC_REPLACE_FUNCS): Check for strcasecmp and + strncasecmp here. + (AC_CHECK_FUNCS): Instead of just strcasecmp here. + + * configure.in (texconfig): Use TEXMFMAIN in preference to TEXMF + for post-0.4 teTeX. + +Wed Apr 15 17:20:31 1998 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.txi (Reporting Bugs): New section. + Suggestion from: Andrew Shapira <shapiraa@cs.rpi.edu> + Date: Mon, 4 Aug 1997 19:06:06 -0400 (EDT) + + * info/infomap.c: Define / to be info_search. + Suggestion from: Egil Kvaleberg <egil@kvaleberg.no> + Date: Fri, 1 Aug 1997 08:16:45 +0200 (MET DST) + + * doc/texinfo.txi (uref): Document reason for not using <URL: format. + Also use ftp.gnu.org instead of ftp.gnu.ai.mit.edu throughout. + +Tue Apr 14 10:43:39 1998 Karl Berry <karl@cs.umb.edu> + + 1998-04-05 Karl Eichwalder <ke@suse.de> + * makeinfo/makeinfo.c (begin_insertion): No need to + gettext; it's a keyword. From carl-friedriech.spilcke-liss@ensae.fr. + (cm_printindex): ditto. + + * util/texi2dvi: Always remove the $tmp_dir's. + From: Dean Gaudet <dgaudet@arctic.org> + Date: Tue, 14 Apr 1998 00:55:36 -0700 (PDT) + +Mon Apr 13 18:02:57 1998 Karl Berry <karl@cs.umb.edu> + + * configure.in: Include + AM_SYS_POSIX_TERMIOS + AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL + to avoid window resizing being ignored under glibc2 systems, + e.g., Red Hat Linux 5.0. Actually any system where the ioctls are not + defined in <termios.h>. + See also http://www-gnats.gnu.org:8080/cgi-bin/wwwgnats.pl/full/206. + * acconfig.h (GWINSZ_IN_SYS_IOCTL): New #undef for autoheader. + * info/termdep.h [GWINSZ_IN_SYSIOCTL]: #include <sys/ioctl> if + this is defined. + From: Mark Jefferys <mjeffery@cse.ogi.edu> + Date: Thu, 9 Apr 1998 12:38:27 -0700 (PDT) + +Fri Apr 3 01:18:22 1998 Philippe De Muyter <phdm@macqel.be> + + * info/info.c (main): Use 0, not NULL, as ? : alternative. + +Tue Mar 3 13:29:17 1998 Karl Berry <karl@cs.umb.edu> + + * configure.in: Version 3.12. + + * po/de.po: New version. + + * po/POTFILES.in: Do not include doc.c; that gets built at + runtime, thus causing texinfo.pot to try to get rebuilt. Besides, + it doesn't have any translatable strings. + +Sun Mar 1 10:38:47 1998 Karl Berry <karl@cs.umb.edu> + + * util/install-info.c: No need for i18n on version message. From + ke@suse.de. + +Fri Feb 27 16:06:23 1998 Karl Berry <karl@cs.umb.edu> + + * configure.in: Run texconfig conf instead of confall. + + * doc/Makefile.am (INSTALL_INFO): New variable. + (install-info-am): Use install-info from our distribution. + + * info/info.c (info_minor_version): Increment. + * (info_patch_level), + * info/info.h (info_patch_level): Remove. + + * info/info.c (program_name): Move decl. + + * util/install-info.c (ensure_dirfile_exists): Use commas and \t + instead of an explicit tab, which make dist expands. + + * doc/texinfo.txi: @prep.ai.mit.edu -> @gnu.org. + + * info/info.c: Make help messages consistent with others. + + * util/install-info.c (print_help): Format consistently. + + (readfile): Support gzipped files via libz. + From: Elliot Lee <sopwith@redhat.com> + Date: Mon, 1 Sep 1997 23:37:14 -0400 (EDT) + +Thu Feb 26 16:13:14 1998 Karl Berry <karl@cs.umb.edu> + + * info/echo-area.c: Whoops, _ might not start with parens. + + * configure.in: Check for libz. + Do not output emacs/Makefile. + + * Makefile.am (AUTOMAKE_OPTIONS): Set to 1.2f. + + * util/texi2dvi: Always remove temporary directories. (From Akim.) + Formatting changes. + +Wed Feb 25 15:26:26 1998 Karl Berry <karl@cs.umb.edu> + + * util/texi2dvi: New options --batch, --clean. + From: Akim Demaille <demaille@inf.enst.fr> + Date: 15 Aug 1997 18:05:33 +0200 + * doc/texinfo.txi (Format with texi2dvi): Mention --help. + + Applied this: +1997-08-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * makeinfo/makeinfo.c (me_executing_string): New variable. + (me_execute_string): Use it instead of executing_string. + (popfile): Check for me_executing_string as well as + executing_string. + (get_until_in_line): Likewise. + (insert_and_underscore): Do not write any expansion output if + executing a string. + (cm_node, cm_include, index_add_arg, cm_footnote, execute_macro, + cm_macro, cm_unmacro): Likewise. + (cm_footnote): Include the footnote marker in the expansion + output. + (append_to_expansion_output): Do nothing if the input_text wasn't + a remembered text. + (defun_internal): Make the index entry even if expanding macros. + (expansion): Don't reset macro_expansion_output_stream around call + to execute_string. + (apply): Fix typo. + +Tue Feb 24 17:33:44 1998 Karl Berry <karl@cs.umb.edu> + + 1997-11-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + * makeinfo/makeinfo.c (get_until_in_line): Don't use xstrdup on + the unterminated input_text. + + * makeinfo/makeinfo.c: Don't assume all \'s in macro bodies are + arguments. + From: Mathias.Herberts@irisa.fr (Mathias Herberts) + Date: Tue, 6 Jan 1998 18:54:26 +0100 + + * configure.in: Check for sigblock in libc before libbsd. + * From: hjl@lucon.org (H.J. Lu) + * Date: Fri, 23 Jan 1998 21:50:25 -0800 (PST) + +Mon Feb 23 16:26:31 1998 Karl Berry <karl@cs.umb.edu> + + * info/window.c (character_width): If ISO_Latin_p is set, make + printable_limit 255, not 160. ISO Latin 1 uses + essentially all of the 256 characters. + Reported by: Marius Groeger <mag@sysgo.de> + Date: Wed, 17 Dec 1997 16:05:27 +0100 + + * info/info.c: Improve help message. + +Sun Feb 22 17:38:32 1998 Karl Berry <karl@cs.umb.edu> + + * Makefile.am (SUBDIRS): Remove emacs; we'll just distribute the + Elisp files with Emacs. + + * doc/Makefile.am (info_TEXINFOS, texinfo): Rename manual to + texinfo.txi to avoid DOS filename clash with texinfo.tex. + + * info/tilde.c: Copy slightly updated alloca stuff from makeinfo. + + * util/texindex.c (main): Declare as returning int to placate + warnings. + + * info/Makefile.am: Uncomment BUILT_SOURCES stuff and add missing _. + From: "Joel N. Weber II" <devnull@gnu.org> + Date: Fri, 30 Jan 1998 17:21:38 -1000 + + * util/texindex.c, + * util/install-info.c, + * makeinfo/makeinfo.c, + * info/info.c: Change help address to @gnu.org. + + 1998-01-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + * makeinfo/makeinfo.c (usage): Fix order of arguments to help + format string. + + * makeinfo/makeinfo.c (cm_top): Error message wording. + + * doc/texinfo.texi (Functions in Typed Languages): Remove + duplicate description of @deftypemethod. + From: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise) + Date: Wed, 07 Jan 1998 11:11:50 +0100 + + * info/session.c (info_get_input_char) [EINTR]: Keep reading if we + get EINTR. + From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + Date: 22 Dec 1997 10:32:53 +0100 + +Sat Feb 21 17:41:26 1998 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (find_and_load): Malloc enough room for the + null as well as the newline. + From: "John W. Eaton" <jwe@bevo.che.wisc.edu> + Date: Tue, 30 Sep 1997 21:12:01 -0500 + + * util/texindex.c (--version), + * makeinfo/makeinfo.c (cm_today), + * makeinfo/makeinfo.c (print_version_info): Version strings etc. do not + need translation. + From: Karl Eichwalder <ke@suse.de> + Date: 13 Sep 1997 16:20:02 +0200 + + * info/echo-area.c: Rewrite pluralization to be translatable. + From: Karl Eichwalder <ke@suse.de> + Date: 13 Sep 1997 16:20:02 +0200 + + * util/texindex.c, + * info/info.c, + * makeinfo/makeinfo.c, + * util/install-info.c: --version: Give year as argument to printf, + to reduce the number of translations needed. + From: Ulrich Drepper <drepper@ipd.info.uni-karlsruhe.de> + Date: 02 Sep 1997 18:01:26 +0200 + + * util/texindex.c: Remove the fnctl.h and sys/file.h conditional #includes, they are + already in lib/system.h. + From: "Philippe De Muyter" <phdm@macqel.be> + Date: Thu, 21 Aug 1997 20:16:49 +0200 (MET DST) + + * info/terminal.c (terminal_begin_using_terminal, + terminal_end_using_terminal): #ifdef SIGWINCH settings for + m68k-motorola-sysv. + From: "Philippe De Muyter" <phdm@macqel.be> + Date: Thu, 21 Aug 1997 20:16:49 +0200 (MET DST) + + * info/filesys.c (info_suffixes): Add /index as a possibility for + subdirectories. + From: Matthew Wilcox <willy@odie.barnet.ac.uk> + Date: Wed, 6 Aug 1997 15:55:16 +0100 (BST) + + * configure.in: Redirect texconfig input from /dev/null to avoid + stoppage. + From: Thomas Esser <te@informatik.uni-hannover.de> + Date: Mon, 4 Aug 1997 18:15:49 +0200 + + * makeinfo/makeinfo.c (find_and_load): Null-terminate the input text. + From: Kenneth Stailey <kstailey@disclosure.com>. + + * info/Makefile.am (INCLUDES): Add -I.. -I$(srcdir). + +Fri Aug 22 16:24:59 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi: Adjust ISBN, edition number for print run. + +Mon Aug 4 16:12:42 1997 Karl Berry <karl@cs.umb.edu> + + * info/info.c (main) [INFODIR]: Add this to infopath, if set. + * info/Makefile.am (DEFS): New define, include -DINFODIR. + From: Larry Schwimmer <rosebud@cyclone.Stanford.EDU>. + + * util/install-info.c (ensure_dirfile_exists): Use tabs instead of + spaces on the File: dir line. + Bug from: Dave Love <d.love@dl.ac.uk>. + +Sat Aug 2 12:43:57 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (cm_value, cm_email, cm_uref): Have to cast + from unsigned char * to char * or IRIX cc complains. + From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>. + +Fri Aug 1 14:05:10 1997 Karl Berry <karl@cs.umb.edu> + + * Makefile.am (EXTRA_DIST): Remove README-alpha. + From: "ir. Mark M._Kettenis" <kettenis@phys.uva.nl>. + +1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * configure.in: Use AC_CHECK_HEADERS, not AC_CHECK_HEADER. + +Thu Jul 31 11:57:46 1997 Karl Berry <karl@cs.umb.edu> + + * Version 3.11. + + * info/man.c (reap_children): Declare status as int, not unsigned, + since that's what POSIX says the arg to wait should be. + + * makeinfo/makeinfo.c (cm_uref, cm_email): Rewrite to do macro + expansion in the arguments. + + * makeinfo/makeinfo.c (main): setlocale LC_MESSAGES and LC_TIME, + instead of LC_ALL. + From: Akim Demaille <demaille@inf.enst.fr>. + + * makeinfo/makeinfo.c (cm_today): Let the %d %s %d be translated, + so other languages can change the order of day/month/year. + From: Akim Demaille <demaille@inf.enst.fr>. + + * info/infomap.c: Doc fix. + + * lib/system.h [!O_RDONLY]: Prefer <fcntl.h> to <sys/fcntl.h>. + + * configure.in (AC_CHECK_HEADERS): Check for fcntl.h. + + * doc/Makefile.am (install-data-local): Suggest tex/generic/dvips + for epsf.tex. + From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>. + + * configure.in (TEXMF): Move check to block with other program + checks. + +Wed Jul 30 11:20:37 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (defun_internal): Allow extra text after + most @def... commands, for tzname[2] in libc.texinfo. + + * info/info.c: Include indices.h. + * configure.in (AC_CHECK_HEADERS): Test for sys/wait.h, info/man.c + uses it. + From: Erick Branderhorst <Erick.Branderhorst@asml.nl>. + +Tue Jul 29 15:55:19 1997 Karl Berry <karl@cs.umb.edu> + + * configure.in: Version 3.9j. + + * info/terminal.c (output_character_function): Return int (the + arg), not void. + + * info/infomap.c: Don't define term_kP as 'v', since that's undefined. + From: Tom Hageman <tom@basil.icce.rug.nl>. + + * makeinfo/makeinfo.c: Parameterize some messages to avoid + duplicate translations. + + * info/terminal.c: Only try to declare ospeed, PC, tputs, etc. if + we don't have <ncurses.h/termcap.h> or <termcap.h>. + + * makeinfo/makeinfo.c (cm_email): New function, like cm_uref. + +Sun Jul 27 17:09:20 1997 Karl Berry <karl@cs.umb.edu> + + * configure.in: Only check for <ncurses/termcap.h> if we're using + -lncurses. + From: Bo Johansson <bo.johansson@mbox2.swipnet.se>. + + * info/dir.c (new_dir_file_p): Avoid automatic struct + initialization, SunOS 4 etc. cc can't handle it. + From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>. + +Sat Jul 26 15:08:13 1997 Karl Berry <karl@cs.umb.edu> + + * Version 3.9i. + + * configure.in: Check for termcap.h and ncurses/termcap.h. + From: bo.johansson@mbox2.swipnet.se. + +Fri Jul 25 14:09:05 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi: Document new second optional arg to email. + + * info/infodoc.c: Document CTRL-x 0 as the way to get out of help. + + * info/dir.c (maybe_build_dir_node): Really check for the same dir + file twice, not just by name. + (new_dir_file_p): New function. + + * util/install-info.c: Tell them about --help in doc strings. + +Thu Jul 24 14:25:44 1997 Karl Berry <karl@cs.umb.edu> + + * util/texindex.c (memory_error): Move to avoid incorrect implicit + decl. + + * makeinfo/makeinfo.c, + * makeinfo/multi.c, + * util/install-info.c, + * util/texindex.c, + * info/tilde.c, + * info/man.c, + * info/gc.c, + * info/session.c (info_replace_key_to_typeahead): Remove unused + function, + * info/nodemenu.c, + * info/man.c, + * info/m-x.c, + * info/footnotes.c + * info/info.c + * info/indices.c, + * info/filesys.c: Parenthesize to avoid -Wall warnings + remove unused variables, + make return types explicit, + printf type corrections. + + * lib/system.h: <ctype.h>: Include this. + * util/texindex.c, + * makeinfo/makeinfo.c, + * info/echo-area.c, + * info/display.c: ctype.h: Included in system.h now. + + * info/echo-area.c: Parenthesize to avoid -Wall warnings. + (ctype.h): #include for isprint. + (echo_area_stack_depth): Remove unused function. + * info/display.c: Parenthesize to avoid -Wall warnings. + (ctype.h): #include for isprint. + * info/dir.c: Parenthesize to avoid -Wall warnings. + (build_dir_node_internal): Remove declaration of nonexistent function. + From: Erick Branderhorst <Erick.Branderhorst@asml.nl>. + + * configure.in (TEXMF): Call texconfig to discover the default value, + for the sake of the warning in doc/Makefile. + From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>. + + * doc/Makefile.am (TEXMF): New variable. + (install-data-local): Use it in warning. + From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>. + + * info/session.c (initialize_info_session): Only call + terminal_prep_terminal if clear_screen is true. Otherwise, failed + --index-searches prep the terminal but do not unprep it. + From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>. + + * info/nodemenu.c: Doc fix. + +Mon Jul 21 17:11:09 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi: Comment out @smallbook and @set smallbook so + people at other sites can print it the way they want. + From: Thomas Walter <walter@pctc.chemie.uni-erlangen.de> + +Sun Jul 20 07:52:25 1997 Karl Berry <karl@cs.umb.edu> + + * configure.in: 3.9h. + + * doc/Makefile.am (install-info-am, distclean-aminfo): New targets + to avoid assuming info files are in srcdir. + + * lib/system.h (xstrdup): Returns char *, not void *. + + * doc/Makefile.am (.texi.info), + * doc/Makefile.am (texinfo): Don't run in $(srcdir). + + * util/install-info.c (main): Remove unnecessary decl of strrchr. + + * info/tilde.c: Include info.h (for config.h) before alloca stuff. + + * makeinfo/makeinfo.c (validate_file): Rename `valid' to `valid_p' + to avoid conflict with SunOS 4 header files. + From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>. + + * info/session.c (initialize_info_session): Call + terminal_prep_terminal here (before calling terminal_clear_screen). + (info_session): Instead of here. + From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>. + + * Makefile.am (EXTRA_DIST): Add README-alpha. + +Sat Jul 19 13:50:27 1997 Karl Berry <karl@cs.umb.edu> + + * info/terminal.c: Use `keypad transmit' sequence if it's defined: + (term_keypad_on, term_keypad_off): New statics. + (terminal_begin_using_terminal): If term_keypad_on, send it. + (terminal_end_using_terminal): If term_keypad_off, send it. + (terminal_initialize_terminal): Look up ks and ke termcap strings. + From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>. + + * info/infomap.c (initialize_info_keymaps): Initialize hardwired + cases for arrow keys a la readline. Found by John Eaton, + jwe@bevo.che.wisc.edu. + + * makeinfo/makeinfo.c (output_pending_notes): Remove footnote + macro expansion code I #if 0'd out some time ago. And doc fixes. + + * Applied this patch: + +Sat Jul 19 16:29:01 1997 Karl Eichwalder <ke@suse.de> + + * info/info.c (main): setlocale, bindtextdomain, and textdomain. + +Fri Jul 18 10:02:18 1997 Karl Berry <karl@cs.umb.edu> + + * doc/Makefile.am (install-data-local), + * emacs/Makefile.am (install-data-local): Give subdir in warning. + + * configure.in: Version 3.9f. + + * doc/texinfo.texi: Correct \^ to @^. + From Andreas S. + + * Merged these changes: + +1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * info/display.c (display_cursor_at_point): Flush ouput. + +1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * info/session.c (remember_window_and_node): Don't crash when the + current window has no current node. + +1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * util/texindex.c (usage): Translate the doc strings. + * makeinfo/makeinfo.c (cm_today): Translate the month names. + * info/variables.c (describe_variable): Translate the doc strings. + * info/nodes.h: Don't translate the strings defining the info format. + +1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * makeinfo/makeinfo.c (get_item_function): Remove superfluous call + to canon_white after get_rest_of_line. + (cm_end): Likewise. + (handle_variable): Likewise. + (cm_item): Likewise. + (cm_unmacro): Likewise. + +1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * info/nodemenu.c (list_visited_nodes): Don't clear the internal + flag, this and other functions depend on it. Don't insist on + displaying the menu below the current window. + +1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * makeinfo/makeinfo.c (cm_uref): Fix memory leaks. + (cm_inforef): Likewise. Handle empty cross reference name. + +1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * info/echo-area.c (ea_possible_completions): Check that the + current window can actually be split. + +Thu Jul 17 17:19:34 1997 Karl Berry <karl@cs.umb.edu> + + + * emacs/Makefile.am (*clean-lisp): Define, as Automake didn't. + From: Kenneth Stailey <kstailey@disclosure.com>. + + * doc/Makefile.am: Do not distribute info.1. + * makeinfo/macros: Do not distribute this directory, it's merged + into the main documentation. + * doc/makeinfo.texi: Don't distribute this either, it's in the + main manual. + + * util/install-info.c: Use \n\ for multiline string constant. + From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>. + +Wed Jul 16 15:29:50 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi: @set must be after @setfilename, I guess. + Noted by Erick Branderhorst. + + * Applied this change: + +Tue Nov 12 22:20:22 1996 John Eaton <jwe@bevo.che.wisc.edu> + + * makeinfo.c (INDEX_ALIST): Use two indices, read_index and + write_index, instead of just one. + (find_index_offset): If a match is found, return index to the + current INDEX_ALIST struct, not the index pointing to the list of + index entries. + (translate_index): Return read_index from the matching + INDEX_ALIST. + (undefindex): Delete the list of index elements pointed to by + read_index from the INDEX_ALIST that matches name. + (defindex): Initialize read_index and write_index. + (index_add_arg): Add entries to the list pointed to by write_index + from the INDEX_ALIST matching name. + (index_append): Delete unused function. + (cm_synindex): Don't merge indcies, just make the write_index for + redirectee the same as the write_index for redirector. + +Tue Jul 15 09:32:04 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi: Bump edition number for 2.24. + + * util/Makefile.am (localedir): Define. + + * info/window.h: Rename __window__ to window_struct. + + * info/window.h, + * info/variables.h, + * info/search.h, + * info/man.h, + * info/info-utils.h, + * info/gc.h, + * info/footnotes.h, + * info/filesys.h, + * info/echo-area.h, + * info/display.h: Avoid leading _ in #define for #include protection. + + * makeinfo/makeinfo.c: Version 1.68. + * info/info.c: Version 2.17. + + * Most all files: Untabify. + + * doc/Makefile.am (texinfo): Add explicit target. + + * emacs/Makefile.am (noinst_LISP): Remove the obsolete + detexinfo.el (makeinfo --no-headers is better) and + texnfo-tex.el (now handled by TeX modes in general). + +Mon Jul 14 15:21:03 1997 Karl Berry <karl@cs.umb.edu> + + * util/texi2dvi: Update RCS file from 3.9 distribution. + + * util/Makefile.am (EXTRA_DIST): Add update-info, from + rhawes@dmapub.dma.org + +Sun Jul 13 17:05:03 1997 Karl Berry <karl@cs.umb.edu> + + * info/signals.c: Use RETSIGTYPE instead of hardwiring void. + From: "Jeffery L. JT Vogt" <lfm@atw.earthreach.com>. + + * info/session.c (info_history_node): Rewrite as + info_kill_node (current_node). + (kill_node, read_nodename_to_kill): New functions from info_kill_node. + (info_kill_node): Now this just calls them. + +Fri Jul 11 11:56:58 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi: Fix `Conditionals' xref. + +Thu Jul 10 17:58:12 1997 Karl Berry <karl@cs.umb.edu> + + * doc/info.texi: Don't say SPC clears ? screen. + +Sun Jul 6 16:26:41 1997 Karl Berry <karl@cs.umb.edu> + + * doc/info-stnd.texi: Document --index-search. + + * info/tilde.c, + * info/session.c: Remove redundant getenv decl. + + * Installed following change: +Tue Nov 12 14:44:00 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * info/info.c (main): Handle new option, --index-search STRING. + (index_search_p, index_search_string): New static variables, used + to handle --index-search option. + + * info/session.c (initialize_info_session): New arg, + clear_screen. Change all callers. + + * info/indices.h (do_info_index_search, index_intry_exists): + Provide declarations here. + + * info/indices.c (do_info_index_search): New function, extracted + from info_index_search. + (info_index_search): Simply call do_info_index_search() with + search_string set to NULL. + (index_entry_exists): New function. + +Sat Jul 5 17:17:14 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi: Document @kbdinputstyle. + + * makeinfo/makeinfo.c (kbdinputstyle): New command. + (cm_no_op_line_arg): New function. + + * info/termdep.h (HAVE_TERMIOS_H) [NeXT]: #undef. + From: Gregor Hoffleit <flight@mathi.uni-heidelberg.de> et al. + +Fri Jul 4 14:18:08 1997 Karl Berry <karl@cs.umb.edu> + + * info/Makefile.am (EXTRA_DIST), + * util/Makefile.am (EXTRA_DIST), + * makeinfo/Makefile.am (EXTRA_DIST), + * lib/Makefile.am (EXTRA_DIST): Include README. + + * doc/texinfo.texi (makeinfo options): Document --paragraph-indent + values more completely. + * makeinfo/makeinfo.c (set_paragraph_indent): Allow translated + asis or none, improve doc. + From ke. + + * doc/Makefile.am (dist-info): New empty target so that we do not + distribute info files. + From Erick Branderhorst. + + * doc/texinfo.texi (Invoking install-info): Document that the dir + file is created now if need be. + * Makefile.am (EXTRA_DIST): No longer need dir. + * util/install-info.c (ensure_dirfile_exists): New routine. + (main): Call it before trying to open dirfile for reading. + + * doc/texinfo.texi: Document install-info --delete a little better. + * util/install-info.c: Set something_deleted when we delete a + normal line. + Bug from: Denis Kosygin <dkosygin@math.Princeton.EDU>. + + * util/install-info.c: If no info dir entry, give warning and exit 0. + +Wed Jul 2 06:35:17 1997 Karl Berry <karl@cs.umb.edu> + + * configure.in (ALL_LINGUAS): Add fr. + + * makeinfo/makeinfo.h (insertion_type, insertion_type_names): Add + ifnot... entries. Alphabetize. + +Tue Jul 1 17:21:54 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (sort_index): Set defining_line and + input_filename so errors in index entries are reported at + the correct location. From rms. + + * makeinfo/makeinfo.c (cm_ifnothtml, etc.): Routines for new + commands. + +Sun Jun 29 09:44:01 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi: Document new @ifnot... commands, etc. + * doc/texinfo.texi: Document @image, etc. + +Thu Jun 26 17:57:37 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (cm_image): New routine for new command @image. + (cm_end): Move to better place, doesn't need its own page. + Doc fixes. + +Mon Jun 23 16:54:03 1997 Karl Berry <karl@cs.umb.edu> + + * Makefile.am (SUBDIRS): Do intl first. + + * doc/Makefile.am (EXTRA_DIST): Include epsf.tex. + (install-data-local): Suggest possible installation directory. + * epsf.tex: New file. + +Wed Jun 18 17:51:52 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi: Document texinfo.cnf. + +Sun Jun 15 14:37:58 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi (Command List): Various commands missing or + erroneous. + From: Karl_Heinz_Marbaise@p69.ks.fido.de. + + * makeinfo/makeinfo.c: Oops, failed to break out of loop. + + * util/texindex.c: Use <getopt.h> not "getopt.h". + + * All source files: Merge gettext changes from Karl E.; + his ChangeLog entries below. + +Sat Jun 14 17:04:28 1997 Karl Berry <karl@cs.umb.edu> + + * Makefile.am, + * makeinfo/Makefile.am: Doc fix. + * util/Makefile.am (EXTRA_DIST): Add texi2dvi. From Karl E. + +Fri Jun 13 17:39:34 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c [WIN32]: Handle read bogosity and c:\ + absolute paths. + From: Eric Hanchrow <erich@MICROSOFT.com>. + + * configure.in (AC_CHECK_HEADERS): Check for pwd.h. + * info/tilde.c (pwd.h): Move #include to system.h. + + * makeinfo/makeinfo.c (main): New option -P to prepend to search path. + From: Kenneth Stailey <kstailey@cvs.openbsd.org>. + + * doc/texinfo.texi (Invoking makeinfo), + * doc/makeinfo.texi: Mention -P. + +Thu Jun 12 16:25:40 1997 Karl Berry <karl@cs.umb.edu> + + * info/signals.h (SIGCHLD): #define as SIGCLD if undefined, for sysV68. + From: "Philippe De Muyter" <phdm%labauto1@ulb.ac.be>. + + * util/install-info.c (O_RDONLY): Remove this stuff, it's in system.h. + (main): Handle existing entry in dir file having .info extension. + From: "Bradley C. Kuszmaul" <bradley@GRANITE.SYSTEMSX.CS.YALE.EDU>. + + * makeinfo/makeinfo.c (get_char_len): Don't count 8-bit characters + as two chars in the output. + From: Sung-Hyun Nam <namsh@amuna.rms.lgic.co.kr>. + +Wed Jun 11 16:36:51 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi (Other Info Directories): Document new trailing + : in INFOPATH feature. + + * info/info.c (main): Have trailing : in INFOPATH expand to the + default path. + +Fri Jun 6 13:22:02 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi (uref): New node for new command. + +Thu Jun 5 18:13:48 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (cm_uref): New function to accept optional + second argument. Call it in command table. + +Sat Jun 14 10:54:16 1997 Karl Eichwalder <ke@suse.de> + + * mkinstalldirs: Update from automake-1.1p. + + * configure.in: Touch po/ChangeLog (gettext needs it). + +Thu Jun 12 08:37:52 1997 Karl Eichwalder <ke@ke.Central.DE> + + * util/texindex.c: Include system.h, remove config.h. + + * po/POTFILES.in: Fill it. + + * makeinfo/multi.c: Include system.h. + + * info/Makefile.am: + * makeinfo/Makefile.am: + * util/Makefile.am: + (localedir): Set. + (INCLUDES): Add intl/ and LOCALEDIR. + (LDADD): Add @INTLLIBS@. + + * makeinfo/makeinfo.c (main): + * util/texindex.c (main): + * util/install-info.c (main): + setlocale, bindtextdomain, and textdomain. + + * lib/system.h: Include locale.h and libintl.h. + + * acconfig.h: Include libintl.h. + (_, N_): Define. + Add ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_LC_MESSAGES, + HAVE_STPCPY for libintl. + Add @TOP@ and @BOTTOM@. + + * configure.in (AM_GNU_GETTEXT): Add. + (AC_OUTPUT): Process Makefiles in intl/ and po/. + (ALL_LINGUAS): Available languages. + + * Makefile.am (AUTOMAKE_OPTIONS): Now use 1.1p. + +Wed Jun 11 17:05:37 1997 Karl Eichwalder <ke@ke.Central.DE> + + * Makefile.am (SUBDIRS): Add intl/ and po/ for NLS. + + * run `gettextize -c' to get the i18n skeleton. + +Wed Jun 4 17:51:08 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (uref): New command, another alias for @code + for now. + +Wed Jun 4 02:02:33 1997 Miles Bader <miles@gnu.ai.mit.edu> + + * doc/texinfo.texi (email): { and } need @ escapes. + +Sun Jun 1 16:34:12 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi (itemx): @itemx should always follow @item. + + * makeinfo/makeinfo.c (cm_item): Insert blank line if two + consecutive @item's. + From: Karl Eichwalder <ke@ke.central.de>. + Also various doc fixes. + +Tue May 27 17:20:44 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi (various): Document @deftypemethod. + (email): @ should have been @@ in the example. + From: Mate Wierdl <mw@wierdlmpc.msci.memphis.edu> + +Mon May 26 16:56:26 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/multi.c (setup_multitable_parameters): Avoid use of %n + for sake of m68k-hp-bsd. + From: Derek L Davies <ddavies@world.std.com>. + + * info/terminal.c (terminal_begin_using_terminal, + terminal_end_using_terminal): Call fflush and sleep to handle + cmdtool/shelltool with scrollbars. Also ignore + SIGWINCH so we do not prematurely exit. Move call. + (terminal_prep_terminal): Disable LNEXT (CTRL-V). + From: strube@physik3.gwdg.de (Hans Werner Strube). + + * configure.in (AC_TYPE_SIGNAL): Check this. + +Sun May 25 16:49:58 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (discard_insertions): Take arg saying + whether ifinfo/ifset/etc. are ok. + (convert_from_loaded_file): At `finished', call discard_insertions. + (handle_variable_internal): Complain if we reach eof before the + @end for a false condition. + From: HERBERT@boevm4.vnet.ibm.com. + + * info/Makefile.am (ginfo_SOURCES): Add doc.h. + * lib/Makefile.am (libtxi_a_SOURCES): Add system.h. + +Sat May 24 18:08:27 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c: Check that we have macro_expansion_filename + before using strcmp. + +Thu May 22 17:59:46 1997 Karl Berry <karl@cs.umb.edu> + + * doc/makeinfo.texi: Minimally document --force. + + * makeinfo/makeinfo.c (--force): New option. + (-E): Allow stdout via `-'. + (convert_from_loaded_file): Unlink output files if errors and !force. + +Tue May 20 17:48:42 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c: Change all strdup calls to xstrdup. + (xmalloc, xrealloc, memory_error): Remove these functions, they're + in lib. + (set_paragraph_indent, cm_paragraph_indent): Move to misc page. + (cm_footnote): Expand macros in the arg for the macro expansion output. + +Fri May 16 17:26:59 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (cm_macro): Allocate an empty body if the + macro was empty. + (cm_unmacro): Allocate one more byte for the null. + From: Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>. + +Sun May 11 17:51:21 1997 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * makeinfo/makeinfo.c (cm_printindex): Fix calculation of the + length of an index line. + +Sun May 11 14:47:42 1997 Tom Tromey <tromey@cygnus.com> + + * makeinfo/makeinfo.c (main): Don't unconditionally run usage when + -e specified. + +Sun May 11 17:47:42 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (init_indices): Free the source for an @synindex. + (undefindex): Do not go further if the target was already freed. + (free_index): Do not free the node names, as init_tags already did. + (cm_synindex, index_add_arg): Improve error message. + (program_index, function_index, etc.): Remove these unused #defines. + +Tue May 6 17:53:37 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (init_internals): Do not free current_node, + it already is, at least when multiple input files are specified. + From: Karl Eichwalder <ke@ke.central.de>. + +Mon May 5 16:14:39 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi: Mention both alignment and non-alignment of + continuation description lines in menus (Arnold). + +Sun Apr 27 16:12:44 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (apply): Handle body being `\string'. + Also, avoid dereferencing a null pointer when a macro has no named + parameters. + From: Eli Zaretskii <eliz@is.elta.co.il>. + + * makeinfo/makeinfo.c: Wording changes/fixes in warnings. + + * info/session.c (info_get_input_char): Do not mix stdio with raw I/O. + From: Egil Kvaleberg <egilk@sn.no>. + + From Tom Hageman <tom@basil.icce.rug.nl>. These changes make + arrow keys work: + * info/infomap.c: Add arrow key bindings. + (keymap_bind_keyseq): New support function. + (initialize_info_keymaps): Use it. + (term_ku,term_kd,term_kl,term_kr): Remove explicit declarations; + use #include "terminal.h" instead. + * info/session.c (initialize_info_session): Unbuffer stdin. + (info_get_another_input_char): Fix bug in `ready' logic. + * info/terminal.h, + * info/terminal.c (term_kP, term_kN): New variables to hold + PageUp, PageDown key sequences. + (terminal_initialize_terminal): Set them. + + * util/texindex.c (main), + * util/install-info.c (main), + * makeinfo/makeinfo.c (print_version_info), + * info/info.c (main): Use PACKAGE and VERSION from Automake for + printing version number. + +Sat Apr 26 19:19:46 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (get_until_in_line): Do not expand if + executing_string. + Also, free temporary strings. + Also, untabify entire file. + + * doc/texinfo.texi: Many corrections from Arnold. + +Thu Apr 24 16:31:09 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/multi.c (draw_horizontal_separator): Account for indent + here also. From Ulrich. + +Wed Apr 23 15:15:34 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (cm_today): Use time_t instead of long; + everyone else does. + (LOCALTIME_CAST): Remove kludge, we'll always use time_t now. + + * info/Makefile.am (ginfo_SOURCES): Remove general.h, that got + merged into system.h. + +Mon Apr 21 17:13:25 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/multi.c (output_multitable_row): Account for + column_indent, both the global one and for each column. + (setup_multitable_parameters): Account for column_indent in the table + width in the columnfrac case, but don't bother with the template + case for now. + +Sun Apr 20 16:32:00 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (output_stream): Remove redundant + definition; it's in makeinfo.h, + and a vaxstation-ultrix4.3 fails to link because of the two defns. + From: Anders Olofsson <anders@kid025.ericsson.se>. + + * makeinfo/makeinfo.c (expansion): Inhibit appending to the macro + expansion stream. + (get_until_in_line): Possibly expand the text. + Change caller in get_node_token to do the expansion, + all other calls to remain the same. + + * makeinfo/makeinfo.c (cm_node): No need to call strlen to check + for the empty string. + + * doc/texinfo.texi: Restore missing @c for initial comment. + +Fri Apr 18 17:41:36 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi: Mention that .info is unnecessary in the info + file name argument of an xref. + + * doc/texinfo.texi: Mention texi2dvi -t instead of embedding + @smallbook or @afourpaper in the document source. + +Sun Apr 13 15:19:08 1997 Karl Berry <karl@cs.umb.edu> + + * lib/system.h (_GNU_SOURCE): #define. + +Mon Apr 7 16:30:11 1997 Karl Berry <karl@cs.umb.edu> + + * doc/info.texi, + * doc/info-stnd.texi, + * doc/texinfo.texi: Do not make (dir) the previous ptr from the top node, + and tell people not to do that in the manual. + From: rmedina@kanojo.ivic.ve (Rodrigo Medina), + confirmed by rms. + +Fri Apr 4 16:30:33 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c: Move error page to top to avoid + prototypes, and do add prototypes for add_word_args and execute_string, + so we can use <stdarg.h>. + + * info/makedoc.c, + * info/nodemenu.c: Use %ld instead of %d for file offsets. + * makeinfo/makeinfo.c (delete_macro): Decrement macro_list_len. + (get_macro_args): Decrement line number if see \n. + * utils/texindex.c (indexify): Use fputs instead of fprintf + for constant string. + From: Eli Zaretskii <eliz@is.elta.co.il>. + +Thu Apr 3 17:40:52 1997 Karl Berry <karl@cs.umb.edu> + + * configure.in (AC_CHECK_HEADERS): No need to check for vararg.h + here, AC_FUNC_VPRINTF does it. + (AC_CHECK_FUNCS): Likewise for vsprintf and vfprintf. + * makeinfo/makeinfo.c (add_word_args, execute_string): Rewrite + like the error functions. + +Wed Apr 2 17:46:28 1997 Karl Berry <karl@cs.umb.edu> + + * configure.in: Add AC_FUNC_VPRINTF. + * makeinfo/makeinfo.c (error, line_error, warning): Rewrite a la + error.c from the *utils to use <stdarg.h> if available. + +Tue Apr 1 11:48:40 1997 Karl Berry <karl@cs.umb.edu> + + * doc/texinfo.texi: Tabs are a bad idea. + + * doc/userdoc.texi, + * doc/info.texi: Untabify. + +Sun Mar 30 17:36:47 1997 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (end_of_sentence_p): New function. + (add_char): Call it, instead of simply sentence_ender. + (post_sentence): New macro. + Also, remove some #include's now in system.h. + * lib/system.h [VMS]: #include <perror.h>, from makeinfo. + +Thu Mar 27 17:41:03 1997 Karl Berry <karl@cs.umb.edu> + + * info/search.c (skip_node_characters): Do not arbitrarily + strip trailing period from end of node name; this is valid. + +Mon Mar 24 16:44:42 1997 Karl Berry <karl@cs.umb.edu> + + * configure.in (AC_OUTPUT): Don't need to create stamp-h here, + tromey says AM_CONFIG_HEADER will do it. + + * info/Makefile.am, util/Makefile.am, makeinfo/Makefile.am (INCLUDES): + Don't need -I.. (for config.h) or -I$(srcdir), says tromey. + Automake includes those already. + +Fri Mar 14 15:05:17 1997 Karl Berry <karl@cs.umb.edu> + + * info/Makefile.am: Build as ginfo, install as info, + to avoid conflict with the standard info target. + + * lib/system.h: New file. + * makeinfo/makeinfo.c (strerror): Remove declaration, + include system.h, remove other redundant #if stuff. + * info/general.h: Include system.h instead of doing common stuff. + * util/install-info.c (my_strerror): Remove this, use strerror, + include system.h. + + * info/terminal.c (terminal_prep_terminal): Only use OCRNL and + ONLCR if they are defined. Reported by many people. + + * Installed: + + Sun Dec 1 19:23:54 1996 Karl Eichwalder <ke@ke.Central.DE> + + * configure.in (TERMLIBS): Add ncurses. + +Thu Mar 13 13:59:45 1997 Karl Berry <karl@cs.umb.edu> + + * lib/Makefile.am (libtxi_a_SOURCES): Add xstrdup.c. + * info/*.c: Use xstrdup instead of strdup everywhere. + + * info/tilde.c: Do not include clib.h, move stdlib.h include to + * info/general.h: here. + + * configure.in (AC_CONFIG_HEADER): Use this, + to avoid hugely long compile line with all the -D's. + * info/general.h: Include <config.h>. + + * emacs/Makefile.am (install, install-data): Do @echo + to tell the user to compile/install the elisp manually. + + * configure.in (AC_REPLACE_FUNCS): Move strerror check to here. + (AC_CHECK_FUNCS): From here. + + * lib/strerror.c: New file, from enscript (et al.) distribution. + +Tue Mar 11 16:36:25 1997 Karl Berry <karl@cs.umb.edu> + + * info/Makefile.am (info_SOURCES): Add doc.c, dribble.c, infodoc.c. + (LDADD): Add @TERMLIBS@. + + * info/info.h: HANDLE_MAN_PAGES, NAMED_FUNCTIONS: Define these. + + * info/filesys.h: Spurious ! when DEFAULT_INFOPATH is not defined. + + * configure.in (AC_OUTPUT): Do lib first and doc last. + + * info/echo-area.c, + * info/echo-area.h, + * info/info.h: Rename echo_area to echo-area. + +Mon Mar 10 17:59:05 1997 Karl Berry <karl@cs.umb.edu> + + * */Makefile.am: Write Makefile.am files for Automake. + * doc: New subdirectory, move all manuals and texinfo.tex there. + * AUTHORS, THANKS, config.guess, config.sub, mkinstalldirs: New files, + required by Automake. + * lib/xmalloc.c: Move from info/. + +Fri Oct 4 07:49:49 1996 Karl Berry <karl@cs.umb.edu> + + * Version 3.9. + + * Makefile.in (install): Say to install texinfo.tex manually. + + * util/texi2dvi, + * util/texindex.c, + * makeinfo/makeinfo.c, + * info/info.c: Include only the current year in the copyright message. + + * util/texi2dvi: Exit successfully. + From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>. + +Thu Oct 3 12:58:32 1996 Karl Berry <karl@cs.umb.edu> + + * Rename install.sh to the preferred install-sh. + + * Makefile.in (VERSION), + * util/texi2dvi, + * util/texindex.c, + * util/install-info.c, + * makeinfo/makeinfo.c (minor_version, print_version_info), + * info/info.c: Update version number. + + * util/texi2dvi: Only show diff if verbose. + + * util/install-info.c (main): Check for a missing dir file as well + as a missing info files. + (main): At start of a node, completely initialize the newly-malloced + node structure. + + * texinfo.texi: Fix incorrect uses of @key, + insert missing newline in Installing Dir Entries' @menu item, + document install-info invocation. + + * Makefile.in (DISTFILES): Do not put .gdbinit's in distribution. + (dist): Use || instead of && (and invert sense) so make doesn't think + the command failed. + (dist): Exclude more junk. + + * makeinfo/makeinfo.c (cm_xref): Back out patch from Tom T., since + we generate a good-enough error message that is suppressible + without it. + + * util/gen-dir-node: The recommended name for the top-level info + file is dir, not dir.info. + + * util/install-info.c (main): At `Mark the end of the Top node', + make sure the node name is non-NULL before comparing it. From + lvirden@cas.org. + + * configure.in (AC_REPLACE_FUNCS): Use this for memcpy, memmove, + and strdup. + (AC_CHECK_FUNCS): Instead of this. + Because both bcopy and memmove are missing on the 3b2, as reported by + Gaylen Miller <gaylen@proaxis.com>, hence we must provide our own. + * libtxi/Makefile.in (LIBOBJS): New variable. + (OBJS): Include it. + * libtxi/memcpy.c, libtxi/memmove.c, libtxi/strdup.c: New files, + taken from fileutils 3.13. + * makeinfo/makeinfo.c, + * info/clib.c (strdup): Move to libtxi. + +Wed Oct 2 18:23:30 1996 Karl Berry <karl@cs.umb.edu> + + * info/info-utils.h (memcpy) [!HAVE_MEMCPY], + * info/termdep.h (memcpy) [!HAVE_MEMCPY], + * makeinfo/makeinfo.c (memmove) [!HAVE_MEMMOVE]: Remove this + #ifdef, as we now include it in libtxi if missing. + +Tue Oct 1 17:41:52 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/Makefile.in (install), + * info/Makefile.in (install), + * Makefile.in (install): Use new option name --info-dir instead of + --infodir. + + * makeinfo/multi.c (out_char): New fn. Replace all calls to + putc/fprintf with calls to this. + + * util/install-info.c: Rename --infodir to info-dir. + +Mon Sep 30 10:07:21 1996 Karl Berry <karl@cs.umb.edu> + + * Version 3.8. + + * texinfo.tex: Untabify. + + * texinfo.tex (\ptexl, \ptexL): Do not save, we have our own + commands now. + (\onepageout): Reformat for readability, and call \indexdummies + to avoid expansion of Texinfo commands (e.g., accents) in \write's. + (\,, \dotaccent, \ringaccent, \tieaccent, \ubaraccent, udotaccent, + \questiondown, \exclamdown, \dotless): New macros. + (\l): Let plain TeX definition remain, instead of switching + to ``lisp'' font. + (\multitable): Ensure space between the columns, + insert struts to make interline spacing constant, + use real strut instead of a box containing `Xy'. + (\indexdummies): Do not define \rm, \char, but + do define \@, \{, \}, \dotless, and \,. And \t should generate + \t, not \r. + (\indexnofonts): Define \, and \dotless as \indexdummyfont, + and let \@ be @. + (\doind): Reformat for readability, and use temp control sequence + names that actually make sense. + (\doublecolumnout, \pagesofar, \enddoublecolumns): Restore + Knuth's original code to avoid spurious overfull vbox messages. + (No boxes are actually overfull). + (\shortcontents): Do not allow hyphenations. + (\dochapentry, \tocentry): Make glue above and below flexible, to allow + better page breaks. + (\tex): Reset \, to its plain TeX meaning, + and do not reset \l. + + * COPYING: Update for new FSF address (from gcc dist). + + * libtxi/Makefile.in: Various simplifications. + +Sun Sep 29 12:58:44 1996 Karl Berry <karl@cs.umb.edu> + + * util/texi2dvi: Use $progname instead of $0 for --version. + + * util/install-info.c (xmalloc, xrealloc): Declare malloc and + realloc as returning void *, + to avoid ptr/int problems on Digital Unix. + + * info/tilde.c (tilde_expand_word): Declare getenv as returning char *, + to avoid warning on Digital Unix. + + * makeinfo/multi.c (multitable_active): Declare extern here to + avoid ld warning on rs6000. + + * util/texindex.c (usage): Avoid ??' trigraph. + + * util/install-info.c: Include <sys/fcntl.h> or <fnctl.h>, + according to HAVE_SYS_FCNTL_H, + and only include <sys/file.h> if HAVE_SYS_FILE_H. + (readlines): Oops, had NULL's and 0's reversed for ptr/int members. + + * info/terminal.c (terminal_goto_xy): Remove spurious extra ;. + + * util/install-info.c: Untabify. (input_sections): Initialize. + (find_lines): Initialize the terminating element of the array. + (print_help): Document --infodir. + (main): Compare the basename of infile sans .info to the dir entry, + not infile itself. + * util/Makefile.in (clean): Remove the install-info binary. + + * info/Makefile.in (distclean): Remove *.info* files. + + * Makefile.in (install), + * info/Makefile.in (install), + * makeinfo/Makefile.in (install): Use --infodir instead of --info-file. + + * info/info.c, + * makeinfo/makeinfo.c: Avoid newlines in string constants for the + sake of SunOS cc. + + * makeinfo/multi.c: Do not assume ANSI C. + + * info/info.texi: Oops, need @end vtable for a @vtable. + +Sat Sep 28 16:31:28 1996 Karl Berry <karl@cs.umb.edu> + + * Makefile.in (texinfo): Do not depend on sub-all, as then + makeinfo is always run. Instead, depend on texinfo.texi. + + * makeinfo/Makefile.in (info, dvi): New targets. + makeinfo.info, makeinfo.dvi: Do not depend on macro.texi for now. + + * info/Makefile.in (install): Must call install-info twice. + + * info/info-stnd.texi, + * info/info.texi, + * makeinfo/makeinfo.texi: Include direntry. + + * emacs/Makefile.in: Use && after cd, etc. + + * texinfo.texi: Kludges so makeinfo -E will not create spurious + differences. Add new direntries. + + * util/install-info.c, + * util/texindex.c, + * makeinfo/makeinfo.c, + * info/info.c: Standardize --version output. + + * makeinfo/makeinfo.c (defun_internal): Don't insert index command + if expanding macros. + (cm_footnotestyle): Don't change the footnote style if it was set + on the command line. + + * util/texi2dvi: Recompute original index files each time through loop. + Make indentation uniform. + Use same basename for the temp input files. + Standardize --version output. + + * info/Makefile.in (install), + * makeinfo/Makefile.in (install): Insert $(POST_INSTALL). + +Fri Sep 27 13:27:30 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.texi (Format with texi2dvi): Rewrite now that the script + runs in a loop. + + * info/Makefile.in (MAKEINFO): Simplify to ../makeinfo/makeinfo. + +Fri Sep 27 00:26:03 1996 Miles Bader <miles@gnu.ai.mit.edu> + + * info/terminal.c [HAVE_TERMIOS_H] (terminal_prep_terminal, + terminal_unprep_terminal): Add code for termios. + [HAVE_TERMIOS_H] (original_termios, ttybuff): New variables. + * info/termdep.h: [HAVE_TERMIOS_H]: Add include of <termios.h>. + * configure.in: Add check for <termios.h>. + +Thu Sep 26 10:46:34 1996 Karl Berry <karl@cs.umb.edu> + + * emacs/texnfo-upd.el, + * emacs/texinfo.el, + * emacs/texinfmt.el: Update from bob for new Texinfo commands, etc. + + * emacs/info.el, emacs/informat.el, emacs/makeinfo.el, + emacs/texnfo-tex.el: Update from Emacs 19.34 dist. + + * emacs/elisp-comp: Use TMPDIR if set. + + * util/Makefile.in (libdir): Remove. + + * makeinfo/Makefile.in (install), + * Makefile.in (install), + * info/Makefile.in (install): Run install-info. + (libdir): Remove. + + * texinfo.texi: Various fixes as I make this go through TeX. + + * util/install-info.c: Quote newlines in help message. + + * util/texi2dvi (texi2dvi): Run TeX until the aux/index files + stabilize, instead of just twice. From: David Shaw + <daves@gsms01.alcatel.com.au>. + +Tue Sep 24 14:43:03 1996 Karl Berry <karl@cs.umb.edu> + + * dir: Blank dir file for installation on new systems. + +Mon Sep 23 12:18:43 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (args_from_string): Do not back up at a }; + that leads to an infinite loop. + +Sat Sep 21 17:48:04 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (cm_xref): Do not seg fault if outside of + any node. From: Tom Tromey <tromey@creche.cygnus.com>. + (cm_ctrl): Make obsolete. + +Tue Sep 17 13:30:08 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\inforef): Move to more appropriate place. + (\pounds): Remove spurious extra $. + (\email): Typeset argument in angle brackets. + (\macro): Use \doignore for robustness, instead of just letting TeX + parse the argument. + (\unmacro): Define. + +Sat Sep 14 16:17:35 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.texi: Document multitables, new ISBN number. + +Wed Sep 11 18:01:24 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/multi.c (struct env): Remove unused output_position + field; this needs to be global. + (setup_multitable_parameters): Implement template-defined multitables. + (output_multitable_row): Remove trailing whitespace. + + * makeinfo/makeinfo.c (_READ_BUFFER_GROWTH, struct _defines): + Remove leading underscore for POSIX/ANSI pedants. + (init_conversion): Initialize output_position here. + (init_paragraph): Instead of here, where it loses with the + multitable calls, eventually resulting in negative counts to the + write call when the output file is split. + + * texinfo.texi: First cut at macro documentation. + Change accent doc to use tables. + Remove whitespace experiments, they are now the default. + +Mon Sep 9 14:16:24 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c: Use putc instead of fprintf where possible. + (cm_accent): Put _ from @ubaraccent after argument. + + * util/texindex.c (strerror) [!strerror]: Conditionalize + declaration. + +Sat Sep 7 14:13:24 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (commandTable): Obsolete @setchapterstyle. + +Thu Sep 5 15:45:11 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (convert_from_loaded_file): Oops, fix + wording of initial output comment. + + * makeinfo/makeinfo.c (cm_angle_brackets): Rename from cm_key. + (commandTable): @email should produce angle brackets. + @key: Change name. + +Tue Sep 3 14:52:17 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\hsize): Decrease. + (\hoffset): Increase. + (\setleading): Decrease dramatically. + This change affects 8.5x11 format only. + + * texinfo.texi: Document accent commands. + +Mon Sep 2 11:10:49 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (commandTable): Deprecate @ichapter and + @titlespec. + Move all the deprecated @i<section> commands to the end of the list. + + * texinfo.texi: Document @pounds{} and @centerchap{}. + + * texinfo.tex (\centerchfplain): Rewrite to use \chfplain, and to + actually center. + (\unnchfplain): Just call \chfplain. + (\chfplain): Rewrite to be generally callable. + (\centerparametersmaybe): Hook, a no-op except with @centerchap. + +Sun Sep 1 15:01:49 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.texi: Document @<whitespace>, rearrange spacing section. + + * makeinfo.c (commandTable): Make @. @? @! insert themselves, + not be sentence-non-enders. They are sentence *enders*. Also, + make @\t and @\n insert a normal space character, not themselves. + Also, define @hyphenation. + (insert_space): New function. + (cm_ignore_sentence_ender): Remove this. + (flush_output): Check only for META-SPC, not META-<sentence-ender>. + +Fri Aug 30 18:55:30 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.texi: Document @- and @hyphenation{}. + Miscellanous fixes. + + * makeinfo/makeinfo.c (commandTable): Define @- as cm_no_op, since + makeinfo doesn't do hyphenation. + +Thu Aug 29 13:05:38 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\key): Do not uppercase the argument; key names + can be mixed case, e.g., `Control'. + + * makeinfo/makeinfo.c: @infotop, @infounnumbered, + @infounnumberedsec, @infounnumberedsubsec, + @infounnumberedsubsubsec, @infoappendix, @infoappendixsec, + @infoappendixsubsec, @infoappendixsubsubsec, @infochapter, + @infosection, @infosubsection, @infosubsubsection: + Remove these long-since obsolete commands. + @iappendix, @iappendixsection, @iappendixsec, @iappendixsubsec, + @iappendixsubsubsec, @ichapter, @isection, @isubsection, + @isubsubsection, @iunnumbered, @iunnumberedsec, @iunnumberedsubsec, + @iunnumberedsubsubsec: + Deprecate these. + @infoinclude: + Obsolete this. + @,: Have to take an argument, since have to do @,{c} not c@,; can't + feasibly implement the latter in TeX. + + * makeinfo/makeinfo.c: Rename @d to @udotaccent, since this is + relatively infrequently used. + +Tue Aug 27 14:58:56 1996 Karl Berry <karl@cs.umb.edu> + + * info/info.c (print_short_help), + * util/install-info.c (print_help), + * util/texi2dvi, + * makeinfo/makeinfo.c (usage) Include bug reporting address. + +Mon Aug 26 15:27:17 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (commandTable): Remove @input, @medbreak, + @smallbreak, @overfullrule, @br. + +Sun Aug 25 17:25:48 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (commandTable): Unify commands that perform + the same operation, such as cm_file, cm_samp, cm_email, + etc., which all do cm_code. + + * texinfo.texi: Document @ifhtml ... @end ifhtml. Change + `PlainTeX' to `plain TeX'. + +Fri Aug 23 16:03:16 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\pounds): New Texinfo command @pounds{}. + (\parskip): New smaller value. + (\chapheadingskip, \secheadingskip, \subsecheadingskip): New smaller + values, both for 8.5x11 and @smallbook formats. From Bob. + + * makeinfo/makeinfo.c (cm_special_char): @pounds{} prints a #. + (commandTable): Add new command @pounds. + +Tue Aug 20 13:47:20 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (CommandTable): Restore "!", accidentally + removed previously. + + * texinfo.tex (\key): Typeset a lozenge around the argument (from + gildea@intouchsys.com). + * makeinfo/makeinfo.c (cm_key): Surround arg with <...> to match + new lozenge style in TeX. + +Wed Aug 14 16:59:23 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.texi: Propagate change from rms. + +Tue Aug 13 11:33:27 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.texi: Propagate change from rms. + + * texinfo.texi: Document other @headings options. + +Sun Aug 11 13:19:42 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (cm_accent, cm_special_char, cm_dotless): + New functions. + (CommandTable): Add new commands for all of plain.tex's + accents and non-English characters. + +Fri Aug 9 14:12:07 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (convert_from_loaded_file): Say we're making + ``text'' file if no_headers. Also, use `input_filename' instead + of just `name' for clarity. + (suffixes): Check for no suffix last, i.e., prefer `foo.texi' as an + input file to `foo'. (The latter is probably a binary.) + +Mon Aug 5 13:52:39 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\heading, \subheading, \subsubheading): Can no + longer call the nonexistent \*secheadingi series. Instead, call + \plain*secheading. + (\plainsubsecheading, \plainsubsubsecheading): New macros, by analogy + with \plainsecheading. + (\unnumberedsubseczzz, \unnumberedsubsubseczzz): Call them. + +Sun Aug 4 16:46:10 1996 Karl Berry <karl@cs.umb.edu> + + * makeinfo/makeinfo.c (flush_output): Mask out eighth bit, that we + turned on in non-sentence enders. + +Sat Aug 3 14:03:10 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\HEADINGSdouble, \HEADINGSsingle, + HEADINGSdoubleafter, \HEADINGSsingleafter, \CHAPPAGoff, + \CHAPPAGon, \CHAPPAGodd): Set \contentsalignmacro, analogous to + \pagealignmacro. + (\startcontents): Call \contentsalignmacro instead of \pagealignmacro. + +Mon Jul 29 14:44:33 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\indexfonts): Make leading be 12pt. Otherwise, it's + too crammed. + (\smalllispx): Remove \setleading{10pt}. That was too small. + (\doprintindex): Do not call \tex ... \Etex. Index files are Texinfo + source, not TeX source, except for using \ instead of @ as the + escape character (for now). + +Sun Jul 28 13:37:05 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (paragraphindent): Move to more reasonable place in + the source file. + (chapfonts, secfonts, subsecfonts, indexfonts): Call \setleading. + (\chfplain, \secheading, \plainsecheading, \subsecheading, + \subsubheading): Rewrite to properly \hangindent the title. + (\sectionheading): New generic macro to print section titles. + + * texinfo.texi: Update the `Obtaining TeX' node. + +Fri Jul 26 14:11:48 1996 Karl Berry <karl@cs.umb.edu> + + * util/texi2dvi: Do macro expansion with makeinfo before running TeX. + Various expansion safety measures added for test; avoid use of -o. + + * makeinfo/makeinfo.c (usage): More usage message tweaks. + +Fri Jul 26 11:55:37 1996 Karl Berry <karl@laurie> + + * util/texi2dvi: Format usage message to conform to the other *utils. + +Thu Jul 25 17:05:47 1996 Karl Berry <karl@cs.umb.edu> + + * emacs/Makefile.in: Do not compile the Elisp by default. We + don't install it, so it confuses people to compile it. + +Sun Jul 21 07:20:09 1996 Karl Berry <karl@cs.umb.edu> + + * util/Makefile.in (install-info): Dependency should be + install-info.o, not install-info. Also, update copyright years. + + * makeinfo/makeinfo.c (cm_printindex): Don't call execute_string + to print index entries, we've already done the expansion now. + + * makeinfo/makeinfo.h: Add copyright. Finish merge of rms changes. + * makeinfo/makeinfo.c: Finish merge, add my expansion changes again. + * makeinfo/multi.c: Add copyright message. + +Fri Jul 19 10:35:22 1996 Karl Berry <karl@cs.umb.edu> + + * info/info.c: Update copyright date. + + * info/info.texi, + * util/install-info.c, + * emacs/Makefile.in, + * emacs/texnfo-tex.el, + * emacs/Makefile.in: Change FSF address. + + * Merged changes from bfox -- below, plus multitable changes, plus + lots more. + + Sun Apr 14 08:49:50 1996 Brian J. Fox <bfox@nirvana.samsara.com> + + * makeinfo/makeinfo.c (remember_node_reference): Numerous commands + call remember_node_reference. If a node has not yet been defined, + use the empty string as the current node for those cases. + + Mon Feb 12 17:35:38 1996 Brian J. Fox <bfox@nirvana.samsara.com> + + * makeinfo/makeinfo.c (push_node_filename): Clean up calls to + xmalloc and xrealloc. Only have to call xrealloc. + + Fri Jan 26 08:00:38 1996 Brian J. Fox <bfox@nirvana.samsara.com> + + * info/session.c (info_input_buffer_space_available): Fix typo + which forced the limitation of the sizeof (int) instead of sizeof + (buffer). + + * Makefile.in (PACKVER): now at 3.8. Add TERMIOS support to + Info. Minor bugs fixed in Makeinfo. + +Sat Jul 13 11:58:57 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.texi (ftable vtable): Mention example. + +Sun Jun 30 14:59:51 1996 Karl Berry <karl@goldman.gnu.ai.mit.edu> + + * makeinfo/makeinfo.c (cm_email): New function for new @email command. + * texinfo.texi (email): New node documenting it. + +Wed Apr 17 18:07:34 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * makeinfo/makeinfo.c (cm_kbd): Do nothing if in @example or @code. + (struct brace_element): New field in_fixed_with_font. + (remember_brace_1): Save in_fixed_with_font. + (pop_and_call_brace): Restore in_fixed_with_font. + (cm_code): Don't decrement in_fixed_with_font at end of construct. + (struct istack_elt): New field in_fixed_with_font. + (push_insertion, pop_insertion): Save and restore in_fixed_with_font. + (end_insertion): Don't decrement in_fixed_with_font here. + (not_fixed_width): New function. + (cm_sc, cm_var, cm_italic, cm_roman, cm_titlefont): + Use not_fixed_width. + +Sat Apr 13 23:22:05 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * util/install-info.c (main): Fatal error if no input file spec'd. + Look for START-INFO-DIR-ENTRY, not BEGIN-INFO-DIR-ENTRY. + +Thu Apr 11 18:21:50 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * makeinfo/makeinfo.c (cm_enddots): New function. + (self_delimiting): Accept -, ^ and ". + (CommandTable): Add commands -, ^, ", enddots, centerchap. + +Sun Mar 24 12:18:32 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * makeinfo/makeinfo.c (enum insertion_type): Add `direntry'. + (insertion_type_names): Add "direntry". + (cm_dircategory): New function. + (cm_direntry): New function. + (CommandTable): Add "dircategory" and "direntry". + (insert_string): New function. + (end_insertion): Handle direntry. + (begin_insertion): Handle direntry. + +Sun Mar 24 11:10:05 1996 Karl Berry <karl@spiff.gnu.ai.mit.edu> + + * makeinfo/makeinfo.c (cm_url): New function for new @url command. + +Fri Feb 23 21:14:40 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * info/Makefile.in (install, uninstall): Use manprefix. + +Fri Feb 23 19:50:18 1996 Richard Stallman <rms@whiz-bang.gnu.ai.mit.edu> + + * util/Makefile.in (install-info, install-info.o): New targets. + (all): Depend on install-info. + (install, uninstall): Operate on install-info. + + * install-info.c: New file. + +Wed Jan 3 10:01:45 1996 Brian J. Fox <bfox@nirvana.datawave.net> + + * makeinfo/makeinfo.c (make_index_entries_unique): Be a little bit + stricter about what makes two index entries identical. + +Fri Dec 29 13:00:24 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * makeinfo/makeinfo.c (Whole File): Add @detailmenu for allowing + detailed menu listings to appear while still defaulting nodes. + +Wed Dec 27 13:54:30 1995 Brian Fox <bfox@albert.gnu.ai.mit.edu> + + * makeinfo/makeinfo.c (cm_code): Always notice that we are in + fixed_width_font, even if other formatting changes are not to take + place. + +Sat Dec 23 11:48:43 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * info/man.c: (clean_manpage) Remove ^L's from page. + + * makeinfo/makeinfo.c (get_brace_args): Change some memcpy's to + memmoves. + + * info/info.c (main): Prefer caseless matches over partial + matches. + + * Makefile.in (All Subdir Targets): Change suggested by Debian + people which allows errors in recursive makes to kill the + top-level make. + + * makeinfo/Makefile.in (makeinfo.dvi): New target. + + * info/info.c (main): Print version of containing texinfo package. + + * makeinfo/makeinfo.c (flush_output): Don't strip high-bit from + sentence_enders. + Print the version number of the containing texinfo package. + + * info/man.c (locate_manpage_xref): Count the 0th entry. + + * makeinfo/makeinfo.c (cm_menu): If a menu is seen before a node + has been defined, warn, and create the node `Top'. + +Wed Jun 21 03:19:39 1995 Brian Fox <bfox@albert.gnu.ai.mit.edu> + + * makeinfo/makeinfo.c (cm_infoinclude): Clean up after printing + error if the file couldn't be included. + (discard_braces): Print errors only for those unmatched open + braces that belong to a texinfo command. + + * */Makefile.in: Use @CFLAGS@ and @LDFLAGS@. + + * makeinfo/makeinfo.c: End `node_search_string' and friends with a + terminating null character. + +Wed Jun 21 01:23:49 1995 Jim Meyering (meyering@comco.com) + + * makeinfo/makeinfo.c: Close comment after #endif. + +Tue Jun 20 04:58:26 1995 Brian Fox <bfox@albert.gnu.ai.mit.edu> + + * emacs/Makefile.in (install): Fix typo: "fle" -> "file". + + * Makefile.in (VERSION): Bump to 3.6 + + * info/clib.c: Include general.h for `info_toupper' and friends. + + * info/clib.h: strncmp and strncascmp return an int. What kind of + drugs was I on? + +Mon Jun 19 23:34:47 1995 Brian Fox <bfox@albert.gnu.ai.mit.edu> + + * makeinfo/makeinfo.c (make_index_entries_unique): Copy the last + index entry. + +Mon Jun 19 21:55:49 1995 Noah Friedman <friedman@prep.ai.mit.edu> + + * util/texi2dvi (--version): New option. + Cosmetic changes. + +Mon Jun 19 16:06:40 1995 Brian Fox <bfox@albert.gnu.ai.mit.edu> + + * makeinfo/makeinfo.c (cm_macro): Fix typo. `x != y' is not the + same as `x |= y'. + + * info/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix). + * makeinfo/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix). + * util/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix). + * libtxi/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix). + + * emacs/Makefile.in (uninstall): New target. + (install): Use the definition of $(lispdir), don't dynamically + find it. Use INSTALL_DATA not cp. + (exec_prefix): use @exec_prefix@ not $(prefix). + + * makeinfo/makeinfo.c (apply): If there isn't an actual argument + for a named argument, default it to "". + + * Makefile.in (VERSION): Now at 3.5. + (texinfo): Make ./makeinfo/makeinfo depend on sub-all for parallel + makes. + + * emacs/Makefile.in (ELISP_OBJS): Explictly declare .el and .elc + in the SUFFIXES list. + + * makeinfo/makeinfo.c (cm_today): Special case for losing alpha. + * (minor_version): Increase to 63. + + * info/info.c (version_string): Now at 2.14. + * info/tilde.c: Declare getenv to return (char *). + * info/window.c (build_message_buffer): Jump through hoops to keep + DEC Alpha's happy. + + * info/xmalloc.c: Declare malloc and realloc as (void *) returning + functions. + +Sun Jun 18 12:47:21 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * emacs/detexinfo.el (detexinfo-line-cmds-without-arg): + Handle ifhtml. + +Fri Jun 16 13:48:14 1995 Brian Fox <bfox@albert.gnu.ai.mit.edu> + + * util/texindex.c: Update TEXINDEX_VERSION_STRING for texinfo 3.4 + + * (All *.c *.h *.in): Change FSF old address to new. + * texinfo.texi (Obtaining TeX): Change FSF old address to new + address. Change Old phone numbers to new phone numbers. + + * Makefile.in (VERSION): Change to 3.4. + +Thu Jun 15 22:49:07 1995 Robert J. Chassell <bob@hill.gnu.ai.mit.edu> + + * texinfo.texi, emacs/=development/cover.texi: update + Texinfo distribution package version number + +Thu Jun 15 09:23:02 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * info/info.c: (minor_version): Set to 13. + + * info/clib.c,h: New files gather together replacement functions + for those POSIX-style C library functions that are not present on + the target system. + + * info/Makefile.in (SRCS): Add clib.c and clib.h. makedoc now + needs clib.o to build on systems missing various string.h stuff. + + * info/variables.c (whole file): Call strdup, not savestring. + * info/tilde.c (whole file): Call strdup, not savestring. + * info/search.c (whole file): Call strdup, not savestring. + * info/nodes.c (whole file): Call strdup, not savestring. + * info/nodemenu.c (whole file): Call strdup, not savestring. + * info/man.c (whole file): Call strdup, not savestring. + * info/makedoc.c (whole file): Call strdup, not savestring. + * info/m-x.c (whole file): Call strdup, not savestring. + * info/info.c (whole file): Call strdup, not savestring. + * info/indices.c (whole file): Call strdup, not savestring. + * info/echo_area.c (whole file): Call strdup, not savestring. + * info/session.c (whole file): Call strdup, not savestring. + * info/filesys.c (whole file): Call strdup, not savestring. + + * makeinfo/makeinfo.c (minor_version): Change to 1.62. + * makeinfo/makeinfo.c (get_execution_string): Initialize `i' to 0 + in case there are no execution_strings. + +Wed Jun 14 17:48:06 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * texinfo.texi: include "texinfo.tex", not "texinfo". + * info/session.c (forget_window_and_nodes): Place a sequence point + in between "info_windows[i] = info_windows[++i];" as per various + compiler experts. + + * makeinfo/makeinfo.c (strdup): Create this function if the system + doesn't have it. + (discard_insertions): Use the insertion's filename, not the + current input file. + (push_insertion): Remember the current input file with each + insertion. + (pop_insertion): Free storage used by remembered input file. + + * makeinfo/makeinfo.c (whole file): Use `strdup' instead of + `savestring'. + * configure.in: Check for `strdup'. + +Wed Jun 14 15:58:51 1995 Brian Fox <bfox@albert.gnu.ai.mit.edu> + + * libtxi/Makefile.in (prefix): Use @prefix@, not /usr/local/ + +Wed Jun 14 10:50:57 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * Makefile.in (DISTFILES): Don't include *.elc files in the list + of files to distribute. + (installdirs): Include `emacs' in the list of sub-dirs with + Makefile.in's. + + * emacs/elisp-comp: Shell script which batch compiles the *.el files. + * emacs/Makefile.in: New file contains targets to build the elc files. + * configure.in: Add `emacs/Makefile' to the list of created makefiles. + * makeinfo/makeinfo.c (whole file): Give every function a return + type. All cm_xxx functions are now void. Add declarations for + functions to top of file. + +Mon Jun 12 12:00:57 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * info/man.c (reference_section_starters): Add versions of "SEE + ALSO" and "RELATED INFORMATION" with tabs instead of spaces as + well. + + * util/texindex.c: Back out changes for OFF_T. Explicity coerce + the result of lseek to a long, and use longs everywhere. + + * texinfo.texi: Change "@end shorttitlepage" to "@end titlepage". + * makeinfo/makeinfo.c: Make @shorttitlepage ignore the rest of the + line. + + * util/texindex.c (strrchr): Create if not present. + Test for HAVE_STRCHR and HAVE_STRING_H. + (main): Make PROGRAM_NAME be just the last path componenet of argv[0]. + (decode_command): Rewrite. + (usage): Rewrite. Now texindex handles --version. + + * makeinfo/makeinfo.c (make_index_entries_unique): Rewrite from + scratch. + + * Don't distribute created info files with texinfo. After all, + the user will have the tools necessary to create them, yes? + + * Makefile.in (distclean): Remove *.log + + * info/man.c (read_from_fd): Change timeout value for select to 15 + seconds. Some systems (e.g., albert.ai.mit.edu) actually need + more than 10 seconds to format a man page. + + * info/tilde.c: Fix typo in declaration for + `tilde_expansion_failure_hook'. + +Wed Jun 7 13:36:53 1995 Brian Fox <bfox@albert.gnu.ai.mit.edu> + + * info/tilde.h: Change type of tilde_expansion_failure_hook to + a pointer to a function returning a (char *). + * info/tilde.c: Change type of tilde_expansion_failure_hook to a + pointer to function returning a (char *). + + * makeinfo/makeinfo.c (get_execution_string): Don't use `i' in the + latter assignment, use `execution_strings_index' instead. + + * info/man.c (read_from_fd): Change logic to avoid using FIONREAD. + + * info/xmalloc.c (xrealloc): Use (void *), not (caddr_t *). + * info/xmalloc.c (xmalloc): Use (void *), not (caddr_t *). + + * Makefile.in (DISTFILES): Don't find RCS no "=" directories. + + * util/Makefile.in (prefix): Use @prefix@ as the value. + * info/Makefile.in (prefix): Use @prefix@ as the value. + * makeinfo/Makefile.in (prefix): Use @prefix@ as the value. + +Wed Jun 7 12:29:28 1995 Robert J. Chassell <bob@hill.gnu.ai.mit.edu> + + * texinfo.texi: Correct minor typos. + + * emacs/texinfmt.el: Don't require @shorttitlepage to be inside + of @iftex ... @end iftex + +Mon May 8 18:33:52 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * info/nodes.c: #include "man.h" if HANDLE_MAN_PAGES. + (info_get_node_of_file_buffer): If the file buffer is one + associated with manpages, call the manpage node finding + function instead. + (info_find_file_internal): If the file buffer is one associated + with manpages, avoid doing any file I/O. + (info_reload_file_buffer_contents): Ditto. + (info_find_file_internal): Call create_manpage_file_buffer instead + of info_load_file_internal. + + * info/info.c: #include "man.h" if HANDLE_MAN_PAGES. + (main): If the initial node cannot be found, perhaps find it as a + manpage. + * info/info-utils.c: #include "man.h" if HANDLE_MAN_PAGES. + (info_xrefs_of_node): If handling man pages, and this is a manpage + node, use xrefs_of_manpage. + + * info/session.c (info_set_input_from_file): Only fclose (stream) + if it is non-null and not stdin. + #include "man.h" if HANDLE_MAN_PAGES. + (info_menu_or_ref_item): If handling man pages, and this is a + manpage node, get the xrefs from manpage_xrefs_in_binding. + (info_man): Compile in for M-x man if handling man pages. + (info_move_to_xref): If handling man pages, and the current node + is a manpage node, use locate_manpage_xref to get xrefs. + +Thu May 4 08:55:23 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * info/info.c (main): If the output device is not a terminal, and + no output filename has been specified, make user_output_filename + be "-", so that the info is written to stdout, and turn on the + dumping of subnodes. + +Thu Apr 13 18:05:06 1995 Daniel Hagerty <hag@churchy.gnu.ai.mit.edu> + + * texinfo.texi: Fixed @end titlepage/@end shorttitlepage + +Sat Apr 8 12:51:49 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> + + * makeinfo/makeinfo.c [! HAVE_STRERROR] (strerror): New function, + snarfed from ../info/filesys.c. + (cm_infoinclude): Use strerror instead of sys_errlist. + +Tue Apr 4 18:44:00 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * util/texindex.c (sort_offline): Change TOTAL to be an off_t. + * util/texindex.c (sort_in_core): Change TOTAL to be an off_t. + * util/texindex.c (MAX_IN_CORE_SORT): Cast to off_t. + +Sun Apr 2 16:20:13 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * info/Makefile.in: Define DEFAULT_INFOPATH in case we are + compiling in the current directory. + * info/Makefile.in (info.o): Add filesys.h because of DEFAULT_INFOPATH. + * info/(search.c,h, nodes.c info-utils.c) Use strcasecmp and + strncasecmp instead of stricmp and strnicmp. Define strcasecmp + and strncasecmp in search.c if !HAVE_STRCASECMP. + * info/search.c: If HAVE_STRING_H include it. + * info/nodes.c: If HAVE_STRING_H include it. + * info/info-utils.c: If HAVE_STRING_H include it. + * info/info.h: If HAVE_STRING_H include it. + * configure.in (AC_HAVE_FUNCS): Check for strcasecmp. + * makeinfo/makeinfo.c (strcasecmp): Define if !HAVE_STRCASECMP. + * makeinfo/makeinfo.c (entire file): Use `strcasecmp' instead of + `stricmp'. + * makeinfo/makeinfo.c (cm_ifeq): New command takes three args. + Compares first two, executes remainder if the first two are + string-wise eq. + * makeinfo/makeinfo.c (ifhtml): Add to command list. Shouldn't be + used, but it is by people who don't want to hack macros. + +Sat Apr 1 09:20:14 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * makeinfo/makeinfo.c (begin_insertion): Fix reversed arguments to + line_error. + + * info/info-stnd.texi: Use "end" footnote style instead of "separate". + + * info/Makefile.in: Change "rm -f" to $(RM). + + * info/general.h: Define zero_mem in terms of memset if we have + it, else in terms of bzero if we have that, else as inline code. + + * info/NEWS: Updated to reflect changes in 2.11. + +Fri Mar 31 22:38:31 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * Makefile (DISTFILES): Don't include *.a, *orig, nor *.e + files. + (DISTFILES): + +Sat Mar 4 12:16:29 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * Makefile.in: Use @prefix@ instead of hardwired `/usr/local'. + Clean up makefile rules which make in subdirs. + (ALL_SUBDIRS): Add makeinfo/macros to list of subdirectories. + + * configure.in (AC_CHECK_FUNCS): Add `bcopy' to list of things to + check for. + +Fri Mar 3 13:54:10 1995 Robert J. Chassell <bob@hill.gnu.ai.mit.edu> + + * texinfo.texi: Minor changes for incremental new edition 2.20. + +Fri Mar 3 19:01:36 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * filesys.c (filesys_read_info_file): Local variable ST_SIZE is a + long which has the value of finfo->st_size casted to it. + * nodes.c (whole file): Similar changes. + + These changes and the following for makedoc.c were required for + proper operation on HPm68k NetBSD. + +Mon Feb 27 15:16:27 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * makedoc.c (process_one_file): Local variable FILE_SIZE is a long + which has the value of finfo.st_size casted to it. + + +Fri Mar 3 18:58:38 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * makeinfo.c (find_and_load): Cast fileinfo.st_size to a long for + internal use. This makes things work on NetBSD. + + +Fri Mar 3 13:54:10 1995 Robert J. Chassell <bob@hill.gnu.ai.mit.edu> + + * texinfo.texi: Minor changes for incremental new edition 2.20. + +Fri Mar 3 09:41:39 1995 Brian J. Fox <bfox@wizard.datawave.net> + + * configure.in (TERMLIBS): Use AC_CHECK_LIB instead of + AC_HAVE_LIBRARY. + +Mon Jan 9 16:55:31 1995 Brian Fox <bfox@churchy.gnu.ai.mit.edu> + + * Makefile.in (DISTFILES): Add the directory EMACS-BACKUPS to the + list of things to avoid distributing. + +Tue Nov 29 17:48:37 1994 David J. MacKenzie <djm@duality.gnu.ai.mit.edu> + + * configure.in: Check for off_t. + * util/texindex.c (main): Use it. + +Fri Nov 11 14:46:28 1994 David J. MacKenzie <djm@duality.gnu.ai.mit.edu> + + * configure.in: Update for Autoconf v2. + +Thu Oct 13 02:17:38 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * emacs/detexinfo.el (detexinfo): Handle @!, @?, @^, @". + +Mon Aug 1 03:26:13 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texindex.c: Move the memset define down past string.h include. + +Tue Jun 28 14:21:43 1994 David J. MacKenzie (djm@churchy.gnu.ai.mit.edu) + + * makeinfo/makeinfo.c: Add --help option. + (usage): Take args for stream and error code. + Change callers. + (print_version_info): Write to stdout, not stderr. + +Wed May 18 18:55:24 1994 Brian J. Fox (bfox@ai.mit.edu) + + * info/session.c (forget_window_and_nodes): Negate test for + internal_info_node_p. We only want to free the text if it is + not an internal node. + +Thu Mar 10 03:07:18 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texindex.c (memset): Fix invalid parm name (was 0). + +Thu Feb 10 12:56:52 1994 Noah Friedman (friedman@prep.ai.mit.edu) + + * makeinfo/makeinfo.c (current_item_function): Don't loop if elt + is NULL. + +Wed Feb 9 12:21:09 1994 Brian J. Fox (bfox@ai.mit.edu) + + * makeinfo/makeinfo.c (minor_version): Release now at 1.60. + + * makeinfo/makeinfo.c (expand_filename): Additional fixes. Now + when called with NULL filename, makes an output filename from the + input filename. + (convert_from_loaded_file): If REQUIRE_SETFILENAME is #defined (no + longer the default case) then error if no @setfilename was found + in the file. If REQUIRE_SETFILENAME is not #defined, the input + file starts either at the first line, or at the second line if the + first line contains the text "\input", and the output filename is + the input file name without directory and with ".info" replacing + any extension found. + (convert_from_loaded_file): Fixed bug in search for first + occurence of "@setfilename". + +Tue Feb 8 14:16:58 1994 Noah Friedman (friedman@prep.ai.mit.edu) + + * configure.in: Check for sys/file.h. + info/dir.c, info/filesys.c, info/makedoc.c, info/nodes.c, + info/session.c, info/termdep.h, makeinfo/makeinfo.c + [HAVE_SYS_FILE_H]: Include <sys/file.h>. + + * makeinfo/makeinfo.c (convert_from_loaded_file): Print + real_output_filename instead of output_filename, so user knows + exactly where output file is going. + + Fri Jun 11 14:34:30 1993 Ian Lance Taylor (ian@cygnus.com) + * configure.in: Check for sigprocmask and sigsetmask. + * info/signals.h (HAVE_SIGSETMASK): Don't define. + (HAVE_SIGPROCMASK): Use instead of _POSIX_VERSION. + (BLOCK_SIGNAL, UNBLOCK_SIGNAL): If neither HAVE_SIGPROCMASK nor + HAVE_SIGSETMASK is defined, define these to do nothing. + * info/signals.c (sigprocmask): Don't compile if HAVE_SIGSETMASK + is not defined. + + * info/terminal.c (terminal_prep_terminal): Don't clobber VINTR + and VQUIT in conditionals. + +Mon Feb 7 18:10:22 1994 Brian J. Fox (bfox@ai.mit.edu) + + * makeinfo/makeinfo.c (full_pathname): Correct to really return + the full pathname of the input argument. Now makeinfo + /foo/bar.texi, where /foo/bar.texi contains "@setfilename + bar.info", correctly leaves the output file in "./bar.info". + Note that "@setfilename ../bar.info" still works; this is already + an absolute pathname. + +Sat Feb 5 13:04:05 1994 Brian J. Fox (bfox@ai.mit.edu) + + * makeinfo/makeinfo.c: Version 1.59 released. + + * makeinfo/makeinfo.c (whole file): Large number of changes allow + the "-E filename" option to be used to write a macro expanded + output file. On a file which contains no @include's and no + @macro's, the output file is identical to the input file. + + * makeinfo/makeinfo.c (declarations): Remove cm_tex (). It is + never used since it is implemented with `command_name_condition'. + + * makeinfo/makeinfo.c (add_char): Shift braces following the + current break point if we have deleted any characters. + (adjust_braces_following): New function adjusts all of the markers + in the brace stack which follow HERE by AMOUNT. This fixes a bug + where (for example) @var{} immediately following a line break + which is the end of a sentence modified the output incorrectly. + +Wed Feb 2 14:14:03 1994 Brian J. Fox (bfox@ai.mit.edu) + + * makeinfo: Version 1.58. + + * makeinfo/makeinfo.c (cm_node): Add extra hair to allow + backtracking through execution strings. Add extra hair to allow + the first node seen after a @top node is seen to adjust the + sectioning level of the @top node and associated menus. + Fix a few typos. + Add facility for macros to invoke the original definition. This + works by not allowing a single macro to recurse. Mutual recursion + is also disallowed with this plan. + + * makeinfo/macros: New directory contains shippable macros. + * makeinfo/macros/simpledoc.texi: Macros which simplify the most + common uses of TeXinfo. See the example file. + Macros are now a reasonable way to get people started using + TeXinfo. + +Mon Jan 31 12:54:36 1994 Brian J. Fox (bfox@ai.mit.edu) + + * makeinfo/makeinfo.c (minor_version): Increase to 57. + + * makeinfo/makeinfo.c (cm_node): Call execute_string on the node, + next, prev, and up pointers. + (reader_loop): Change logic for `@bye'. No longer required at the + ends of executed strings. + (execute_string): Do not append `@bye' to the string to execute. + + * makeinfo/makeinfo.c (whole file): Use COMMAND_PREFIX instead of + hardcoding `@' character in strings and searches. + + * makeinfo/makeinfo.c (read_command): If HAVE_MACROS is defined, + then recognize and execute macros here. + (CommandTable): Add "macro" and "unmacro" to table if HAVE_MACROS + is defined. + + * makeinfo/makeinfo.c (cm_macro, cm_unmacro, execute_macro) + makeinfo/makeinfo.c (get_macro_args, find_macro, add_macro) + makeinfo/makeinfo.c (delete_macro, array_len, apply): + New functions implement macro facility if HAVE_MACROS is + defined. + + * makeinfo/macro.texi (new file): Examples of using the new macro + facility. + +Mon Jan 31 10:24:52 1994 Noah Friedman (friedman@prep.ai.mit.edu) + + * makeinfo/makeinfo.c (executing_string): Restore global + declaration. + +Mon Jan 24 23:48:26 1994 Noah Friedman (friedman@prep.ai.mit.edu) + + * texinfo.texi: Various typo fixes from Bob Chassell + <bob@gnu.ai.mit.edu>. + +Thu Jan 6 13:34:21 1994 Noah Friedman (friedman@prep.ai.mit.edu) + + * texinfo.texi: Turned on smallbook format and @set smallbook. + +Wed Dec 15 20:08:43 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * info/filesys.h (DEFAULT_INFOPATH): Added /usr/local/info, + /opt/gnu/info, /usr/share/info, and /usr/local/share/info. + +Tue Dec 14 19:10:20 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * libtxi/Makefile.in (ALLOCA): Define from configure. + +Fri Dec 10 04:33:12 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * util/texi2dvi: Put under RCS control. + +Sun Dec 26 11:55:46 1993 Brian J. Fox (bfox@ai.mit.edu) + + * info/session.c (info_numeric_digit_arg_loop): Fix doc string. + + * info/infodoc.c (create_internal_info_help_node): Print out list + of functions which have to keystroke equivalent if we support + NAMED_FUNCTIONS. + + * info/filesys.c (compress_suffixes): Add ".gz" for "gunzip" to + alist. + + * info/footnotes.c (make_footnotes_node): If refs[i] doesn't have + a nodename, then it couldn't be a reference to a footnote. + + * info/nodemenu.c (get_visited_nodes): Handle the case where + filter_func has left no possible buffers to select. + +Sat Dec 25 10:35:56 1993 Brian J. Fox (bfox@ai.mit.edu) + + * info/infodoc.c (create_internal_info_help_node): Conditionalize + generation of the help node based on the #define + HELP_NODE_GETS_REGENERATED. When this is not set (the default) + the help node is generated exactly once, and is not gc'able. + Otherwise, a new node is always created for the help window, and + the old node gets garbage collected by the gc system. + (info_find_or_create_help_window): Conditionalize window node + selected based on the #define HELP_NODE_GETS_REGENERATED. + + * info/dir.c (add_menu_to_file_buffer): Place exactly one blank + line between directory entries. + + * info/info.c (version_string): Update minor version to "11". + + * info/info.h: Update comment to "2.11". + + * info/dir.c (maybe_build_dir_node): Only add the contents of a + new file if it is not identical to the file of the DIR buffer. + + * info/nodes.c (info_get_node): Call `maybe_build_dir_node' on + "dir" as well as "localdir" to mimic emacs-19.22 "dir" merging + behaviour. + +Fri Dec 3 13:41:44 1993 Brian J. Fox (bfox@ai.mit.edu) + + * info/info-utils.c (canonicalize_whitespace): Suppress whitespace + found at the start of STRING. + +Sat Nov 20 14:00:50 1993 Brian J. Fox (bfox@hippie) + + * info/indices.c (DECLARE_INFO_COMMAND): Fix typo in assignment to + `old_offset' (= instead of ==). + +Tue Nov 2 12:22:40 1993 Brian J. Fox (bfox@ai.mit.edu) + + * makeinfo/makeinfo.c (make_index_entries_unique): New function + makes a sorted array have all unique entries by appending numbers + to the ends of strings. + (sort_index): Call `make_index_entries_unique'. + +Mon Sep 20 12:04:05 1993 Brian J. Fox (bfox@ai.mit.edu) + + * makeinfo/makeinfo.c (get_execution_string): New Function returns + a pointer to an EXECUTION_STRING structure. + (execute_string): No longer uses a static string; call + `get_execution_string' instead in order to get a free buffer for + consing. + +Sun May 23 07:00:20 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * Texinfo 3.1 released. + +Sat May 22 18:21:27 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * info/info.c (info_patch_level): Increment constant to 1. + + * info/Makefile.in (DEFAULT_INFOPATH): Default definition deleted. + Makefile.in: Put it here instead. + * Makefile.in (MDEFINES): Add DEFAULT_INFOPATH. + + * configure.in: check for vfprintf and vsprintf. + + * makeinfo/makeinfo.c: Version 1.55. + + * makeinfo/makeinfo.c (add_word_args, execute_string) [HAVE_VARARGS_H]: + Don't use this definition unless HAVE_VSPRINTF is also defined. + (error, line_error, warning) [HAVE_VARARGS_H]: Don't use this + definition unless HAVE_VFPRINTF is also defined. + Remove indentation of all cpp directives, except for #pragma. + +Fri May 21 14:34:24 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * texinfo.texi: Rename to texi.texi. + Change @setfilenname and START-INFO-DIR-ENTRY to `texi.info'. + + * Makefile.in (MDEFINES): Pass LDFLAGS to sub-makes. + (realclean): Delete `configure'. + Changed all references to texinfo.info to texi.info + + * configure.in: Add AC_PROG_RANLIB, and AC_CONST. + Check for `rindex' function. + Check for varargs.h. + Clean up symbol names for header files so a single AC_HAVE_HEADERS + can be used. + (AC_INIT): Use texi.texi instead of makeinfo/makeinfo.c + + * info/info-utils.h: Copy definitions of bcopy, index, and rindex + (with appropriate #ifdef wrappers) from termdep.h. These are + included by a mutually exclusive set of files. + + * info/termdep.h [HAVE_SYS_PTEM]: Use HAVE_SYS_PTEM_H instead. + + * info/terminal.c, info/termdep.h [HAVE_TERMIO]: Use HAVE_TERMIO_H + instead. + + * info/makedoc.c, info/filesys.c [!O_RDONLY]: Include fcntl.h or + sys/fnctl.h, depending on whether HAVE_SYS_FCNTL_H is set. + + * info/termdep.h: Remove all indentation in #-exprs. + Remove old assumptions about bcopy, index, and rindex. + [HAVE_BCOPY]: Define bcopy. + [HAVE_RINDEX]: Define index and rindex. + + * info/nodes.c (info_get_node): Don't call stricmp if nodename is + NULL. Remove indentation in #-exprs. + + * info/echo_area.c (echo_area_stack_depth): Declare static. + + * info/Makefile.in (DEFAULT_INFOPATH): Make separate Makefile + variable so it can be overridden more easily by the user. Add `.' + to beginning of path. + (clean): Delete core.* (386bsd core files). + (MAKEDOC): Variable removed. Refer to `makedoc' explicitly. + (funs.h): Add `:' commands after if, to avoid spurious nonzero + exit statuses. + + * info/userdoc.texi: Improved comments explaining its purpose. + + * makeinfo/makeinfo.c [HAVE_VARARGS_H]: Include varargs.h. + (error, line_error, warning, add_word_args, + execute_string)[HAVE_VARARGS_H]: New versions that + use varargs. From bfox. + + * makeinfo/Makefile.in (clean): Delete core.* (386bsd core files). + + * util/Makefile.in (clean): Remove core.* (386bsd core files). + + * libtxi/Makefile.in: Remove all references to $(common). + (RANLIB): New variable, set from autoconf. + (libtxi.a): Use $(RANLIB) instead of `ranlib' in target rules. + (clean): Delete core.* (386bsd core files). + +Tue May 18 12:08:24 1993 Robert J. Chassell (bob at grackle.stockbridge.ma.us) + + * emacs/texinfmt.el (texinfo-format-refill): Do not fill a section + title line with the asterisks, hyphens, etc. that underline + it in any circumstance. + +Sun May 16 13:53:43 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * util/mkinstalldirs: handle relative pathnames. + +Fri May 14 20:18:49 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * util/mkinstalldirs: initialize IFS if unset. + +Tue May 11 06:33:14 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * makeinfo/makeinfo.c (cm_item): don't dereference item_func if NULL. + +Mon May 10 14:50:31 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * Texinfo 3.0 released. + + * Makefile.in (ALLOCA): Provide for substitution. + +Mon May 10 10:12:53 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * emacs/texinfmt.el (texinfmt-version): Updated year. + +Fri Apr 16 04:48:03 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * makeinfo/makeinfo.c: Version 1.54 from bfox. + + * util/fixfonts: Replace instances of `[..]' with `test'. + Use more portable `test' arguments: `z$foo = z' instead of `! $foo'. + Robustify quoting in eval assignments. + (textfmdir, texpkdir, texgfdir): Don't override definition from + environment, if any. + Trap EXIT, SIGHUP, SIGINT, SIGQUIT, SIGTERM to delete temp files + instead of trying to remove them explicitly before calling exit. + When changing cwd, do so in subshell, in case various tex*dir + variables are relative. + Don't use `head', `dirname', or `basename'. These don't behave + consistently and/or don't even exist on some systems. They can + all be emulated with `sed' anyway. + (tempfile2_line1): New variable. Use it instead of running + process to extract first line out of tempfile2 multiple times. + Eliminate some gratuitous uses of $tempfile2, such as in for loops. + +Fri Mar 26 23:25:13 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * texinfo.texi: @setfilename texinfo.info. + + * makeinfo/makeinfo.c (reader_loop, end_insertion): Fix typos in + comments. + (handle_variable_internal): Handle the case that there further + menu text after a false ifset/ifclear. + + * util/texi2dvi: Version 0.4 + Replace all instances of `[ ... ]' with `test'. + Updated bug-reporting address. + +Thu Mar 25 12:31:30 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * info/Makefile.in (install): Install info.1 man page. + (uninstall): Remove installed info.1 man page. + + * info/infoman.texi: Standalone manual renamed to info-stnd.texi. + Makefile.in: Targets updated appropriately. + + * info/Makefile.in (LDEFS): New variable. Use it for info-local + macros, since DEFS will be inherited from parent make and any + local definitions will get clobbered. + + * info/RELEASE: Renamed to info/NEWS. + + * README: New file. + + * Makefile.in (topclean): New target. + + * Getting-started: Renamed to INTRODUCTION. Former name is too + long (over 14 chars). + + * New-features: Renamed to NEWS. + + * Makefile.in (MDEFINES): Set it. + + * Makefile.in (dist): Use --gzip option to tar to make sure + resulting file is compressed with gzip. Change tar file + extension from `.Z' to `.z'. + + * Makefile.in (DISTFILES): Filter out any file or directory names + starting with `='. + + * fixfonts: Moved to util/fixfonts. + + * RELEASE: Deleted. + + * makeinfo/Makefile.in (VPATH): Use $(srcdir), not @srcdir@. + (common): Use ../libtxi, not ../common. + (makeinfo.in): Run makeinfo with --no-split. + + * makeinfo/makeinfo.texi: Changes from bob. + + * util/Makefile.in (VPATH): Use $(srcdir), not @srcdir@. + (common): Use ../libtxi, not ../common. + + * util/fixfonts: Moved from top-level directory. + +Wed Mar 24 10:21:31 1993 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el (texinfo-format-region): Do not require + `@setfilename' line; delete `\input texinfo' line if part of + region. + + * emacs/texinfmt.el (texinfo-raise-lower-sections): Raise or lower the + hierarchical level of chapters, sections, etc. according to + `@raisesections' and `@lowersections' commands. + +Thu Mar 18 16:02:27 1993 Robert J. Chassell (bob at grackle) + + * emacs/texinfo.el (texinfo-show-structure): Indent *Occur* buffer + according to the structure of the file. + +Sat Mar 6 05:16:44 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * util/texi2dvi: use ${1+"$@"}, not just "$@". + +Tue Feb 2 08:38:06 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * info/Makefile.in: Replace all "--nosplit" arguments to makeinfo + with "--no-split" + +Sun Jan 31 18:16:58 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * util/texi2dvi: Don't put .dvi and related auxillary files in same + directory as source files. Put them in current directory instead. + (TEXINPUTS_orig): New variable. + (file_texi): Variable removed. + (filename_texi): New variable. + (command_line_filename): Use this wherever references to file_texi + occured except in setting filename_noext. + (TEXINPUTS): Current directory and source directory where input + file resides prepended to standard path before invoking TeX. + +Wed Jan 27 16:24:37 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * util/Makefile.in: overhauled. + +Tue Jan 26 21:04:23 1993 Noah Friedman (friedman@prep.ai.mit.edu) + + * Makefile.in, info/Makefile.in, makeinfo/Makefile.in: Overhauled. + + * configure.in: Renamed from texinfo.in. + Incorporated makeinfo/makeinfo.in, info/info.in, and + util/util.in. Create all child Makefiles. + + * makeinfo/makeinfo.in, info/info.in: Deleted (incorporated into + top configure.in). + + * util/util.in: Deleted (incorporated into ../configure.in). + +Mon Jan 25 10:59:49 1993 Brian Fox (bfox@cubit) + + * info/info.c: New version 2.9; new variable INFO_PATCH_LEVEL + appears in the version string if it is non-zero. New function + version_string () produces the current version string, as in 2.8-p1. + + * info/dir.c: New file implements Gillespies `localdir' hacks. + + * info/nodes.c (info_get_node): Now calls maybe_build_dir_node () + if the file name to look for is "dir". + + * info/nodes.h: New flag N_CannotGC unconditionally prevents garbage + collection of a file buffer's contents. Used when "dir" is made + from at least one "localdir". + +Fri Jan 22 11:36:42 1993 Brian Fox (bfox@cubit) + + * info/footnotes.c: Do not declare auto_footnotes_p as "extern" in + this file. + +Thu Jan 21 08:57:08 1993 Brian Fox (bfox@cubit) + + * info/info.c: New version 2.8. + + * info/userdoc.texi, info/infoman.texi, info/info.texi: Fully + document Info; create both online and printed manual versions. + "userdoc.texi" contains exactly the documentation for GNU Info 2.x. + "infoman.texi" is a wrapper for that file; it is meant to produce + printed documentation. "info.texi" has the user documentation as a + complete chapter within itself, but continues to contain the Info + tutorial. + + * info/makedoc.c: Convert "ea_" into "echo_area_" when creating the + command name. + +Fri Jan 15 16:50:35 1993 Brian Fox (bfox@cubit) + + * info/search.c (skip_node_characters): New argument NEWLINES_OKAY if + non-zero says that newlines should be skipped over during parsing. + + * info/info-utils.c (info_parse_node): New argument NEWLINES_OKAY if + non-zero says that newlines should be skipped while parsing out + the nodename specification. + +Wed Jan 13 14:42:33 1993 Brian Fox (bfox@cubit) + + * info/makedoc.c: Remove "info_" from the front of the command name + before installing it. + + * info/session.c (info_menu_or_ref_item): A label of "Menu" is okay if + the builder is not info_menu_of_node (); + + * info/m-x.c: New function replace_in_documentation () replaces \\[foo] + with the keystrokes you type to get that command. Now used in + indices.c, info.c, infodoc.c. + +Mon Jan 11 10:27:41 1993 Brian Fox (bfox@cubit) + + * info/variables.c, h: New files contain describe-variable and stuff + moved out of m-x.c. + + * info/m-x.c: Move VARIABLE_ALIST and variable functions into + variables.c. Add documentation string to variable definition. + + * info/echo_area.c (push_echo_area): Zero the contents of + echo_area_completion_items after pushing the vars. + +Sat Jan 9 11:59:47 1993 Brian Fox (bfox@cubit) + + * info/Makefile.in: Add footnotes.c,h,o to the appropriate Makefile + variables. + + * info/window.c (window_tile_windows): New function divides the + available space among the visible windows. + + * info/session.c (info_tile_windows): New function calls + window_tile_windows. + + * info/footnotes.c, footnotes.h: New file implements functions for + aiding automatic footnote display when entering a node which has + footnotes. + + * info/m-x.c: New user-variable "automatic-footnotes". + + * info/window.c (window_physical_lines) New function counts the + carriage returns found in NODE. + +Wed Jan 6 11:24:19 1993 Brian Fox (bfox@cubit) + + * info/general.h: #include <unistd.h> if we have it. + +Tue Jan 5 11:12:33 1993 Brian Fox (bfox@cubit) + + * info/info-utils.c (info_concatenate_references): If either arg is + NULL, return the other arg. + + * info/indices.c (info_indices_of_file_buffer): Simplified and + corrected loop through tags/nodes of file buffer looking for + indices. + + * info/search.c (skip_node_characters): Rewrite "if" statement for + clarification and conciseness. + +Fri Jan 1 03:18:26 1993 Brian Fox (bfox@cubit) + + * info/info.in: Check for setvbuf (), and check to see whether the args + are reversed. + + * info/dribble.c (open_dribble_file) Check HAVE_SETVBUF and + SETVBUF_REVERSED when setting the buffering on info_dribble_file. + +Thu Dec 31 20:14:13 1992 Brian Fox (bfox@cubit) + + * info/session.c (info_select_reference) If the node couldn't be found, + look for the label as a filename (i.e., "(LABEL)Top"). + +Wed Dec 30 01:57:50 1992 Brian Fox (bfox@cubit) + + * New Version 2.7 Beta. + + * info/echo_area.c: Numerous functions now do something with the + numeric argument. Kill ring implemented, as well as yank and + yank_pop. Also transpose-chars. + + * info/window.c (window_make_modeline): Check node->flags for + N_IsCompressed and display "zz" in the modeline if the node comes + from a file which is compressed on disk. + +Mon Dec 28 17:33:12 1992 Brian Fox (bfox@cubit) + + * info/filesys.c, info/nodes.c: New member of FILE_BUFFER "FILESIZE" + contains the size of file_buffer->contents. finfo.st_size is no + longer relied upon to read the contents of files, since the new + function (filesys_read_info_file) can read compressed files. + + * info/filesys.c (info_find_fullpath) If a file starts with a slash (or + tilde expansion causes it to start with a slash) still call + info_find_file_in_path () on it so that we can find files with + compression suffixes. + + * info/m-x.c: New variable "gc-compressed-files". + +Tue Dec 22 03:45:28 1992 Brian Fox (bfox@cubit) + + * info/info.c: Version 2.6 Beta. + + * info/indices.c (info_index_next): Improve the final search for the + matched index entry. + + * info/session.c (move_to_screen_line): New function implements `M-r'. + Given a numeric argument, move point to the start of that line in + the current window; without an arg, move to the center line. + * infomap.c: Put move_to_screen_line () on `M-r'. + + * info/nodes.c (adjust_nodestart): Don't set N_UpdateTags unless the + node came from a tags table. + + * info/nodes.c (info_find_file_internal): If the filename being looked + for doesn't start with a `/', then additionally compare the + filename against the fullpath of the file buffer sans the + directory name. This can happen when selecting nodemenu items. + +Mon Dec 21 10:07:18 1992 Brian Fox (bfox@cubit) + + * info/session.c, info/display.c: Remove all references to + active_window_ch, active_window_cv, cursor_h, and cursor_v. The + single function display_cursor_at_point () is used for all cursor + movement, and to place the terminal's cursor at the right location + on the screen. + +Sat Dec 19 12:01:33 1992 Brian Fox (bfox@cubit) + + * info/nodemenu.c: New file implements a few functions for manipulating + previously visited nodes. `list-visited-nodes' produces a menu of + the nodes that could be reached by info_history_node () in some + window. `select-visited-node' is similar to `list-visited-node' + followed by `info-menu-item', but doesn't display a window with + the visited nodes menu. + + * info/session.c (info_numeric_arg_digit_loop): If redisplay had been + interrupted, then redisplay all of the windows while waiting for + input. + + * info/display.c (display_was_interrupted_p): New variable keeps track + of interrupted display. Used in + info/session.c:info_numeric_arg_digit_loop (). + + * info/session.c (info_global_next, info_global_prev): Use the numeric + argument passed to determine how many nodes to move. + + * info/session.c (info_scroll_forward, info_scroll_backward): If the + invoking key is not SPC or DEL only do Page Only scrolling. + +Thu Dec 17 01:34:22 1992 Brian Fox (bfox@cubit) + + * info/display.c (display_update_one_window): Allow W_NoWrap to affect + window display. + + * info/window.c (calculate_line_starts): Now takes a WINDOW * as an + argument, and simply does the calculation, placing the results + into window->line_starts and window->line_count. It also handles + W_NoWrap in window->flags. + +Mon Dec 14 02:18:55 1992 Brian Fox (bfox@cubit) + + * info/session.c (info_backward_scroll): Don't try to get previous node + if the top of the node isn't currently being displayed. + + * info/window.c (window_adjust_pagetop) Use new variable + "window_scroll_step" to attempt to control the amount which the + window scrolls. + + * info/m-x.c (info_variables) Add "scroll-step" to the list. + +Thu Dec 10 08:52:10 1992 Brian Fox (bfox@cubit) + + * info/m-x.c: New variable entry show-index-matches. When set to + non-zero the matched portion of the search string is indicated + with ` and '. Perhaps I should use `|' inst|ea|d? + + * info/echo_area.c (ea_possible_completions): Always build completions + before checking to see how many there were. + + * info/info-utils.c: (info_concatenate_references): New utility + function concatenates references. + + * info/Makefile.in: Add indices.c and indices.h to SRCS and HDRS. + Add indices.c to CMDFILES. + + * info/indices.c, info/indices.h: New file implements `i' and `,' + commands of info, and provides index searching capabilities. + + * info/echo_area.c (info_read_completing_in_echo_area): Split off into + separate callable function info_read_completing_internal (). + + * info/echo_area.c (info_read_maybe_completing): New function calls + info_read_completing_internal () with non-forcing argument. + + * info/session.c: Rename down_next_upnext_or_error () and + prev_up_or_error () to forward_move_node_structure (), and + backward_move_node_structure (). Implement new commands + info_global_next () and info_global_prev (). + + * info/infomap.c (initialize_info_keymaps): Bind `[' and `]' to + backward_, forward_move_node_structure () respectively. + + * info/session.c (info_menu_digit): Called with "0" as arg, select the + last menu item. + + * info/infomap.c (initialize_info_keymaps): "0" calls + info_menu_digit (). + + * info/session.c (info_move_to_xref): Take dir into account when there + are xrefs and menu items in the node and we are wrapping + backwards. + +Tue Dec 8 09:57:58 1992 Brian Fox (bfox@cubit) + + * info/info.c: Version 2.5 Beta. + + * info/terminal.c (terminal_insert_lines, terminal_delete_lines) Do not + expect tgoto to return a new string; it returns the address of a + static buffer. + + * info/infodoc.c (info_find_or_create_help_window) Correct check for + prior existing help node. + + * info/m-x.c (set_variable): Allow variables to have a list of choices. + Add new variable scroll-behaviour. + + * info/session.c (down_next_upnext_or_error, prev_up_or_error) New + functions implement user-controlled behaviour when attempting to + scroll past the bottom or top of a node. New variable + info_scroll_behaviour is user visible as "scroll-behaviour". + + * info/session.c (info_scroll_forward, info_scroll_backward) Call new + functions for user-controlled scroll behaviour. + + * info/terminal.c (terminal_initialize_terminal) Set PC from BC not + from BUFFER. + +Mon Dec 7 11:26:12 1992 Brian Fox (bfox@cubit) + + * util/texindex.c: Change EXIT_SUCCESS and EXIT_FATAL to TI_NO_ERROR + and TI_FATAL_ERROR respectively. This avoids namespace conflicts + on NeXT 2.0. + +Sat Dec 5 00:07:59 1992 Brian Fox (bfox@cubit) + + * info/info.c: New option "--subnodes" says to recursively dump the + menus of the nodes that you wish to dump. Menu items which point + to external nodes are not dumped, and no node is dumped twice. + +Thu Dec 3 16:11:02 1992 Brian Fox (bfox@cubit) + + * info/session.c (info_error) Don't ring the bell if + info_error_rings_bell_p is zero. (info_abort_key) Ring the bell + if printing "Quit" in the echo area wouldn't do it. + + * info/m-x.c (set_variable) New functions allows setting of + variables in the echo area. Currently, only visilble-bell and + errors-ring-bell are implemented. + +Wed Dec 2 13:11:37 1992 Brian Fox (bfox@cubit) + + * info/nodes.c, info/makedoc.c: If O_RDONLY is not defined by + sys/file.h, include sys/fcntl.h. + + * info/filesys.c (info_file_in_path): Expand leading tildes found + within directory names. + + * info/terminal.c (terminal_initialize_terminal) Set ospeed to 13 if + not settable any other way. It is an index into an array of + output speeds. + + * info/display.c (free_display) Do not free a NULL display. + + * info/display.c (string_width): New functions returns the width of + STRING when printed at HPOS. + +Sun Nov 29 01:24:42 1992 Brian Fox (bfox@cubit) + + * info/info.c: New version 2.4 beta. + + * info/general.h: #define info_toupper and info_tolower which check + their arguments before performing any conversion. + + * info/search.c, info/echo_area.c: Use info_toupper. + +Sat Nov 28 14:23:24 1992 Brian Fox (bfox@cubit) + + * info/session.c (info_scroll_forward, info_scroll_backward) If at + last/first page of the node, and the last command was + forward/backward, do info_next/prev/_node. + + * info/session.c: New function info_select_reference_this_line gets + menu or cross reference immediately. + + * info/infomap.c (initialize_info_keymaps): Add info_keymap[LFD] to + invoke info_select_reference_this_line (). + + * info/session.c (info_last_reference) Rename to + info_history_reference. Wrote info_last_reference, and + info_first_reference which go to the last or first node of an info + file. + +Fri Nov 27 00:59:02 1992 Brian Fox (bfox@cubit) + + * info/info.c: New version 2.3. Completed implementing contents of + TODO file. + + * info/session.c (info_redraw_display): Fix C-l with numeric arg. + +Thu Nov 26 20:14:18 1992 Brian Fox (bfox@cubit) + + * info/m-x.c: New file implements reading named commands in the echo + area, along with a new function "info-set-screen-height". + Compilation of this file and some code in others controlled by the + Makefile variable NAMED_COMMANDS (set to -DNAMED_COMMANDS). + + * info/window.c (window_new_screen_size) Rewrite from scratch, allowing + clean growth and shrinkage of the screen. New variable + window_deletion_notifier is a pointer to a function to call when + the screen changes size, and some windows have to get deleted. + The function is called with the window to be deleted as an + argument, and it should clean up dangling references to that + window. + + * info/session.c (initialize_info_session): Set + window_deletion_function to forget_window_and_nodes. + + * info/display.c (display_update_one_window): If the first row of the + window to display wouldn't appear in the_screen, don't try to + display it. This happens when the screen has been made + unreasonably small, and we attempt to display the echo area. + +Tue Nov 24 00:47:20 1992 Brian Fox (bfox@cubit) + + * Release Info 2.2. + + * info/session.c: New functions implement reading typeahead and + implement C-g flushing typed ahead characters. + (info_search_internal): allows C-g to exit multi-file searches. + +Mon Nov 23 01:53:35 1992 Brian Fox (bfox@cubit) + + * info/nodes.c: Remove calls to sscanf (), replacing them with calls to + atol (), since that is much faster. + (get_nodes_of_tags_table) Only check for "(Indirect)" if we + haven't parsed any nodes out of the tags table. Increase the + amount that file_buffer->nodes grows to 100 from 50. These two + together sufficiently speed up the parsing process. + + * info/nodes.c: info_get_node_of_file_buffer_tags (), + info_get_node_of_file_buffer_nodes (): Search the appropriate list + and return a node. This was simply a cut and paste edit to + functionalize the code. + + * info/TODO: Remove suggestion for partial tag parsing, since tag + parsing is much faster now. + +Sat Nov 21 02:48:23 1992 Brian Fox (bfox@cubit) + + * info/makedoc.c: New File replaces makedoc.sh shell script. + + * info/infomap.c: Install info_isearch (on C-s) and + info_reverse_isearch (on C-r) for Info windows. + + * info/session.c (incremental_search, info_isearch, + info_reverse_isearch) New functions implement incremental + searching. + +Fri Nov 20 00:01:35 1992 Brian Fox (bfox@cubit) + + * info/terminal.c (terminal_initialize_terminal): Declare and set up + `ospeed'. Turn off C-s and C-q processing. + + * info/session.c (info_show_point) When this function is called, the + desired result is to show the point immediately. So now it calls + set_window_pagetop () if the new pagetop is not the same as the + old one. This means that info_prev_line (), info_next_line (), + info_forward_word (), and info_backward_word () can all scroll the + window if they have to. + +Thu Nov 19 12:27:07 1992 Brian Fox (bfox@cubit) + + * info/session.c (set_window_pagetop): Add scrolling to make this + faster. + + * info/echo_area.c (push/pop_echo_area): Remember the list of items to + complete over. + + * info/session.c (info_forward_char): Don't let point get equal to + nodelen, only to nodelen - 1. + + * info/display.c: New function display_scroll_display () scrolls the + rmembered display as well as the text on the actual display. + + * info/terminal.c: New functions terminal_scroll_terminal (), + terminal_scroll_down (), and terminal_scroll_up (). All + implemented using "al" and "dl" termcap capabilities. (i.e., + insert and delete line). + +Wed Nov 18 15:05:14 1992 Brian Fox (bfox@cubit) + + * info/termdep.h: Only define HAVE_FCNTL_H if !aix and !ultrix. + +Tue Nov 17 20:35:08 1992 Brian Fox (bfox@cubit) + + * First Beta Release of Info 2.0. + +Sun Nov 1 02:21:05 1992 Noah Friedman (friedman@prep.ai.mit.edu) + + * util/texi2dvi (--force): Option removed. Always run tex at least + once, don't bother checking if .dvi file is newer than source. + +Fri Oct 30 02:16:28 1992 Noah Friedman (friedman@prep.ai.mit.edu) + + * util/texi2dvi (-D): debugging option renamed from '-d'. + Made check to enable debugging more terse. + When checking if index files have changed, use + variable $this_file instead of $file in for loop. + (file_texi): wherever the variable $file was used to reference + the texinfo file, substituted $file_texi. + +Sat Oct 17 07:30:34 1992 Brian J. Fox (bfox@helios) + + * util/texindex.c: Remove references to USG replacing them with a + define declaring the actual feature required or missing. + +Thu Oct 15 16:17:47 1992 Robert J. Chassell (bob@nutrimat.gnu.ai.mit.edu) + + * emacs/texinfmt.el (texinfo-format-setfilename): Remove date from + Info file header so regression testing is easier. + +Tue Sep 15 16:28:35 1992 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el (texinfmt-version): New variable. + (texinfo-format-setfilename): Include date and + version in Info file header. + Better documentation for @definfoenclose + Handle whitespace after @end iftex, etc. + +Thu Sep 3 09:25:37 1992 Robert J. Chassell (bob at grackle) + + * emacs/texnfo-upd.el: Fix typo re `texinfo-sequential-node-update.' + +Tue Aug 18 08:56:24 1992 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el (texinfo-value): Revise syntax. + + * emacs/texnfo-upd.el (texinfo-start-menu-description): + New function to insert title as description in a menu. + (texinfo-make-menu-list): Remove automatic title insertion. + + * emacs/texinfo.el (texinfo-mode-map): Add keybinding for + texinfo-start-menu-description. + +Wed Jul 29 11:58:53 1992 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el (texinfo-set): Revise to set a string to the flag. + (texinfo-value): @value{flag}: New command which inserts the + string to which the flag is set. + +Tue Jul 7 15:10:52 1992 Robert J. Chassell (bob at grackle) + + * emacs/texnfo-upd.el (texinfo-master-menu): Error message if file + contains too few nodes for a master menu. + (texinfo-insert-master-menu-list): Only attempt to insert detailed + master menu if there is one. + +Wed Jun 10 15:26:18 1992 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el (texinfo-append-refill): Refill properly when lines + begin with within-paragraph @-commands. + +Tue Jun 9 12:28:11 1992 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el: Add `texinfo-deffn-formatting-property' and + `texinfo-defun-indexing-property' to @deffn commands. + +Mon Jun 8 11:52:01 1992 Robert J. Chassell (bob at grackle) + + * emacs/texnfo-upd.el: Replace `(mark-whole-buffer)' with + `(push-mark (point-max) t) (goto-char (point-min))' + to avoid `Mark set' messages. + +Fri Jun 5 15:15:16 1992 Robert J. Chassell (bob@kropotkin.gnu.ai.mit.edu) + + * emacs/texnfo-upd.el (texinfo-check-for-node-name): Offer section + title as prompt. + (texinfo-copy-next-section-title): Copy title correctly. + +Thu May 28 20:34:17 1992 Robert J. Chassell (bob@hill.gnu.ai.mit.edu) + + * emacs/texinfmt.el: @vtable defined, parallel to @ftable, for + variables. + (texinfo-append-refill): set case-fold-search nil so @TeX is not + confused with @tex. + +Thu Mar 26 21:36:41 1992 Robert J. Chassell (bob@kropotkin.gnu.ai.mit.edu) + + * emacs/makeinfo.el: Rename temp buffer from `*Makeinfo*' back to + `*compilation*' so `next-error' works; unfortunately, + `*compilation*' is written into the code as the name + `next-error' needs. + Rename `makeinfo-recenter-makeinfo-buffer' back to + `makeinfo-recenter-makeinfo-buffer' + +Thu May 14 21:14:25 1992 Noah Friedman (friedman@prep.ai.mit.edu) + + * util/fixfonts: Enclosed most variable references with "" to prevent + potential globbing and other weirdness. Eliminated uses of + ${var-value}, which unfortunately isn't portable. + + * util/texi2dvi: rewritten from scratch. + +Sat Apr 18 23:46:25 1992 Charles Hannum (mycroft@hal.gnu.ai.mit.edu) + + * util/fixfonts: Re-evaluate prefix and libdir if inherited (to resolve + variable references from make). + (texlibdir): Don't add '/tex', since it's already there. + +Fri Apr 10 14:51:23 1992 Noah Friedman (friedman@prep.ai.mit.edu) + + * util/fixfonts: set prefix and libdir only if they are not already + defined (i.e. not inherited from the environment). + Changed default path for libdir to be consistent with Makefile. + +Tue Mar 3 13:17:42 1992 Robert J. Chassell (bob at grackle) + + * emacs/texnfo-upd.el (texinfo-insert-master-menu-list): Insert a + master menu only after `Top' node and before next node. + (texinfo-copy-menu): Error message if menu empty. + +Mon Feb 24 15:47:49 1992 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el (texinfo-format-region): Make sure region ends in a + newline. + (texinfo-itemize-item): Recognize all non-whitespace on same line + as @item command. + +Sat Feb 22 02:15:00 1992 Brian Fox (bfox at gnuwest.fsf.org) + + * util/texindex.c: New version 1.45 has cleanups, should compile under + VMS quietly. + +Wed Feb 12 10:50:51 1992 Robert J. Chassell (bob at grackle) + + * emacs/makeinfo.el: Rename temp buffer as *Makeinfo*. + Rename `makeinfo-recenter-compilation-buffer'. + (makeinfo-buffer): Offer to save buffer if it is modified. + (makeinfo-compile): Do not offer to save other buffers. + (makeinfo-compilation-sentinel): Switch to Info file. + +Tue Feb 4 13:07:39 1992 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el (texinfo-print-index): Format so that node names in + the index are lined up. + +Mon Feb 3 09:08:14 1992 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el (texinfo-itemize-item): Format entry when text + is on the same line as @item command. Also, handle @-commands. + (texinfo-format-region, texinfo-format-buffer-1): Set fill column + to local value of Texinfo buffer. + + * emacs/texnfo-upd.el (texinfo-pointer-name): Find only those + section commands that are accompanied by `@node' lines. + +Tue Jan 14 16:10:16 1992 Robert J. Chassell (bob at grackle) + + * emacs/texnfo-upd.el: Ensure that no commands depend on the value of + case-fold-search. + +Fri Jan 10 15:13:55 1992 Robert J. Chassell (bob at kropotkin) + + * emacs/texinfmt.el (texinfo-append-refill): Replace use of + unsupported function `looking-at-backward' with + `re-search-backward'. + +Mon Dec 23 23:46:42 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + + * util/texindex.c: Change POSIX ifdefs to HAVE_UNISTD_H and + _POSIX_VERSION. + +Mon Dec 16 15:01:36 1991 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el (texinfo-append-refill): New function appends + @refill to all appropriate paragraphs so you no longer need to + append @refill command yourself. + (texinfo-format-region, texinfo-format-buffer-1, + texinfo-format-include): Call `texinfo-append-refill'. + +Fri Dec 6 01:25:09 1991 David J. MacKenzie (djm at wookumz.gnu.ai.mit.edu) + + * util/texindex.c: Conditionalize on _AIX (which is predefined) instead + of AIX, just like makeinfo does. + +Tue Nov 26 10:21:04 1991 Robert J. Chassell (bob at grackle) + + * emacs/texnfo-upd.el (texinfo-section-types-regexp): `@subtitle' no + longer treated as subsection. + +Sat Nov 16 08:27:42 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * util/fixfonts: New file, from Karl Berry. + +Tue Nov 12 16:13:24 1991 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el: Create @end smalllisp. + +Mon Nov 11 16:50:13 1991 Robert J. Chassell (bob at grackle) + + * emacs/texinfo.el (texinfo-environment-regexp): Add all other block + enclosing Texinfo commands. + +Thu Nov 7 10:23:51 1991 Robert J. Chassell (bob at grackle) + + * emacs/texinfo.el (texinfo-insert-@end): Attempt to insert correct end + command statement, eg, @end table. Fails with nested lists. + (texinfo-insert-*): Accept prefix arg to surround following N + words with braces for command. + +Thu Oct 31 21:31:41 1991 Robert J. Chassell (bob at kropotki) + + * emacs/texinfmt.el (texinfo-clear): Clear flag even if flag not + previously set. + +Wed Oct 23 11:15:58 1991 Robert J. Chassell (bob at grackle) + + * emacs/texinfo.el (texinfo-mode): page-delimiter now finds top node as + well as chapters. + +Tue Oct 22 11:46:12 1991 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el (texinfo-do-flushright): Test whether a line is too + long for the flush right command (line length must be less than + the value of fill column). + + * emacs/texnfo-tex.el (texinfo-tex-buffer): Prompt for original file + even if point moved to *texinfo-tex-shell*. + texinfo-tex-original-file: variable to hold file name. + +Wed Oct 16 08:32:05 1991 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el (texinfo-format-center): Expand string before + centering so @-commands not included. + +Thu Oct 10 22:01:47 1991 Robert J. Chassell (bob at kropotki) + + * emacs/texnfo-tex.el (texinfo-show-tex-print-queue): Do not kill a + running process; do start a process none exists. + +Thu Sep 26 21:58:47 1991 Robert J. Chassell (bob at kropotki) + + * util/texi2dvi: Misc. bugs fixed. + + * emacs/texinfo.el: Remove extraneous references to TeX. + +Thu Sep 19 20:45:29 1991 Robert J. Chassell (bob at kropotki) + + * emacs/texinfmt.el: add @cartouche as a noop (makes box with rounded + corners in TeX) + +Tue Sep 10 20:44:57 1991 Robert J. Chassell (bob at grackle) + + * emacs/texnfo-upd.el (texinfo-make-one-menu): Copy node-name correctly + for message. + +Thu Aug 29 17:54:07 1991 Robert J. Chassell (bob at kropotki) + + * emacs/texnfo-tex.el (texinfo-quit-tex-job): Do not set mark. + +Wed Aug 21 10:36:21 1991 Robert J. Chassell (bob at grackle) + + * emacs/texnfo-upd.el: (texinfo-copy-menu-title): Copy title as it + should rather than node line. + +Mon Aug 5 15:27:12 1991 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el (texinfo-format-convert): Changed regexp that + looks for three hyphens in a row to find those between word + constituent characters, as now, for Oxford Univ. style dashes and + also between spaces, for Cambridge Univ. Press style dashes. + + * emacs/texnfo-tex.el (texinfo-tex-start-shell): Runs "/bin/sh" so + `explicit-shell-file-name' is not set globally. + + * emacs/texnfo-upd.el: Rewrite messages. + (texinfo-find-higher-level-node): Stop search at limit. + (texinfo-copy-menu-title): Rewrite to handle outer include files. + (texinfo-multi-file-update): Update all nodes properly; + rewrite doc string and interactive. + +Sat Aug 3 10:46:13 1991 Robert J. Chassell (bob at grackle) + + * emacs/texnfo-upd.el (texinfo-all-menus-update): Fixed typo that + caused the function to create a master menu when it shouldn't. + + * emacs/texinfo.el (texinfo-mode): Make `indent-tabs-mode' a local + variable and set to nil to prevent TABs troubles with TeX. + +Wed Jul 31 11:07:08 1991 Robert J. Chassell (bob at grackle) + + * emacs/texnfo-tex.el (texinfo-quit-tex-job): New function: quit + currently running TeX job, by sending an `x' to it. + (texinfo-tex-shell-sentinel): New function to + restart texinfo-tex-shell after it is killed. + (texinfo-kill-tex-job): Rewrite to use kill-process rather than + quit-process; uses `texinfo-tex-shell-sentinel' to restart + texinfo-tex-shell after it is killed. + (texinfo-tex-region, texinfo-tex-buffer): Replace + texinfo-kill-tex-job with quit-process. + + * emacs/texinfo.el (texinfo-define-common-keys): Add keybinding for + texinfo-quit-tex-job + +Wed Jul 10 15:15:03 1991 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el: New commands @set, @clear, @ifset...@end + ifset, and @ifclear...@end ifclear. + Definition functions rewritten to make them easier to + maintain. + +Wed Jul 3 19:37:04 1991 Robert J. Chassell (bob at kropotki) + + * emacs/texinfmt.el (texinfo-format-deftypefn-index): Remove reference + to data-type to make consistent with texinfo.tex and makeinfo. + texinfo.el: Fix page-delimiter and texinfo-chapter-level-regexp + variables. + +Thu Jun 27 18:35:36 1991 Robert J. Chassell (bob at nutrimat) + + * emacs/texinfmt.el: Add @dmn as `texinfo-format-noop'. + texinfo2.texi: Document @dmn. + texinfmt.el (texinfo{,-end}-{eleterate,ecapitate} renamed + {alphaenumerate, capsenumerate}. + +Fri Jun 14 12:46:32 1991 Robert J. Chassell (bob at churchy.gnu.ai.mit.edu) + + * emacs/texinfmt.el (texinfo-format-defun-1): @defivar prints name + correctly. + +Thu Jun 6 21:38:33 1991 Robert J. Chassell (bob at churchy.gnu.ai.mit.edu) + + * emacs/texinfo.el (texinfo-mode): Set page delimiter to + 'texinfo-chapter-level-regexp' so that page commands work by + chapter or equivalent. + + * emacs/texinfmt.el (texinfo-format-defun-1): @defop prints name + correctly. + (batch-texinfo-format): replace unsupported + 'buffer-disable-undo' with 'buffer-flush-undo' + +Fri Apr 5 15:17:17 1991 Robert J. Chassell (bob at wookumz.gnu.ai.mit.edu) + + * emacs/makeinfo.el (makeinfo-compilation-sentinel): Check for + existance of makeinfo-temp-file to avoid harmless error message. + texinfo2.texi: Minor typos fixed. + +Thu Mar 28 19:13:24 1991 Robert J. Chassell (bob at pogo.gnu.ai.mit.edu) + + * util/texi2dvi: Revised. + +Mon Mar 11 12:35:51 1991 Robert J. Chassell (bob at grackle) + + * emacs/texinfmt.el: (@footnotestyle): New command to set + footnotestyle. + (@paragraphindent): New command to set indentation. + (texinfo-format-refill): Add indentation feature so as to + indent paragraph or leave indentation asis before refilling + according to value set by @paragraphindent command. + (texinfo-format-region): Insert header, if any, into Info buffer. + (texinfo-format-separate-node, texinfo-format-end-node): Run + texinfo-format-scan on footnote text only once. + (texinfo-format-scan): Shorten `---' to `--'. + + * emacs/texinfo.el: Define key for `texinfo-master-menu'; define + start and end of header expressions. + + * emacs/texnfo-upd.el (texinfo-all-menus-update): Update + pre-existing master menu, if there is one. + +Fri May 11 14:36:07 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * util/texindex.c: Rename `lines' to `nlines'. + (bzero): Pass arg to lib$movc5 through non-register var. + (perror_with_file, pfatal_with_file): Move extern decls and includes + to top of file. + [VMS]: If not using VMS C, define away `noshare' keyword. + Include perror.h. + +Mon Jul 11 18:02:29 1988 Chris Hanson (cph at kleph) + + * util/texindex.c (indexify): when comparing to initial strings to + decide whether to change the header, must use `strncmp' to avoid + comparing entire strings of which initials are a substring. + +Sun Jun 26 18:46:16 1988 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * util/texindex.c (sort_in_core, sort_offline, parsefile): + Give up on input file if any line doesn't start with backslash. + +/* changelog for texinfo.tex before 19jun01. */ + +2001-05-24 <karl@gnu.org> + + * texinfo.tex (\smallbreak, \medbreak, \bigbreak): add check for + \ifnum\lastpenalty to plain tex definitions, so that we won't + insert space right after a section title. + (\aboveenvbreak): similar check of \lastpenalty. + +2001-05-21 <karl@gnu.org> + + * texinfo.tex (\pdfurl): \let\value=\expandablevalue, so at least + some cases can be properly handled. + +2001-03-28 <karl@gnu.org> + + * texinfo.tex: Copyright. + + * texinfo.tex (\pdfmkdest): remove trailing @ in target names; + suggestion from: Reiner Schlotte <R.Schlotte@science-computing.de>. + (\imagexxx): call \normalturnoffactive so _ (among others) will be + allowed in filenames; report from arnold@skeeve.com. + +2001-02-02 <karl@gnu.org> + + * texinfo.tex (\secondary): handle pdf case. + (\dosubind): secondary index entry not written as separate arg for + texindex. + From: Trevin Beattie <trevin@eyring.com> + Date: Tue, 21 Mar 2000 13:04:06 -0700 + +2001-01-12 <karl@gnu.org> + + * texinfo.tex (\dopdfimage): different syntax for filename + inclusion (foo vs {foo}). From: <Kurt.Hornik@ci.tuwien.ac.at>, + 22dec99. + +2001-01-08 <karl@gnu.org> + + * texinfo.tex (\afivepaper): new command from Jose Romildo + Malaquias <romildo@urano.iceb.ufop.br>. + +2000-12-12 <karl@gnu.org> + + * texinfo.tex: oops, had outside page reversed. + +2000-12-11 <karl@gnu.org> + + * texinfo.tex (\inmargin): allow lefttext and righttext as args. + +2000-11-10 <karl@gnu.org> + + * texinfo.tex: implementation of new commands @verbatim, @verb, + and @verbatiminclude from janneke@gnu.org. + +2000-11-09 <karl@gnu.org> + + * texinfo.tex (\inmargin): rewrite to allow for placing the + material either in the right or left margin. + +2000-10-27 <karl@gnu.org> + + * texinfo.tex (\dosynindex): new macro subroutine, do not + \closeout twice the index being redirected. + (\synindex, \syncodeindex): call it. + +2000-10-18 <karl@gnu.org> + + * texinfo.tex (\inmargin): rewrite to allow argument to be vmode + material, such as a box from an image. + +2000-09-06 <karl@gnu.org> + + * texinfo.tex (\doublecolumnout): must subtract \ht\partialpage + here, not in \begindoublecolumns. Otherwise the \partialpage on + the first page of double columns affects every subsequent page, + e.g., if @setchapternewpage off. Reported by Aharon Robbins + <arnold@skeeve.com> for standards.texi. + +2000-05-28 <karl@gnu.org> + + * texinfo.tex (\linkcolor): replace Cyan with Blue. + (\output): do \pdfmkdest at top. + (\pdfmakeoutlines): set \_ to \normalunderscore. + From: Trevin Beattie <trevin@eyring.com>. + +2000-05-27 <karl@gnu.org> + + * texinfo.tex (\today): only define if undefined. + From: Stepan Kasal <kasal@suse.cz>. + +2000-05-16 <karl@gnu.org> + + * texinfo.tex (\deftypeivarheader): need defheaderxcond. From: + Marcel van der Boom <marcel@hsdev.com>. + +1999-10-01 Karl Berry <karl@gnu.org> + + * texinfo.tex (\afourwide): had hsize and vsize reversed. + From: Pascal Obry <pascal_obry@csi.com> + +1999-09-25 Karl Berry <karl@gnu.org> + + * texinfo.tex (\alias): fix from Andreas. + +1999-09-19 Karl Berry <karl@gnu.org> + + * texinfo.tex (\key): rename the \smallrm and \smallsy here. + + * texinfo.tex (\indexfonts): rename to \smallfonts, along with + \indrm, etc. + Define all the fonts, too. + (\footnotezzz): use \smallfonts. + + * texinfo.tex (\needx): get better leading; do nothing if @need + value is less than one linespace. From Arnold. + (\douref, \xrefX, \doemail [pdf]): make spaces normal again, so our + \ignorespaces commands are effective even in an @display. + + * texinfo.tex (\finishtitlepage): remove FINISH TITLE debugging + message. + + * texinfo.tex (\anchor): rewrite to always \ignorespaces. + Bug from esken. + + * texinfo.tex (\indexnofonts): dummy up \acronym. + From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de> + +1999-09-06 Karl Berry <karl@gnu.org> + + * texinfo.tex (\texinfoversion): update. + + * texinfo.tex: Avoid multiparagraph cells losing linespace between + paragraphs. From: Andreas Schwab <schwab@suse.de>. + Bug from: Lalo Martins <lalo@webcom.com>. + +1999-08-19 Karl Berry <karl@gnu.org> + + * texinfo.tex (\shortchaplabel): move computation of width of + "Appendix" inside, in case it's been changed by a language. + +Mon Aug 9 16:31:55 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: pdf updates from Han. + +Fri Aug 6 13:48:22 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\charcode): remove unused counter. + From: Akira KAKUTO <kakuto@fsci.fuk.kindai.ac.jp>. + +Thu Jul 22 19:08:19 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: Update from Han. + +Tue Jul 20 17:13:16 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: More pdf improvements from Han. + +Mon Jul 19 16:33:31 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: Better pdf support from: Han The Thanh + <thanh@informatics.muni.cz>. + +Sun Jul 18 14:21:03 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: pdfimage takes braces. + +Tue Jul 6 19:40:14 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\deftypeop): New command. + +Mon Jul 5 17:17:33 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\contents): call \pdfmakeoutlines here instead of + inline (!). + (\pdfmakeoutlines): call \indexnofonts instead of making a separate + attempt at it. + +Tue May 25 06:16:06 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (time-stamp-format): use %02H. + + * texinfo.tex: Had PDF and DVI transposed. + +Sun Apr 25 15:30:00 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\appendixletter): restore \the, necessary for .toc. + +Thu Apr 22 19:22:12 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\emergencystretch): Increase to .15\hsize. + +Tue Apr 20 05:11:04 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\defunargs): use \tensl\hyphenchar\font to work + better with Gildea's PostScript version. + + * texinfo.tex (\tab): Change back to just &. + From: Nathan Sidwell <nathan@acm.org>. + + * texinfo.tex: No \fi. + +Mon Apr 19 17:38:54 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\pdflink) [!\ifpdf]: define to ignore arg. + + * texinfo.tex: Add pdf support. Merge from: Kurt Hornik + <Kurt.Hornik@ci.tuwien.ac.at>. + +Wed Mar 31 13:24:16 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\defopheader): missing word space before `on'. + Report from: Chris Hanson <cph@martigny.ai.mit.edu>. + +Fri Mar 26 17:00:41 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\imagexxx): Equalize space above and below if in + vmode. From rms. + +Thu Mar 25 20:00:00 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\deftypeivar): new command. + +Tue Mar 23 17:53:37 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (&): be sure active & is defined for @deftypefn + operator&. + Report from: Nathan Sidwell <nathan@acm.org>. + +Sat Mar 20 12:31:53 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\exampleindent): new command. From Yoshiki. + + * texinfo.tex: Changes from Andreas to use \sl\$ inside italics + and to avoid extra spaces around @anchor. + + * texinfo.tex (\image, \imagexx): move pdf test to imagexxx for + correct filename parsing. + +Mon Mar 15 16:51:20 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\imagexxx): reset catcode ^^M in case we're inside + in an example. Report from kama. + + * texinfo.tex (\putwordin): new macro for word `in'. + (\xrefX): use it. + Report from: "Alexey A. Nikiforov" <A.A.Nikiforov@inp.nsk.su> + +Sun Feb 21 16:47:28 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: Expand tabs. + +Sun Feb 14 16:02:29 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\paragraphindent): implement. + Suggestion from: Paul DuBois <dubois@primate.wisc.edu>. + +Tue Feb 9 07:25:07 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\alias): use def rather than \let. + Change timestamp format to include hours. + + * texinfo.tex: New commands @alias and @definfoenclose. + From: "Eric S. Raymond" <esr@snark.thyrsus.com>. + +Mon Feb 8 14:46:56 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\scanmacro): Use \endinput to avoid spurious space, + and various other space fixes. From: Andreas Schwab + <schwab@ls5.informatik.uni-dortmund.de>. + +Thu Feb 4 15:24:40 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\uref): implement optional third arg. + + * texinfo.tex (\dosubind): Include index entry in third arg to + \entry instead of writing as bogus fourth arg. + Report from: kama@hippo.fido.de (Karl Heinz Marbaise). + + * texinfo.tex (\setemergencystretch): Increase somewhat. + + * texinfo.tex (\putwordof): rename from \putwordOf. + * texinfo.tex (defivarhead, \defcvarheader): Use \putwordof. + +Tue Feb 2 16:57:00 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\documentlanguage, \documentencoding): new + commands. \documentlanguage based on an implementation by kama. + +Sat Jan 30 17:23:45 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\putwordMMai): Should be MMay. From Trond. + +Fri Jan 29 17:52:16 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: Fix @macro expansion inside @section. Patch from + Andreas: + + From: Andreas Schwab <schwab@ls5.informatik.uni-dortmund.de> + + The general idea is to construct a list a all defined macros in + the form \do\macro1\do\macro2..., then temporarily define + \do to something appropriate and execute the list to do + whatever is needed. Here is a patch, and i have also + fixed a few other bugs that i found while browsing through + the @macro implementation. Additionally i have added a + check to prevent the user from doing silly things like + @macro shipout. + +Sun Jan 24 09:59:42 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\obstexwarn): Don't use *** in message, it + interferes with make output parsing. + +Thu Jan 21 15:45:20 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: Internationalization improvements from kama. + +Wed Jan 20 17:12:52 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\contents, \shortcontents): Run \contentspagealignmacro. + From: Trond Endrestol <trond@agamemnon.gtf.ol.no> + +Thu Jan 14 16:53:43 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\begindoublecolumns): Ship out \partialpage + immediately if it is nonvoid, instead of saving it. This avoids a + bug where the index could end up printing one line per page (see + the indexspread.tex test). + From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * texinfo.tex (\image): If running pdftex, do \pdfimage{imagefile.pdf}. + From: Samuel Tardieu <sam@inf.enst.fr> + + Also, update copyright year. + +Tue Jan 5 17:50:45 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\enddoublecolumns): Move \pagegoal reset to after + the \endgroup so we get the restored single-column \vsize + as intended. + +Sun Dec 20 17:57:22 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex (\indexdummies): Set \{ and \} to \mylbrace and + \mybrace to avoid braces in the index file, which + texindex can't handle. + +Sat Dec 19 18:13:16 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex (\pickupwholefraction): Ignore whole-number part. + (\setuptable): Always pass whole-number part and decimal point. This + allows leading zeroes. + Suggestion from: Ben Bullock <ben@hayamasa.demon.co.uk>. + Date: Fri, 21 Aug 1998 14:06:50 +0100 (BST) + +Tue Dec 15 16:38:07 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex (\indexdummies): set \{ and \} to \lbracecmd and + \rbracecmd to avoid lossage if @tex is active during \shipout. + Report from: "Peter Kabal" <Kabal@ece.mcgill.ca>. + +Sun Dec 6 17:11:17 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex: Doc fix. + +1998-11-11 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> + + * doc/texinfo.tex (\onepageout): Put the cropmarks in vboxes of + zero height so that they don't contribute space themselves. + Compensate for \topandbottommargin. + (\internalpagesizes): Advance \outervsize by 2\topandbottommargin, + not only 0.6in. + +Fri Nov 6 17:27:57 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex: Use standard time-stamp.el package instead of + update-date.el. + +Sat Oct 31 19:23:02 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex (\indexnofonts,\indexdummies): add \url and \uref to + list. + +Fri Oct 30 08:16:23 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex (\expandablevalue): Delete spurious `v' character. + +Tue Oct 27 11:18:40 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex (@env, @command, @option): Must disable for index + and xref commands. Also, \input plain if necessary before + using {} in the version number. + +Wed Sep 30 11:40:36 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Use date as version number instead of RCS, and + update-date to update it. + +Thu Sep 17 13:22:44 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Fix @macro expansion of @code with _ in the + argument. + From: Zack Weinberg <zack@rabi.columbia.edu>. + +Fri Aug 28 10:30:29 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\itemzzz): take \itemmargin into account when + unhboxing. Reported by Bob. + +Fri Aug 14 16:56:58 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Change @defun environments so that right margin is + not changed, and instead the defun type label is outdented + into the margin. + +Thu Aug 13 13:31:41 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\smartslanted): define this separately from + \smartitalic. + (\emph, \i): use \smartitalic for true italics. + +Mon Aug 10 11:51:13 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\value): handle active _ or - in argument (happens + if called from @code). + Report from: Dave Love <d.love@dl.ac.uk>. + +Sun Jul 19 09:49:23 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\dosubind): Don't do \vskip to preserve \lastskip + unless we are in vertical mode. Otherwise we might end a + paragraph prematurely, and \folio won't get expanded by + \output. + Report from: "Richard E. Stone" <res@rstone.mn.org> + +Thu Jul 16 15:33:37 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Keep track of how negative the page numbers have + gotten: + (\lastnegativepageno): New \count register. + (\startcontents): Use it. + (\contents, \summarycontents): set it. + +Mon Jul 13 16:58:11 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\imagexxx): Add some space around the image if it's + by itself. + +1998-07-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * texinfo.tex (chapterzzz): Put a space before the chapter number + in the message. + (appendixzzz): Use \putwordAppendix in the message. + +Thu Jul 9 08:39:53 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\macro): Globalize assignments since it's done + inside a group. From Zack. + +Mon Jul 6 17:21:25 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\comment): Speed up. + (\loggingall): Turn on eTeX's extended tracing. + More macro fixes. + Date: Sat, 04 Jul 1998 14:51:49 -0400 + From: Zack Weinberg <zack@rabi.phys.columbia.edu> + +Thu Jul 2 10:20:32 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\contents, \summarycontents, \startcontents): Use + roman numerals for toc, arabic outside, even when toc is + at the beginning. + +Mon Jun 29 10:05:28 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\anchor): New command @anchor. + (\xrefX): Avoid double space when xref to an @anchor or an @unnumbered. + + * texinfo.tex (\itemzzz): Use kerns and \unhbox when item text + fits in the space, so footnotes can work. + + * texinfo.tex (\setref): Take additional argument for the -snt + xref. Call \indexdummies. + (\donoderef, \appendixnoderef, \unnumbnoderef): Change \setref calls. + +Sat Jun 27 19:16:34 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\contents, \summarycontents): Must not be \outer. + +Fri Jun 26 16:15:14 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\writetocentry): New macro. + (\chapternofonts): No longer needed. + (\chapter, ..., \unnumberedsubsubsec): Change all the sectioning + commands to call \writetocentry instead of doing it inline. + Also, do not call \chapternofonts, we avoid expansion with + \the\toks instead. + (\opencontents): No longer needed, instead \writetocentry opens + the file when necessary. + (\setfilename): Don't call \opencontents. + (\ifsetcontentsaftertitlepage, \ifsetshortcontentsaftertitlepage): + New conditionals. + (\Etitlepage): Call \contents and/or \shortcontents if + conditionals are set. + + Global: use \nobreak instead of \penalty 10000 for epsilon efficiency. + +Thu Jun 25 08:29:32 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\option,\env,\command): New markup commands. + Suggested by arnold@gnu.org. + + * texinfo.tex (\afourpaper): More reasonable margins. + From: Wilhelm Mueller <muewi@hb.senbvs43.uni-bremen.de> + Date: Thu, 25 Jun 1998 10:48:13 +0200 (MET DST) + +Wed Jun 24 17:46:43 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\acronym): New Texinfo command. + +Tue Jun 23 17:36:39 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\dots, \enddots): Missing \leavevmode. + Report from: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de> + Date: Tue, 23 Jun 1998 14:22:27 +0200 (MET DST) + +Mon Jun 22 16:00:53 1998 Karl Berry <karl@north> + + * texinfo.tex: Rewrite of index stuff to do better column breaking + and balancing. + The old code failed miserably when the index was just the wrong size, + e.g., the Autoconf manual with @afourpaper. + Bug report from: Wilhelm Mueller <muewi@hb.senbvs43.uni-bremen.de> + Date: Fri, 12 Jun 1998 16:34:49 +0200 (MET DST) + (\initial): Add more glue around the initial, and make it a + multiple of \baselineskip. + (\entry): Add glue before each entry so the columns can always be the + same height. + (\doublecolumnout): Available space no longer needs to handle + \partialpage specially. + (\pagesofar): Take \ht\partialpage into account with \vsize. + (\enddoublecolumns): Reset \output to avoid calling + \balancecolumns twice + (\balancecolumns): Format for readability. + (\initialskipamount): No longer needed, remove. + + (\hbadness): Increase a bit, boxes that are a little underfull look ok. + +Sun Jun 21 16:48:38 1998 Karl Berry <karl@north> + + * texinfo.tex (\ninettsl): cmsltt10 is not standard, so use + cmsltt10 scaled 900. + Date: Mon, 15 Jun 1998 12:35:41 +0200 (MET DST) + From: Werner Struckmann <struck@ips.cs.tu-bs.de>. + +Thu Jun 18 08:32:15 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: @macro fixes from Zack Weinberg + <zack@rabi.phys.columbia.edu>. + - @ifblah did not work inside @macro + - spaces in parameter lists in macro definitions caused errors + - leading spaces in parameter lists in macro invocations were + preserved inappropriately. + +Wed Jun 10 16:50:53 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\smallformatx, \smalldisplayx): New macros. + (\smallbook): Arrange to use them. + (\display, \flushleft, etc.): Rewrite to avoid duplication. + +Sun Jun 7 18:13:45 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\pagesizes): Rename to \internalpagesizes. + (\custompaper): Rename to \pagesizes. + +Sat Jun 6 13:16:32 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Rewrite paper size definitions, add @custompaper. + + * texinfo.tex: Fix for macros in arguments to other commands. + From Zack. + +Thu Jun 4 11:21:07 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Better @macro implementation. + From: Zack Weinberg <zack@rabi.phys.columbia.edu>. + +Tue May 26 17:43:21 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\imagexxx): Center image if it is not part of a + paragraph. + +Tue May 19 17:17:12 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: \linkstrue by default. + Also, first implementation of @macro; can only handle some cases, + but that is better than nothing. + From: Zack Weinberg <zack@rabi.phys.columbia.edu> + +Thu May 14 17:32:47 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: New command @novalidate along the lines of makeinfo + --no-validate. + Date: Sun, 26 Oct 1997 18:54:47 -0500 + From: Zack Weinberg <zack@rabi.phys.columbia.edu> + +Tue May 12 16:19:35 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\valuexxx): Split up into expandable and + non-expandable parts. + (\expandablevalue): New macro. + (\indexdummies): \let\value = \expandable value. + + * texinfo.tex: Doc fixes. + + * texinfo.tex (\doind): Just call \dosubind with empty third arg. + (\dosubind): Replace with \doind definition and suitable code to handle + possible third arg. And propagate glue past the whatsit from the + \write so index entries don't cause extra space between + @defuns (for example). + +Wed May 6 12:51:27 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\deftypemethparsebody): Handle the extra arg in + @deftypemethodx, too. + (\deftypefunx): Error definition was misspelled as \deftypeunx. + +Fri May 1 17:31:58 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo/texinfo.tex (\putwordon, \putwordMethodon): New macros. + Use in \def... commands. + (\indexdummies): make `\ ' be just ` ' for sorting. + (\deftypemethparsebody): New macro. + (\defmethod): Call it. + Various doc fixes. + Repored by: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise) + Date: Wed, 07 Jan 1998 10:19:42 +0100 + +Fri Apr 10 16:54:48 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: @cartouche: Align right side correctly. + From: dale.smith@bellhow.com (Dale Smith) + Date: Fri, 06 Mar 1998 14:47:02 GMT + +Sun Apr 5 17:19:03 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\dosetq): Use \normalturnoffactive instead of just + \turnoffactive, so \'s in node names are handled properly. + (\tie): Move definition to more rational position in the file. + (\@, \{, etc.): Use decimal numbers in all cases, to avoid use of '. + Paranoia only. + (\+): Turn off once and for all at the beginning, and define as + \tabalign in @tex. + +Tue Mar 31 19:33:31 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\synindex, \syncodeindex): \closeout the redirected + index. + From: Jakob Stoklund Olesen <stoklund@mi.aau.dk> + + * texinfo.tex (\doignore): Ignore everything after `c', so @end + ifinfo and the like can be commented out. + (\macrocsname): New macro. + Reported by: "James A. Lupo" <lupoja@feynman.ml.wpafb.af.mil> + +Wed Feb 25 15:48:51 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\doprintindex): Change catcode of @ before \read, + in case of \initial{@} being the line that is read. + Reported by: Drew Csillag <drew_csillag@geocities.com> + + * texinfo.tex (\dotable): Add \leftskip to \hsize in the first column. + Don't inherit \rightskip from surrounding environment. + Set \item to \crcr to avoid empty first row. + Prepend \parskip glue before table. + Set \everycr locally outside of alignment, don't reset it + explicitly in \Emultitable. + All from Andreas Schwab, to avoid overfull hboxes. + + Also, work on leading commentary in file a bit. + +Tue Feb 24 17:48:29 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: \!: Save and restore this for @tex. + From: Jean-Pierre Moreau <jpmoreau@ciframedical.com> + Date: Fri, 22 Aug 1997 16:47:36 -0400 + + * texinfo.tex (\angleleft, \angleright): New macros. + (\refx, \email, \key): Use them. + From: Stephen Gildea <gildea@intouchsys.com> + Date: Fri, 26 Dec 1997 11:43:32 EST + +Mon Feb 23 17:34:23 1998 Karl Berry <karl@cs.umb.edu> + + 1997-08-28 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + * doc/texinfo.tex (xrdef): Read the second argument with \ + as an escape character. + +1998-01-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * texinfo.tex (\tocentry): Don't \turnoffactive before typesetting + the arguments, it causes special characters to be printed + incorrectly. + +Mon Jan 19 10:58:25 1998 Karl Berry <karl@cs.umb.edu> + + * texi2html: Correct version number, home page reference. + +Sat Jan 17 15:12:03 1998 Karl Berry <karl@cs.umb.edu> + + * texi2html: Version 1.54. Handle @image better, etc. + * From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>. + +Wed Dec 24 13:59:07 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\dots, \enddots): Use current font instead of + always using math italic. From Stephen Gildea. + +Tue Dec 23 11:33:07 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Spurious xepsf.tex should be epsf.tex. + +Mon Oct 13 15:49:28 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\titlefont): Explicitly set \rm. + +Sat Jul 26 15:12:37 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\email): Let to \uref instead of \code, as a second + optional argument makes sense for this, too. + +Mon Jul 14 13:43:43 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\indexdummies): Add \value. + +Thu Jul 10 13:34:30 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\authorrm): Must use \def instead of \let, as + \secrm is not yet defined. + +1997-07-09 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> + + * texinfo.tex (\titlefont): Define again, using \titlefonts. + +Wed Jul 9 16:45:30 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\startcontents): Leave ^ catcode as other. + +Sat Jul 5 17:16:40 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\titlefonts): New macro to set title font styles, + so italic etc. work in @title. + (\titlefont): No longer needed. + (\titlepage): Call \titlefonts instead of \titlefont. + (\chapsf, \ssecsy, \ssecttsl): Correct magstep values. + From: Stephen Gildea <gildea@intouchsys.com>. + + * texinfo.tex (\onepageout): Back up to 2\baselineskip per Stephen. + (\kbdinputstyle): New command. + +1997-04-03 00:07:28 1997 Richard Stallman <rms@gnu.ai.mit.edu> + + * texinfo.tex (\kbdfont, \kbdexamplefont): New macros, parms that + tell @@kbd what to do. + (\setkbdinputdistinct, \setkbdinputexample): New commands set them. + (\kbd): Use those parms. + +Thu Jul 3 16:52:39 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\onepageout): Leave only one line space above the + footline, to be more like plain. Suggested by Stephen Gildea. + (\evenfootline): Left one too many line spaces here, so reduce by two. + + (\ifnottex): Another ignore command. + (\ifnothtml,\ifnotinfo): New commands. + (\doignore): Ignore brace characters, so mismatched braces in ignored + text do not cause complaints. + +Fri Jun 27 15:09:16 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\image): New definition for new @image command. + +Wed Jun 18 15:58:20 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\oddfootingxxx), + (\onepageout): Leave space for the footline if present. + (\everyfootingxxx, \everyheadingxxx): Call \oddfootingxxx and + \evenfootingxxx instead of repeating their code. From: Stephen + Gildea <gildea@intouchsys.com>. + + (\setfilename): Read texinfo.cnf if present. + + (\indexdummies, \indexnofonts): No-op additional commands @result @equiv + @expansion @print @error @point. From: Dave Bodenstab + <imdave@ais.net> (for texi2www doc). + +Fri Jun 6 10:31:34 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\setmultitablespacing): Restore bad typing mistake + from yesterday. + +Thu Jun 5 18:04:26 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\uref): Write real definition, taking one mandatory + argument and one optional one. + +Wed Jun 4 17:16:09 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\mainmagstep): Define this as a \count variable + instead of with \let, to make changing to \magstep1 more transparent. + From: HERBERT@boevm4.vnet.ibm.com. + (\uref): New command a la \url. + +Sat May 24 18:06:41 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\deftypemethod, \deftypemethodheader): New macros + to implement new commands @deftypemethod and @deftypemethodx. + Suggestion from: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise). + +Wed May 21 17:17:52 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\opnr, \clnr): Increment/decrement \parencount, for + @defun lines with nested parens. From Bill Schelter + <wfs@fireant.ma.utexas.edu>. + (\itemizeitem): Correct \errmessage. + +Mon May 19 17:34:40 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\codeunder): Use \_ and \ifusingtt to avoid + dotaccent from _ in roman fonts, e.g., @deftypefn. + (\tex): Remove spurious spaces at the end of subdefinitions. + From: "John W. Eaton" <jwe@bevo.che.wisc.edu>. + (\url, \email): \let to \code; no quotes or angle brackets. + +Mon May 5 17:06:35 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\onepageout): \ifcropmarks, center the page body. + Lost this when merged \croppageout with \onepageout. Found by + Arnold. + + (\doprintindex): Do not bother to go into double column mode unless + there actually is a non-empty index. + + (\begindoublecolumns): Include any existing \partialpage in the new one, + lest we lose a whole page of output. Found by M J Morley + <mjm@scs.leeds.ac.uk>. + + (\chapternofonts): Remove spurious spaces, both in the definitions that + get output to the aux file(s) and in this macro. + + Fix comments and rationalize whitespace in various other places. + +Sun Apr 27 15:41:16 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\chapter, etc.): Avoid expansion of section title + when writing the toc. + +Thu Apr 24 16:35:46 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\onepageout): Integrate cropmarks case here, + instead of having a completely different routine. + (\croppageout): Remove this. + +Sun Jun 9 14:26:42 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\ignoremorecommands): Ignore \defcodeindex, and do + not ignore \message. + +Thu Apr 11 12:59:42 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\macro): New macro. + (\enddots, \endldots): New macros. + (\centerchap, \centerchapyyy): New macros. + (\centerchfplain, \centerchfopen): New macros. + (\CHAPFplain, \CHAPFopen): Set \centerchapmacro. + +Wed Mar 13 11:42:17 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\url): New macro, like \samp for now. + +Sun Mar 10 13:05:08 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex: Changes in @multitable code. + Change meaning of @multitablelinespace. + +Tue Mar 5 18:56:08 1996 Dave Love <d.love@dl.ac.uk> + + * texinfo.tex (\set): Set catcode of space explicitly (inside a + group) to avoid losing inside @example, say. + +Sun Mar 3 17:01:27 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\itemxpar): Protect the \vskip here with \nobreak, + to avoid a possible page break at an @itemx. + +Sun Feb 25 14:53:15 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\obstexwarn): Use \global to avoid ever getting the + warning twice. + + * texinfo.tex (\include): Allow underscores and other such + characters we made active in the file name argument. + +Tue Feb 6 15:06:27 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\afourlatex): Delete the old duplicate definition + of \afourlatex. + +Sun Feb 4 15:20:16 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\tab): New definition. + (\setuptable): Fix previous change. + (\multitablecolspace): Renamed from \multitablecolmargin. + (\multitablelinespace): Renamed from \multitablelineskip. + +Fri Feb 2 02:20:16 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\multitableparskip): Renamed from \intableparskip. + Allocate with \newskip. + (\multitableparindent): Renamed from \intableparindent. Use \newskip. + (\multitablelineskip): Renamed from \spacebetweenlines. Use \newskip. + (\multitablecolmargin): Renamed from \spacebetweencols. + (\columnfractions): Renamed from \percentofhsize. + (xcolumnfractions): Renamed from \xpercentofhsize. + + * texinfo.tex (\setuptable): Handle >1 digits after @percentofsize. + (\pickupwholepercent): New macro. + +Sun Jan 28 21:14:46 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\key, \kbdfoo): Use \ttsl unconditionally. + (\setkeyfont): Definition deleted. + +Tue Jan 23 14:57:23 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: @kbd within @example selects slanted tty font: + (\ttsl, \ttslshape): Define this new font shape. + (\kbdfoo): Set the font to \ttsl if already using \tt. + (\setkeyfont, \ifmonospace): New macros. + +Wed Jan 17 23:57:48 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\changepagesizes): Additional arg for topskip. + (\afourlatex): Total rewrite. + (\afourwide): Pass new arg to \changepagesizes. + +Wed Jan 3 17:15:00 1996 Stephen Gildea <gildea@x.org> + + * texinfo.tex (\slbshape, \itbshape): Use bold slant and and + bold italic in titles to match the bold roman. Do not use + bold sf or bold tt, which would be too heavy. + + * texinfo.tex (\setfont): Pass font name in more pieces. + (\*shape): New macros defining symbolic names for all font + shapes so can use other font families with different naming + conventions. + +Wed Jan 3 15:52:18 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\ignoremorecommands): Turn off @everyheading and + friends, @headings, @setchapternewpage, @setchapterstyle. + +Sat Dec 30 17:20:48 1995 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\inmargin): Don't allow a break before the vertical + kern. Do allow a whole paragraph of marginal text, not just one line. + Use \inmarginspacing. + +Thu Dec 28 23:22:08 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\inmargin): New command @inmargin. + (\dircategory): Ignore @dircategory. + +Tue Dec 12 17:25:36 1995 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\lvvmode): Remove this; use \leavevmode as usual, + so spaces/underscores at beginnings of lines inside @example work. + Bogus index entries should be (and now are, I think) handled in + other ways. + +Mon Nov 13 16:07:09 1995 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\xrefX): Test for xref-automatic-section-title + being @set correctly, and remove spurious redefinition of + \printednodename in that case. + +Mon Oct 16 15:16:34 1995 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\unsepspaces): New macro to make active space + expand into a normal space char in index entries. + (\indexdummies): Use \unsepspaces. + +Thu Oct 12 14:56:52 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\tie): Use \lvvmode, not \leavevmode. + Don't use \@M directly either. + +Sun Aug 27 21:17:09 1995 Paul Eggert <eggert@twinsun.com> + + * texinfo.tex (\appendixsection): Fix misspelled defn. + +Mon Jul 31 23:57:57 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\ttfont): Don't call \nohyphenation. + +Sun Jul 30 18:30:47 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\tocentry): Use \turnoffactive. + +Sun Feb 5 05:34:13 1995 Richard Stallman <rms@pogo.gnu.ai.mit.edu> + + * texinfo.tex (\boldbraxnoamp): New function. + (\deftypefunargs): Use that, not \boldbrax. + +Tue Jan 31 12:15:28 1995 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\set): Use \gdef, not \xdef. + +Sat Jan 21 16:39:36 1995 Richard Stallman <rms@pogo.gnu.ai.mit.edu> + + * texinfo.tex: Initially make _ and + \active, + then later make them \other. + (\otherifyactive): New command. + +Thu Jan 19 21:59:22 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\afourwide): New command. + +Mon Jan 16 09:29:38 1995 Stephen Gildea <gildea@x.org> + + * texinfo.tex: Initially make + and _ "other" characters. + (\fixbackslash, \everyjob): Make + and _ active characters. + +Tue Jan 10 19:16:09 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex: At beginning, \input plain if necessary. + (\deftypefunargs): Use \boldbrax, not \functionparens. + +Sun Dec 18 16:40:11 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\indsc): Use csc10 (at 9pt), not indrm. + +Mon Oct 31 00:51:20 1994 Richard Stallman <rms@pogo.gnu.ai.mit.edu> + + * texinfo.tex (\changepapersizes): Fix definition syntax. + (\fontprefix): Define only if not yet defined. + + * texinfo.tex (\margin): Define a new insert. + (\SETmarginindex): Initialize to \relax. + (\doindex): Optionally put the entry in the margin. + (\pagecontents): Print the index entries put in the margin. + +Sat Oct 29 19:50:10 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\auxhat): New macro. + (\dosetq): Use \auxhat. + (reading the aux file): Give ^ catcode 7. + +Wed Oct 26 03:28:04 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\setfont): New macro. Use it for specifying + most of the fonts that are normally cm fonts. + (\fontprefix): New macro, normally `cm'. + +Mon Oct 24 01:27:09 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\startcontents): Set catcode of ^. + +Thu Oct 13 02:19:43 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\ifhtml, \html, \enddots, \?, \!): New commands. + +Fri Sep 16 16:30:52 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\defheaderxcond): New macro. + (\deftypefnheaderx): Use defheaderxcond when calling defname. + (\deftypefunheaderx, \deftypevarheader, \deftypevrheader): Likewise. + +Fri Aug 26 03:08:08 1994 Amy Hendickson <amyh@ai.mit.edu> + + * texinfo.tex (\multitable): New command. + +Mon Aug 1 14:28:57 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\changepagesizes, \afourlatex): New macros. + +Tue Jul 12 11:45:58 1994 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\quotation): Set \parskip to zero to avoid extra + space below the environment. + (\quotation): Clean up comments and indentation. + +Wed Jul 13 05:36:40 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\xrefX): Put back, and correct, the test of + SETxref-automatic-section-title. + +Thu Jul 7 15:57:52 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * Set catcodes of chars 128-255 to \other. + +Mon Jul 4 15:32:41 1994 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\tie): Set \catcode of @ to 11 before using \@M. + + * texinfo.tex (\xrefX): Undo \turnoffactive while printing the node + name, so _ in node names doesn't come out as the dot accent. + +Sat Jul 2 14:49:26 1994 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\tie): Ensure we're in horizontal mode before the + \penalty. + +Tue May 10 01:21:28 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\donoderef, \unnumbnoderef, \appendixnoderef): + Set \lastnode globally. + +Sun Apr 17 15:35:43 1994 Karl Berry (karl@ra.cs.umb.edu) + + * texinfo.tex (\~): Define to be a tie. + (\ptextilde): New defn to save the plain's tilde accent. + (\tex): Restore plain tilde. + +Sun Mar 27 23:35:17 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\smallbook): Set \defbodyindent and \deftypemargin. + +Sun Mar 20 19:47:59 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\xrefX): Define and use \correctnodename. + (@turnoffactive): Move after @ becomes available + and turn off backslash as well as other chars. Use @realbackslash. + (@normalturnoffactive): Like @turnoffactive but use @normalbackslash. + +Sat Mar 19 12:26:25 1994 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\singlespaceskip): Increase to 12.5pt. + (\singlespace): Call \setleading instead of just assigning to + \baselineskip, so the strut box will be reset. + (\smalllispx): Likewise. + +Sun Mar 13 20:32:28 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\dots): Change back to \ldots. + +Sat Mar 12 22:34:10 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\indexnofonts): Add %'s to suppress newlines after \def. + +Sat Feb 26 15:51:37 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\deftexinfoversion): New macro. + (\texinfoversion): Define using \deftexinfoversion. + +Wed Jan 26 12:40:52 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\putwordSee, \putwordInfo, \putwordfile) + (\putwordChapter, \putwordAppendix, \putwordSection) + (\putwordsection, \putwordpage) + (\putwordTableofContents, \putwordShortContents): New macros. + Used in various places instead of fixed words. + +Mon Jan 24 22:51:36 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\ignoremorecommands): Turn off @item and @message. + +Thu Jan 20 17:01:53 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\indexnofonts): Treat accents as dummies. + Turn modified European letters into one or more ordinary letters. + +Tue Jan 18 14:54:32 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\indexdummies): Handle tex accents and European letters. + +Wed Nov 24 16:11:51 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\dots): Use $\,$ for spacing. + +Sun Nov 21 22:16:21 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\dots): Avoid using \ldots; use periods and kern. + (\indexdotfill): Use italic periods. + +Fri Nov 19 20:50:31 1993 Roland H. Pesch (pesch@apple-gunkies.gnu.ai.mit.edu) + + * texinfo.tex (\deftypefunargs): use \tclose rather than \code to + avoid side effects on active chars + +Tue Sep 28 16:01:58 1993 Roland H. Pesch (pesch@apple-gunkies.gnu.ai.mit.edu) + + * texinfo.tex (\obeyedspace defn): remove blank after \sepspaces + (left destructive penalty in vertical list) + +Mon Aug 30 14:17:27 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * texinfo.tex (\setref, \unnumbsetref, \appendixsetref): Uncomment + \dosetq for title. + (\Ytitle): Define as \thissection instead of \thischapter. + (\xrefX): If there is no printed-title arg given, and @ifset + xref-automatic-section-title, try to use the real section title. + +Tue Jul 27 12:47:24 1993 Charles Hannym (mycroft@trinity.gnu.ai.mit.edu) + + * texinfo.tex (\ifitemxneedsnegativevskip): New \if; set immediately + following a short \item. + (\itemxpar): \par and then if \ifitemxneedsnegativevskip is set, do + a \vskip-\parskip. + (\internalBitemx, \internalBxitemx, \internalBkitemx): Use \itemxpar + rather than \par. + (\itemzzz): Set \ifitemxneedsnegativevskip as appropriate. + +Thu Jul 22 16:08:33 1993 Charles Hannum (mycroft@trinity.gnu.ai.mit.edu) + + * texinfo.tex (\titlezzz, \finishtitlepage): Explicitly make hrules + have a width of \hsize so they aren't too long in smallbook format. + +Tue Jun 29 15:56:19 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\deftypefnheaderx): call \normalparens to permit + normal typesetting of strings (e.g. for C++ docn) containing `&' + +Fri Jun 25 14:08:44 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\nestedignore): turn off \ind... fonts too + (primarily for use within @smallexample) + +Wed Jun 23 11:58:48 1993 Jim Kingdon (kingdon@wombat.gnu.ai.mit.edu) + + * longopts.table: Update GDB options. + +Sun Jun 20 22:00:11 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * lgpl.texinfo: Use @smallexample instead of @example. Reformat + example disclaimer to avoid overfull \hbox. + +Mon Jun 14 04:09:47 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\entry): Don't make a line of dots + if there are no page numbers. + +Fri Jun 11 16:35:23 1993 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\defparsebodycommon): New macro from \defvrparsebody. + (\deftpparsebody): Call it; can't use \defvrparsebody. + (\deftpheaderline, \removeemptybraces): New macros. + +Sat May 8 10:49:25 1993 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\itemzzz): Only change \parskip temporarily, and + unskip by it later if the item text is on its own line. + + * texinfo.tex (\tablez): Do \afterenvbreak before the \endgroup, + so the \parskip value is the table's, not the surrounding text's. + (\vtable, \ftable, \itemizey): Likewise. + Note: for most environments, \nonfillfinish deals with this. + + * texinfo.tex (\smalllisp): New definition for non-small case, a + la @smallexample. + + * texinfo.tex: Delete \message{} at beginning; it does nothing. + + (These changes are all trying to make space above and below + environments more equal.) + * texinfo.tex (\singlespace): Don't insert a kern. + (\group): Do \offinterlineskip, and reset \par to insert a blank + line's worth of space. + (\lisppar): Delete meaningless call to \obeyspaces before making + the definition. + (\Elisp [the outer one]): Rename to \nonfillfinish, and end the + paragraph before the group. + (\lisp): Set \Elisp (the inner one) to \nonfillfinish + (\example, \smallexample, \display, \format, \flushleft, + \flushright, \quotation): Use \nonfillfinish. + (\lineskipfactor, \strut{height,depth}percent): Set to more exact + values. + (\setleading): Set \normallineskip and call \normalbaselines, for + cleanliness. + +Thu May 6 16:00:59 1993 Jeffrey Osier (jeffrey@deneb.cygnus.com) + + * texinfo.tex (\ignoremorecommands): Turn off \set and \clear. + +Tue Apr 20 17:02:34 1993 Roland H. Pesch (pesch@apple-gunkies.gnu.ai.mit.edu) + + * texinfo.tex (\codex): Delete space. + +Thu Apr 15 14:59:04 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\ignoremorecommands): Turn off @raisesections, @up, + @lowersections, @down within false conditionals. + +Sun Apr 18 04:33:13 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\code): Define - and _ to permit line-breaking + despite the fact that hyphenation is disabled. + (\codex, \codedash, \codeunder): New macros. + +Tue Mar 16 18:19:16 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\ignoremorecommands): Turn off @printindex within + false conditionals. + +Sun Mar 14 10:47:36 1993 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\footnote): Don't bother to take the footnote text + as an argument, and hence don't define as \long. + (\footnotezzz): Do \footstrut after we start the paragraph. + (Also reformat these macros to make them easier to read.) + +Fri Feb 26 13:02:44 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (@include): Use \thisfile rather than #1 as \input arg. + + * texinfo.tex (\readauxfile): Call \warnedobstrue to turn off warning + re TeX 3.0 on second and subsequent runs. + +Thu Feb 25 18:03:38 1993 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\realeverypar): Delete, as it was unused. + + * texinfo.tex (\group): Do a \strut in \everypar. + +Mon Feb 22 17:10:06 1993 Karl Berry (karl@claude.cs.umb.edu) + + * texinfo.tex (\obeyedspace): Define to be whatever \sepspaces + does (and move the definition to after \sepspaces). + +Wed Feb 17 01:55:20 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\nonfillstart): Do \singlespaces and \let\par + before \obeylines. + +Fri Feb 12 12:32:56 1993 Roland H. Pesch (pesch at el_bosque.cygnus.com) + + * texinfo.tex (\obstexwarn): issue message re bug in TeX 3.0. + (\nullfont): commented-out redefinition, to enable w/TeX 3.0. + (\nestedignore): call \obstexwarn for manuals that may trip bug + + * texinfo.tex (\nestedignore): avoid @tex contents with \doignore + +Thu Feb 11 15:41:06 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\indexdummies): enable @dfn and @emph in index entries + +Thu Feb 11 13:32:32 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\ignoremorecommands): ignore @include within + failing conditionals + +Sat Feb 6 19:44:28 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\nestedignore): Set \globaldefs--make all defs local. + +Tue Feb 2 15:57:37 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (@raisesections, @lowersections): new commands. + * (@up, down): original BFox synonyms for above. + * (\numhead, \apphead, \unnmhead): internal macros to map headings + to appropriate level + * (@nwnode): new synonym for @node, used in newest + makeinfo + +Tue Jan 26 17:05:02 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\include): avoid group around file contents + +Tue Jan 19 18:58:56 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\ignoremorecommands, used in \nestedignore): also + ignore cross-ref commands and \settitle + (\setyyy, used in @set): make definitions global + (\clearxxx, used in @clear): clear definitions globally + +Thu Jan 14 17:43:32 1993 Michael I Bushnell (mib@geech.gnu.ai.mit.edu) + + * texinfo.tex: Added \shorttitlepage. + +Sat Jan 2 15:01:45 1993 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\tclose): Use \spaceskip instead of modifying + \fontdimen's to normalize the interword space. + + * texinfo.tex (\t, \key, \tclose): Use \hyphenchar instead of + \exhyphenpenalty, to turn off hyphenation for real. + (\{no,restore}hyphenation): New macros. + +Sat Jan 2 15:01:45 1993 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\t, \key, \tclose): Use \hyphenchar instead of + \exhyphenpenalty, to turn off hyphenation for real. + (\{no,restore}hyphenation): New macros. + +Tue Jan 5 19:15:46 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\deftpparsebody): Make synonymous with \defvrparsebody. + +Sun Dec 27 09:40:08 1992 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\inforef, \inforefzzz): Use the \ignorespaces + primitive instead of \losespace. + (\losespace): Delete. + + * texinfo.tex (\menu, \direntry): Handle like \ifinfo. + + * texinfo.tex (\unmatchedenderror, \defineunmatchedend): New macros. + (\endxxx): Call it, instead of just doing it inline. + (\conditionalsucceed, \nece): More new macros. + (\iftex): Call \conditionalsucceed. + (\Eiftex): Define to give an error at the outer level. + + * texinfo.tex (\ignoremorecommands, \nestedignore): New macros. + (\ifset, \ifclear): Expand a macro on success as well as failure; + also switch to using expansion instead of assignments to act after + the conditional. + (\if{set,clear}succeed): Call \conditionalsucceed. + (\if{set,clear}fail): Call \nestedignore instead of \doignore. + + * texinfo.tex (\clear): Don't insert a spurious space. + + * texinfo.tex (\value): Put comment next to definition. + + * texinfo.tex (\setyyy): Call \setzzz, and define the variable as + simply the parameter, no \unskip. + (\setzzz): New macro; do not globally define the variable. + +Thu Dec 3 17:24:05 1992 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (croppageout): use same escape-char switching as + default output routine. Permits using _ in TOC entries. + +Fri Nov 13 17:35:38 1992 Charles Hannum (mycroft@gnu.ai.mit.edu) + + * texinfo.tex (indexing): Rewrote double-column mode to fix a + rare breakage. + +Sun Oct 25 07:13:31 1992 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\obeyedspace): No need to define with \gdef, we're + at the outer level. + +Fri Oct 16 18:04:40 1992 Roland McGrath (roland@geech.gnu.ai.mit.edu) + + * lgpl.texinfo: Change "This program" to "This library" in example + copying notice. + +Sat Oct 10 09:43:45 1992 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\bullet, \minus): Use \implicitmath instead of $. + +Fri Oct 2 08:35:51 1992 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\Egroup): Don't do the \strut and \nointerlineskip. + +Sat Sep 26 09:08:59 1992 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\doignore, \enddoignore): New macros. + (\ifinfo): Call \doignore. + (\ifxinfoxxx): Deleted. + (\ignore, \ifsetfail, \ifclearfail): use \doignore. + + * texinfo.tex (\unnumbered): Expand the arg only once for the \message. + + * texinfo.tex (\deftpparsebody, \parsetpheaderline): New macros. + (\deftp): Call \deftpparsebody. + +Thu Sep 24 10:12:45 1992 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\entry): Do \par first; add comments. + (\short{chap,unnumbered}entry,\do{chap,sec,subsec,subsubsec}entry): + Call \tocentry, instead of using \vbox. + (\tocentry): New macro. + +Sat Sep 19 14:36:11 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\`, \'): Definitions deleted. + +Fri Sep 18 14:33:09 1992 Roland H. Pesch (pesch@cygnus.com) + + * texinfo.tex (\ifset, \ifclear): Standardize catcode of space as + for \ignore. + +Fri Sep 11 15:25:01 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\finalout): Move out of final section of file, + which claims not to define new control words. + + * texinfo.tex (\setleading): New macro. + (outer level, @smallbook, @afourpaper): Call it, instead of + setting \baselineskip directly. + + * texinfo.tex (\|): New definition for changebars. + +Tue Sep 1 17:32:48 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\begindoublecolumns): Exactly double \vsize. + +Sat Aug 29 10:12:16 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\group): Define \Egroup to use struts instead of + letting TeX do its own interline spacing. + + * texinfo.tex (\{remove,ignore}activespaces): New macros. + (\end): Call \removeactivespaces; give the correct error messages; + don't try to expand a nonexistent \E... macro. + + * texinfo.tex (\EMsimple): End the help message with a period. + + * texinfo.tex (\gobble): New macro. + (\lisp): Call it (instead of defining it every time). + (\example, \smallexample): Define \E... within the macro. + +Tue Aug 25 11:56:26 1992 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\readauxfile): Make + normal while reading aux file. + +Thu Aug 20 21:32:34 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\doublecolumnhsize): Compute value in + \begindoublecolumns. + (\afourpaper, \smallbook, <outer level>): Remove these (virtually + identical) computations. + + * texinfo.tex (\doublecolumnvsize): Deleted. + (\afourpaper, \smallbook): Don't compute it. + (\begindoublecolumns): Just double \vsize here (thus decreasing + the value considerably from the old value of 19.1in, which was far + too large.) + +Fri Aug 14 10:16:42 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\parseargx): Use \expandafter instead of + \aftergroup to continue the processing. + (\parsearglinex): Renamed to \parseargline, since the former + \parseargline is no longer needed. + + * texinfo.tex (\parseargline) Remove a trailing @c or @comment. + (\argremovec, \argremovecomment): New macros. + +Thu Aug 6 11:28:55 1992 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex: extended @set to define expandable vars; + @value expands same. Auxiliary macros \setxxx, \setyyy + used for @set. + +Sun Aug 2 14:34:48 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\entry): do line-breaking on the index entry. + +Wed Jul 1 17:05:26 1992 Karl Berry (karl@claude.cs.umb.edu) + + * texinfo.tex (\lparen, \rparen): new definitions. + ((,[,],)): new global definitions for these four active + characters, so parens and brackets can be used in @deffn names. + +Sat Jun 27 11:32:58 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\shortchaplabel): new macro to align chapter and + appendix labels. + (\shortchapentry): call it. + (\shortappendixwidth): new dimen register. + +Wed Jun 24 09:45:34 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\afterenvbreak): make the same as \aboveenvbreak, + so space below environments doesn't get lost. + (\aboveenvskipamount): rename to \envskipamount, since it's used + both above and below. + +Wed Jun 24 09:45:34 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\group): do @comment at the end, to avoid excessive + white space when called inside @group. + +Wed Jun 24 16:36:04 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\startcontents): End page before setting pageno. + +Thu May 28 20:27:25 1992 Robert J. Chassell (bob@hill.gnu.ai.mit.edu) + + * texinfo.tex (\vtable): Like @ftable, but for variables. + +Fri May 22 07:04:32 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\w): do \leavevmode before the \hbox. + +Sat May 16 11:16:27 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\smallbook): decrease \topskip somewhat. + + * texinfo.tex (\group): use \vtop instead of \vbox. + + * texinfo.tex (\newlinechar): define for use in help strings. + (\groupinvalidhelp): define this for use with \errhelp. + (\group): set \errhelp to above. + +Thu Apr 30 16:19:17 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\need): Rewritten by karl. + +Sat Apr 18 16:24:00 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\exdentamount): New var, set by environments. + (\exdent, \exdentyyy): Define suitably for filled environments. + Always exdent by innermost indentation step. + (\nofillexdent, \nofillexdentyyy): Alternates for nofill envs. + (\lisp, \smalllispx, \display): Set \exdent to \nofillexdent. + +Thu Apr 2 15:04:15 1992 Robert J. Chassell (bob@kropotkin.gnu.ai.mit.edu) + + * texinfo.tex (\Esmalllisp): Smaller baseline skip for smallexamples. + +Sun Mar 29 20:44:49 1992 Brendan Kehoe (brendan@cs.widener.edu) + + * texinfo.tex (\startcontents): Always close contentsfile and + adjust the page. + +Fri Mar 27 17:41:52 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\chapternofonts): Deal with \result, \equiv, etc. + +Sat Mar 21 08:22:29 1992 Karl Berry (karl at hayley) + + * texinfo.tex (\entry): format entries better if the page number + and entry text don't fit on one line. + + * texinfo.tex (\loggingall, \gloggingall): new macros to help with + debugging. + +Fri Mar 20 15:35:42 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\result, \expansion, \print, \equiv): + Don't copy prefabricated boxes; must adapt to current font. + (\dblarrowbox, \longdblarrowbox, \pushcharbox, \equivbox): Deleted. + (\bullbox): Deleted. + +Thu Mar 19 22:17:14 1992 Robert J. Chassell (bob@kropotkin.gnu.ai.mit.edu) + + * texinfo.tex (\widowpenalty, \clubpenalty): Set them to 10000, since + 8000 did not work. + +Fri Mar 6 13:26:36 1992 Robert J. Chassell (bob@kropotkin.gnu.ai.mit.edu) + + * texinfo.tex (\widowpenalty, \clubpenalty): Set them to 8000, since + 2000 did not work (but \widowpenalty at 20000 did work). + +Thu Feb 27 12:27:14 1992 Karl Berry (karl@wombat.gnu.ai.mit.edu) + + * texinfo.tex (\widowpenalty): set to 2000, not 20000. + +Sat Feb 8 14:34:45 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\widowpenalty, \clubpenalty): Set them to 2000. + (\itemizeitem): Use penalty 1200. + (\itemzzz): Add \nobreak near beginning. + + * texinfo.tex (\quotation): Increase right margin, instead of + left margin twice. + +Wed Feb 5 12:08:30 1992 Karl Berry (karl at hayley) + + * texinfo.tex (\alphaenumerate, \capsenumerate): redefine as a call + to \enumerate. + (\{lower,upper}caseenumerate): Rename from \{alpha,caps}enumerate. + +Sun Feb 2 21:07:19 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\itemzzz): Compensate in line-by-itself case for + a table that is indented. + +Mon Jan 13 21:04:07 1992 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex: Use 26 instead of control-z as character constant. + +Sat Jan 11 02:20:58 1992 Roland McGrath (roland@albert.gnu.ai.mit.edu) + + * gpl.texinfo: Unfilled Yoyodyne example. + +Sat Dec 7 16:16:54 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\cartouche): Set \nonarrowing. + (\lisp, \smalllisp, \quotation, \display): If set, don't narrow. + +Mon Dec 2 08:15:08 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\itemzzz): don't start a paragraph if the item text + is on a line by itself; don't allow a page break after that + line; always do \par before typesetting anything. + +Tue Nov 26 15:13:13 1991 Roland McGrath (roland@albert.gnu.ai.mit.edu) + + * lgpl.texinfo: @ifset lgpl-appendix, use @appendix instead of + @unnumbered. + +Sun Nov 10 12:00:06 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\doprintindex): only \read if the file existed; + \closein the test stream in all cases. + (\initial, \entry): do not \outer, so that \read does not get an + error if the index exists. + +Fri Nov 8 18:13:28 1991 Michael Bushnell (roland@churchy.gnu.ai.mit.edu) + + * texinfo.tex (\itemizey): missing %'s in macro defn. + Also, add \begingroup; accidentally deleted by Karl Berry. + +Thu Nov 7 11:41:25 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\doprintindex): \read from the index file to make + \ifeof true when the file exists but is empty. + +Tue Nov 5 08:29:13 1991 Robert J. Chassell (bob at grackle) + + * texinfo.tex (@thischaptername): Provide default value for when + @chapter not defined. + +Sat Nov 2 17:59:02 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\itemizezzz): do \begingroup here, since \itemizey + can't any longer. + +Tue Oct 29 12:17:41 1991 Robert J. Chassell (bob at grackle) + + * texinfo.tex: @paragraphindent defined as a no op. + +Fri Oct 25 15:19:47 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\enumeratey): allow any lowercase letter, uppercase + letter, or number as argument; initialize \itemno and begin the + environment's group here. + (\itemizey): don't initialize \itemno here. + (\numericenumerate, \startenumeration): new macro. + +Wed Oct 23 16:26:30 1991 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\ifclear, \ifset): Remove \outer. + + * texinfo.tex (\afourpaper): Set various parameters. + +Tue Oct 22 18:42:31 1991 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\alphaenumerate, \capsenumerate): + Let @end enumerate end these. + (\Ealphaenumerate, \Ecapsenumerate): Aliases for \Eenumerate. + +Sun Oct 20 18:23:18 1991 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\mainmagstep): New parameter macro. + (Defining fonts): Use that parameter to scale them. + If \bigger is defined, use 12 point fonts. + +Tue Sep 24 00:30:07 1991 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * texi2dvi: Iterate over the right variable to look for new idx files. + + * texi2dvi: GPL 2. + + * texi2dvi: Fix 2nd invocation of texindex to pass right args. + +Wed Sep 11 20:52:42 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\cartouche): New macro. + +Fri Aug 23 16:13:46 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\section, \subsection, \subsubsection): + Initially define for numbered chapters. + +Fri Aug 2 01:46:09 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\footnote): Use \unskip instead of \removelastskip. + +Mon Jul 29 14:06:54 1991 Roland H. Pesch (pesch at cygint.cygnus.com) + + * texinfo.tex (\majorheadingzzz, \chapheadingzzz, \chfplain, + \unnchfplain, \unnchfopen, \secheadingi, \subsecheadingi, + \subsubsecheadingi): allow line breaks in headings. + (\shortchapentry, \shortunnumberedentry, \dochapentry, \dosecentry, + \dosubsecentry, \dosubsubsecentry): allow line breaks in table of + contents entries. + +Thu Jul 18 19:01:53 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\secfonts, \indexfonts): Fix typos. + +Sun Jul 7 16:36:28 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\afourpaper): New command. + + * texinfo.tex (\numberedsec): Renamed from \section. + (\numberedsubsec): Renamed from \subsection. + (\numberedsubsubsec): Renamed from \subsubsection. + (\chapter, \appendix, \unnumbered): Define \section, \subsection, + and \subsubsection here according to type of chapter. + +Thu Jul 4 14:19:32 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\defvarparsebody, \defvrparsebody, \defopvarparsebody): + New functions. + (\defvar, \defvr, \defopt, \defcv, \defivar): Use them. + (\deftypevar, \deftypevr): Likewise. + +Mon Jul 1 13:49:25 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\group): Report error if used outside @example, etc. + + * texinfo.tex (\defname): Reduce \leftskip + to cancel temporarily the increase made in \defparsebody. + + * texinfo.tex (\enumerate): Allow optional arg to specify type + of counting. + + * texinfo.tex (\set, \clear): New commands. + +Mon Jun 24 12:22:44 1991 Roland McGrath (roland@albert.gnu.ai.mit.edu) + + * texinfo.tex (\eleterate): Renamed to \alphaenumerate. Sigh. + (\ecapitate): Likewise \capsenumerate. + +Thu Jun 6 20:02:48 1991 Roland McGrath (roland@geech.gnu.ai.mit.edu) + + * lgpl.texinfo: Created from /fsf/rms/gnuorg/lgpl.text. + + * gpl.texinfo: Created from /fsf/rms/gnuorg/gpl.text (GPL v2). + + * texinfo.tex (\eleterate, \ecapitate): New commands, like @itemize, + but with [a..z] or [A..Z] instead of [1..n]. + +Tue May 21 15:46:32 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\dmn): new command to typeset a dimension. + +Tue May 21 20:58:22 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\doind, \dosubind): Make new group around \indexdummies + and most of body, excluding the \penalty commands. + +Mon May 20 21:16:32 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\tex): Typo in redefining \@. + + * texinfo.tex (\_): Use \lvvmode, not \leavevmode. + (\lvvmode): New macro. + + * texinfo.tex (\authorrm, \titlerm): Move to after section fonts. + +Tue May 14 21:13:29 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\defunargs): Set \hyphenchar in \tensl, not \sl. + +Thu May 9 17:07:08 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\ignore): Standardize catcode of space. + +Wed May 8 13:49:45 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\sffam, \sf): New macros; support sans serif + type style in math. + (top level): Set up \textfonts early on, so we can create boxes w/ it. + (\tenrm...\tensf): Define these to be \textrm...\textsf instead. + (\df, \textfonts, \chapfonts, \secfonts, \subsecfonts): + (\indexfonts): Redefine \tenrm (etc.) instead of just \rm, so that + the math family assignment doesn't get lost; call \resetmathfonts. + (\resetmathfonts): New macro; redefines \textfont of each math family. + (\indsc, \indi, \indsy \chapsc, \chapi, \chapsy, \secsc, \seci): + (\secsy, \ssecsc, \sseci, \ssecsy): New font definitions. + +Mon May 6 21:30:19 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\indexdummies): Write \_ when an _ is seen. + +Mon Apr 29 01:41:44 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\defname): Use \dimen2, \dimen3 for outer margins. + Use outer margins for influencing \rightline. + (\tclose, \key, \t): Turn off line breaks at hyphens. + +Fri Apr 12 03:12:14 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\authorrm): Move definition to top level; copy \secrm. + +Tue Apr 2 22:48:39 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\defname): Adjust size of \rlap box, not \dimen0 + or \dimen1, for current width. + + * texinfo.tex (\Yappendixletterandtype): End with {}. + +Sat Mar 30 16:13:25 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\xrefX): Really use \cite. + (\inforefzzz): Use \samp for node name. + + * texinfo.tex (\defname): Use current width for \dimen0, \dimen1. + + * texinfo.tex (\doprintindex): Put lots of whitespace before index. + +Fri Mar 29 17:00:58 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\xrdef): Take out last change. + + * texinfo.tex (\needx): Turn off \baselineskip. Use kern, and no glue. + + * texinfo.tex (\shortcontrm): Renamed from \truesecrm. + (\shortcontbf, \shortcontsl): New fonts for short contents lines. + (\summarycontents): Use them. + + * texinfo.tex (\defname): Don't set \leftskip to 0; just decrease by + one indent level. + (\defparsebody, \def*parsebody): Increment both margins by one level. + +Tue Mar 26 22:41:38 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\xrdef): Change catcode before reading args. + +Wed Mar 20 14:21:57 1991 Roland McGrath (roland at geech.gnu.ai.mit.edu) + + * texi2dvi: Use p modifier in sed -n command, so it works. + Duplicate code to find the index files, instead of being smart in + one place and dumb in another. + +Thu Mar 7 17:08:32 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\defaultparindent): New variable. + (\footnotezzz): Reset \parindent to default. + (\xrefX): Use \cite for printed manual and node names. + +Tue Mar 5 13:39:34 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\emergencystretch feature): Use \thisisundefined. + +Mon Mar 4 00:35:57 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\ftablex): Define \Eftable; undefine \Etable. + + * texinfo.tex (\footnote): Discard preceding whitespace. + + * texinfo.tex: Use the \emergencystretch feature if available. + +Fri Feb 22 03:50:58 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\tex): Make + not active. + +Fri Feb 15 10:05:24 1991 Roland McGrath (mcgrath at cygint.cygnus.com) + + * texi2dvi: Use $TEXINFO in place of $TEX (falling back to $TEX + if $TEXINFO is undefined). + + * texi2dvi: Renamed from texinfo. Bob (I believe) did this at some + point at and didn't make a ChangeLog entry. I'd shoot him myself if + he weren't the person who signs my paychecks. + +Sun Feb 10 22:51:52 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\doprintindex): If index is empty, print a dummy. + (\need): Use vskips and penalties; don't use \pagetotal. + +Fri Feb 8 17:36:53 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\ignoresections): + Turn off \contents, \smallbook and \titlepage. + + * texinfo.tex (\Etitlepage): Do a page break before ending the group. + + * texinfo.tex (\setref, \unnumbsetref, \appendixsetref): + Comment out recording the chapter title. + +Thu Jan 24 23:28:41 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\top): Synonym for \unnumbered. + (\infotop): Synonym for \infounnumbered. + (\ignoresections): Handle \top. + +Thu Jan 24 12:41:33 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex: Delete spurious character at beginning. + +Thu Jan 17 16:34:25 1991 Roland McGrath (roland at cygint.cygnus.com) + + * texinfo: Check the exit status of tex and texindex. Don't procede + after a failing run. + +Thu Jan 10 15:16:47 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\xrefX): Get rid of blank line. + +Wed Jan 9 18:06:20 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\entry, \secondary): Use \indexdotfill. + (\indexdotfill): New macro. + +Tue Jan 8 17:44:01 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\donoderef): Define a ...-title cross-reference. + (Ytitle): Subroutine for that. + (xrefX): Use the real title by default (but this is commented out). + +Tue Jan 1 23:18:21 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\indexnofonts): Delete troublemaking blank line. + +Sat Dec 22 00:47:21 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\xrefX): Prevent extra space. + +Fri Dec 21 21:14:50 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\comment, \commentxxx): Ignore @ in comment. + +Thu Dec 13 22:38:31 1990 Chris Hanson (cph at kleph) + + * texinfo.tex (\defivarheader): Capitalize "Variable". + +Sun Dec 2 01:46:04 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\indexdummies, \indexnofonts): Handle \t like \r. + + * texinfo.tex (heading fonts): New fonts based on cm...12. + +Tue Nov 27 16:59:35 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\indexnofonts): Also supersede \TeX and \dots. + +Sun Nov 18 16:18:14 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\*): End with \ignorespaces. + +Fri Nov 2 17:41:48 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\*): Output empty hbox to avoid losing whitespace. + (\deftypevarheader, \deftypevrheader): End the paragraph + with suitable penalties. + (\deftypevrheader): Do print the data type. + +Thu Nov 1 12:04:52 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\defmethodheader): Print `method', not `operation'. + +Fri Oct 26 17:11:08 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\indexdummies): Temporarily redefine \_. + (\ptexdots): Copy of plain tex \dots. + (\tex): Temporarily reinstall that. + +Fri Oct 19 16:57:48 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\subsubsecheadingi, \subsecheadingi): New subroutines. + +Mon Oct 8 13:34:19 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (active _): Use \normalunderscore. + +Tue Sep 25 22:32:55 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\deftypefn, \deftypevar, \deftypevr): New macros. + Their subroutines also new. + +Tue Sep 25 16:42:52 1990 Roland McGrath (roland at geech.ai.mit.edu) + + * texinfo: Recognize `.tex' as a suffix. + +Tue Sep 25 01:46:54 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\deftypefun): New macro. + (\deftypefunheader, \deftypefunheaderx, \deftypefunargs): Also new. + +Fri Sep 14 00:38:28 1990 Roland McGrath (roland at churchy.ai.mit.edu) + + * texinfo: Weed out files that have two-letter extensions but don't + start with a backslash, and therefore aren't index files. + + * texinfo: Handle index files that have any two-letter extension, + rather than using a static list of extensions. + + * texinfo: Handle .texi extension as well as .texinfo. + + * texinfo: New file, a sh script to do .texinfo -> .dvi. + +Mon Sep 10 13:14:39 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\math): New macro. + +Tue Sep 4 07:43:33 1990 Karl Berry (karl at hayley) + + * texinfo.tex (\chfplain): Do not print a period after the chapter + number, for consistency with sections et al. + + * texinfo.tex (\refX): hyphenate `undefined' so that the ligature + is not lost. + + * texinfo.tex (_): use \_ unless we're in tt. + (\ifusingtt): new macro for such conditionalization. + + * texinfo.tex (\xrefX): don't use \unhbox to print the node names, + since that loses on hyphens. + Use \ignorespaces rather than \losespace. + +Thu Aug 2 07:03:26 1990 Karl Berry (karl at hayley) + + * texinfo.tex (\linenumber): new macro. + (\refx): give the line number in the message. + +Tue Jul 31 09:13:32 1990 Karl Berry (karl at hayley) + + * texinfo.tex (\refx): improve warning messages, remove + unnecessary groups, and improve logic. + +Thu Jul 26 20:53:38 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\subheading, \subsubheading): Missing macros defined. + +Thu Jul 19 22:48:26 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\titlepage): Don't print rule for \page unless already + printed a rule. + (\abstract): Deleted. + (\direntry): New command, much like \ignore. + +Sun Jul 15 16:28:42 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\abstract): New construct; trivial in tex. + +Sun Jun 17 01:03:16 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\defcv): Protect space before `of'. + (\defspec): Capitalize `Form'. + +Sat Jun 16 19:36:56 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\kbd, \kbdfoo): Use \par to term. arg to \kbdfoo. + +Fri Jun 15 10:47:12 1990 Robert J. Chassell (bob at pogo.ai.mit.edu) + + * texinfo.tex (\defcv): Use \defcvarheader instead of (undefined) + \defcvheader. + +Fri May 25 18:04:31 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\xrefX): Use \turnoffactive. + +Mon May 21 21:17:34 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\turnoffactive): New command. + (\normaldoublequote, ...): New commands. + (\dosetq): Use \turnoffactive. + +Sat May 19 12:31:17 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\indit): Use slanted font, not italic. + (\smalllispx): Do \indexfonts. + +Fri May 4 17:35:04 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\footnote, \footnotezzz): Make it \long. + +Wed May 2 01:19:55 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\titlerm): Go back to cmbx10 scaled \magstep5. + (\hsize): Don't set it, use the default. + +Fri Mar 23 21:07:02 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\footnote): Read arg in braces, not as a line. + +Mon Mar 19 19:30:08 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\unnumbsubsubsecentry): Typo in name being defined. + +Tue Mar 13 18:49:27 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\defvarargs): Add penalty at end. + + * texinfo.tex (\synindex, \syncodeindex): Copy one index file name + into the other. + +Tue Mar 6 16:58:54 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\deftt): Make this a distinct font. + + * texinfo.tex (\initial): Define \tt like \tentt. + + * texinfo.tex (\ifinfo): End with \losespace. + (\ignore, \ifsetfailxxx, \ifclearfailxxx): Likewise. + +Sun Mar 4 19:55:57 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\lbrb, \rbrb): Use \bf. + +Sat Mar 3 17:53:22 1990 Richard Stallman (rms at geech) + + * texinfo.tex (\onepageout): Set \escapechar here. + + * texinfo.tex (\rawbackslash): Define using \chardef. + + * texinfo.tex (\@): Use ttfont. + +Thu Mar 1 16:37:46 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (Ysectionnumberandtype, Yappendixletterandtype): + Capitalize "chapter", "appendix" and "section". + +Mon Feb 19 20:26:22 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\xkey): Attempt to eliminate spurious space from + output. Look at y-or-n-p. + +Mon Feb 12 16:34:00 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\errorbox): Get \dimen0 from \tentt. + +Sun Feb 11 15:11:57 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\defunargs): Use ragged right for args. + Add large penalty at end. + + * texinfo.tex: Make active definition for = using \tt, but disable. + (\defparsebody): Make = active. + (\defunheader, etc.): Make inactive again. + + * texinfo.tex (\errorbox): Try to equalize outside space to both sides. + +Fri Feb 2 14:47:21 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\appendix): Don't use \the before \appendixletter. + +Sat Dec 16 14:02:56 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\chapter, \appendix): Make defn of \thischapter + refer to \thischaptername, and store actual name there. + (\chapternofonts): Turn off more macros. + (\indexdummies): Likewise. + +Sun Nov 19 15:29:47 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\titlerm): There were two definitions of this command. + Put them together and commented out one of them. + (\subtitlerm): Was same as \tenrm, so just copy that. + (\ninett): Always define this. + (\indtt): Copy from \ninett. + +Sat Nov 18 22:57:37 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\ssecrm, etc.): Scale by 1315, rather than to 13pt. + +Wed Nov 8 18:38:33 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\titlepage): Turn on iffinishedtitlepage so + bottom rule is not printed. + (\titlezzz): Turn it off, so bottom rule is printed. + +Mon Nov 6 09:23:29 1989 Karl Berry (karl at hayley) + + * texinfo.tex (\chapterzzz, \appendixzzz): include `Chapter + \the\chapno' and `Appendix \appendixletter' in \thischapter; use + \xdef instead of \gdef to define \thischapter, to avoid timing + problems with \chapno or \appendixletter. + (\startcontents): don't bother putting `Table of Contents' or + `Short Contents' in the headline. + +Fri Oct 20 09:11:35 1989 Karl Berry (karl at hayley) + + * texinfo.tex (\titlepage): remove obsolete code for subtitles. + (\titlezzz): end with \relax, to avoid misinterpretation of a + following `plus' or `minus' + (\page (inside \titlepage)): call \finishtitlepage. + (\Etitlepage): call \finishtitlepage, if it hasn't been. + (\finishtitlepage): new macro to print a rule and leave some space + at the bottom of the title page. + (\iffinishedtitlepage): new; says whether \finishtitlepage has been + called. + +Mon Nov 6 21:35:34 1989 Robert J. Chassell (bob at rice-chex) + + * texinfo.tex: Replaced `GNU CC' in the copyleft of this file with + the phrase `this texinfo.tex file'. + +Fri Oct 27 10:36:32 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\setfilename): Do nothing except 1st time used. + (\titlepage): Brace misplaced in \titlezzz. + (\indexdummies, \indexnofonts): Handle @w. + + (\readauxfile): Set \ifhavexrefs true. + (\refX): Warn for every use of an undefined xref, + but if no xref values are known, warn just once that none are known. + +Tue Sep 19 04:12:51 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\xrefX): Go back to `section N [Foo], page M'. + (\exp): Delete it. + +Mon Sep 18 15:29:30 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\chapentryfonts): Try using \rm for chap title. + +Tue Sep 12 03:41:10 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\titlepage): Missing closeparen after \title. + Delete excess paren after \page. + + * texinfo.tex (\samp): Use \tclose. + +Mon Sep 11 23:28:04 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\tclose): Make `@ ' a full-width space. + +Sat Sep 9 20:11:29 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\balancecolumns): Handle properly the case where + the index ends before one page is output, so \partialpage is nonempty. + In this case we may need to output two pages if the data + would just barely fit if not for \partialpage. + +Wed Aug 30 22:45:31 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\refx): New 2nd operand, output if xref is non-null. + (\xrefX): Use that to output the comma after the section number. + (\appendixnoderef, \appendixsetref, \Yappendixletterandtype): + Define xrefs for appendices that say "Appendix N". + Used in \appendix, \appendixsec, etc. + + * texinfo.tex (\smartitalic): The actual italic correction was omitted. + +Mon Aug 28 00:21:33 1989 Richard Stallman (rms at apple-gunkies.ai.mit.edu) + + * texinfo.tex (\ref): New kind of cross-reference. + (\xrefX): Put single quotes around section name. + (\refx): Allow hyphenation in `undefined'. + + * texinfo.tex (+): Make it active. + (Altmode): Delete active defn. + + * texinfo.tex (\defunargs): Prevent hyphenation at `-' in args. + Move the penalty at the end so that it works. + (\defvarargs): Move the penalty at the end so that it works. + + * texinfo.tex (\defparsebody): Do increase right margin. + + * texinfo.tex (\defbodyindent): Now .4 inch. + + * texinfo.tex (\point, \result, \expansion, \print, \equiv, \error): + New macros for Lisp manual. + + * texinfo.tex (\tex): Set = to code 12. + + * texinfo.tex (\entry): Hairier way to output dots. + + * texinfo.tex (\kbd): If arg consists of one \key command, be a no op. + + * texinfo.tex (\sc): Delete spurious \. + + * texinfo.tex (\smartitalic): New macro, does italic correction at end. + (\i, \var, \dfn, \emph, \cite): Use that. + + * texinfo.tex (\node): Do \ENVcheck. + + * texinfo.tex (\initial): Infinite penalty at end. + + * texinfo.tex (\chapternofonts): New macro, sets \code, etc. to + output selves into file. Also undef \frenchspacing and \rawbackslash. + (\xhapterzzz, etc.): Call that. Make a group to undo it. + (\indexdummies): Do like \chapternofonts. + +Sun Aug 27 16:05:23 1989 Richard Stallman (rms at apple-gunkies.ai.mit.edu) + + * texinfo.tex (\frenchspacing): Our own definition, using + decimal numbers for all character codes. The standard one fails. + + * texinfo.tex (\indexnofonts): Handle \file, \tt, and many more. + +Fri Aug 25 22:05:24 1989 Richard Stallman (rms at apple-gunkies.ai.mit.edu) + + * texinfo.tex (\chapter, etc.): Undefine \tclose around \edef\temp. + +Mon Aug 21 15:42:47 1989 Richard Stallman (rms at apple-gunkies.ai.mit.edu) + + * texinfo.tex (\tclose): Like \t but make space same width + as in surrounding text. + (\code, \kbd): Use \tclose. + +Tue Jul 4 20:53:52 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (titlepage): Don't set \everypar; start just one group. + See comments in the code. + + * texinfo.tex (defop,defcv): Use defopparsebody. + * texinfo.tex (defopparsebody): Like defmethparsebody but defines + def...x for more arguments. + +Sat Jun 17 13:49:13 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\titlepage): Rename @subtext, etc., to @subtitle, etc. + + * texinfo.tex (\titlepage): Don't print the title automatically. + Define @title to print it, and the rule underneath it. + This should make @titlepage upward compatible with the old one. + + * texinfo.tex (\titlepage): Revert local definition of @page + to previous. Don't print a rule. + +Mon Jun 12 20:49:17 1989 Karl Berry. (karl at mote) + + * texinfo.tex (\titlepage): allow intensional definition of the + items on the title page. New control sequences (allowed only + within the titlepage environment:) + (@subtext): may take either a paragraph (e.g., a brief + description of the program) or just a line (e.g., the date). + May appear more than once. + (@author): must come after all the @subtext's. Can appear more + than once, also. + Also, use the title defined by @settitle. + (\subtextfont, \authorfont): switch to using the appropriate + fonts with appropriate leading. + (\titlepagetopglue, \titlepagebottomglue): define space that + never stretches or shrinks. + (\realeverypar): formatting for the @subtext's. + +Sun Jun 4 15:04:59 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\shortchapentry, \shortunnumberedentry): + Use dots, right justify page numbers. Don't use italics. + +Fri Jun 2 14:40:28 1989 Karl Berry. (karl at mote) + + * texinfo.tex (\entry, \secondary): use plain TeX \dotfill for + better leaders than the homegrown one. + (\Dotsbox): Deleted. + (\dotfill): Deleted; use Plain TeX definition. + +Wed May 31 17:19:30 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (ignore): Undefine the chapter/section macros + while reading the args, since they are \outer. + (ifinfo): Likewise + (ifsetxxx, ifclearxxx): Call another macro to parse the + conditionalized text, and do to that macro as with \ignore. + +Tue May 30 15:04:37 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (unnumbered): Change back from \long to \outer. + + * texinfo.tex: Changes by Karl Berry for toc format. + Rewrite the table of contents for appearance's sake. Add a + synonym for \summarycontents, \shortcontents, since that is the + traditional name. Two subroutines are now shared by \contents and + \summarycontents: \prepareforcontents, to reset the page number + and such; and \startcontents, which begins the \unnumbered and + resets catcodes before \input \jobname.toc. Some other macros -- + \labelspace, \dopageno, \shortpageno -- are shared by the printing + macros. + + * texinfo.tex (\truesecrm): New font, section-size roman, used in the + new toc. (cmr12) + +Sun May 28 07:25:42 1989 Karl Berry. (karl at mote) + + * texinfo.tex (\eatinput): Do not print the `\input texinfo' if a + .fmt file is being used; ignore it, instead. This is the initial + definition for `\' now. + (\fixbackslash): on the other hand, subsequent backslashes should + be printed, and if the file does not have an `\input texinfo', the + first one should be printed. This new macro makes the definition + for `\' be \normalbackslash, if it is \eatinput. + (\setfilename): use \fixbackslash. + +Wed May 24 15:34:59 1989 Joseph Arceneaux (jla at apple-gunkies.ai.mit.edu) + + * texinfo.tex: Changed def of unnumbered from \outer to \long. + +Tue May 23 12:27:59 1989 Karl Berry. (karl at mote) + + * texinfo.tex: Allow one to make a texinfo.fmt file (with the + invocation: + initex \&plain texinfo + and then saying + @dump + after texinfo.tex has been read. + Changes: + (\setfilename): Instead of being a no-op, read the xref info, and + open the contents and index files. These actions were done as + texinfo.tex was read before. + (\opencontents, \openindices): new macros to open those files. + (\readauxfile): and one to read the aux file. + +Sat Apr 29 22:28:02 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex: `@headings on' no longer does a page break. + +Sun Apr 2 11:22:29 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex: Defined `@headings single' and `@headings double'. + `@headings on' picks one of them: `@setchapternewpage odd' + says `@headings on' means double; otherwise it means single. + +Mon Jan 30 22:00:35 1989 Robert J. Chassell (bob at rice-krispies.ai.mit.edu) + + * texinfo.tex: Changed the size of the subsection fonts so they + are scaled at13pt rather than at magstep 2. This makes them + smaller than the section fonts, which are scaled at magstep 2. + In addition, changed the ssecrm font from cmbx to cmb. + +Fri Jan 6 15:00:44 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex: Changed @lisp, @smalllisp, @display not to change + the right margin. + +Mon Dec 5 22:01:49 1988 Robert J. Chassell (bob at rice-krispies.ai.mit.edu) + + * texinfo.tex: Tested the use of `cmbx10' vrs `cmb10' font and + stayed with cmb10 font since cmb10 looks better when the bold face + is part of a sentence although the cmbx10 font looks better on its own. + +Mon Aug 15 14:33:51 1988 Robert J. Chassell (bob at spiff) + + * texinfo.tex: Changed the (undocumented) @today command from a + Month Day, Year format to a Day Month Year format. Left old + version commented out. + + +Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, +1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. + + +Local Variables: +mode: indented-text +left-margin: 8 +fill-column: 76 +version-control: never +End: diff --git a/gnu/dist/texinfo/INSTALL b/gnu/dist/texinfo/INSTALL index 995e262ff1d..5e20e9fac79 100644 --- a/gnu/dist/texinfo/INSTALL +++ b/gnu/dist/texinfo/INSTALL @@ -1,4 +1,4 @@ -Id: INSTALL,v 1.3 2004/04/09 17:43:53 karl Exp +Id: INSTALL,v 1.5 2004/11/19 13:08:47 karl Exp Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -16,6 +16,12 @@ Installation notes specific to Texinfo: make TEXMF=/your/texmf install-tex texinfo.tex is installed in ${TEXMF}/tex/texinfo/texinfo.tex, etc. +* On the other hand, if you're maintaining a TeX distribution, you don't + want your users to see the installation warnings, because you already + have the files installed. (And you're keeping them up to date, right?) + In this case, run configure --disable-install-warnings, or set + enable_install_warnings=no in the environment. + * On MacOSX, if configure fails with the error: ac_cv_build='config.sub: invalid option -apple-darwin7.2.0 this is probably because your uname -p is returning "unknown". Use diff --git a/gnu/dist/texinfo/INSTALL.generic b/gnu/dist/texinfo/INSTALL.generic index 54caf7c190f..095b1eb4063 100644 --- a/gnu/dist/texinfo/INSTALL.generic +++ b/gnu/dist/texinfo/INSTALL.generic @@ -1,13 +1,16 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. +Installation Instructions +************************* - This file is free documentation; the Free Software Foundation gives +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== - These are generic installation instructions. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -67,9 +70,9 @@ The simplest way to compile this package is: Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -82,7 +85,7 @@ is an example: Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the @@ -99,19 +102,19 @@ for another architecture. Installation Names ================== - By default, `make install' will install the package's files in +By default, `make install' will install the package's files in `/usr/local/bin', `/usr/local/man', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. +give `configure' the option `--exec-prefix=PREFIX', the package will +use PREFIX as the prefix for installing programs and libraries. Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -122,7 +125,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -137,11 +140,11 @@ you can use the `configure' options `--x-includes=DIR' and Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -167,9 +170,9 @@ eventually be run) with `--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -178,7 +181,7 @@ A warning: not all `configure' scripts look for a site script. Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -192,8 +195,7 @@ overridden in the site shell script). `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' diff --git a/gnu/dist/texinfo/INTRODUCTION b/gnu/dist/texinfo/INTRODUCTION index c18b789d1ac..6c0de31d26e 100644 --- a/gnu/dist/texinfo/INTRODUCTION +++ b/gnu/dist/texinfo/INTRODUCTION @@ -1,4 +1,4 @@ -Id: INTRODUCTION,v 1.1.1.1 2003/12/06 01:30:34 karl Exp +Id: INTRODUCTION,v 1.3 2004/04/11 17:56:45 karl Exp Getting started with Texinfo. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 diff --git a/gnu/dist/texinfo/Makefile.am b/gnu/dist/texinfo/Makefile.am index 43cd367a50e..88cfaea129d 100644 --- a/gnu/dist/texinfo/Makefile.am +++ b/gnu/dist/texinfo/Makefile.am @@ -1,5 +1,5 @@ # Makefile.am for texinfo. -# Id: Makefile.am,v 1.3 2004/02/24 01:17:11 karl Exp +# Id: Makefile.am,v 1.13 2004/12/15 16:53:59 kasal Exp # Process this file with automake to produce Makefile.in in all directories. # # This file is free software; as a special exception the author gives @@ -14,18 +14,24 @@ AUTOMAKE_OPTIONS = 1.8 readme-alpha # Additional files to distribute. -EXTRA_DIST = INSTALL.generic INTRODUCTION config.rpath \ +EXTRA_DIST = ChangeLog.46 INSTALL.generic INTRODUCTION README.dev \ + config.rpath \ djgpp/README djgpp/config.bat djgpp/config.sed djgpp/config.site # This is to prevent texinfo.tex from being included in the top-level # distribution directory. TEXINFO_TEX = doc/texinfo.tex -# All subdirectories. -# Do intl, m4, and lib first since the C programs depend on them. -# Do doc last so makeinfo will be built when we get there. -# Others are alphabetical. -SUBDIRS = intl m4 lib info makeinfo po util doc +if TOOLS_ONLY + # Build native tools only. + SUBDIRS = lib info makeinfo util +else + # All subdirectories. + # Do intl, m4, and lib first since the C programs depend on them. + # Do doc last so makeinfo will be built when we get there. + # Others are alphabetical. + SUBDIRS = $(native_tools) intl m4 lib info makeinfo po util doc +endif # for gettext. ACLOCAL_AMFLAGS = -I m4 @@ -38,3 +44,12 @@ distcleancheck_listfiles = \ # One special target for installers to use by hand if desired. install-tex: cd doc && $(MAKE) TEXMF=$(TEXMF) install-tex + +distclean-local: + -test -d "$(native_tools)" && rm -rf "$(native_tools)" + +# Don't install native tools for cross compile. +if TOOLS_ONLY +install: + +endif diff --git a/gnu/dist/texinfo/NEWS b/gnu/dist/texinfo/NEWS index 6ca010a2db8..efac8f32314 100644 --- a/gnu/dist/texinfo/NEWS +++ b/gnu/dist/texinfo/NEWS @@ -1,5 +1,6 @@ -Id: NEWS,v 1.24 2004/04/07 20:18:21 karl Exp -This file records noteworthy changes. +Id: NEWS,v 1.103 2004/12/24 16:43:58 karl Exp +This file records noteworthy changes, very tersely. +See the manual for detailed information. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -18,10 +19,37 @@ 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 + http://www.gnu.org/software/texinfo/manual/texinfo/html_node/Document-Permissions.html ------------------------------------------------------------------------------- + +4.8 (31 December 2004) +* Language: + . new command @euro for the Euro currency symbol, and + @documentencoding has some support for ISO-8859-15. + . new command @abbr for general abbreviations. + . new command @slanted to typeset text in a slanted font, + and @sansserif to typeset in a sans serif font. +* makeinfo: + . An empty first argument to cross-reference commands, such as @xref, + causes an error. This change was made in 4.1, but not mentioned in NEWS. + . HTML output: + - <a name="..."> constructs are added for the old-style + conversion of node names to HTML names, so that external references + to them can continue to work. + - "g_t" prefixed to targets for node names beginning with a + nonletter, for XHTML compatibility. + . Docbook output: recognize more image formats. +* texi2dvi: + . new option --recode, to call recode for input character translation. +* Distribution: + . new convenience script texi2pdf, equivalent to texi2dvi --pdf (from tetex). + . some cross-compiling support in configure && make. + . new configure option --disable-install-warnings, for TeX. + distributions which do have the files installed. + . automake 1.9.4. + 4.7 (9 April 2004) * Language: . new commands @float, @caption, @shortcaption, @listoffloats for @@ -86,7 +114,7 @@ convenience, here's a url to one of the relevant sections: * Distribution: . new script gendocs.sh (not installed), for use by GNU maintainers in getting their manuals on the GNU web site. Documented in - maintain.texi (http://www.gnu.org/prep/maintain_toc.html). + maintain.texi (http://www.gnu.org/prep/maintain/). . Most code uses ANSI C prototypes, to some extent. . New translation: nb. . automake 1.8.3, autoconf 2.59, gettext 0.14.1. diff --git a/gnu/dist/texinfo/README b/gnu/dist/texinfo/README index 33a973fecb6..ac01bbb573e 100644 --- a/gnu/dist/texinfo/README +++ b/gnu/dist/texinfo/README @@ -1,8 +1,9 @@ -Id: README,v 1.1.1.1 2003/12/06 01:30:35 karl Exp -This is the README file for the GNU Texinfo distribution. +Id: README,v 1.16 2004/12/13 13:36:32 karl Exp +This is the README file for the GNU Texinfo distribution. Texinfo is +the preferred documentation format for GNU software. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/gnu/dist/texinfo/README.dev b/gnu/dist/texinfo/README.dev new file mode 100644 index 00000000000..c4f9a628368 --- /dev/null +++ b/gnu/dist/texinfo/README.dev @@ -0,0 +1,44 @@ +Id: README.dev,v 1.7 2003/11/24 15:11:06 karl Exp +README.dev - Texinfo developer information. + + Copyright (C) 2002, 2003 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. + +The development sources for Texinfo is available through anonymous cvs +at Savannah, see + http://savannah.gnu.org/cvs/?group=texinfo + +This distribution uses whatever versions of automake, autoconf, and +gettext are listed in NEWS; usually the latest ones released. If you +are getting the Texinfo sources from cvs, or change the Texinfo +configure.ac, you'll need to have these tools installed to (re)build. +You'll also need help2man. (All of these are available from +ftp://ftp.gnu.org/gnu.) + +Here's the order in which to run the tools for a fresh build: + + autoheader # creates config.in, not necessarily needed every time + aclocal -I m4 # for a new version of automake + automake + autoconf + configure CFLAGS=-g --enable-maintainer-mode + make + +(with arguments to taste, of course.) Or you can run + + ./bootstrap + +instead of the various auto* tools. + + +One final note: If you would like to contribute to the GNU project by +implementing additional documentation output formats for Texinfo, that +would be great. But please do not write a separate translator texi2foo +for your favorite format foo! That is the hard way to do the job, and +makes extra work in subsequent maintenance, since the Texinfo language +is continually being enhanced and updated. Instead, the best approach +is modify Makeinfo to generate the new format, as it does now for Info, +HTML, XML, and DocBook. diff --git a/gnu/dist/texinfo/TODO b/gnu/dist/texinfo/TODO index 52dcd06d13b..a04598c7dc7 100644 --- a/gnu/dist/texinfo/TODO +++ b/gnu/dist/texinfo/TODO @@ -1,4 +1,4 @@ -Id: TODO,v 1.10 2004/03/27 00:31:21 karl Exp +Id: TODO,v 1.26 2004/11/22 23:57:32 karl Exp This is the todo list for GNU Texinfo. If you are interested in working on any of these, email bug-texinfo@gnu.org. @@ -66,15 +66,13 @@ 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. + - Better def... command syntax. - 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. - - @LaTeX{} command to produce the LaTeX logo. - Glossary/general definition support (dumas msg 28 Nov 2003 17:09:57 +0100). + - Add support for other Latin 9 (and Latin 2 and Latin 1) characters. * Makeinfo: - Translation of "Appendix" etc. should depend on @doclang not $LANG. @@ -87,12 +85,16 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org. makeinfo --no-headers comes close. - If node name contains an @ command, complain explicitly. - Use @documentlanguage instead of LANG for many translations. + - HTML: split output by chapter to improve context, per Akim. + Generate dummy files for all nodes for the sake of cross-references. - HTML: support thumbnails. - HTML: make images of math, maybe. - HTML: allow settable background color, table colors and spacing, <head> meta tags, etc. A la http://texi2html.cvshome.org. In fact: - HTML: have a library of different CSS styles. http://mail.gnu.org/archive/html/bug-texinfo/2004-01/msg00025.html + - XML: cannot be loaded directly in a browser; why not? + - Docbook: € and other entities do not work; does anything work? - Rewrite completely to simplify generation of different formats. * TeX: @@ -109,6 +111,7 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org. - How about using latex2html to produce HTML? - Table of contents gets misaligned if there are 10 or more [sub]sections. - Use url.sty (or something) to allow linebreak of url's. + - Include hyperlink \special's in the DVI output for xdvi, etc. - PDF: make each letter of the index (A, B, ...) a section in the TOC. From Carsten Dominik <dominik@astro.uva.nl>. @@ -168,9 +171,11 @@ Ideas that will not be implemented: [This has the disadvantage of needing to be updated when the Texinfo language changes, so don't.] -- Split HTML output by chapter. - [Then cross-references in HTML cannot be generated consistently.] - - Call Ghostscript to get ASCII/jpg output for the @image command. [makeinfo should not try to be make, or assume it knows how the user wants to generate images. Too many different methods are possible.] + +- 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. Merely specifying what should be + changed is not obvious. diff --git a/gnu/dist/texinfo/config.guess b/gnu/dist/texinfo/config.guess index 51fab477097..82294713260 100755 --- a/gnu/dist/texinfo/config.guess +++ b/gnu/dist/texinfo/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-03-12' +timestamp='2004-11-12' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -203,15 +203,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; cats:OpenBSD:*:*) echo arm-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -227,21 +227,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pegasos:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} + echo mips64-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -307,9 +298,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -331,6 +319,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 exit 0 ;; @@ -354,7 +345,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; @@ -764,7 +755,7 @@ EOF echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` @@ -787,21 +778,7 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <features.h> - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - # GNU/KFreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -850,6 +827,12 @@ EOF cris:Linux:*:*) echo cris-axis-linux-gnu exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -1096,9 +1079,9 @@ EOF M680?0:D-NIX:5.3:*) echo m68k-diab-dnix exit 0 ;; - M68*:*:R3V[567]*:*) + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1196,9 +1179,10 @@ EOF echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - case `uname -p` in + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; @@ -1260,6 +1244,16 @@ EOF *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/gnu/dist/texinfo/config.sub b/gnu/dist/texinfo/config.sub index ba331039bb8..0f84ac2c51e 100755 --- a/gnu/dist/texinfo/config.sub +++ b/gnu/dist/texinfo/config.sub @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-03-12' +timestamp='2004-11-30' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -145,7 +145,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -267,7 +267,7 @@ case $basic_machine in | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -300,7 +300,7 @@ case $basic_machine in | avr-* \ | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ @@ -326,8 +326,9 @@ case $basic_machine in | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ @@ -342,8 +343,8 @@ case $basic_machine in | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -445,6 +446,10 @@ case $basic_machine in basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; cr16c) basic_machine=cr16c-unknown os=-elf @@ -452,6 +457,9 @@ case $basic_machine in crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; @@ -481,6 +489,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -659,10 +671,6 @@ case $basic_machine in mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -743,10 +751,6 @@ case $basic_machine in np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -1029,6 +1033,10 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1059,6 +1067,9 @@ case $basic_machine in romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1294,6 +1305,9 @@ case $os in -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -1374,6 +1388,9 @@ case $basic_machine in *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; diff --git a/gnu/dist/texinfo/depcomp b/gnu/dist/texinfo/depcomp index 9beba448a31..11e2d3bfe1c 100644 --- a/gnu/dist/texinfo/depcomp +++ b/gnu/dist/texinfo/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2003-12-28.12 +scriptversion=2004-05-31.23 -# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004 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 @@ -287,26 +287,35 @@ tru64) base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + # Dependencies are output in .lo.d with libtool 1.4. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir.libs/$base.d" + tmpdepfile2="$dir$base.o.d" + tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD else tmpdepfile1="$dir$base.o.d" tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi if test -f "$tmpdepfile1"; then tmpdepfile="$tmpdepfile1" - else + elif test -f "$tmpdepfile2"; then tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" diff --git a/gnu/dist/texinfo/doc/Makefile.am b/gnu/dist/texinfo/doc/Makefile.am index cfdc307b625..a6191c87ec3 100644 --- a/gnu/dist/texinfo/doc/Makefile.am +++ b/gnu/dist/texinfo/doc/Makefile.am @@ -1,4 +1,4 @@ -# Id: Makefile.am,v 1.1.1.1 2003/12/06 01:31:15 karl Exp +# Id: Makefile.am,v 1.20 2004/11/18 01:10:59 karl Exp # Makefile.am for texinfo/doc. # Run automake in .. to produce Makefile.in from this. # @@ -17,9 +17,10 @@ DISTCLEANFILES = texinfo texinfo-* info*.info* man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \ info.5 texinfo.5 -# Use the programs built in our distribution. -MAKEINFO = ../makeinfo/makeinfo -INSTALL_INFO = ../util/install-info +# Use the programs built in our distribution, taking account of possible +# cross-compiling. +MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo +INSTALL_INFO = $(top_builddir)/$(native_tools)/util/install-info TXI_XLATE = txi-cs.tex txi-de.tex txi-en.tex txi-es.tex txi-fr.tex \ txi-it.tex txi-nl.tex txi-no.tex txi-pl.tex txi-pt.tex txi-tr.tex @@ -29,9 +30,12 @@ EXTRA_DIST = epsf.tex pdfcolor.tex texinfo.tex \ fdl.texi \ $(man_MANS) $(TXI_XLATE) +if INSTALL_WARNINGS install-data-local: @echo - @echo "WARNING: You must install texinfo.tex and txi-??.tex manually," + @echo "WARNING: If your texmf tree does not already contain" + @echo " up-to-date versions, you must install" + @echo " texinfo.tex and txi-??.tex manually," @echo " perhaps in TEXMF/tex/texinfo/," @echo " where TEXMF is a root of your TeX tree." @echo " See doc/README for some considerations." @@ -41,6 +45,7 @@ install-data-local: @echo " use pdftex) pdfcolor.tex in TEXMF/tex/generic/dvips" @echo " and TEXMF/pdftex/plain/misc/pdfcolor.tex respectively," @echo " if your TeX installation did not include them." +endif texmf_texinfo = $(TEXMF)/tex/texinfo texmf_dvips = $(TEXMF)/tex/generic/dvips @@ -58,17 +63,17 @@ install-tex: if MAINTAINER_MODE common_mandeps = $(top_srcdir)/configure.ac info.1: $(top_srcdir)/info/info.c $(common_mandeps) - $(HELP2MAN) --name="read Info documents" `basename $< .c` >$@ + $(HELP2MAN) --name="read Info documents" `basename $@ .1` >$@ infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps) - $(HELP2MAN) --name="compile customizations for Info" `basename $< .c` >$@ + $(HELP2MAN) --name="compile customizations for Info" `basename $@ .1` >$@ install-info.1: $(top_srcdir)/util/install-info.c $(common_mandeps) - $(HELP2MAN) --name="update info/dir entries" `basename $< .c` >$@ + $(HELP2MAN) --name="update info/dir entries" `basename $@ .1` >$@ makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps) - $(HELP2MAN) --name="translate Texinfo documents" `basename $< .c` >$@ + $(HELP2MAN) --name="translate Texinfo documents" `basename $@ .1` >$@ texi2dvi.1: $(top_srcdir)/util/texi2dvi $(common_mandeps) - $(HELP2MAN) --name="print Texinfo documents" `basename $< .c` >$@ + $(HELP2MAN) --name="print Texinfo documents" `basename $@ .1` >$@ texindex.1: $(top_srcdir)/util/texindex.c $(common_mandeps) - $(HELP2MAN) --name="sort Texinfo index files" `basename $< .c` >$@ + $(HELP2MAN) --name="sort Texinfo index files" `basename $@ .1` >$@ endif # Do not create info files for distribution. diff --git a/gnu/dist/texinfo/doc/README b/gnu/dist/texinfo/doc/README index f95cfe97925..8fa072ae845 100644 --- a/gnu/dist/texinfo/doc/README +++ b/gnu/dist/texinfo/doc/README @@ -1,4 +1,4 @@ -Id: README,v 1.1.1.1 2003/12/06 01:31:15 karl Exp +Id: README,v 1.4 2004/04/11 17:56:45 karl Exp texinfo/doc/README Copyright (C) 2002 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/doc/info-stnd.texi b/gnu/dist/texinfo/doc/info-stnd.texi index 0339b6b6236..a5a82ccd682 100644 --- a/gnu/dist/texinfo/doc/info-stnd.texi +++ b/gnu/dist/texinfo/doc/info-stnd.texi @@ -1,6 +1,6 @@ \input texinfo.tex @c -*-texinfo-*- -@c $NetBSD: info-stnd.texi,v 1.1.1.5 2004/07/12 23:26:41 wiz Exp $ -@comment Id: info-stnd.texi,v 1.7 2004/03/24 01:41:06 karl Exp +@c $NetBSD: info-stnd.texi,v 1.1.1.6 2008/09/02 07:51:41 christos Exp $ +@comment Id: info-stnd.texi,v 1.9 2004/12/14 16:58:15 karl Exp @c We must \input texinfo.tex instead of texinfo, otherwise make @c distcheck in the Texinfo distribution fails, because the texinfo Info @c file is made first, and texi2dvi must include . first in the path. @@ -711,7 +711,7 @@ Select the `Up' node. @end table You can easily select a node that you have already viewed in this window -by using the @samp{l} command -- this name stands for "last", and +by using the @samp{l} command---this name stands for ``last'', and actually moves backwards through the history of visited nodes for this window. This is handy when you followed a reference to another node, possibly to read about a related issue, and would like then to resume @@ -1303,8 +1303,7 @@ Split the current window into two windows, both showing the same node. Each window is one half the size of the original window, and the cursor remains in the original window. The variable @code{automatic-tiling} can cause all of the windows on the screen to be resized for you -automatically, please @pxref{Variables, , automatic-tiling} for more -information. +automatically (@pxref{Variables, , automatic-tiling}). @item @kbd{C-x @key{0}} (@code{delete-window}) @cindex windows, deleting @@ -1324,7 +1323,7 @@ Delete all of the windows excepting the current one. @findex scroll-other-window Scroll the other window, in the same fashion that @samp{C-v} might scroll the current window. Given a negative argument, scroll the -"other" window backward. +``other'' window backward. @item @kbd{C-x @key{^}} (@code{grow-window}) @kindex C-x ^ @@ -1580,7 +1579,7 @@ with @samp{fol}. @item @key{ESC C-v} (@code{echo-area-scroll-completions-window}) @kindex ESC C-v, in the echo area @findex echo-area-scroll-completions-window -Scroll the completions window, if that is visible, or the "other" +Scroll the completions window, if that is visible, or the ``other'' window if not. @end table @@ -1907,7 +1906,7 @@ nonzero value, Info attempts to scroll the node text by that many lines; if that is enough to bring the cursor back into the window, that is what is done. The default value of this variable is 0, thus placing the cursor (and the text it is attached to) in the center of the window. -Setting this variable to 1 causes a kind of "smooth scrolling" which +Setting this variable to 1 causes a kind of ``smooth scrolling'' which some people prefer. @item show-index-match diff --git a/gnu/dist/texinfo/doc/info.1 b/gnu/dist/texinfo/doc/info.1 index a1359323b0b..02981804705 100644 --- a/gnu/dist/texinfo/doc/info.1 +++ b/gnu/dist/texinfo/doc/info.1 @@ -1,7 +1,7 @@ -.\" $NetBSD: info.1,v 1.1.1.5 2004/07/12 23:26:39 wiz Exp $ +.\" $NetBSD: info.1,v 1.1.1.6 2008/09/02 07:51:56 christos Exp $ .\" -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -.TH INFO "1" "April 2004" "info 4.7" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34. +.TH INFO "1" "December 2004" "info 4.8" "User Commands" .SH NAME info \- read Info documents .SH SYNOPSIS @@ -45,7 +45,7 @@ output escapes as literal text. read initial keystrokes from FILENAME. .TP \fB\-O\fR, \fB\-\-show\-options\fR, \fB\-\-usage\fR -go to command-line options node. +go to command\-line options node. .TP \fB\-\-subnodes\fR recursively output menu items. @@ -54,12 +54,12 @@ recursively output menu items. print physical location of Info file. .TP \fB\-\-vi\-keys\fR -use vi-like and less-like key bindings. +use vi\-like and less\-like key bindings. .TP \fB\-\-version\fR display version information and exit. .PP -The first non-option argument, if present, is the menu entry to start from; +The first non\-option argument, if present, is the menu entry to start from; it is searched for in all `dir' files along INFOPATH. If it is not present, info merges all `dir' files and shows the result. Any remaining arguments are treated as the names of menu @@ -67,10 +67,10 @@ items relative to the initial node visited. .SH EXAMPLES .TP info -show top-level dir menu +show top\-level dir menu .TP info emacs -start at emacs node from top-level dir +start at emacs node from top\-level dir .TP info emacs buffers start at buffers node within emacs manual @@ -81,8 +81,8 @@ start at node with emacs' command line options info \fB\-f\fR ./foo.info 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. +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 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/doc/info.5 b/gnu/dist/texinfo/doc/info.5 index 2f0cf596a52..48d6d77176a 100644 --- a/gnu/dist/texinfo/doc/info.5 +++ b/gnu/dist/texinfo/doc/info.5 @@ -1,7 +1,7 @@ -.\" $NetBSD: info.5,v 1.1.1.3 2004/07/12 23:26:39 wiz Exp $ +.\" $NetBSD: info.5,v 1.1.1.4 2008/09/02 07:51:56 christos Exp $ .\" .\" info(5) -.\" Id: info.5,v 1.1.1.1 2003/12/06 01:31:23 karl Exp +.\" Id: info.5,v 1.2 2004/04/11 17:56:45 karl Exp .\" .\" Copyright (C) 1998 Free Software Foundation, Inc. .\" diff --git a/gnu/dist/texinfo/doc/info.texi b/gnu/dist/texinfo/doc/info.texi index 68ca7383554..14decb6319e 100644 --- a/gnu/dist/texinfo/doc/info.texi +++ b/gnu/dist/texinfo/doc/info.texi @@ -1,5 +1,5 @@ \input texinfo.tex @c -*-texinfo-*- -@c $NetBSD: info.texi,v 1.1.1.4 2004/07/12 23:26:42 wiz Exp $ +@c $NetBSD: info.texi,v 1.1.1.5 2008/09/02 07:51:43 christos Exp $ @c We must \input texinfo.tex instead of texinfo, otherwise make @c distcheck in the Texinfo distribution fails, because the texinfo Info @c file is made first, and texi2dvi must include . first in the path. @@ -63,6 +63,11 @@ The GNU Project distributes most of its on-line manuals in the @dfn{Info format}, which you read using an @dfn{Info reader}. You are probably using an Info reader to read this now. +There are two primary Info readers: @code{info}, a stand-alone program +designed just to read Info files, and the @code{info} package in GNU +Emacs, a general-purpose editor. At present, only the Emacs reader +supports using a mouse. + @ifinfo If you are new to the Info reader and want to learn how to use it, type the command @kbd{h} now. It brings you to a programmed @@ -85,7 +90,7 @@ Started' chapter. @comment node-name, next, previous, up @chapter Getting Started -This first part of the Info manual describes how to get around inside +This first part of this Info manual describes how to get around inside of Info. The second part of the manual describes various advanced Info commands, and how to write an Info as distinct from a Texinfo file. The third part briefly explains how to generate Info files from @@ -112,7 +117,7 @@ stand-alone program designed just to read Info files. @item Type @code{emacs} at the command line; then type @kbd{C-h i} (@kbd{Control-h}, followed by @kbd{i}). This approach uses the Info -mode of the Emacs program, an editor with many other capabilities. +mode of the Emacs editor. @end enumerate In either case, then type @kbd{mInfo} (just the letters), followed by @@ -126,15 +131,15 @@ the screen. @end ifnotinfo @menu -* Help-Small-Screen:: Starting Info on a Small Screen -* Help:: How to use Info -* Help-P:: Returning to the Previous node +* Help-Small-Screen:: Starting Info on a Small Screen. +* Help:: How to use Info. +* Help-P:: Returning to the Previous node. * Help-^L:: The Space, DEL, B and ^L commands. * Help-Inv:: Invisible text in Emacs Info. -* Help-M:: Menus -* Help-Xref:: Following cross-references -* Help-Int:: Some intermediate Info commands -* Help-Q:: Quitting Info +* Help-M:: Menus. +* Help-Xref:: Following cross-references. +* Help-Int:: Some intermediate Info commands. +* Help-Q:: Quitting Info. @end menu @node Help-Small-Screen @@ -208,8 +213,8 @@ This is line 59 If you have managed to get here, go back to the beginning with @kbd{DEL} (or @key{BACKSPACE}), and come back here again, then you understand the about the @samp{Space} and @samp{Backspace} keys. So -now type an @kbd{n} ---just one character; don't type the quotes and -don't type the Return key afterward--- to get to the normal start of +now type an @kbd{n}---just one character; don't type the quotes and +don't type the Return key afterward---to get to the normal start of the course. @end ifinfo @@ -239,8 +244,8 @@ well. In Emacs, the header line is duplicated in a special typeface, and the duplicate remains at the top of the window all the time even if you scroll through the node. - Besides a @samp{Next}, a node can have a @samp{Previous} or an -@samp{Up} links, or both. As you can see, this node has all of these + Besides a @samp{Next}, a node can have a @samp{Previous} link, or an +@samp{Up} link, or both. As you can see, this node has all of these links. @kindex n @r{(Info mode)} @@ -271,9 +276,10 @@ command. Another @kbd{n} command now would take you to the next node, @samp{Help-^L}. @format ->> But do not type @kbd{n} yet. First, try the @kbd{p} command, - or click the middle mouse button on the @samp{Prev} link. That - takes you to the @samp{Previous} node. Then use @kbd{n} to return here. +>> But do not type @kbd{n} yet. First, try the @kbd{p} command, or + (in Emacs) click the middle mouse button on the @samp{Prev} link. + That takes you to the @samp{Previous} node. Then use @kbd{n} to + return here. @end format If you read this in Emacs, you will see an @samp{Info} item in the @@ -289,8 +295,8 @@ to. You could make Info skip past an important warning that was coming up. @format ->> Now do an @kbd{n}, or click the middle mouse button on the @samp{Next} - link, to get to the node @samp{Help-^L} and learn more. +>> Now do an @kbd{n}, or (in Emacs) click the middle mouse button on + the @samp{Next} link, to get to the node @samp{Help-^L} and learn more. @end format @node Help-^L, Help-Inv, Help-P, Getting Started @@ -370,7 +376,7 @@ scroll beyond the beginning or the end of the current node. @kindex C-l @r{(Info mode)} If your screen is ever garbaged, you can tell Info to display it -again by typing @kbd{C-l} (@kbd{Control-L}, that is---hold down +again by typing @kbd{C-l} (@kbd{Control-L}---that is, hold down @key{CTRL} and type @kbd{L} or @kbd{l}). @format @@ -409,8 +415,8 @@ the list, make it go away by typing a @key{SPC} repeatedly. (If you are using the stand-alone Info reader, type @kbd{C-x 0} to return here, that is---press and hold @key{CTRL}, type an @kbd{x}, -then release @key{CTRL} and @kbd{x}, and press @kbd{0}---a zero, not -the letter ``o''.) +then release @key{CTRL} and @kbd{x}, and press @kbd{0}; that's a zero, +not the letter ``o''.) From now on, you will encounter large nodes without warning, and will be expected to know how to use @key{SPC} and @key{BACKSPACE} to @@ -966,7 +972,7 @@ the node @samp{Top} in the Info file @file{dir}. Likewise, all of the current file by typing @kbd{g*@key{RET}} or all of any other file with @kbd{g(@var{filename})@key{RET}}. -@subheading @kbd{1} -- @kbd{9} choose a menu subtopic by its number +@subheading @kbd{1}--@kbd{9} choose a menu subtopic by its number @kindex 1 @r{through} 9 @r{(Info mode)} @findex Info-nth-menu-item @@ -1056,7 +1062,7 @@ you typed @emph{as a substring}. For each match, Info shows in the echo area the full index entry it found. Often, the text of the full index entry already gives you enough information to decide whether it is relevant to what you are looking for, so we recommend that you read -what Emacs shows in the echo area before looking at the node it +what Info shows in the echo area before looking at the node it displays. Since @kbd{i} looks for a substring, you can search for subjects even @@ -1200,7 +1206,7 @@ reads from the terminal. A menu begins with a line starting with @w{@samp{* Menu:}}. The rest of the line is a comment. After the starting line, every line that begins with a @samp{* } lists a single topic. The name of the -topic--what the user must type at the @kbd{m}'s command prompt to +topic---what the user must type at the @kbd{m}'s command prompt to select this topic---comes right after the star and space, and is followed by a colon, spaces and tabs, and the name of the node which discusses that topic. The node name, like node names following diff --git a/gnu/dist/texinfo/doc/infokey.1 b/gnu/dist/texinfo/doc/infokey.1 index d83dee8341d..41955721409 100644 --- a/gnu/dist/texinfo/doc/infokey.1 +++ b/gnu/dist/texinfo/doc/infokey.1 @@ -1,14 +1,14 @@ -.\" $NetBSD: infokey.1,v 1.1.1.1 2004/07/12 23:26:39 wiz Exp $ +.\" $NetBSD: infokey.1,v 1.1.1.2 2008/09/02 07:51:56 christos Exp $ .\" -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -.TH INFOKEY "1" "April 2004" "infokey 4.7" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34. +.TH INFOKEY "1" "December 2004" "infokey 4.8" "User Commands" .SH NAME infokey \- compile customizations for Info .SH SYNOPSIS .B infokey [\fIOPTION\fR]... [\fIINPUT-FILE\fR] .SH DESCRIPTION -Compile infokey source file to infokey file. Reads INPUT-FILE (default +Compile infokey source file to infokey file. Reads INPUT\-FILE (default $HOME/.infokey) and writes compiled key file to (by default) $HOME/.info. .SH OPTIONS .TP @@ -21,8 +21,8 @@ display this help and exit. \fB\-\-version\fR 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. +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 2003 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/doc/install-info.1 b/gnu/dist/texinfo/doc/install-info.1 index 8e401a2951d..1acbb215441 100644 --- a/gnu/dist/texinfo/doc/install-info.1 +++ b/gnu/dist/texinfo/doc/install-info.1 @@ -1,24 +1,24 @@ -.\" $NetBSD: install-info.1,v 1.1.1.5 2004/07/12 23:26:39 wiz Exp $ +.\" $NetBSD: install-info.1,v 1.1.1.6 2008/09/02 07:51:46 christos Exp $ .\" -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -.TH INSTALL-INFO "1" "April 2004" "install-info 4.7" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34. +.TH INSTALL-INFO "1" "December 2004" "install-info 4.8" "User Commands" .SH NAME install-info \- update info/dir entries .SH SYNOPSIS .B install-info [\fIOPTION\fR]... [\fIINFO-FILE \fR[\fIDIR-FILE\fR]] .SH DESCRIPTION -Install or delete dir entries from INFO-FILE in the Info directory file -DIR-FILE. +Install or delete dir entries from INFO\-FILE in the Info directory file +DIR\-FILE. .SH OPTIONS .TP \fB\-\-delete\fR -delete existing entries for INFO-FILE from DIR-FILE; +delete existing entries for INFO\-FILE from DIR\-FILE; don't insert any new entries. .TP \fB\-\-dir\-file\fR=\fINAME\fR specify file name of Info directory file. -This is equivalent to using the DIR-FILE argument. +This is equivalent to using the DIR\-FILE argument. .TP \fB\-\-entry\fR=\fITEXT\fR insert TEXT as an Info directory entry. @@ -33,7 +33,7 @@ display this help and exit. .TP \fB\-\-info\-file\fR=\fIFILE\fR specify Info file to install in the directory. -This is equivalent to using the INFO-FILE argument. +This is equivalent to using the INFO\-FILE argument. .TP \fB\-\-info\-dir\fR=\fIDIR\fR same as \fB\-\-dir\-file\fR=\fIDIR\fR/dir. @@ -58,8 +58,8 @@ from information in the Info file itself. \fB\-\-version\fR 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. +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 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/doc/makeinfo.1 b/gnu/dist/texinfo/doc/makeinfo.1 index 23edc8a00f3..6cc4eb6b8e8 100644 --- a/gnu/dist/texinfo/doc/makeinfo.1 +++ b/gnu/dist/texinfo/doc/makeinfo.1 @@ -1,7 +1,7 @@ -.\" $NetBSD: makeinfo.1,v 1.1.1.5 2004/07/12 23:26:39 wiz Exp $ +.\" $NetBSD: makeinfo.1,v 1.1.1.6 2008/09/02 07:51:56 christos Exp $ .\" -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -.TH MAKEINFO "1" "April 2004" "makeinfo 4.7" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34. +.TH MAKEINFO "1" "December 2004" "makeinfo 4.8" "User Commands" .SH NAME makeinfo \- translate Texinfo documents .SH SYNOPSIS @@ -22,7 +22,7 @@ preserve output even if errors. display this help and exit. .TP \fB\-\-no\-validate\fR -suppress node cross-reference validation. +suppress node cross\-reference validation. .TP \fB\-\-no\-warn\fR suppress warnings (but not errors). @@ -51,7 +51,7 @@ output plain text rather than Info. .SS "General output options:" .TP \fB\-E\fR, \fB\-\-macro\-expand\fR FILE -output macro-expanded source to FILE. +output macro\-expanded source to FILE. ignoring any @setfilename. .TP \fB\-\-no\-headers\fR @@ -96,7 +96,7 @@ split Info files at size NUM (default 300000). .TP \fB\-\-css\-include\fR=\fIFILE\fR include FILE in HTML <style> output; -read stdin if FILE is -. +read stdin if FILE is \-. .SS "Options for XML and Docbook:" .TP \fB\-\-output\-indent\fR=\fIVAL\fR @@ -157,6 +157,8 @@ do not process @iftex and @tex text. \fB\-\-no\-ifxml\fR do not process @ifxml and @xml text. .IP +Also, for the \fB\-\-no\-ifFORMAT\fR options, do process @ifnotFORMAT 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, \fB\-\-ifinfo\fR is on and the others are off; @@ -183,8 +185,8 @@ makeinfo \fB\-\-html\fR \fB\-\-no\-headers\fR foo.texi write html without node l 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. +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 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/doc/mdate-sh b/gnu/dist/texinfo/doc/mdate-sh index 05e828b081a..881782eb55e 100755 --- a/gnu/dist/texinfo/doc/mdate-sh +++ b/gnu/dist/texinfo/doc/mdate-sh @@ -1,9 +1,9 @@ #!/bin/sh # Get modification time of a file or directory and pretty-print it. -scriptversion=2003-11-09.00 +scriptversion=2004-12-08.12 -# Copyright (C) 1995, 1996, 1997, 2003 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 1997, 2003, 2004 Free Software Foundation, Inc. # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995 # # This program is free software; you can redistribute it and/or modify @@ -80,7 +80,7 @@ fi # words should be skipped to get the date. # On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below. -set - x`$ls_command /` +set x`ls -l -d /` # Find which argument is the month. month= @@ -107,7 +107,7 @@ do done # Get the extended ls output of the file or directory. -set - x`eval "$ls_command \"\$save_arg1\""` +set x`eval "$ls_command \"\$save_arg1\""` # Remove all preceding arguments eval $command diff --git a/gnu/dist/texinfo/doc/stamp-1 b/gnu/dist/texinfo/doc/stamp-1 index d31f1c13b82..32973a788b2 100644 --- a/gnu/dist/texinfo/doc/stamp-1 +++ b/gnu/dist/texinfo/doc/stamp-1 @@ -1,4 +1,4 @@ -@set UPDATED 23 March 2004 -@set UPDATED-MONTH March 2004 -@set EDITION 4.7 -@set VERSION 4.7 +@set UPDATED 14 December 2004 +@set UPDATED-MONTH December 2004 +@set EDITION 4.8 +@set VERSION 4.8 diff --git a/gnu/dist/texinfo/doc/stamp-vti b/gnu/dist/texinfo/doc/stamp-vti index 7faeafcb8b1..ae55f879d47 100644 --- a/gnu/dist/texinfo/doc/stamp-vti +++ b/gnu/dist/texinfo/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 9 April 2004 -@set UPDATED-MONTH April 2004 -@set EDITION 4.7 -@set VERSION 4.7 +@set UPDATED 29 December 2004 +@set UPDATED-MONTH December 2004 +@set EDITION 4.8 +@set VERSION 4.8 diff --git a/gnu/dist/texinfo/doc/texi2dvi.1 b/gnu/dist/texinfo/doc/texi2dvi.1 index dd7cee48f99..d248343ba90 100644 --- a/gnu/dist/texinfo/doc/texi2dvi.1 +++ b/gnu/dist/texinfo/doc/texi2dvi.1 @@ -1,7 +1,7 @@ -.\" $NetBSD: texi2dvi.1,v 1.1.1.5 2004/07/12 23:26:39 wiz Exp $ +.\" $NetBSD: texi2dvi.1,v 1.1.1.6 2008/09/02 07:51:56 christos Exp $ .\" -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -.TH TEXI2DVI "1" "April 2004" "texi2dvi 1.3" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34. +.TH TEXI2DVI "1" "December 2004" "texi2dvi 1.34" "User Commands" .SH NAME texi2dvi \- print Texinfo documents .SH SYNOPSIS @@ -9,7 +9,7 @@ texi2dvi \- print Texinfo documents [\fIOPTION\fR]... \fIFILE\fR... .SH DESCRIPTION Run each Texinfo or LaTeX FILE through TeX in turn until all -cross-references are resolved, building all indices. The directory +cross\-references are resolved, building all indices. The directory containing each FILE is searched for included files. The suffix of FILE is used to determine its language (LaTeX or Texinfo). .PP @@ -46,7 +46,7 @@ display version information and exit successfully report on what is done .SS "TeX tuning:" .TP --@ +\-@ use @input instead of \einput; for preloaded Texinfo .TP \fB\-e\fR, \fB\-E\fR, \fB\-\-expand\fR @@ -61,8 +61,11 @@ specify the LANG of FILE (LaTeX or Texinfo) \fB\-p\fR, \fB\-\-pdf\fR use pdftex or pdflatex for processing .TP +\fB\-r\fR, \fB\-\-recode\fR +call recode before TeX to translate input characters +.TP \fB\-t\fR, \fB\-\-command\fR=\fICMD\fR -insert CMD in copy of input file; +insert CMD in copy of input file .TP or \fB\-\-texinfo\fR=\fICMD\fR multiple values accumulate @@ -72,8 +75,8 @@ TEX (or PDFTEX), TEXINDEX, and THUMBPDF environment variables are used to run those commands, if they are set. Any CMD strings are added after @setfilename for Texinfo input, in the first line for LaTeX input. .SH "REPORTING BUGS" -Email bug reports to <bug-texinfo@gnu.org>, -general questions and discussion to <help-texinfo@gnu.org>. +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 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/doc/texinfo.5 b/gnu/dist/texinfo/doc/texinfo.5 index 1f8b44ea316..ab1b9739066 100644 --- a/gnu/dist/texinfo/doc/texinfo.5 +++ b/gnu/dist/texinfo/doc/texinfo.5 @@ -1,7 +1,7 @@ -.\" $NetBSD: texinfo.5,v 1.1.1.3 2004/07/12 23:26:39 wiz Exp $ +.\" $NetBSD: texinfo.5,v 1.1.1.4 2008/09/02 07:51:56 christos Exp $ .\" .\" texinfo(5) -.\" Id: texinfo.5,v 1.1.1.1 2003/12/06 01:32:34 karl Exp +.\" Id: texinfo.5,v 1.2 2004/04/11 17:56:45 karl Exp .\" .\" Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc. .\" diff --git a/gnu/dist/texinfo/doc/texinfo.tex b/gnu/dist/texinfo/doc/texinfo.tex index d93d432f32c..c93912a055b 100644 --- a/gnu/dist/texinfo/doc/texinfo.tex +++ b/gnu/dist/texinfo/doc/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2004-04-07.08} +\def\texinfoversion{2004-11-25.16} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software @@ -27,7 +27,7 @@ % As a special exception, when this file is read by TeX when processing % a Texinfo source document, you may use the result without % restriction. (This has been our intent since Texinfo was invented.) -% +% % Please try the latest version of texinfo.tex before submitting bug % reports; you can get the latest version from: % http://www.gnu.org/software/texinfo/ (the Texinfo home page), or @@ -55,7 +55,7 @@ % It is possible to adapt texinfo.tex for other languages, to some % extent. You can get the existing language-specific files from the % full Texinfo distribution. -% +% % The GNU Texinfo home page is http://www.gnu.org/software/texinfo. @@ -89,10 +89,11 @@ \let\ptexhat=^ \let\ptexi=\i \let\ptexindent=\indent -\let\ptexnoindent=\noindent \let\ptexinsert=\insert \let\ptexlbrace=\{ \let\ptexless=< +\let\ptexnewwrite\newwrite +\let\ptexnoindent=\noindent \let\ptexplus=+ \let\ptexrbrace=\} \let\ptexslash=\/ @@ -481,16 +482,16 @@ \def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next} % Define the framework for environments in texinfo.tex. It's used like this: -% +% % \envdef\foo{...} % \def\Efoo{...} -% +% % It's the responsibility of \envdef to insert \begingroup before the % actual body; @end closes the group after calling \Efoo. \envdef also % defines \thisenv, so the current environment is known; @end checks % whether the environment name matches. The \checkenv macro can also be % used to check whether the current environment is the one expected. -% +% % Non-false conditionals (@iftex, @ifset) don't fit into this, so they % are not treated as enviroments; they don't open a group. (The % implementation of @end takes care not to call \endgroup in this @@ -607,15 +608,15 @@ % The \TeX{} logo, as in plain, but resetting the spacing so that a % period following counts as ending a sentence. (Idea found in latex.) -% -\edef\TeX{\TeX \spacefactor=3000 } +% +\edef\TeX{\TeX \spacefactor=1000 } % @LaTeX{} logo. Not quite the same results as the definition in % latex.ltx, since we use a different font for the raised A; it's most % convenient for us to use an explicitly smaller font, rather than using % the \scriptstyle font (since we don't reset \scriptstyle and % \scriptscriptstyle). -% +% \def\LaTeX{% L\kern-.36em {\setbox0=\hbox{T}% @@ -1096,7 +1097,7 @@ where each line of input produces a line of output.} % @comma{} is so commas can be inserted into text without messing up % Texinfo's parsing. -% +% \let\comma = , % @refill is a no-op. @@ -1221,7 +1222,7 @@ where each line of input produces a line of output.} % of subentries (or empty, for subsubsections). #3 is the node % text, which might be empty if this toc entry had no % corresponding node. #4 is the page number. - % + % \def\dopdfoutline#1#2#3#4{% % Generate a link to the node text if that exists; else, use the % page number. We could generate a destination for the section @@ -1242,13 +1243,13 @@ where each line of input produces a line of output.} % Read toc silently, to get counts of subentries for \pdfoutline. \def\numchapentry##1##2##3##4{% \def\thischapnum{##2}% - \let\thissecnum\empty - \let\thissubsecnum\empty + \def\thissecnum{0}% + \def\thissubsecnum{0}% }% \def\numsecentry##1##2##3##4{% \advancenumber{chap\thischapnum}% \def\thissecnum{##2}% - \let\thissubsecnum\empty + \def\thissubsecnum{0}% }% \def\numsubsecentry##1##2##3##4{% \advancenumber{sec\thissecnum}% @@ -1257,9 +1258,9 @@ where each line of input produces a line of output.} \def\numsubsubsecentry##1##2##3##4{% \advancenumber{subsec\thissubsecnum}% }% - \let\thischapnum\empty - \let\thissecnum\empty - \let\thissubsecnum\empty + \def\thischapnum{0}% + \def\thissecnum{0}% + \def\thissubsecnum{0}% % % use \def rather than \let here because we redefine \chapentry et % al. a second time, below. @@ -1276,7 +1277,7 @@ where each line of input produces a line of output.} % Read toc second time, this time actually producing the outlines. % The `-' means take the \expnumber as the absolute number of % subentries, which we calculated on our first read of the .toc above. - % + % % We use the node names as the destinations. \def\numchapentry##1##2##3##4{% \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}% @@ -1292,7 +1293,7 @@ where each line of input produces a line of output.} % since the encoding is unknown. For example, the eogonek from % Latin 2 (0xea) gets translated to a | character. Info from % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100. - % + % % xx to do this right, we have to translate 8-bit characters to % their "best" equivalent, based on the @documentencoding. Right % now, I guess we'll just let the pdf reader have its way. @@ -1393,20 +1394,20 @@ where each line of input produces a line of output.} % Change the current font style to #1, remembering it in \curfontstyle. % For now, we do not accumulate font styles: @b{@i{foo}} prints foo in % italics, not bold italics. -% +% \def\setfontstyle#1{% \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd. \csname ten#1\endcsname % change the current font } % Select #1 fonts with the current style. -% +% \def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname} \def\rm{\fam=0 \setfontstyle{rm}} \def\it{\fam=\itfam \setfontstyle{it}} \def\sl{\fam=\slfam \setfontstyle{sl}} -\def\bf{\fam=\bffam \setfontstyle{bf}} +\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} \def\tt{\fam=\ttfam \setfontstyle{tt}} % Texinfo sort of supports the sans serif font style, which plain TeX does not. @@ -1468,17 +1469,10 @@ where each line of input produces a line of output.} \def\scbshape{csc} % Text fonts (11.2pt, magstep1). -\newcount\mainmagstep -\ifx\bigger\relax - % not really supported. - \mainmagstep=\magstep1 - \setfont\textrm\rmshape{12}{1000} - \setfont\texttt\ttshape{12}{1000} -\else - \mainmagstep=\magstephalf - \setfont\textrm\rmshape{10}{\mainmagstep} - \setfont\texttt\ttshape{10}{\mainmagstep} -\fi +\def\textnominalsize{11pt} +\edef\mainmagstep{\magstephalf} +\setfont\textrm\rmshape{10}{\mainmagstep} +\setfont\texttt\ttshape{10}{\mainmagstep} \setfont\textbf\bfshape{10}{\mainmagstep} \setfont\textit\itshape{10}{\mainmagstep} \setfont\textsl\slshape{10}{\mainmagstep} @@ -1495,6 +1489,7 @@ where each line of input produces a line of output.} \def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} % Fonts for indices, footnotes, small examples (9pt). +\def\smallnominalsize{9pt} \setfont\smallrm\rmshape{9}{1000} \setfont\smalltt\ttshape{9}{1000} \setfont\smallbf\bfshape{10}{900} @@ -1507,6 +1502,7 @@ where each line of input produces a line of output.} \font\smallsy=cmsy9 % Fonts for small examples (8pt). +\def\smallernominalsize{8pt} \setfont\smallerrm\rmshape{8}{1000} \setfont\smallertt\ttshape{8}{1000} \setfont\smallerbf\bfshape{10}{800} @@ -1519,6 +1515,7 @@ where each line of input produces a line of output.} \font\smallersy=cmsy8 % Fonts for title page (20.4pt): +\def\titlenominalsize{20pt} \setfont\titlerm\rmbshape{12}{\magstep3} \setfont\titleit\itbshape{10}{\magstep4} \setfont\titlesl\slbshape{10}{\magstep4} @@ -1533,6 +1530,7 @@ where each line of input produces a line of output.} \def\authortt{\sectt} % Chapter (and unnumbered) fonts (17.28pt). +\def\chapnominalsize{17pt} \setfont\chaprm\rmbshape{12}{\magstep2} \setfont\chapit\itbshape{10}{\magstep3} \setfont\chapsl\slbshape{10}{\magstep3} @@ -1545,6 +1543,7 @@ where each line of input produces a line of output.} \font\chapsy=cmsy10 scaled \magstep3 % Section fonts (14.4pt). +\def\secnominalsize{14pt} \setfont\secrm\rmbshape{12}{\magstep1} \setfont\secit\itbshape{10}{\magstep2} \setfont\secsl\slbshape{10}{\magstep2} @@ -1557,6 +1556,7 @@ where each line of input produces a line of output.} \font\secsy=cmsy10 scaled \magstep2 % Subsection fonts (13.15pt). +\def\ssecnominalsize{13pt} \setfont\ssecrm\rmbshape{12}{\magstephalf} \setfont\ssecit\itbshape{10}{1315} \setfont\ssecsl\slbshape{10}{1315} @@ -1569,6 +1569,7 @@ where each line of input produces a line of output.} \font\ssecsy=cmsy10 scaled 1315 % Reduced fonts for @acro in text (10pt). +\def\reducednominalsize{10pt} \setfont\reducedrm\rmshape{10}{1000} \setfont\reducedtt\ttshape{10}{1000} \setfont\reducedbf\bfshape{10}{1000} @@ -1596,18 +1597,19 @@ where each line of input produces a line of output.} % of just \STYLE. We do this because \STYLE needs to also set the % current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire % \tenSTYLE to set the current font. -% +% % Each font-changing command also sets the names \lsize (one size lower) % and \lllsize (three sizes lower). These relative commands are used in % the LaTeX logo and acronyms. -% +% % This all needs generalizing, badly. -% +% \def\textfonts{% \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy \let\tenttsl=\textttsl + \def\curfontsize{text}% \def\lsize{reduced}\def\lllsize{smaller}% \resetmathfonts \setleading{\textleading}} \def\titlefonts{% @@ -1615,13 +1617,16 @@ where each line of input produces a line of output.} \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy \let\tenttsl=\titlettsl + \def\curfontsize{title}% \def\lsize{chap}\def\lllsize{subsec}% \resetmathfonts \setleading{25pt}} \def\titlefont#1{{\titlefonts\rm #1}} \def\chapfonts{% \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc - \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy \let\tenttsl=\chapttsl + \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy + \let\tenttsl=\chapttsl + \def\curfontsize{chap}% \def\lsize{sec}\def\lllsize{text}% \resetmathfonts \setleading{19pt}} \def\secfonts{% @@ -1629,6 +1634,7 @@ where each line of input produces a line of output.} \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy \let\tenttsl=\secttsl + \def\curfontsize{sec}% \def\lsize{subsec}\def\lllsize{reduced}% \resetmathfonts \setleading{16pt}} \def\subsecfonts{% @@ -1636,6 +1642,7 @@ where each line of input produces a line of output.} \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy \let\tenttsl=\ssecttsl + \def\curfontsize{ssec}% \def\lsize{text}\def\lllsize{small}% \resetmathfonts \setleading{15pt}} \let\subsubsecfonts = \subsecfonts @@ -1644,6 +1651,7 @@ where each line of input produces a line of output.} \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy \let\tenttsl=\reducedttsl + \def\curfontsize{reduced}% \def\lsize{small}\def\lllsize{smaller}% \resetmathfonts \setleading{10.5pt}} \def\smallfonts{% @@ -1651,6 +1659,7 @@ where each line of input produces a line of output.} \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy \let\tenttsl=\smallttsl + \def\curfontsize{small}% \def\lsize{smaller}\def\lllsize{smaller}% \resetmathfonts \setleading{10.5pt}} \def\smallerfonts{% @@ -1658,6 +1667,7 @@ where each line of input produces a line of output.} \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy \let\tenttsl=\smallerttsl + \def\curfontsize{smaller}% \def\lsize{smaller}\def\lllsize{smaller}% \resetmathfonts \setleading{9.5pt}} @@ -1715,13 +1725,18 @@ where each line of input produces a line of output.} \def\cite#1{{\sl #1}\futurelet\next\smartitalicx} \let\i=\smartitalic +\let\slanted=\smartslanted \let\var=\smartslanted \let\dfn=\smartslanted \let\emph=\smartitalic +% @b, explicit bold. \def\b#1{{\bf #1}} \let\strong=\b +% @sansserif, explicit sans. +\def\sansserif#1{{\sf #1}} + % We can't just use \exhyphenpenalty, because that only has effect at % the end of a paragraph. Restore normal hyphenation at the end of the % group within which \nohyphenation is presumably called. @@ -1885,7 +1900,7 @@ where each line of input produces a line of output.} \endgroup} % @url synonym for @uref, since that's how everyone uses it. -% +% \let\url=\uref % rms does not like angle brackets --karl, 17may97. @@ -1929,6 +1944,10 @@ where each line of input produces a line of output.} \def\sc#1{{\smallcaps#1}} % smallcaps font \def\ii#1{{\it #1}} % italic font +% @acronym for "FBI", "NATO", and the like. +% We print this one point size smaller, since it's intended for +% all-uppercase. +% \def\acronym#1{\doacronym #1,,\finish} \def\doacronym#1,#2,#3\finish{% {\selectfonts\lsize #1}% @@ -1938,10 +1957,70 @@ where each line of input produces a line of output.} \fi } -% @pounds{} is a sterling sign, which is in the CM italic font. +% @abbr for "Comput. J." and the like. +% No font change, but don't do end-of-sentence spacing. % +\def\abbr#1{\doabbr #1,,\finish} +\def\doabbr#1,#2,#3\finish{% + {\frenchspacing #1}% + \def\temp{#2}% + \ifx\temp\empty \else + \space ({\unsepspaces \ignorespaces \temp \unskip})% + \fi +} + +% @pounds{} is a sterling sign, which Knuth put in the CM italic font. +% \def\pounds{{\it\$}} +% @euro{} comes from a separate font, depending on the current style. +% We use the free feym* fonts from the eurosym package by Henrik +% Theiling, which support regular, slanted, bold and bold slanted (and +% "outlined" (blackboard board, sort of) versions, which we don't need). +% It is available from http://www.ctan.org/tex-archive/fonts/eurosym. +% +% Although only regular is the truly official Euro symbol, we ignore +% that. The Euro is designed to be slightly taller than the regular +% font height. +% +% feymr - regular +% feymo - slanted +% feybr - bold +% feybo - bold slanted +% +% There is no good (free) typewriter version, to my knowledge. +% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide. +% Hmm. +% +% Also doesn't work in math. Do we need to do math with euro symbols? +% Hope not. +% +% +\def\euro{{\eurofont e}} +\def\eurofont{% + % We set the font at each command, rather than predefining it in + % \textfonts and the other font-switching commands, so that + % installations which never need the symbold don't have to have the + % font installed. + % + % There is only one designed size (nominal 10pt), so we always scale + % that to the current nominal size. + % + % By the way, simply using "at 1em" works for cmr10 and the like, but + % does not work for cmbx10 and other extended/shrunken fonts. + % + \def\eurosize{\csname\curfontsize nominalsize\endcsname}% + % + \ifx\curfontstyle\bfstylename + % bold: + \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize + \else + % regular: + \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize + \fi + \thiseurofont +} + % @registeredsymbol - R in a circle. The font for the R should really % be smaller yet, but lllsize is the best we can do for now. % Adapted from the plain.tex definition of \copyright. @@ -1952,6 +2031,14 @@ where each line of input produces a line of output.} }$% } +% Laurent Siebenmann reports \Orb undefined with: +% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 +% so we'll define it if necessary. +% +\ifx\Orb\undefined +\def\Orb{\mathhexbox20D} +\fi + \message{page headings,} @@ -2054,7 +2141,7 @@ where each line of input produces a line of output.} % @author should come last, but may come many times. % It can also be used inside @quotation. -% +% \parseargdef\author{% \def\temp{\quotation}% \ifx\thisenv\temp @@ -2257,17 +2344,13 @@ where each line of input produces a line of output.} % \parskip glue -- logically it's part of the @item we just started. \nobreak \vskip-\parskip % - % Stop a page break at the \parskip glue coming up. (Unfortunately - % we can't prevent a possible page break at the following - % \baselineskip glue.) However, if what follows is an environment - % such as @example, there will be no \parskip glue; then - % the negative vskip we just would cause the example and the item to - % crash together. So we use this bizarre value of 10001 as a signal - % to \aboveenvbreak to insert \parskip glue after all. - % (Possibly there are other commands that could be followed by - % @example which need the same treatment, but not section titles; or - % maybe section titles are the only special case and they should be - % penalty 10001...) + % Stop a page break at the \parskip glue coming up. However, if + % what follows is an environment such as @example, there will be no + % \parskip glue; then the negative vskip we just inserted would + % cause the example and the item to crash together. So we use this + % bizarre value of 10001 as a signal to \aboveenvbreak to insert + % \parskip glue after all. Section titles are handled this way also. + % \penalty 10001 \endgroup \itemxneedsnegativevskipfalse @@ -2293,15 +2376,26 @@ where each line of input produces a line of output.} % @table, @ftable, @vtable. \envdef\table{% \let\itemindex\gobble - \tablex + \tablecheck{table}% } \envdef\ftable{% \def\itemindex ##1{\doind {fn}{\code{##1}}}% - \tablex + \tablecheck{ftable}% } \envdef\vtable{% \def\itemindex ##1{\doind {vr}{\code{##1}}}% - \tablex + \tablecheck{vtable}% +} +\def\tablecheck#1{% + \ifnum \the\catcode`\^^M=\active + \endgroup + \errmessage{This command won't work in this context; perhaps the problem is + that we are \inenvironment\thisenv}% + \def\next{\doignore{#1}}% + \else + \let\next\tablex + \fi + \next } \def\tablex#1{% \def\itemindicate{#1}% @@ -2554,7 +2648,7 @@ where each line of input produces a line of output.} % #1 is the @columnfraction, usually a decimal number like .5, but might % be just 1. We just use it, whatever it is. -% +% \def\pickupwholefraction#1 {% \global\advance\colcount by 1 \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}% @@ -2612,7 +2706,10 @@ where each line of input produces a line of output.} \startsavinginserts % % @item within a multitable starts a normal row. - \let\item\crcr + % We use \def instead of \let so that if one of the multitable entries + % contains an @itemize, we don't choke on the \item (seen as \crcr aka + % \endtemplate) expanding \doitemize. + \def\item{\crcr}% % \tolerance=9500 \hbadness=9500 @@ -2697,19 +2794,17 @@ where each line of input produces a line of output.} \global\setpercentfalse } -\def\setmultitablespacing{% test to see if user has set \multitablelinespace. -% If so, do nothing. If not, give it an appropriate dimension based on -% current baselineskip. +\def\setmultitablespacing{% + \def\multistrut{\strut}% just use the standard line spacing + % + % Compute \multitablelinespace (if not defined by user) for use in + % \multitableparskip calculation. We used define \multistrut based on + % this, but (ironically) that caused the spacing to be off. + % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100. \ifdim\multitablelinespace=0pt \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip \global\advance\multitablelinespace by-\ht0 -%% strut to put in table in case some entry doesn't have descenders, -%% to keep lines equally spaced -\let\multistrut = \strut -\else -%% FIXME: what is \box0 supposed to be? -\gdef\multistrut{\vrule height\multitablelinespace depth\dp0 -width0pt\relax} \fi +\fi %% Test to see if parskip is larger than space between lines of %% table. If not, do nothing. %% If so, set to same dimension as multitablelinespace. @@ -2778,14 +2873,14 @@ width0pt\relax} \fi \doignorecount = 0 % % Swallow text until we reach the matching `@end #1'. - \dodoignore {#1}% + \dodoignore{#1}% } { \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source. \obeylines % % \gdef\dodoignore#1{% - % #1 contains the string `ifinfo'. + % #1 contains the command name as a string, e.g., `ifinfo'. % % Define a command to find the next `@end #1', which must be on a line % by itself. @@ -2814,7 +2909,7 @@ width0pt\relax} \fi } % We have to swallow the remaining "\_STOP_". -% +% \def\doignoretextzzz#1{% \ifnum\doignorecount = 0 % We have just found the outermost @end. \let\next\enddoignore @@ -2939,9 +3034,8 @@ width0pt\relax} \fi % Index generation facilities % Define \newwrite to be identical to plain tex's \newwrite -% except not \outer, so it can be used within \newindex. -{\catcode`\@=11 -\gdef\newwrite{\alloc@7\write\chardef\sixt@@n}} +% except not \outer, so it can be used within macros and \if's. +\edef\newwrite{\makecsname{ptexnewwrite}} % \newindex {foo} defines an index named foo. % It automatically defines \fooindex such that @@ -3054,6 +3148,7 @@ width0pt\relax} \fi \def\definedummyletter##1{% \expandafter\def\csname ##1\endcsname{\realbackslash ##1}% }% + \let\definedummyaccent\definedummyletter % % Do the redefinitions. \commondummies @@ -3076,6 +3171,7 @@ width0pt\relax} \fi \def\definedummyletter##1{% \expandafter\def\csname ##1\endcsname{@##1}% }% + \let\definedummyaccent\definedummyletter % % Do the redefinitions. \commondummies @@ -3124,12 +3220,14 @@ width0pt\relax} \fi % % Assorted special characters. \definedummyword{bullet}% + \definedummyword{comma}% \definedummyword{copyright}% \definedummyword{registeredsymbol}% \definedummyword{dots}% \definedummyword{enddots}% \definedummyword{equiv}% \definedummyword{error}% + \definedummyword{euro}% \definedummyword{expansion}% \definedummyword{minus}% \definedummyword{pounds}% @@ -3156,18 +3254,18 @@ width0pt\relax} \fi \gdef\commondummiesnofonts{% % Control letters and accents. \definedummyletter{!}% - \definedummyletter{"}% - \definedummyletter{'}% + \definedummyaccent{"}% + \definedummyaccent{'}% \definedummyletter{*}% - \definedummyletter{,}% + \definedummyaccent{,}% \definedummyletter{.}% \definedummyletter{/}% \definedummyletter{:}% - \definedummyletter{=}% + \definedummyaccent{=}% \definedummyletter{?}% - \definedummyletter{^}% - \definedummyletter{`}% - \definedummyletter{~}% + \definedummyaccent{^}% + \definedummyaccent{`}% + \definedummyaccent{~}% \definedummyword{u}% \definedummyword{v}% \definedummyword{H}% @@ -3215,13 +3313,16 @@ width0pt\relax} \fi % would be for a given command (usually its argument). % \def\indexnofonts{% - \def\definedummyword##1{% + % Accent commands should become @asis. + \def\definedummyaccent##1{% \expandafter\let\csname ##1\endcsname\asis }% - % We can just ignore the accent commands and other control letters. + % We can just ignore other control letters. \def\definedummyletter##1{% \expandafter\def\csname ##1\endcsname{}% }% + % Hopefully, all control words can become @asis. + \let\definedummyword\definedummyaccent % \commondummiesnofonts % @@ -3258,18 +3359,23 @@ width0pt\relax} \fi % Assorted special characters. % (The following {} will end up in the sort string, but that's ok.) \def\bullet{bullet}% + \def\comma{,}% \def\copyright{copyright}% \def\registeredsymbol{R}% \def\dots{...}% \def\enddots{...}% \def\equiv{==}% \def\error{error}% + \def\euro{euro}% \def\expansion{==>}% \def\minus{-}% \def\pounds{pounds}% \def\point{.}% \def\print{-|}% \def\result{=>}% + % + % Don't write macro names. + \emptyusermacros } \let\indexbackslash=0 %overridden during \printindex. @@ -3390,17 +3496,18 @@ width0pt\relax} \fi \dosubindwrite % \ifx\lastskipmacro\zeroskipmacro - % if \lastskip was zero, perhaps the last item was a - % penalty, and perhaps it was >=10000, e.g., a \nobreak. - % In that case, we want to re-insert the penalty; since we - % just inserted a non-discardable item, any following glue - % (such as a \parskip) would be a breakpoint. For example: + % If \lastskip was zero, perhaps the last item was a penalty, and + % perhaps it was >=10000, e.g., a \nobreak. In that case, we want + % to re-insert the same penalty (values >10000 are used for various + % signals); since we just inserted a non-discardable item, any + % following glue (such as a \parskip) would be a breakpoint. For example: + % % @deffn deffn-whatever % @vindex index-whatever % Description. % would allow a break between the index-whatever whatsit % and the "Description." paragraph. - \ifnum\count255>9999 \nobreak \fi + \ifnum\count255>9999 \penalty\count255 \fi \else % On the other hand, if we had a nonzero \lastskip, % this make-up glue would be preceded by a non-discardable item @@ -3498,7 +3605,10 @@ width0pt\relax} \fi \removelastskip % % We like breaks before the index initials, so insert a bonus. - \penalty -300 + \nobreak + \vskip 0pt plus 3\baselineskip + \penalty 0 + \vskip 0pt plus -3\baselineskip % % Typeset the initial. Making this add up to a whole number of % baselineskips increases the chance of the dots lining up from column @@ -3508,10 +3618,9 @@ width0pt\relax} \fi % No shrink because it confuses \balancecolumns. \vskip 1.67\baselineskip plus .5\baselineskip \leftline{\secbf #1}% - \vskip .33\baselineskip plus .1\baselineskip - % % Do our best not to break after the initial. \nobreak + \vskip .33\baselineskip plus .1\baselineskip }} % \entry typesets a paragraph consisting of the text (#1), dot leaders, and @@ -3523,7 +3632,7 @@ width0pt\relax} \fi % But this frozes the catcodes in the argument, and can cause problems to % @code, which sets - active. This problem was fixed by a kludge--- % ``-'' was active throughout whole index, but this isn't really right. -% +% % The right solution is to prevent \entry from swallowing the whole text. % --kasal, 21nov03 \def\entry{% @@ -3789,7 +3898,7 @@ width0pt\relax} \fi % We do the following ugly conditional instead of the above simple % construct for the sake of pdftex, which needs the actual % letter in the expansion, not just typeset. -% +% \def\appendixletter{% \ifnum\appendixno=`A A% \else\ifnum\appendixno=`B B% @@ -3926,11 +4035,11 @@ width0pt\relax} \fi % @chapter, @appendix, @unnumbered. Increment top-level counter, reset % all lower-level sectioning counters to zero. -% +% % Also set \chaplevelprefix, which we prepend to @float sequence numbers % (e.g., figures), q.v. By default (before any chapter), that is empty. \let\chaplevelprefix = \empty -% +% \outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz \def\chapterzzz#1{% % section resetting is \global in case the chapter is in a group, such @@ -4154,10 +4263,10 @@ width0pt\relax} \fi \CHAPPAGon % Chapter opening. -% +% % #1 is the text, #2 is the section type (Ynumbered, Ynothing, % Yappendix, Yomitfromtoc), #3 the chapter number. -% +% % To test against our argument. \def\Ynothingkeyword{Ynothing} \def\Yomitfromtockeyword{Yomitfromtoc} @@ -4233,7 +4342,7 @@ width0pt\relax} \fi % I don't think this chapter style is supported any more, so I'm not % updating it with the new noderef stuff. We'll see. --karl, 11aug03. -% +% \def\setchapterstyle #1 {\csname CHAPF#1\endcsname} % \def\unnchfopen #1{% @@ -4257,7 +4366,7 @@ width0pt\relax} \fi % Section titles. These macros combine the section number parts and % call the generic \sectionheading to do the printing. -% +% \newskip\secheadingskip \def\secheadingbreak{\dobreak \secheadingskip{-1000}} @@ -4271,11 +4380,11 @@ width0pt\relax} \fi % Print any size, any type, section title. -% +% % #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is % the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the % section number. -% +% \def\sectionheading#1#2#3#4{% {% % Switch to the right set of fonts. @@ -4332,14 +4441,14 @@ width0pt\relax} \fi % glue accumulate. (Not a breakpoint because it's preceded by a % discardable item.) \vskip-\parskip - % - % This \nobreak is purely so the last item on the list is a \penalty - % of 10000. This is so other code, for instance \parsebodycommon, can - % check for and avoid allowing breakpoints. Otherwise, it would - % insert a valid breakpoint between: + % + % This is purely so the last item on the list is a known \penalty > + % 10000. This is so \startdefun can avoid allowing breakpoints after + % section headings. Otherwise, it would insert a valid breakpoint between: + % % @section sec-whatever % @deffn def-whatever - \nobreak + \penalty 10001 } @@ -4348,14 +4457,14 @@ width0pt\relax} \fi \newwrite\tocfile % Write an entry to the toc file, opening it if necessary. -% Called from @chapter, etc. -% +% Called from @chapter, etc. +% % Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno} % We append the current node name (if any) and page number as additional % arguments for the \{chap,sec,...}entry macros which will eventually % read this. The node name is used in the pdf outlines as the % destination to jump to. -% +% % We open the .toc file for writing here instead of at @setfilename (or % any other fixed time) so that @contents can be anywhere in the document. % But if #1 is `omit', then we don't do anything. This is used for the @@ -4486,7 +4595,7 @@ width0pt\relax} \fi % But use \hss just in case. % (This space doesn't include the extra space that gets added after % the label; that gets put in by \shortchapentry above.) - % + % % We'd like to right-justify chapter numbers, but that looks strange % with appendix letters. And right-justifying numbers and % left-justifying letters looks strange when there is less than 10 @@ -4511,7 +4620,7 @@ width0pt\relax} \fi % Appendices, in the main contents. % Need the word Appendix, and a fixed-size box. -% +% \def\appendixbox#1{% % We use M since it's probably the widest letter. \setbox0 = \hbox{\putwordAppendix{} M}% @@ -4684,7 +4793,8 @@ width0pt\relax} \fi % start of the next paragraph will insert \parskip. % \def\aboveenvbreak{{% - % =10000 instead of <10000 because of a special case in \itemzzz, q.v. + % =10000 instead of <10000 because of a special case in \itemzzz and + % \sectionheading, q.v. \ifnum \lastpenalty=10000 \else \advance\envskipamount by \parskip \endgraf @@ -4888,7 +4998,7 @@ width0pt\relax} \fi % We have retained a nonzero parskip for the environment, since we're % doing normal filling. -% +% \def\Equotation{% \par \ifx\quotationauthor\undefined\else @@ -5045,8 +5155,7 @@ width0pt\relax} \fi } % @copying ... @end copying. -% Save the text away for @insertcopying later. Many commands won't be -% allowed in this context, but that's ok. +% Save the text away for @insertcopying later. % % We save the uninterpreted tokens, rather than creating a box. % Saving the text in a box would be much easier, but then all the @@ -5055,62 +5164,14 @@ width0pt\relax} \fi % file; b) letting users define the frontmatter in as flexible order as % possible is very desirable. % -\def\copying{\begingroup - % Define a command to swallow text until we reach `@end copying'. - % \ is the escape char in this texinfo.tex file, so it is the - % delimiter for the command; @ will be the escape char when we read - % it, but that doesn't matter. - \long\def\docopying##1\end copying{\gdef\copyingtext{##1}\enddocopying}% - % - % We must preserve ^^M's in the input file; see \insertcopying below. - \catcode`\^^M = \active - \docopying -} - -% What we do to finish off the copying text. -% -\def\enddocopying{\endgroup\ignorespaces} - -% @insertcopying. Here we must play games with ^^M's. On the one hand, -% we need them to delimit commands such as `@end quotation', so they -% must be active. On the other hand, we certainly don't want every -% end-of-line to be a \par, as would happen with the normal active -% definition of ^^M. On the third hand, two ^^M's in a row should still -% generate a \par. -% -% Our approach is to make ^^M insert a space and a penalty1 normally; -% then it can also check if \lastpenalty=1. If it does, then manually -% do \par. -% -% This messes up the normal definitions of @c[omment], so we redefine -% it. Similarly for @ignore. (These commands are used in the gcc -% manual for man page generation.) -% -% Seems pretty fragile, most line-oriented commands will presumably -% fail, but for the limited use of getting the copying text (which -% should be quite simple) inserted, we can hope it's ok. -% -{\catcode`\^^M=\active % -\gdef\insertcopying{\begingroup % - \parindent = 0pt % looks wrong on title page - \def^^M{% - \ifnum \lastpenalty=1 % - \par % - \else % - \space \penalty 1 % - \fi % - }% - % - % Fix @c[omment] for catcode 13 ^^M's. - \def\c##1^^M{\ignorespaces}% - \let\comment = \c % - % - % Don't bother jumping through all the hoops that \doignore does, it - % would be very hard since the catcodes are already set. - \long\def\ignore##1\end ignore{\ignorespaces}% - % - \copyingtext % -\endgroup}% +\def\copying{\checkenv{}\begingroup\scanargctxt\docopying} +\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}} +% +\def\insertcopying{% + \begingroup + \parindent = 0pt % paragraph indentation looks wrong on title page + \scanexp\copyingtext + \endgroup } \message{defuns,} @@ -5128,10 +5189,11 @@ width0pt\relax} \fi % If there are two @def commands in a row, we'll have a \nobreak, % which is there to keep the function description together with its % header. But if there's nothing but headers, we need to allow a - % break somewhere. Check for penalty 10002 (inserted by - % \defargscommonending) instead of 10000, since the sectioning - % commands insert a \penalty10000, and we don't want to allow a break - % between a section heading and a defun. + % break somewhere. Check specifically for penalty 10002, inserted + % by \defargscommonending, instead of 10000, since the sectioning + % commands also insert a nobreak penalty, and we don't want to allow + % a break between a section heading and a defun. + % \ifnum\lastpenalty=10002 \penalty2000 \fi % % Similarly, after a section heading, do not allow a break. @@ -5291,7 +5353,7 @@ width0pt\relax} \fi % #1 is the category, such as "Function". % #2 is the return type, if any. % #3 is the function name. -% +% % We are followed by (but not passed) the arguments, if any. % \def\defname#1#2#3{% @@ -5349,9 +5411,9 @@ width0pt\relax} \fi % tt for the name. This is because literal text is sometimes needed in % the argument list (groff manual), and ttsl and tt are not very % distinguishable. Prevent hyphenation at `-' chars. -% +% \def\defunargs#1{% - % use sl by default (not ttsl), + % use sl by default (not ttsl), % tt for the names. \df \sl \hyphenchar\font=0 % @@ -5455,7 +5517,7 @@ width0pt\relax} \fi \ifx\eTeXversion\undefined \newwrite\macscribble \def\scantokens#1{% - \toks0={#1\endinput}% + \toks0={#1}% \immediate\openout\macscribble=\jobname.tmp \immediate\write\macscribble{\the\toks0}% \immediate\closeout\macscribble @@ -5468,7 +5530,11 @@ width0pt\relax} \fi \newlinechar`\^^M \let\xeatspaces\eatspaces % Undo catcode changes of \startcontents and \doprintindex - \catcode`\@=0 \catcode`\\=\other \escapechar=`\@ + % When called from @insertcopying or (short)caption, we need active + % backslash to get it printed correctly. Previously, we had + % \catcode`\\=\other instead. We'll see whether a problem appears + % with macro expansion. --kasal, 19aug04 + \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ % ... and \example \spaceisspace % @@ -5480,6 +5546,11 @@ width0pt\relax} \fi \endgroup } +\def\scanexp#1{% + \edef\temp{\noexpand\scanmacro{#1}}% + \temp +} + \newcount\paramno % Count of parameters \newtoks\macname % Macro name \newif\ifrecursive % Is it recursive? @@ -5487,13 +5558,15 @@ width0pt\relax} \fi % \do\macro1\do\macro2... % Utility routines. -% This does \let #1 = #2, except with \csnames. +% This does \let #1 = #2, with \csnames; that is, +% \let \csname#1\endcsname = \csname#2\endcsname +% (except of course we have to play expansion games). +% \def\cslet#1#2{% -\expandafter\expandafter -\expandafter\let -\expandafter\expandafter -\csname#1\endcsname -\csname#2\endcsname} + \expandafter\let + \csname#1\expandafter\endcsname + \csname#2\endcsname +} % Trim leading and trailing spaces off a string. % Concepts from aro-bend problem 15 (see CTAN). @@ -5520,30 +5593,36 @@ width0pt\relax} \fi % done by making ^^M (\endlinechar) catcode 12 when reading the macro % body, and then making it the \newlinechar in \scanmacro. -\def\macrobodyctxt{% - \catcode`\~=\other +\def\scanctxt{% + \catcode`\"=\other + \catcode`\+=\other + \catcode`\<=\other + \catcode`\>=\other + \catcode`\@=\other \catcode`\^=\other \catcode`\_=\other \catcode`\|=\other - \catcode`\<=\other - \catcode`\>=\other - \catcode`\+=\other + \catcode`\~=\other +} + +\def\scanargctxt{% + \scanctxt + \catcode`\\=\other + \catcode`\^^M=\other +} + +\def\macrobodyctxt{% + \scanctxt \catcode`\{=\other \catcode`\}=\other - \catcode`\@=\other \catcode`\^^M=\other - \usembodybackslash} + \usembodybackslash +} \def\macroargctxt{% - \catcode`\~=\other - \catcode`\^=\other - \catcode`\_=\other - \catcode`\|=\other - \catcode`\<=\other - \catcode`\>=\other - \catcode`\+=\other - \catcode`\@=\other - \catcode`\\=\other} + \scanctxt + \catcode`\\=\other +} % \mbodybackslash is the definition of \ in @macro bodies. % It maps \foo\ => \csname macarg.foo\endcsname => #N @@ -5725,11 +5804,25 @@ width0pt\relax} \fi \expandafter\parsearg \fi \next} -% We mant to disable all macros during \shipout so that they are not +% We want to disable all macros during \shipout so that they are not % expanded by \write. \def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}% \edef\next{\macrolist}\expandafter\endgroup\next} +% For \indexnofonts, we need to get rid of all macros, leaving only the +% arguments (if present). Of course this is not nearly correct, but it +% is the best we can do for now. makeinfo does not expand macros in the +% argument to @deffn, which ends up writing an index entry, and texindex +% isn't prepared for an index sort entry that starts with \. +% +% Since macro invocations are followed by braces, we can just redefine them +% to take a single TeX argument. The case of a macro invocation that +% goes to end-of-line is not handled. +% +\def\emptyusermacros{\begingroup + \def\do##1{\let\noexpand##1=\noexpand\asis}% + \edef\next{\macrolist}\expandafter\endgroup\next} + % @alias. % We need some trickery to remove the optional spaces around the equal @@ -5762,7 +5855,7 @@ width0pt\relax} \fi % might or might not have spaces before the first comma, like: % @node foo , bar , ... % We don't want such trailing spaces in the node name. -% +% \parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse} % % also remove a trailing comma, in case of something like this: @@ -5775,7 +5868,7 @@ width0pt\relax} \fi % Write a cross-reference definition for the current node. #1 is the % type (Ynumbered, Yappendix, Ynothing). -% +% \def\donoderef#1{% \ifx\lastnode\empty\else \setref{\lastnode}{#1}% @@ -5798,11 +5891,11 @@ width0pt\relax} \fi % 2) NAME-snt - section number and type, passed as the SNT arg, or % empty for anchors. % 3) NAME-pg - the page number. -% +% % This is called from \donoderef, \anchor, and \dofloat. In the case of % floats, there is an additional part, which is not written here: % 4) NAME-lof - the text as it should appear in a @listoffloats. -% +% \def\setref#1#2{% \pdfmkdest{#1}% \iflinks @@ -5897,13 +5990,13 @@ width0pt\relax} \fi \fi % % if the user also gave the printed manual name (fifth arg), append - % "in MANUALNAME". + % "in MANUALNAME". \ifdim \wd1 > 0pt \space \putwordin{} \cite{\printedmanual}% \fi \else % node/anchor (non-float) references. - % + % % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not % insert empty discretionaries after hyphens, which means that it will % not find a line break at a hyphen in a node names. Since some manuals @@ -6014,7 +6107,7 @@ width0pt\relax} \fi % it was a float, and we have the (safe) float type in \iffloattype. \expandafter\let\expandafter\floatlist \csname floatlist\iffloattype\endcsname - % + % % Is this the first time we've seen this float type? \expandafter\ifx\floatlist\relax \toks0 = {\do}% yes, so just \do @@ -6030,7 +6123,7 @@ width0pt\relax} \fi } % Read the last existing aux file, if any. No error if none exists. -% +% \def\tryauxfile{% \openin 1 \jobname.aux \ifeof 1 \else @@ -6335,22 +6428,25 @@ width0pt\relax} \fi \endgroup} -% @float FLOATTYPE,LOC ... @end float for displayed figures, tables, etc. -% We don't actually implement floating yet, we just plop the float "here". -% But it seemed the best name for the future. -% -\envparseargdef\float{\dofloat #1,,,\finish} +% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables, +% etc. We don't actually implement floating yet, we always include the +% float "here". But it seemed the best name for the future. +% +\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish} + +% There may be a space before second and/or third parameter; delete it. +\def\eatcommaspace#1, {#1,} % #1 is the optional FLOATTYPE, the text label for this float, typically % "Figure", "Table", "Example", etc. Can't contain commas. If omitted, % this float will not be numbered and cannot be referred to. -% +% % #2 is the optional xref label. Also must be present for the float to % be referable. -% +% % #3 is the optional positioning argument; for now, it is ignored. It % will somehow specify the positions allowed to float to (here, top, bottom). -% +% % We keep a separate counter for each FLOATTYPE, which we reset at each % chapter-level command. \let\resetallfloatnos=\empty @@ -6360,6 +6456,10 @@ width0pt\relax} \fi \let\thisshortcaption=\empty % % don't lose footnotes inside @float. + % + % BEWARE: when the floats start float, we have to issue warning whenever an + % insert appears inside a float which could possibly float. --kasal, 26may04 + % \startsavinginserts % % We can't be used inside a paragraph. @@ -6386,7 +6486,7 @@ width0pt\relax} \fi \ifx\floatlabel\empty \else % We want each FLOATTYPE to be numbered separately (Figure 1, % Table 1, Figure 2, ...). (And if no label, no number.) - % + % \expandafter\getfloatno\csname\safefloattype floatno\endcsname \global\advance\floatno by 1 % @@ -6396,7 +6496,7 @@ width0pt\relax} \fi % labels (which have a completely different output format) from % node and anchor labels. And \xrdef uses it to construct the % lists of floats. - % + % \edef\thissection{\floatmagic=\safefloattype}% \setref{\floatlabel}{Yfloat}% }% @@ -6444,7 +6544,7 @@ width0pt\relax} \fi \fi % % caption text. - \appendtomacro\captionline\thiscaption + \appendtomacro\captionline{\scanexp\thiscaption}% \fi % % If we have anything to print, print it, with space before. @@ -6452,6 +6552,9 @@ width0pt\relax} \fi \ifx\captionline\empty \else \vskip.5\parskip \captionline + % + % Space below caption. + \vskip\parskip \fi % % If have an xref label, write the list of floats info. Do this @@ -6462,37 +6565,44 @@ width0pt\relax} \fi % caption if specified, else the full caption if specified, else nothing. {% \atdummies \turnoffactive \otherbackslash - \immediate\write\auxfile{@xrdef{\floatlabel-lof}{% - \floatident - \ifx\thisshortcaption\empty - \ifx\thiscaption\empty \else : \thiscaption \fi - \else - : \thisshortcaption - \fi - }}% + % since we read the caption text in the macro world, where ^^M + % is turned into a normal character, we have to scan it back, so + % we don't write the literal three characters "^^M" into the aux file. + \scanexp{% + \xdef\noexpand\gtemp{% + \ifx\thisshortcaption\empty + \thiscaption + \else + \thisshortcaption + \fi + }% + }% + \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident + \ifx\gtemp\empty \else : \gtemp \fi}}% }% \fi - % - % Space below caption, if we printed anything. - \ifx\printedsomething\empty \else \vskip\parskip \fi \egroup % end of \vtop + % + % place the captured inserts + % + % BEWARE: when the floats start float, we have to issue warning whenever an + % insert appears inside a float which could possibly float. --kasal, 26may04 + % \checkinserts } % Append the tokens #2 to the definition of macro #1, not expanding either. -% -\newtoks\appendtomacroAtoks -\newtoks\appendtomacroBtoks +% \def\appendtomacro#1#2{% - \appendtomacroAtoks = \expandafter{#1}% - \appendtomacroBtoks = {#2}% - \edef#1{\the\appendtomacroAtoks \the\appendtomacroBtoks}% + \expandafter\def\expandafter#1\expandafter{#1#2}% } -% @caption, @shortcaption are easy. -% -\long\def\caption#1{\checkenv\float \def\thiscaption{#1}} -\def\shortcaption#1{\checkenv\float \def\thisshortcaption{#1}} +% @caption, @shortcaption +% +\def\caption{\docaption\thiscaption} +\def\shortcaption{\docaption\thisshortcaption} +\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption} +\def\defcaption#1#2{\egroup \def#1{#2}} % The parameter is the control sequence identifying the counter we are % going to use. Create it if it doesn't exist and assign it to \floatno. @@ -6511,7 +6621,7 @@ width0pt\relax} \fi % \setref calls this to get the XREFLABEL-snt value. We want an @xref % to the FLOATLABEL to expand to "Figure 3.1". We call \setref when we % first read the @float command. -% +% \def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}% % Magic string used for the XREFLABEL-title value, so \xrefX can @@ -6521,12 +6631,12 @@ width0pt\relax} \fi % #1 is the control sequence we are passed; we expand into a conditional % which is true if #1 represents a float ref. That is, the magic % \thissection value which we \setref above. -% +% \def\iffloat#1{\expandafter\doiffloat#1==\finish} % % #1 is (maybe) the \floatmagic string. If so, #2 will be the % (safe) float type for this float. We set \iffloattype to #2. -% +% \def\doiffloat#1=#2=#3\finish{% \def\temp{#1}% \def\iffloattype{#2}% @@ -6534,7 +6644,7 @@ width0pt\relax} \fi } % @listoffloats FLOATTYPE - print a list of floats like a table of contents. -% +% \parseargdef\listoffloats{% \def\floattype{#1}% floattype {% @@ -6564,10 +6674,10 @@ width0pt\relax} \fi % xref label, in the form LABEL-title, which is how we save it in the % aux file. We strip off the -title and look up \XRLABEL-lof, which % has the text we're supposed to typeset here. -% +% % Figures without xref labels will not be included in the list (since % they won't appear in the aux file). -% +% \def\listoffloatsdo#1{\listoffloatsdoentry#1\finish} \def\listoffloatsdoentry#1-title\finish{{% % Can't fully expand XR#1-lof because it can contain anything. Just diff --git a/gnu/dist/texinfo/doc/texinfo.txi b/gnu/dist/texinfo/doc/texinfo.txi index 5791a7de8e7..5b0f3140317 100644 --- a/gnu/dist/texinfo/doc/texinfo.txi +++ b/gnu/dist/texinfo/doc/texinfo.txi @@ -1,5 +1,5 @@ \input texinfo.tex @c -*-texinfo-*- -@c Id: texinfo.txi,v 1.52 2004/04/09 21:30:07 karl Exp +@c Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp @c Ordinarily, Texinfo files have the extension .texi. But texinfo.texi @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi. @@ -59,6 +59,7 @@ Software Foundation raise funds for GNU development.'' * Texinfo: (texinfo). The GNU documentation format. * install-info: (texinfo)Invoking install-info. Update info/dir entries. * texi2dvi: (texinfo)Format with texi2dvi. Print Texinfo documents. +* texi2pdf: (texinfo)PDF Output. PDF output for Texinfo. * texindex: (texinfo)Format with tex/texindex. Sort Texinfo index files. * makeinfo: (texinfo)Invoking makeinfo. Translate Texinfo source. @end direntry @@ -345,6 +346,7 @@ Indicating Definitions, Commands, etc. * option:: Indicating option names. * dfn:: Specifying definitions. * cite:: Referring to books not in the Info system. +* abbr:: Indicating abbreviations. * acronym:: Indicating acronyms. * indicateurl:: Indicating a World Wide Web reference. * email:: Indicating an electronic mail address. @@ -438,6 +440,7 @@ Special Insertions * Dots Bullets:: How to insert dots and bullets. * TeX and copyright:: How to insert the @TeX{} logo and the copyright symbol. +* euro:: How to insert the Euro currency symbol. * pounds:: How to insert the pounds currency symbol. * minus:: How to insert a minus sign. * math:: How to format a mathematical expression. @@ -856,7 +859,7 @@ files. @xref{Creating and Installing Info Files}. @cindex Plain text output (Generated via @command{makeinfo --no-headers}.) This is almost the same as Info output, except the navigational control characters are -omitted. +omitted. Also, standard output is used by default. @item HTML @cindex HTML output @@ -895,12 +898,14 @@ For more information on @TeX{} in general, please see the book @cindex PDF output @cindex Beebe, Nelson @pindex pdftex -(Generated via @command{texi2dvi --pdf}.) This format, based on -PostScript, was developed by Adobe Systems for document interchange. -It is intended to be platform-independent and easily viewable, among -other design goals; for a discussion, see -@uref{http://tug.org/tugboat/Articles/tb22-3/tb72beebeI.pdf}. Texinfo -uses the @command{pdftex} program, a variant of @TeX{}, to output pdf; +(Generated via @command{texi2dvi --pdf} or @command{texi2pdf}.) This +was developed by Adobe Systems for portable document interchange, +based on their previous PostScript language. It can represent the exact +appearance of a document, including fonts, and supporting arbitrary +scaling. It is intended to be platform-independent and easily +viewable, among other design goals; for a discussion, see +@uref{http://tug.org/TUGboat/Articles/tb22-3/tb72beebeI.pdf}. Texinfo +uses the @command{pdftex} program, a variant of @TeX{}, to output PDF; see @uref{http://tug.org/applications/pdftex}. @xref{PDF Output}. @item XML @@ -1273,13 +1278,13 @@ Unicode. @cindex En dash, producing Use three hyphens in a row, @samp{---}, to produce a long dash---like this (called an @dfn{em dash}), used for punctuation in sentences. -Use two hyphens, @samp{--}, to produce a medium dash--like this -(called an @dfn{en dash}), used to separate numeric ranges. Use a -single hyphen, @samp{-}, to produce a standard hyphen used in compound -words. For display on the screen, Info reduces three hyphens to two -and two hyphens to one (not transitively!). Of course, any number of -hyphens in the source remain as they are in literal contexts, such as -@code{@@code} and @code{@@example}. +Use two hyphens, @samp{--}, to produce a medium dash (called an +@dfn{en dash}), used primarily for numeric ranges, as in ``June +25--26''. Use a single hyphen, @samp{-}, to produce a standard hyphen +used in compound words. For display on the screen, Info reduces three +hyphens to two and two hyphens to one (not transitively!). Of course, +any number of hyphens in the source remain as they are in literal +contexts, such as @code{@@code} and @code{@@example}. @item @cindex Tabs; don't use! @@ -3464,9 +3469,11 @@ Cover art by @dots{} @cindex Titlepage end starts headings @cindex End titlepage starts headings -The @code{@@end titlepage} command must be written on a line by itself. -It not only marks the end of the title and copyright pages, but also -causes @TeX{} to start generating page headings and page numbers. +Like all @code{@@end} commands (@pxref{Quotations and Examples}), the @code{@@end titlepage} command +must be written at the beginning of a line by itself, with only one +space between the @code{@@end} and the @code{titlepage}. It not only +marks the end of the title and copyright pages, but also causes @TeX{} +to start generating page headings and page numbers. To repeat what is said elsewhere, Texinfo has two standard page heading formats, one for documents which are printed on one side of each sheet of paper @@ -4008,7 +4015,8 @@ beginning of a line followed by either @samp{asis} or a number: @@exampleindent @var{indent} @end example -The indentation is according to the value of @var{indent}: +@code{@@exampleindent} is ignored for HTML output. Otherwise, the +indentation is according to the value of @var{indent}: @table @asis @item @code{asis} @@ -4023,8 +4031,9 @@ Indent environments by @var{n} space characters in Info output, by @end table -The default value of @var{indent} is 5. @code{@@exampleindent} is -ignored for HTML output. +The default value of @var{indent} is 5 spaces in Info, and 0.4@dmn{in} +in @TeX{}, which is somewhat less. (The reduction is to help @TeX{} +fit more characters onto physical lines.) It is best to write the @code{@@exampleindent} command before the end-of-header line at the beginning of a Texinfo file, so the region @@ -6293,16 +6302,13 @@ Sea surges are described in Section 6.7 [Hurricanes], page 72. Sea surges are described in *Note Hurricanes::. @end example -@quotation Caution -You should write a period or comma immediately after an @code{@@ref} -command with two or more arguments. Otherwise, Info will generate a -(grammatically incorrect) period, just so the cross-reference doesn't -fail completely. -@end quotation +As a general rule, you should write a period or comma immediately +after an @code{@@ref} command with two or more arguments. -As a general rule, you should write a period or comma after every -@code{@@ref} command. This works best in both the printed and the -Info output. +If there is no such following punctuation, @command{makeinfo} will +generate a (grammatically incorrect) period in the Info output; +otherwise, the cross-reference would fail completely, due to the +current syntax of Info format. @node pxref @@ -6313,9 +6319,9 @@ Info output. The parenthetical reference command, @code{@@pxref}, is nearly the same as @code{@@xref}, but you use it @emph{only} inside parentheses -and you do @emph{not} type a comma or period after the command's -closing brace. The command differs from @code{@@xref} in two -ways:@refill +and you do @emph{not} type a comma or period (or anything else) after +the command's closing brace. The command differs from @code{@@xref} +in two ways: @enumerate @item @@ -6330,8 +6336,9 @@ closing colon or period.@refill Because one type of formatting automatically inserts closing punctuation and the other does not, you should use @code{@@pxref} @emph{only} inside parentheses as part of another sentence. Also, you -yourself should not insert punctuation after the reference, as you do -with @code{@@xref}.@refill +yourself should not insert punctuation after the reference (or any +other text), as you do with @code{@@xref}. In the Info +output, such text would follow a period, which is grammatically wrong. @code{@@pxref} is designed so that the output looks right and works right between parentheses both in printed output and in an Info file. @@ -6411,10 +6418,12 @@ location breaks up the flow of reading. @cindex References using @code{@@inforef} @findex inforef -@code{@@inforef} is used for cross references to Info files for which -there are no printed manuals. Even in a printed manual, -@code{@@inforef} generates a reference directing the user to look in -an Info file.@refill +@code{@@inforef} is used for making cross references to Info +documents---even from a printed manual. This might be because you +want to refer to conditional @code{@@ifinfo} text +(@pxref{Conditionals}), or because printed output is not available +(perhaps because there is no Texinfo source), among other +possibilities. The command takes either two or three arguments, in the following order:@refill @@ -6444,7 +6453,7 @@ The template is: @need 800 @noindent -Thus, +For example, @example @group @@ -6455,7 +6464,7 @@ for more information. @need 800 @noindent -produces +produces (in Info): @example @group @@ -6466,41 +6475,18 @@ for more information. @need 800 @noindent -and +and (in the printed output): @quotation See Info file @file{info}, node @samp{Advanced}, for more information. @end quotation -@need 800 -@noindent -Similarly, - -@example -@group -@@inforef@{Advanced, , info@}, for more information. -@end group -@end example - -@need 800 -@noindent -produces - -@example -*Note (info)Advanced::, for more information. -@end example - -@need 800 -@noindent -and - -@quotation -See Info file @file{info}, node @samp{Advanced}, for more information. -@end quotation +(This particular example is not realistic, since the Info manual is +written in Texinfo, so all formats are available.) The converse of @code{@@inforef} is @code{@@cite}, which is used to refer to printed works for which no Info form exists. @xref{cite, , -@code{@@cite}}.@refill +@code{@@cite}}. @node uref @@ -6656,17 +6642,18 @@ not something else that should not be changed.@refill * code:: Indicating program code. * kbd:: Showing keyboard input. * key:: Specifying keys. -* samp:: A literal sequence of characters. -* verb:: A verbatim sequence of characters. +* samp:: Indicating a literal sequence of characters. +* verb:: Indicating a verbatim sequence of characters. * var:: Indicating metasyntactic variables. * env:: Indicating environment variables. * file:: Indicating file names. * command:: Indicating command names. * option:: Indicating option names. * dfn:: Specifying definitions. -* cite:: Referring to books not in the Info system. +* cite:: Referring to books not in the Info system. +* abbr:: Indicating abbreviations. * acronym:: Indicating acronyms. -* indicateurl:: Indicating a World Wide Web reference. +* indicateurl:: Indicating an example URL. * email:: Indicating an electronic mail address. @end menu @@ -6686,46 +6673,68 @@ The commands serve a variety of purposes:@refill @table @code @item @@code@{@var{sample-code}@} -Indicate text that is a literal example of a piece of a program.@refill +Indicate text that is a literal example of a piece of a program. +@xref{code,,@code{@@code}}. @item @@kbd@{@var{keyboard-characters}@} -Indicate keyboard input.@refill +Indicate keyboard input. +@xref{kbd,,@code{@@kbd}}. @item @@key@{@var{key-name}@} -Indicate the conventional name for a key on a keyboard.@refill +Indicate the conventional name for a key on a keyboard. +@xref{key,,@code{@@key}}. @item @@samp@{@var{text}@} -Indicate text that is a literal example of a sequence of characters.@refill +Indicate text that is a literal example of a sequence of characters. +@xref{samp,,@code{@@samp}}. + +@item @@verb@{@var{text}@} +Write a verbatim sequence of characters. +@xref{verb,,@code{@@verb}}. @item @@var@{@var{metasyntactic-variable}@} -Indicate a metasyntactic variable.@refill +Indicate a metasyntactic variable. +@xref{var,,@code{@@var}}. @item @@env@{@var{environment-variable}@} -Indicate an environment variable.@refill +Indicate an environment variable. +@xref{env,,@code{@@kenv}}. @item @@file@{@var{file-name}@} -Indicate the name of a file.@refill +Indicate the name of a file. +@xref{file,,@code{@@file}}. @item @@command@{@var{command-name}@} -Indicate the name of a command.@refill +Indicate the name of a command. +@xref{command,,@code{@@command}}. @item @@option@{@var{option}@} -Indicate a command-line option.@refill +Indicate a command-line option. +@xref{option,,@code{@@option}}. @item @@dfn@{@var{term}@} -Indicate the introductory or defining use of a term.@refill +Indicate the introductory or defining use of a term. +@xref{dfn,,@code{@@dfn}}. @item @@cite@{@var{reference}@} -Indicate the name of a book.@refill +Indicate the name of a book. +@xref{cite,,@code{@@cite}}. + +@item @@abbr@{@var{abbreviation}@} +Indicate an abbreviation. @item @@acronym@{@var{acronym}@} -Indicate an acronym.@refill +Indicate an acronym. +@xref{acronym,,@code{@@acronym}}. @item @@indicateurl@{@var{uniform-resource-locator}@} -Indicate a uniform resource locator for the World Wide Web. +Indicate an example (that is, nonfunctional) uniform resource locator. +@xref{indicateurl,,@code{@@indicateurl}}. (Use @code{@@url} +(@pxref{uref,,@code{@@url}}) for live url's.) @item @@email@{@var{email-address}[, @var{displayed-text}]@} Indicate an electronic mail address. +@xref{email,,@code{@@email}}. @ignore @item @@ctrl@{@var{ctrl-char}@} @@ -7080,7 +7089,10 @@ normal Texinfo text, where the three characters @code{@@@{@}} are special. With @code{@@verb}, nothing is special except the delimiter character you choose. -It is not reliable to use @code{@@verb} inside other Texinfo constructs. +It is not reliable to use @code{@@verb} inside other Texinfo +constructs. In particular, it does not work to use @code{@@verb} in +anything related to cross-referencing, such as section titles or +figure captions. @node var @@ -7351,32 +7363,76 @@ identify that control character: an uparrow followed by the character @end ignore +@node abbr +@subsection @code{@@abbr}@{@var{abbreviation}[, @var{meaning}]@} +@findex abbr + +@cindex Abbreviations, tagging +You can use the @code{@@abbr} command for general abbreviations. The +abbreviation is given as the single argument in braces, as in +@samp{@@abbr@{Comput.@}}. As a matter of style, or for particular +abbreviations, you may prefer to omit periods, as in +@samp{@@abbr@{Mr@} Stallman}. + +@code{@@abbr} accepts an optional second argument, intended to be used +for the meaning of the abbreviation. + +If the abbreviation ends with a lowercase letter and a period, and is +not at the end of a sentence, and has no second argument, remember to +use the @code{@@.} command (@pxref{Not Ending a +Sentence}) to get the correct spacing. However, you do not have to +use @code{@@.} within the abbreviation itself; Texinfo automatically +assumes periods within the abbreivation do not end a sentence. + +@cindex <abbr> tag +In @TeX{} and in the Info output, the first argument is printed as-is; +if the second argument is present, it is printed in parentheses after +the abbreviation. In HTML and XML, the @code{<abbr>} tag is +used; in Docbook, the @code{<abbrev>} tag is used. For instance: + +@example +@@abbr@{Comput. J., Computer Journal@} +@end example + +@noindent produces: + +@display +@abbr{Comput. J., Computer Journal} +@end display + +For abbreviations consisting of all capital letters, you may prefer to +use the @code{@@acronym} command instead. See the next section for +more on the usage of these two commands. + + @node acronym @subsection @code{@@acronym}@{@var{acronym}[, @var{meaning}]@} @findex acronym @cindex NASA, as acronym -@cindex F.B.I., as acronym -@cindex Abbreviations, tagging @cindex Acronyms, tagging Use the @code{@@acronym} command for abbreviations written in all capital letters, such as `@acronym{NASA}'. The abbreviation is given as the single argument in braces, as in @samp{@@acronym@{NASA@}}. As -a matter of style, or for particular abbreviations, you may prefer to -use periods, as in @samp{@@acronym@{F.B.I.@}}. +a matter of style, or for particular acronyms, you may prefer to +use periods, as in @samp{@@acronym@{N.A.S.A.@}}. + +@code{@@acronym} accepts an optional second argument, intended to be +used for the meaning of the acronym. -If the acronym is at the end of a sentence, remember to use the -special @code{@@.} and similar commands (@pxref{Ending a Sentence}). +If the acronym is at the end of a sentence, and if there is no second +argument, remember to use the @code{@@.} or similar command +(@pxref{Ending a Sentence}) to get the correct spacing. @cindex <acronym> tag In @TeX{}, the acronym is printed in slightly smaller font. In the -Info output, the argument is printed as-is. In HTML, Docbook, and -XML, the @code{<acronym>} tag is used. +Info output, the argument is printed as-is. In either format, if the +second argument is present, it is printed in parentheses after the +acronym. In HTML, Docbook, and XML, the @code{<acronym>} tag is +used. -@code{@@acronym} accepts an optional second argument, intended to be -used for the meaning of the acronym. If present, it is printed in -parentheses after the acronym. For instance (since GNU is a recursive -acronym, we use @code{@@acronym} recursively): +For instance (since GNU is a recursive acronym, we use +@code{@@acronym} recursively): @example @@acronym@{GNU, @@acronym@{GNU@}'s Not Unix@} @@ -7392,6 +7448,38 @@ In some circumstances, it is conventional to print family names in all capitals. Don't use @code{@@acronym} for this, since a name is not an acronym. Use @code{@@sc} instead (@pxref{Smallcaps}). +@code{@@abbr} and @code{@@acronym} are closely related commands: they +both signal to the reader that a shortened form is being used, and +possibly give a meaning. When choosing whether to use these two +commands, please bear the following in mind. + +@itemize @minus +@item +In standard English usage, acronyms are a subset of abbreviations: +they include pronounceable words like `@acronym{NATO}', `radar', and +`snafu', and some sources also include syllable acronyms like +`Usenet', hybrids like `@acronym{SIGGRAPH}', and unpronounceable +initialisms like `@acronym{FBI}'. + +@item +In Texinfo, an acronym (but not an abbreviation) should consist only +of capital letters and periods, no lowercase. + +@item +In @TeX{}, an acronym (but not an abbreviation) is printed in a +slightly smaller font. + +@item +Some browsers place a dotted bottom border under abbreviations but not +acronyms. + +@item +It's not essential to use these commands for all abbreviations. Text +is perfectly readable without them, and for common abbreviations like +`etc.@:', we consider them to be overkill. + +@end itemize + @node indicateurl @subsection @code{@@indicateurl}@{@var{uniform-resource-locator}@} @@ -7534,7 +7622,7 @@ Richard @sc{Stallman} founded @acronym{GNU}. @end display As shown here, we recommend using @code{@@acronym} for actual -abbreviations (@pxref{acronym}), and reserving @code{@@sc} for special +acronyms (@pxref{acronym}), and reserving @code{@@sc} for special cases where you want small caps. The output is not the same (@code{@@acronym} prints in a smaller text font, not the small caps font), but more importantly it describes the actual text more @@ -7560,37 +7648,54 @@ We recommend using regular mixed case wherever possible. @node Fonts @subsection Fonts for Printing, Not Info @cindex Fonts for printing, not Info -@findex i @r{(italic font)} -@findex b @r{(bold font)} -@findex t @r{(typewriter font)} -@findex r @r{(roman font)} -Texinfo provides four font commands that specify font changes in the -printed manual and (where possible) in the HTML output, but have no -effect in the Info file. All four commands apply to an argument that -follows, surrounded by braces. +Texinfo provides a number of font commands that specify font changes +in the printed manual and (where possible) in the HTML output, but +have no effect in the Info file. All the commands apply to an +argument that follows, surrounded by braces. @table @code +@item @@b +@findex b @r{(bold font)} +@cindex Bold font +selects @b{bold} face; + @item @@i +@findex i @r{(italic font)} @cindex Italic font selects an @i{italic} font; -@item @@b -@cindex Bold font -selects @b{bold} face; +@item @@r +@findex r @r{(roman font)} +@cindex Roman font +@cindex Default font +selects a @r{roman} font, which is the usual font in which text is +printed. It may or may not be seriffed. + +@item @@sansserif +@findex sansserif @r{(sans serif font)} +@cindex Sans serif font +selects a @sansserif{sans serif} font; + +@item @@slanted +@findex slanted @r{(slanted font)} +@cindex Slanted font +@cindex Oblique font +rselects a @slanted{slanted} font; @item @@t +@findex t @r{(typewriter font)} @cindex Monospace font @cindex Fixed-width font @cindex Typewriter font selects the @t{fixed-width}, typewriter-style font used by @code{@@code}; -@item @@r -@cindex Roman font -selects a @r{roman} font, which is the usual font in which text is printed. - @end table +(The commands with longer names were invented much later than the +others, when it did not seem desirable to use very short names for +such an infrequently needed feature.) + @cindex <lineannotation> Docbook tag Only the @code{@@r} command has much use: in example-like environments, you can use the @code{@@r} command to write comments in @@ -7615,9 +7720,9 @@ produces (+ 2 2) ; @r{Add two plus two.} @end lisp -In general, you should avoid using the other three font commands. If -you need to use one, it probably indicates a gap in the Texinfo -language. +In general, you should avoid using the other font commands. Some of +them are only useful when documenting functionality with specific font +effects, such as in \TeX\ and related packages. @node Quotations and Examples @@ -7625,16 +7730,17 @@ language. Quotations and examples are blocks of text consisting of one or more whole paragraphs that are set off from the bulk of the text and -treated differently. They are usually indented.@refill +treated differently. They are usually indented in the output. +@findex end In Texinfo, you always begin a quotation or example by writing an @@-command at the beginning of a line by itself, and end it by writing an @code{@@end} command that is also at the beginning of a line by itself. For instance, you begin an example by writing @code{@@example} by itself at the beginning of a line and end the example by writing @code{@@end example} on a line by itself, at the beginning of that -line. -@findex end +line, and with only one space between the @code{@@end} and the +@code{example}. @menu * Block Enclosing Commands:: Different constructs for different purposes. @@ -7732,10 +7838,8 @@ the margins are closer to the center of the page, so the whole of the quotation is indented; @item -the first lines of paragraphs are indented no more than other lines; +and the first lines of paragraphs are indented no more than other lines. -@item -in the printed output, interparagraph spacing is reduced. @end itemize @quotation @@ -8024,13 +8128,13 @@ consistently within a chapter. @cindex Display formatting @findex display -The @code{@@display} command begins a kind of example. It is like the -@code{@@example} command -except that, in -a printed manual, @code{@@display} does not select the fixed-width -font. In fact, it does not specify the font at all, so that the text -appears in the same font it would have appeared in without the -@code{@@display} command.@refill +The @code{@@display} command begins a kind of example, where each line +of input produces a line of output, and the output is indented. It is +thus like the @code{@@example} command except that, in a printed +manual, @code{@@display} does not select the fixed-width font. In +fact, it does not specify the font at all, so that the text appears in +the same font it would have appeared in without the @code{@@display} +command. @display This is an example of text written between an @code{@@display} command @@ -8043,6 +8147,11 @@ Texinfo also provides a command @code{@@smalldisplay}, which is like @code{@@display} but uses a smaller font in @code{@@smallbook} format. @xref{small}. +The @code{@@table} command (@pxref{table}) does not work inside +@code{@@display}. Since @code{@@display} is line-oriented, it doesn't +make sense to use them together. If you want to indent a table, try +@code{@@quotation} (@pxref{quotation}). + @node format @section @code{@@format} and @code{@@smallformat} @@ -9071,7 +9180,19 @@ The @code{@@shortcaption} command likewise may be used only within @code{@@float}, and takes a single argument in braces. The short caption text is used instead of the caption text in a list of floats (see the next section). Thus, you can write a long caption for the -main document, and a short title to appear in the list of floats. +main document, and a short title to appear in the list of floats. For +example: + +@example +@@float +... as above ... +@@shortcaption@{Text for list of floats.@} +@@end float +@end example + +The text for @code{@@caption} and @code{@@shortcaption} may not +contain comments (@code{@@c}), verbatim text (@code{@@verb}), +environments such as @code{@@example}, or other complex constructs. @node listoffloats @@ -9176,6 +9297,13 @@ will cause @code{makeinfo} to look for @file{foo.xpm} before any others. The @var{width} and @var{height} arguments are described in the next section. +For @TeX{} output, if an image is the first thing in a paragraph, for +example if you want two images side-by-side, you must precede it with +@code{@@noindent} (@pxref{noindent,,@code{@@noindent}}). Otherwise it +will be displayed on a line by itself. If you want it centered, +use @code{@@center} (@pxref{titlefont center sp,,@code{@@titlefont +@@center @@sp}}). + @cindex Alt attribute for images @cindex Images, alternate text for When producing html, @code{makeinfo} sets the @dfn{alt attribute} for @@ -9855,6 +9983,7 @@ These are: * Dots Bullets:: How to insert dots and bullets. * TeX and copyright:: How to insert the @TeX{} logo and the copyright symbol. +* euro:: How to insert the Euro currency symbol. * pounds:: How to insert the pounds currency symbol. * minus:: How to insert a minus sign. * math:: How to format a mathematical expression. @@ -10389,14 +10518,38 @@ registered symbol, `@registeredsymbol{}'. Where possible, this is an @samp{R} inside a circle; in Info, this is @samp{(R)}. +@node euro +@section @code{@@euro}@{@} (@euro{}): Euro currency symbol +@findex euro + +Use the @code{@@euro@{@}} command to generate `@euro{}'. Where +possible, this is the symbol for the Euro currency, invented as part +of the European economic unification relatively recently. In plain +Info, it is the word @samp{Euro }. (The space is included in the text +transliteration since typically there would be no space after the +symbol, so it would be inappropriate to have a space in the source document.) + +Texinfo cannot magically synthesize support for the Euro symbol where +the underlying system (fonts, software, whatever) does not support +it. Therefore, in many cases it is preferable to use the word +``Euro''. (In banking circles, the abbreviation for the Euro is EUR.) + +@cindex ISO 8859-15 +@cindex Latin 9 +In order to get the Euro symbol in encoded Info output, for example, +it is necessary to specify @code{@@documentencoding ISO-8859-15}. +(@xref{documentencoding,,@code{@@documentencoding}}.) The Euro symbol +is in ISO 8859-15 (aka Latin@tie{}9), and is @emph{not} in the more +widely-used and supported ISO 8859-1 (Latin@tie{}1). + + @node pounds @section @code{@@pounds}@{@} (@pounds{}): Pounds Sterling @findex pounds -Use the @code{@@pounds@{@}} command to generate `@pounds{}'. In a -printed manual, this is the symbol for the currency pounds sterling. -In Info, it is a @samp{#}. Other currency symbols are unfortunately not -available. +Use the @code{@@pounds@{@}} command to generate `@pounds{}'. Where +possible, this is the symbol for the currency pounds sterling. In +Info, it is a @samp{#}. @node minus @@ -13196,18 +13349,23 @@ The @code{@@documentencoding} command declares the input document encoding. Write it on a line by itself, with a valid encoding specification following. -At present, Texinfo supports only three encodings: +At present, Texinfo supports only these encodings: @table @code @item US-ASCII This has no particular effect, but it's included for completeness. + @itemx ISO-8859-1 +@itemx ISO-8859-15 @item ISO-8859-2 -These specify the standard encodings for Western European and -Eastern European languages, respectively. A full description of the -encodings is beyond our scope here; -@uref{http://czyborra.com/charsets/iso8859.html} is one of many useful -references. +These specify the standard encodings for Western European (the first +two) and Eastern European languages (the third), respectively. ISO +8859-15 replaces some little-used characters from 8859-1 (e.g., +precomposed fractions) with more commonly needed ones, such as the +Euro symbol. + +A full description of the encodings is beyond our scope here; +one useful reference is @uref{http://czyborra.com/charsets/iso8859.html}. @end table Specifying an encoding @var{enc} has the following effects: @@ -13215,11 +13373,11 @@ Specifying an encoding @var{enc} has the following effects: @opindex --enable-encoding @cindex Local Variables: section, for encoding @cindex Info output, and encoding -In Info output, if the option @option{--enable-encoding} is also given +In Info output, if the option @option{--enable-encoding} is given to @command{makeinfo}, a so-called `Local Variables' section (@pxref{File Variables,,,emacs,The GNU Emacs Manual}) is output including @var{enc}. This allows Info readers to set the encoding -appropriately: +appropriately. @example Local Variables: @@ -13233,7 +13391,7 @@ End: In HTML output, a @samp{<meta>} tag is output, in the @samp{<head>} section of the HTML, that specifies @var{enc}. Web servers and browsers cooperate to use this information so the correct encoding is -used to display the page. +used to display the page, if supported by the system. @example <meta http-equiv="Content-Type" content="text/html; @@ -13470,9 +13628,10 @@ Twice: a,b & a,b. @node Macro Details -@section Macro Details +@section Macro Details and Caveats @cindex Macro details @cindex Details of macro usage +@cindex Caveats for macro usage Due to unavoidable limitations, certain macro-related constructs cause problems with @TeX{}. If you get macro-related errors when producing @@ -13487,7 +13646,7 @@ As mentioned earlier, macro names must consist entirely of letters. @item It is not advisable to redefine any @TeX{} primitive, plain, or Texinfo command name as a macro. Unfortunately this is a very large -set of names, and the possible resulting errors are completely random. +set of names, and the possible resulting errors are unpredictable. @item All macros are expanded inside at least one @TeX{} group. This means @@ -13495,18 +13654,61 @@ that @code{@@set} and other such commands have no effect inside a macro. @item -Macros containing a command which must be on a line by itself, such as a -conditional, cannot be invoked in the middle of a line. - -@item Commas in macro arguments, even if escaped by a backslash, don't always work. @item -It is best to avoid comments inside macro definitions. +Macro arguments cannot cross lines. @item -Macro arguments cannot cross lines. +It is (usually) best to avoid comments inside macro definitions, but +see the next item. + +@item +Macros containing a command which must be on a line by itself, such as +a conditional, cannot be invoked in the middle of a line. In general, +the interaction of newlines in the macro definitions and invocations +depends on the precise commands and context. You may be able to work +around some problems with judicious use of @code{@@c}. Suppose you +define a macro that is always intended to be used on a line by itself: + +@example +@@macro linemac +@@cindex whatever +@@c +@@end macro +... +foo +@@linemac +bar +@end example + +Without the @code{@@c}, there will be an unwanted blank line between +the @samp{@@cindex whatever} and the @samp{bar} (one newline comes +from the macro definition, one from after the invocation), causing a +paragraph break. + +On the other hand, you wouldn't want the @code{@@c} if the macro was +sometimes invoked in the middle of a line (the text after the +invocation would be treated as a comment). + +@item +In general, you can't arbitrarily substitute a macro call for Texinfo +command arguments, even when the text is the same. It might work with +some commands, it fails with others. Best not to do it at all. For +instance, this fails: + +@example +@@macro offmacro +off +@@end macro +@@headings @@offmacro +@end example + +@noindent +You would expect this to be equivalent to @code{@@headings off}, but +for @TeX{}nical reasons, it fails with a mysterious error message +(@code{Paragraph ended before @@headings was complete}). @item Macros cannot define macros in the natural way. To do this, you must @@ -13757,13 +13959,12 @@ any device (see the following sections). @pindex texindex The @code{tex} formatting command itself does not sort the indices; it -writes an output file of unsorted index data. (The @code{texi2dvi} -command automatically generates indices; @pxref{Format with texi2dvi,, -Format with @code{texi2dvi}}.) To generate a printed index after -running the @code{tex} command, you first need a sorted index to work -from. The @code{texindex} command sorts indices. (The source file -@file{texindex.c} comes as part of the standard Texinfo distribution, -among other places.)@refill +writes an output file of unsorted index data. To generate a printed +index after running the @command{tex} command, you first need a sorted +index to work from. The @command{texindex} command sorts indices. +(The source file @file{texindex.c} comes as part of the standard +Texinfo distribution, among other places.) (@command{texi2dvi} runs +@command{tex} and @command{texindex} as necessary.) @cindex Names of index files @cindex Index file names @@ -13901,10 +14102,21 @@ formats, such as @code{@@smallbook} (@pxref{smallbook}), (You can also do this on a site-wide basis with @file{texinfo.cnf}; @pxref{Preparing for TeX,,Preparing for @TeX{}}). +With the @option{--pdf} option, @command{texi2dvi} produces PDF output +instead of DVI (@pxref{PDF Output}), by running @command{pdftex} +instead of @command{tex}. Alternatively, the command +@command{texi2pdf} is an abbreviation for running @samp{texi2dvi --pdf}. + @cindex @LaTeX{}, processing with @command{texi2dvi} @command{texi2dvi} can also be used to process @LaTeX{} files; simply run @samp{texi2dvi filename.ext}. +@command{texi2dvi} will use @command{etex} (or @command{pdfetex}) if +they are available; these extended versions of @TeX{} are not +required, and the DVI (or PDF) output is identical, but they simplify +the @TeX{} programming in some cases, and provide additional tracing +information when debugging @file{texinfo.tex}. + For a list of other options, run @samp{texi2dvi --help}. @@ -14569,24 +14781,42 @@ magnifications. Be prepared to experiment. @cindex PDF output @pindex pdftex -You can generate a PDF output file from Texinfo source by using the -@command{pdftex} program to process your file instead of plain -@command{tex}. That is, run @samp{pdftex foo.texi} instead of @samp{tex -foo.texi}, or give the @samp{--pdf} option to @command{texi2dvi}. +The simplest way to generate PDF output from Texinfo source is to run +the convenience script @command{texi2pdf}; this simply executes the +@command{texi2dvi} script with the @option{--pdf} option +(@pxref{Format with texi2dvi}). If for some reason you want to +process by hand, simply run the @command{pdftex} program instead of +plain @command{tex}. That is, run @samp{pdftex foo.texi} instead of +@samp{tex foo.texi}. @dfn{PDF} stands for `Portable Document Format'. It was invented by Adobe Systems some years ago for document interchange, based on their -PostScript language. A @uref{http://www.foolabs.com/xpdf/, PDF -reader} for the X window system is freely available, as is the -@uref{http://partners.adobe.com/asn/developer/technotes/, definition -of the file format}. At present, there are no @samp{@@ifpdf} or -@samp{@@pdf} commands as with the other output formats. +PostScript language. Related links: + +@itemize +@item +GNU GV, a @uref{http://www.foolabs.com/xpdf/, Ghostscript-based PDF +reader}. (It can also preview PostScript documents.) + +@item +A freely available standalone @uref{http://www.foolabs.com/xpdf/, +PDF reader} for the X window system. + +@item +@uref{http://partners.adobe.com/asn/acrobat/sdk/public/docs/, PDF definition}. + +@end itemize -Despite the `portable' in the name, PDF files are nowhere near as -portable in practice as the plain ASCII formats (Info, HTML) that -Texinfo supports (DVI portability is arguable). They also tend to be -much larger. Nevertheless, a PDF file does preserve an actual printed -document on a screen as faithfully as possible, so it has its place. +At present, Texinfo does not provide +@samp{@@ifpdf} or @samp{@@pdf} commands as for the other output +formats, since PDF documents contain many internal links that would be +hard or impossible to get right at the Texinfo source level. + +PDF files require special software to be displayed, unlike the plain +ASCII formats (Info, HTML) that Texinfo supports. They also tend to +be much larger than the DVI files output by @TeX{} by default. +Nevertheless, a PDF file does define an actual typeset document in a +self-contained file, so it has its place. @node Obtaining TeX @@ -14850,8 +15080,7 @@ MS-DOS/MS-Windows). For the specified format, process @samp{@@if@var{format}} and @samp{@@@var{format}} commands even if not generating the given output format. For instance, if @option{--iftex} is specified, then -@samp{@@iftex} and @samp{@@tex} blocks will be read. This can be useful -when postprocessing the output. +@samp{@@iftex} and @samp{@@tex} blocks will be read. @item --macro-expand=@var{file} @itemx -E @var{file} @@ -14863,17 +15092,19 @@ file. Normally, the results of macro expansion are used internally by @command{texi2dvi}. @item --no-headers +@item --plaintext @opindex --no-headers +@opindex --plaintext @cindex Plain text output @cindex ASCII text output @cindex Generating plain text files @cindex @file{INSTALL} file, generating @cindex Node separators, omitting @cindex Menus, omitting -For Info output, do not include menus or node separator lines in the -output, and implicitly @option{--enable-encoding} (see above). This -results in a simple plain text file that you can (for example) send in -email without complications, or include in a distribution (as in an +Do not include menus or node separator lines in the output, and +implicitly @option{--enable-encoding} (see above). This results in a +simple plain text file that you can (for example) send in email +without complications, or include in a distribution (as in an @file{INSTALL} file). @cindex Navigation links, omitting @@ -14898,9 +15129,21 @@ output by default---can be overridden with @option{-o}. @itemx --no-ifxml @opindex --no-ifxml Do not process @samp{@@if@var{format}} and @samp{@@@var{format}} -commands even if generating the given format. For instance, if -@option{--no-ifhtml} is specified, then @samp{@@ifhtml} and -@samp{@@html} blocks will not be read. +commands, and do process @samp{@@ifnot@var{format}}, even if +generating the given format. For instance, if @option{--no-ifhtml} is +specified, then @samp{@@ifhtml} and @samp{@@html} blocks will not be +read, and @samp{@@ifnothtml} blocks will be. + +@item --no-number-footnotes +@opindex --no-number-footnotes +Suppress automatic footnote numbering. By default, @code{makeinfo} +numbers each footnote sequentially in a single node, resetting the +current footnote number to 1 at the start of each node. + +@item --no-number-sections +@opindex --no-number-sections +Do not output chapter, section, and appendix numbers. +You need to specify this if your manual is not hierarchically-structured. @item --no-split @opindex --no-split @@ -14916,28 +15159,21 @@ For HTML output, each file contains one node (@pxref{Generating HTML}). @opindex --no-pointer-validate @opindex --no-validate @cindex Pointer validation, suppressing -Suppress the pointer-validation phase of @code{makeinfo}. This can also -be done with the @code{@@novalidate} command (@pxref{Use TeX,,Use -@TeX{}}). Normally, after a Texinfo file is processed, some consistency -checks are made to ensure that cross references can be resolved, etc. -@xref{Pointer Validation}. +Suppress the pointer-validation phase of @code{makeinfo}---a dangerous +thing to do. This can also be done with the @code{@@novalidate} +command (@pxref{Use TeX,,Use @TeX{}}). Normally, after a Texinfo file +is processed, some consistency checks are made to ensure that cross +references can be resolved, etc. @xref{Pointer Validation}. @item --no-warn @opindex --no-warn -Suppress warning messages (but @emph{not} error messages). You might -want this if the file you are creating has examples of Texinfo cross -references within it, and the nodes that are referenced do not actually -exist. +Suppress warning messages (but @emph{not} error messages). @item --number-sections @opindex --number-sections Output chapter, section, and appendix numbers as in printed manuals. - -@item --no-number-footnotes -@opindex --no-number-footnotes -Suppress automatic footnote numbering. By default, @code{makeinfo} -numbers each footnote sequentially in a single node, resetting the -current footnote number to 1 at the start of each node. +This is the default. It works only with hierarchically-structured +manuals. @item --output=@var{file} @itemx -o @var{file} @@ -15070,7 +15306,8 @@ cross-reference.@refill @cindex @@-commands in @@node, limited support Some Texinfo documents might fail during the validation phase because they use commands like @code{@@value} and @code{@@definfoenclose} in -node definitions and cross-references inconsistently. Consider the +node definitions and cross-references inconsistently. (Your best bet +is to avoid using @@-commands in node names.) Consider the following example: @example @@ -16079,6 +16316,11 @@ the directory is @file{./} (or just the empty string), and the file is @end itemize +One exception: the algorithm for node name expansion prefixes the +string @samp{g_t} when the node name begins with a non-letter. This +kludge (due to XHTML rules) is not necessary for filenames, and is +therefore omitted. + Any directory part in the filename argument of the source cross-reference command is ignored. Thus, @code{@@xref@{,,,../foo@}} and @code{@@xref@{,,,foo@}} both use @samp{foo} as the manual name. @@ -16108,10 +16350,11 @@ in. @xref{HTML Xref Mismatch}. As mentioned in the previous section, the key part of the HTML cross-reference algorithm is the conversion of node names in the -Texinfo source into strings suitable for HTML identifiers and +Texinfo source into strings suitable for XHTML identifiers and filenames. The restrictions are similar for each: plain ASCII letters, numbers, and the @samp{-} and @samp{_} characters are all -that can be used. +that can be used. (Although HTML anchors can contain most characters, +XHTML is more restrictive.) Cross-references in Texinfo can actually refer either to nodes or anchors (@pxref{anchor}), but anchors are treated identically to nodes @@ -16124,6 +16367,7 @@ simplicity. A special exception: the Top node (@pxref{The Top Node}) is always mapped to the file @file{index.html}, to match web server software. However, the HTML @emph{target} is @samp{Top}. Thus (in the split case): + @example @@xref@{Top, Introduction,, emacs, The GNU Emacs Manual@}. @result{} <a href="emacs/index.html#Top"> @@ -16131,8 +16375,12 @@ However, the HTML @emph{target} is @samp{Top}. Thus (in the split case): @enumerate @item -The standard ASCII letters (a-z and A-z), and numbers (0-9) are not -modified. All other characters are changed as specified below. +The standard ASCII letters (a-z and A-Z) are not modified. All other +characters are changed as specified below. + +@item +The standard ASCII numbers (0-9) are not modified except when a number +is the first character of the node name. In that case, see below. @item Multiple consecutive space, tab and newline characters are transformed @@ -16152,6 +16400,13 @@ Other ASCII 7-bit characters are transformed into @samp{_00@var{xx}}, where @var{xx} is the ASCII character code in (lowercase) hexadecimal. This includes @samp{_}, which is mapped to @samp{_005f}. +@item +If the node name does not begin with a letter, the literal string +@samp{g_t} is prefixed to the result. (Due to the rules above, that +string can never occur otherwise; it is an arbitrary choice, standing +for ``GNU Texinfo''.) This is necessary because XHTML requires that +identifiers begin with a letter. + @end enumerate For example: @@ -16204,7 +16459,7 @@ the text of the argument is recursively transformed: @example @@asis @@b @@cite @@code @@command @@dfn @@dmn @@dotless @@emph @@env @@file @@indicateurl @@kbd @@key -@@samp @@sc @@strong @@t @@var @@w +@@samp @@sc @@slanted @@strong @@t @@var @@w @end example @noindent For @code{@@sc}, any letters are capitalized. @@ -16240,6 +16495,7 @@ according to the other rules. @item @code{@@enddots} @tab @samp{...} @item @code{@@equiv} @tab U+2261 @item @code{@@error} @tab @samp{error-->} +@item @code{@@euro} @tab U+20AC @item @code{@@exclamdown} @tab U+00A1 @item @code{@@expansion} @tab U+2192 @item @code{@@minus} @tab U+2212 @@ -16254,8 +16510,8 @@ according to the other rules. @item @code{@@tie} @tab (space) @end multitable -An @code{@@acronym} command is replaced by the first argument, -followed by the second argument in parentheses, if present. +An @code{@@acronym} or @code{@@abbr} command is replaced by the first +argument, followed by the second argument in parentheses, if present. @xref{acronym}. An @code{@@email} command is replaced by the @var{text} argument if @@ -16276,10 +16532,11 @@ Any other command is an error, and the result is unspecified. @cindex 8-bit characters, in HTML cross-references @cindex Expansion of 8-bit characters in HTML cross-references -Characters other than plain 7-bit ASCII are transformed into the -corresponding Unicode code point(s), in Normalization Form C, which +Usually, characters other than plain 7-bit ASCII are transformed into +the corresponding Unicode code point(s) in Normalization Form C, which uses precomposed characters where available. (This is the -normalization form recommended by the W3C and other bodies.) +normalization form recommended by the W3C and other bodies.) This +holds when that code point is 0xffff or less, as it almost always is. These will then be further transformed by the rules above into the string @samp{_@var{xxxx}}, where @var{xxxx} is the code point in hex. @@ -16291,10 +16548,18 @@ For example, combining this rule and the previous section: @result{} A-TeX-B_0306-_2605_002e_002e_002e @end example -Notice: 1)@tie{}@code{@@enddots} expands to three periods which in turn expands -to three @samp{_002e}'s; 2)@tie{}@code{@@u@{B@}} is a `B' with a breve -accent, which does not exist as a pre-accented Unicode character, -therefore expands to @samp{B_0306} (B with combining breve). +Notice: 1)@tie{}@code{@@enddots} expands to three periods which in +turn expands to three @samp{_002e}'s; 2)@tie{}@code{@@u@{B@}} is a `B' +with a breve accent, which does not exist as a pre-accented Unicode +character, therefore expands to @samp{B_0306} (B with combining +breve). + +When the Unicode code point is above 0xffff, the transformation is +@samp{__@var{xxxxxx}}, that is, two leading underscores followed by +six hex digits. Since Unicode has declared that their highest code +point is 0x10ffff, this is sufficient. (We felt it was better to +define this extra escape than to always use six hex digits, since the +first two would nearly always be zeros.) For the definition of Unicode Normalization Form C, see Unicode report UAX#15, @uref{http://www.unicode.org/reports/tr15/}. Many related @@ -16477,9 +16742,13 @@ Generate a tilde accent over the next character, as in @~N. Generate the uppercase and lowercase Scandinavian A-ring letters, respectively: @AA{}, @aa{}. @xref{Inserting Accents}. -@item @@acronym@{@var{abbrev}@} -Tag @var{abbrev} as an acronym, that is, an abbreviation written in all -capital letters, such as `NASA'. @xref{acronym,, @code{acronym}}. +@item @@abbr@{@var{abbreviation}@} +Tag @var{abbreviation} as an abbreviation, such as `Comput.'. +@xref{abbr,, @code{abbr}}. + +@item @@acronym@{@var{acronym}@} +Tag @var{acronym} as an acronym, such as `NASA'. +@xref{acronym,, @code{acronym}}. @item @@AE@{@} @itemx @@ae@{@} @@ -16859,6 +17128,10 @@ Optionally, start list with @var{number-or-letter}. Pair with Indicate to the reader the exact equivalence of two forms with a glyph: @samp{@equiv{}}. @xref{Equivalence}.@refill +@item @@euro@{@} +Generate the Euro currency sign. +@xref{euro,,@code{@@euro@{@}}}. + @item @@error@{@} Indicate to the reader with a glyph that the following text is an error message: @samp{@error{}}. @xref{Error Glyph}.@refill @@ -17250,6 +17523,10 @@ Highlight @var{text} that is a literal example of a sequence of characters. Used for single characters, for statements, and often for entire shell commands. @xref{samp, , @code{@@samp}}.@refill +@item @@sansserif@{@var{text}@} +Print @var{text} in a @sansserif{sans serif} font if possible. No +effect in Info. @xref{Fonts}. + @item @@sc@{@var{text}@} Set @var{text} in a printed output in @sc{the small caps font} and set text in the Info file in uppercase letters. @@ -17304,6 +17581,10 @@ Contents}.@refill @item @@shorttitlepage @var{title} Generate a minimal title page. @xref{titlepage,,@code{@@titlepage}}. +@item @@slanted@{@var{text}@} +Print @var{text} in a @slanted{slanted} font if possible. No effect +in Info. @xref{Fonts}. + @item @@smallbook Cause @TeX{} to produce a printed manual in a 7 by 9.25 inch format rather than the regular 8.5 by 11 inch format. @xref{smallbook, , @@ -18170,7 +18451,7 @@ The @samp{$Id:} comment is for the CVS (@pxref{Top,, Overview, cvs, Concurrent Versions System}) or RCS (see rcsintro(1)) version control systems, which expand it into a string such as: @example -Id: texinfo.txi,v 1.52 2004/04/09 21:30:07 karl Exp +Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp @end example (This is useful in all sources that use version control, not just manuals.) You may wish to include the @samp{$Id:} comment in the @code{@@copying} @@ -18236,7 +18517,7 @@ Here is the sample document: @verbatim \input texinfo @c -*-texinfo-*- -@comment Id: texinfo.txi,v 1.52 2004/04/09 21:30:07 karl Exp +@comment Id: texinfo.txi,v 1.128 2004/12/29 15:06:41 karl Exp @comment %**start of header @setfilename sample.info @include version.texi @@ -18756,7 +19037,6 @@ A single-sided page looks like this: | Start of text ... | | ... | | | - @end group @end example @@ -18788,7 +19068,6 @@ Two pages, side by side as in an open book, look like this:@refill | Start of text ... | | More text ... | | ... | | ... | | | | | - @end group @end example diff --git a/gnu/dist/texinfo/doc/txi-cs.tex b/gnu/dist/texinfo/doc/txi-cs.tex index 3bdc8456e7a..061a215b49a 100644 --- a/gnu/dist/texinfo/doc/txi-cs.tex +++ b/gnu/dist/texinfo/doc/txi-cs.tex @@ -1,4 +1,4 @@ -% Id: txi-cs.tex,v 1.1.1.1 2003/12/06 01:32:07 karl Exp +% Id: txi-cs.tex,v 1.3 2004/04/11 17:56:45 karl Exp % Czech translation for texinfo.tex. % % Copyright (C) 1999, 2000 Free Software Foundation. diff --git a/gnu/dist/texinfo/doc/txi-de.tex b/gnu/dist/texinfo/doc/txi-de.tex index bcee2515fe6..233cfab9d36 100644 --- a/gnu/dist/texinfo/doc/txi-de.tex +++ b/gnu/dist/texinfo/doc/txi-de.tex @@ -1,5 +1,5 @@ % txi-de.tex -- adaptation to German for texinfo.tex. -% Id: txi-de.tex,v 1.1.1.1 2003/12/06 01:32:07 karl Exp +% Id: txi-de.tex,v 1.3 2004/04/11 17:56:45 karl Exp % % Copyright (C) 1999 Free Software Foundation, Inc. % diff --git a/gnu/dist/texinfo/doc/txi-en.tex b/gnu/dist/texinfo/doc/txi-en.tex index eee7a092b39..f321872ce8f 100644 --- a/gnu/dist/texinfo/doc/txi-en.tex +++ b/gnu/dist/texinfo/doc/txi-en.tex @@ -1,7 +1,7 @@ % English non-translation for texinfo.tex. This is read when a source % document says @documentlanguage en (which might happen after another % @documentlanguage). The actual values are the same as defaults. -% Id: txi-en.tex,v 1.1.1.1 2003/12/06 01:32:07 karl Exp +% Id: txi-en.tex,v 1.3 2004/04/11 17:56:45 karl Exp % % Copyright (C) 1999 Free Software Foundation. % diff --git a/gnu/dist/texinfo/doc/txi-fr.tex b/gnu/dist/texinfo/doc/txi-fr.tex index df80aca0f63..93d4f3db581 100644 --- a/gnu/dist/texinfo/doc/txi-fr.tex +++ b/gnu/dist/texinfo/doc/txi-fr.tex @@ -1,5 +1,5 @@ % txi-fr.tex -- TeX macros to handle French language for texinfo.tex documents. -% Id: txi-fr.tex,v 1.1.1.1 2003/12/06 01:32:07 karl Exp +% Id: txi-fr.tex,v 1.3 2004/04/11 17:56:45 karl Exp % % Copyright (C) 1999 Free Software Foundation. % diff --git a/gnu/dist/texinfo/doc/txi-it.tex b/gnu/dist/texinfo/doc/txi-it.tex index 1cac4d6df29..aee4b934a03 100644 --- a/gnu/dist/texinfo/doc/txi-it.tex +++ b/gnu/dist/texinfo/doc/txi-it.tex @@ -1,7 +1,7 @@ % English non-translation for texinfo.tex. This is read when a source % document says @documentlanguage en (which might happen after another % @documentlanguage). The actual values are the same as defaults. -% Id: txi-it.tex,v 1.1.1.1 2003/12/06 01:32:07 karl Exp +% Id: txi-it.tex,v 1.3 2004/04/11 17:56:45 karl Exp % % Copyright (C) 1999 Free Software Foundation. % diff --git a/gnu/dist/texinfo/doc/txi-nl.tex b/gnu/dist/texinfo/doc/txi-nl.tex index 5cfc91d5913..54a9ab1234f 100644 --- a/gnu/dist/texinfo/doc/txi-nl.tex +++ b/gnu/dist/texinfo/doc/txi-nl.tex @@ -1,5 +1,5 @@ % Dutch translation for texinfo.tex. -% Id: txi-nl.tex,v 1.1.1.1 2003/12/06 01:32:07 karl Exp +% Id: txi-nl.tex,v 1.3 2004/04/11 17:56:45 karl Exp % % Copyright (C) 1999 Free Software Foundation. % diff --git a/gnu/dist/texinfo/doc/txi-pl.tex b/gnu/dist/texinfo/doc/txi-pl.tex index 2bc7d6c349c..c36a7ac2e57 100644 --- a/gnu/dist/texinfo/doc/txi-pl.tex +++ b/gnu/dist/texinfo/doc/txi-pl.tex @@ -1,5 +1,5 @@ % txi-pl.tex -- adaptation to Polish for texinfo.tex. -% Id: txi-pl.tex,v 1.1.1.1 2003/12/06 01:32:33 karl Exp +% Id: txi-pl.tex,v 1.3 2004/04/11 17:56:45 karl Exp % % Copyright (C) 2003 Free Software Foundation. % diff --git a/gnu/dist/texinfo/doc/txi-tr.tex b/gnu/dist/texinfo/doc/txi-tr.tex index 748a824166c..f817593b7c5 100644 --- a/gnu/dist/texinfo/doc/txi-tr.tex +++ b/gnu/dist/texinfo/doc/txi-tr.tex @@ -1,5 +1,5 @@ % txi-en.tex -- adaptation to Turkish for texinfo.tex. -% Id: txi-tr.tex,v 1.1.1.1 2003/12/06 01:32:33 karl Exp +% Id: txi-tr.tex,v 1.3 2004/04/11 17:56:45 karl Exp % % Copyright (C) 2003 Free Software Foundation, Inc. % diff --git a/gnu/dist/texinfo/doc/version-stnd.texi b/gnu/dist/texinfo/doc/version-stnd.texi index 37ec57f5d5d..078103b2044 100644 --- a/gnu/dist/texinfo/doc/version-stnd.texi +++ b/gnu/dist/texinfo/doc/version-stnd.texi @@ -1,5 +1,5 @@ -@set UPDATED 23 March 2004 -@c $NetBSD: version-stnd.texi,v 1.1.1.4 2004/07/12 23:26:39 wiz Exp $ -@set UPDATED-MONTH March 2004 -@set EDITION 4.7 -@set VERSION 4.7 +@set UPDATED 14 December 2004 +@c $NetBSD: version-stnd.texi,v 1.1.1.5 2008/09/02 07:51:36 christos Exp $ +@set UPDATED-MONTH December 2004 +@set EDITION 4.8 +@set VERSION 4.8 diff --git a/gnu/dist/texinfo/doc/version.texi b/gnu/dist/texinfo/doc/version.texi index afa96106e73..07a617de5e5 100644 --- a/gnu/dist/texinfo/doc/version.texi +++ b/gnu/dist/texinfo/doc/version.texi @@ -1,5 +1,5 @@ -@set UPDATED 9 April 2004 -@c $NetBSD: version.texi,v 1.1.1.5 2004/07/12 23:26:41 wiz Exp $ -@set UPDATED-MONTH April 2004 -@set EDITION 4.7 -@set VERSION 4.7 +@set UPDATED 29 December 2004 +@c $NetBSD: version.texi,v 1.1.1.6 2008/09/02 07:51:46 christos Exp $ +@set UPDATED-MONTH December 2004 +@set EDITION 4.8 +@set VERSION 4.8 diff --git a/gnu/dist/texinfo/info/Makefile.am b/gnu/dist/texinfo/info/Makefile.am index babb077aaab..08f4d1ad7c7 100644 --- a/gnu/dist/texinfo/info/Makefile.am +++ b/gnu/dist/texinfo/info/Makefile.am @@ -1,4 +1,4 @@ -# Id: Makefile.am,v 1.2 2004/01/09 09:07:44 dirt Exp +# Id: Makefile.am,v 1.8 2004/10/28 14:03:27 karl Exp # Makefile.am for texinfo/info. # Run automake in .. to produce Makefile.in from this. # @@ -10,8 +10,6 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -noinst_PROGRAMS = makedoc - # Use `ginfo' for building to avoid confusion with the standard `info' # target. Removes the `g' in the install rule before applying any # user-specified name transformations. @@ -29,15 +27,8 @@ DEFS += -DLOCALEDIR=\"$(localedir)\" -DINFODIR=\"$(infodir)\" \ -DINFODIR2=\"$(infodir2)\" LDADD = ../lib/libtxi.a $(TERMLIBS) $(LIBINTL) -# The files `doc.c' and `funs.h' are created by ./makedoc run over the source -# files which contain DECLARE_INFO_COMMAND. `funs.h' is a header file -# listing the functions found. `doc.c' is a structure containing pointers -# to those functions along with completable names and documentation strings. -BUILT_SOURCES = doc.c funs.h key.c - -EXTRA_DIST = README pcterm.c $(BUILT_SOURCES) +EXTRA_DIST = README pcterm.c -makedoc_SOURCES = makedoc.c ginfo_SOURCES = dir.c display.c display.h doc.h dribble.c dribble.h \ echo-area.c echo-area.h \ filesys.c filesys.h footnotes.c footnotes.h gc.c gc.h \ @@ -45,9 +36,28 @@ ginfo_SOURCES = dir.c display.c display.h doc.h dribble.c dribble.h \ infomap.c infomap.h m-x.c man.c man.h nodemenu.c nodes.c nodes.h \ search.c search.h session.c session.h signals.c signals.h \ termdep.h terminal.c terminal.h tilde.c tilde.h \ - variables.c variables.h window.c window.h \ - $(BUILT_SOURCES) $(generated_sources) -infokey_SOURCES = infokey.c infokey.h key.c key.h + variables.c variables.h window.c window.h +nodist_ginfo_SOURCES = doc.c funs.h +infokey_SOURCES = infokey.c infokey.h key.h +nodist_infokey_SOURCES = key.c funs.h + +# The files `doc.c', `key.c' and `funs.h' are created by ./makedoc run over the +# source files which contain DECLARE_INFO_COMMAND. `funs.h' is a header file +# listing the functions found. `doc.c' is a structure containing pointers +# to those functions along with completable names and documentation strings. +# +generated_sources = doc.c key.c funs.h + +# We need a linear ordering to prevent race condition in parallel make. +# See the node ``(automake)Multiple Outputs'' for an explanation. +doc.c: key.c +key.c: funs.h + +# These files are not distributed. +DISTCLEANFILES = $(generated_sources) + +noinst_PROGRAMS = makedoc +makedoc_SOURCES = makedoc.c # Files with Info commands defined that makedoc should read. cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \ @@ -55,6 +65,10 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \ $(srcdir)/footnotes.c $(srcdir)/variables.c # The $(EXEEXT) should be added by Automake, but isn't. Fine. -$(BUILT_SOURCES): makedoc$(EXEEXT) $(cmd_sources) - rm -f $(BUILT_SOURCES) - ./makedoc $(cmd_sources) +$(generated_sources): makedoc$(EXEEXT) $(cmd_sources) + rm -f $(generated_sources) + $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources) + +# The following hack is necessary to hint make before the automatic +# dependencies are built. +BUILT_SOURCES = funs.h diff --git a/gnu/dist/texinfo/info/README b/gnu/dist/texinfo/info/README index 2b5d5d98cb5..d22b2aede5c 100644 --- a/gnu/dist/texinfo/info/README +++ b/gnu/dist/texinfo/info/README @@ -1,4 +1,4 @@ -Id: README,v 1.1.1.1 2003/12/06 01:32:34 karl Exp +Id: README,v 1.3 2004/04/11 17:56:45 karl Exp texinfo/info/README Copyright (C) 2002 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/dir.c b/gnu/dist/texinfo/info/dir.c index abc6a983a71..ce7d8fe5aef 100644 --- a/gnu/dist/texinfo/info/dir.c +++ b/gnu/dist/texinfo/info/dir.c @@ -1,7 +1,7 @@ -/* $NetBSD: dir.c,v 1.1.1.4 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: dir.c,v 1.1.1.5 2008/09/02 07:49:33 christos Exp $ */ /* dir.c -- how to build a special "dir" node from "localdir" files. - Id: dir.c,v 1.3 2004/03/14 00:57:29 karl Exp + Id: dir.c,v 1.3 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 1997, 1998, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/display.c b/gnu/dist/texinfo/info/display.c index a4e50922b0f..52e72c67505 100644 --- a/gnu/dist/texinfo/info/display.c +++ b/gnu/dist/texinfo/info/display.c @@ -1,7 +1,7 @@ -/* $NetBSD: display.c,v 1.1.1.4 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: display.c,v 1.1.1.5 2008/09/02 07:49:34 christos Exp $ */ /* display.c -- How to display Info windows. - Id: display.c,v 1.4 2004/03/27 15:34:40 karl Exp + Id: display.c,v 1.7 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 1997, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/display.h b/gnu/dist/texinfo/info/display.h index 728a9282de4..dc51e566195 100644 --- a/gnu/dist/texinfo/info/display.h +++ b/gnu/dist/texinfo/info/display.h @@ -1,7 +1,7 @@ -/* $NetBSD: display.h,v 1.1.1.3 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: display.h,v 1.1.1.4 2008/09/02 07:49:34 christos Exp $ */ /* display.h -- How the display in Info is done. - Id: display.h,v 1.3 2004/03/14 00:57:29 karl Exp + Id: display.h,v 1.3 2004/04/11 17:56:45 karl Exp This file is part of GNU Info, a program for reading online documentation stored in Info format. diff --git a/gnu/dist/texinfo/info/doc.h b/gnu/dist/texinfo/info/doc.h index aab74e93780..fe6d756a4a6 100644 --- a/gnu/dist/texinfo/info/doc.h +++ b/gnu/dist/texinfo/info/doc.h @@ -1,7 +1,7 @@ -/* $NetBSD: doc.h,v 1.1.1.3 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: doc.h,v 1.1.1.4 2008/09/02 07:49:34 christos Exp $ */ /* doc.h -- Structures associating function pointers with documentation. - Id: doc.h,v 1.4 2004/03/21 18:58:27 karl Exp + Id: doc.h,v 1.3 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 2001, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/dribble.c b/gnu/dist/texinfo/info/dribble.c index d55c2fc5830..73ce57c759b 100644 --- a/gnu/dist/texinfo/info/dribble.c +++ b/gnu/dist/texinfo/info/dribble.c @@ -1,7 +1,7 @@ -/* $NetBSD: dribble.c,v 1.1.1.4 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: dribble.c,v 1.1.1.5 2008/09/02 07:49:34 christos Exp $ */ /* dribble.c -- dribble files for Info. - Id: dribble.c,v 1.3 2004/03/14 00:57:29 karl Exp + Id: dribble.c,v 1.3 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 1998, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/echo-area.h b/gnu/dist/texinfo/info/echo-area.h index 9278ec99803..af2dca2556f 100644 --- a/gnu/dist/texinfo/info/echo-area.h +++ b/gnu/dist/texinfo/info/echo-area.h @@ -1,7 +1,7 @@ -/* $NetBSD: echo-area.h,v 1.1.1.3 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: echo-area.h,v 1.1.1.4 2008/09/02 07:49:37 christos Exp $ */ /* echo-area.h -- Functions used in reading information from the echo area. - Id: echo-area.h,v 1.3 2004/03/14 00:57:29 karl Exp + Id: echo-area.h,v 1.4 2004/08/07 22:03:08 karl Exp This file is part of GNU Info, a program for reading online documentation stored in Info format. @@ -35,7 +35,7 @@ extern int echo_area_is_active, info_aborted_echo_area; killed some text. */ extern int echo_area_last_command_was_kill; -extern void inform_in_echo_area (char *message); +extern void inform_in_echo_area (const char *message); extern void echo_area_inform_of_deleted_window (WINDOW *window); extern void echo_area_prep_read (void); extern VFunction *ea_last_executed_command; diff --git a/gnu/dist/texinfo/info/filesys.c b/gnu/dist/texinfo/info/filesys.c index 45e63ece9ed..a54bac5df6b 100644 --- a/gnu/dist/texinfo/info/filesys.c +++ b/gnu/dist/texinfo/info/filesys.c @@ -1,7 +1,7 @@ -/* $NetBSD: filesys.c,v 1.1.1.5 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: filesys.c,v 1.1.1.6 2008/09/02 07:49:37 christos Exp $ */ /* filesys.c -- filesystem specific functions. - Id: filesys.c,v 1.3 2004/03/14 00:57:29 karl Exp + Id: filesys.c,v 1.6 2004/07/30 17:17:40 karl Exp Copyright (C) 1993, 1997, 1998, 2000, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -283,13 +283,13 @@ extract_colon_unit (char *string, int *idx) if (!string || i >= strlen (string)) return NULL; + if (!string[i]) /* end of string */ + return NULL; + /* Advance to next PATH_SEP. */ while (string[i] && string[i] != PATH_SEP[0]) i++; - if (!string[i] && i == start) /* end of string, and didn't advance */ - return NULL; - { char *value = xmalloc ((i - start) + 1); strncpy (value, &string[start], (i - start)); diff --git a/gnu/dist/texinfo/info/filesys.h b/gnu/dist/texinfo/info/filesys.h index f2a41e3eeb3..ef3383d4620 100644 --- a/gnu/dist/texinfo/info/filesys.h +++ b/gnu/dist/texinfo/info/filesys.h @@ -1,7 +1,7 @@ -/* $NetBSD: filesys.h,v 1.1.1.4 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: filesys.h,v 1.1.1.5 2008/09/02 07:49:38 christos Exp $ */ /* filesys.h -- external declarations for filesys.c. - Id: filesys.h,v 1.3 2004/03/14 00:57:29 karl Exp + Id: filesys.h,v 1.3 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/footnotes.c b/gnu/dist/texinfo/info/footnotes.c index f317753786e..f866351063e 100644 --- a/gnu/dist/texinfo/info/footnotes.c +++ b/gnu/dist/texinfo/info/footnotes.c @@ -1,7 +1,7 @@ -/* $NetBSD: footnotes.c,v 1.1.1.4 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: footnotes.c,v 1.1.1.5 2008/09/02 07:49:38 christos Exp $ */ /* footnotes.c -- Some functions for manipulating footnotes. - Id: footnotes.c,v 1.4 2004/04/06 22:58:25 karl Exp + Id: footnotes.c,v 1.4 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 1997, 1998, 1999, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/footnotes.h b/gnu/dist/texinfo/info/footnotes.h index 7232f1afe19..a55fc1f558f 100644 --- a/gnu/dist/texinfo/info/footnotes.h +++ b/gnu/dist/texinfo/info/footnotes.h @@ -1,7 +1,7 @@ -/* $NetBSD: footnotes.h,v 1.1.1.4 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: footnotes.h,v 1.1.1.5 2008/09/02 07:49:38 christos Exp $ */ /* footnotes.h -- Some functions for manipulating footnotes. - Id: footnotes.h,v 1.3 2004/03/14 00:57:29 karl Exp + Id: footnotes.h,v 1.3 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/gc.c b/gnu/dist/texinfo/info/gc.c index 8d46c6bcb8c..0033bf9df67 100644 --- a/gnu/dist/texinfo/info/gc.c +++ b/gnu/dist/texinfo/info/gc.c @@ -1,7 +1,7 @@ -/* $NetBSD: gc.c,v 1.1.1.3 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: gc.c,v 1.1.1.4 2008/09/02 07:49:38 christos Exp $ */ /* gc.c -- Functions to remember and garbage collect unused node contents. - Id: gc.c,v 1.3 2004/03/14 00:57:29 karl Exp + Id: gc.c,v 1.3 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/gc.h b/gnu/dist/texinfo/info/gc.h index cc0600e065e..73c0c64639f 100644 --- a/gnu/dist/texinfo/info/gc.h +++ b/gnu/dist/texinfo/info/gc.h @@ -1,7 +1,7 @@ -/* $NetBSD: gc.h,v 1.1.1.3 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: gc.h,v 1.1.1.4 2008/09/02 07:49:38 christos Exp $ */ /* gc.h -- Functions for garbage collecting unused node contents. - Id: gc.h,v 1.3 2004/03/14 00:57:29 karl Exp + Id: gc.h,v 1.3 2004/04/11 17:56:45 karl Exp This file is part of GNU Info, a program for reading online documentation stored in Info format. diff --git a/gnu/dist/texinfo/info/indices.c b/gnu/dist/texinfo/info/indices.c index 50cc13cfc87..be895ff5ce5 100644 --- a/gnu/dist/texinfo/info/indices.c +++ b/gnu/dist/texinfo/info/indices.c @@ -1,7 +1,7 @@ -/* $NetBSD: indices.c,v 1.1.1.5 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: indices.c,v 1.1.1.6 2008/09/02 07:49:40 christos Exp $ */ /* indices.c -- deal with an Info file index. - Id: indices.c,v 1.4 2004/04/06 22:58:25 karl Exp + Id: indices.c,v 1.5 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/indices.h b/gnu/dist/texinfo/info/indices.h index 2be1f0b803f..17916e54400 100644 --- a/gnu/dist/texinfo/info/indices.h +++ b/gnu/dist/texinfo/info/indices.h @@ -1,7 +1,7 @@ -/* $NetBSD: indices.h,v 1.1.1.3 2004/07/12 23:26:55 wiz Exp $ */ +/* $NetBSD: indices.h,v 1.1.1.4 2008/09/02 07:49:40 christos Exp $ */ /* indices.h -- Functions defined in indices.c. - Id: indices.h,v 1.3 2004/03/14 00:57:29 karl Exp + Id: indices.h,v 1.3 2004/04/11 17:56:45 karl Exp This file is part of GNU Info, a program for reading online documentation stored in Info format. diff --git a/gnu/dist/texinfo/info/info-utils.c b/gnu/dist/texinfo/info/info-utils.c index f057f749d51..b850a80fcb8 100644 --- a/gnu/dist/texinfo/info/info-utils.c +++ b/gnu/dist/texinfo/info/info-utils.c @@ -1,7 +1,7 @@ -/* $NetBSD: info-utils.c,v 1.1.1.5 2004/07/12 23:26:55 wiz Exp $ */ +/* $NetBSD: info-utils.c,v 1.1.1.6 2008/09/02 07:49:40 christos Exp $ */ /* info-utils.c -- miscellanous. - Id: info-utils.c,v 1.6 2004/03/27 13:26:39 karl Exp + Id: info-utils.c,v 1.4 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 1998, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/info-utils.h b/gnu/dist/texinfo/info/info-utils.h index 7fc083ce249..296e4aa0b81 100644 --- a/gnu/dist/texinfo/info/info-utils.h +++ b/gnu/dist/texinfo/info/info-utils.h @@ -1,7 +1,7 @@ -/* $NetBSD: info-utils.h,v 1.1.1.5 2004/07/12 23:26:55 wiz Exp $ */ +/* $NetBSD: info-utils.h,v 1.1.1.6 2008/09/02 07:49:40 christos Exp $ */ /* info-utils.h -- Exported functions and variables from info-utils.c. - Id: info-utils.h,v 1.4 2004/03/14 00:57:29 karl Exp + Id: info-utils.h,v 1.4 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 1996, 1998, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/info.h b/gnu/dist/texinfo/info/info.h index 5542598383b..b7b2f2e82f1 100644 --- a/gnu/dist/texinfo/info/info.h +++ b/gnu/dist/texinfo/info/info.h @@ -1,7 +1,7 @@ -/* $NetBSD: info.h,v 1.1.1.5 2004/07/12 23:26:55 wiz Exp $ */ +/* $NetBSD: info.h,v 1.1.1.6 2008/09/02 07:49:43 christos Exp $ */ /* info.h -- Header file which includes all of the other headers. - Id: info.h,v 1.3 2004/03/14 00:57:29 karl Exp + Id: info.h,v 1.4 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/infodoc.c b/gnu/dist/texinfo/info/infodoc.c index 49620bd09d8..a0b32774fca 100644 --- a/gnu/dist/texinfo/info/infodoc.c +++ b/gnu/dist/texinfo/info/infodoc.c @@ -1,7 +1,7 @@ -/* $NetBSD: infodoc.c,v 1.1.1.5 2004/07/12 23:26:55 wiz Exp $ */ +/* $NetBSD: infodoc.c,v 1.1.1.6 2008/09/02 07:49:44 christos Exp $ */ /* infodoc.c -- functions which build documentation nodes. - Id: infodoc.c,v 1.3 2004/03/14 00:57:29 karl Exp + Id: infodoc.c,v 1.8 2004/04/11 17:56:45 karl Exp Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/infokey.h b/gnu/dist/texinfo/info/infokey.h index 155412712a7..0168e798103 100644 --- a/gnu/dist/texinfo/info/infokey.h +++ b/gnu/dist/texinfo/info/infokey.h @@ -1,7 +1,7 @@ -/* $NetBSD: infokey.h,v 1.1.1.2 2004/07/12 23:26:52 wiz Exp $ */ +/* $NetBSD: infokey.h,v 1.1.1.3 2008/09/02 07:50:15 christos Exp $ */ /* infokey.h -- Custom keystroke definition support. - Id: infokey.h,v 1.1.1.1 2003/12/06 01:32:48 karl Exp + Id: infokey.h,v 1.2 2004/04/11 17:56:45 karl Exp Copyright (C) 1999, 2002 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/infomap.c b/gnu/dist/texinfo/info/infomap.c index 296fc4baf38..80c3560e87f 100644 --- a/gnu/dist/texinfo/info/infomap.c +++ b/gnu/dist/texinfo/info/infomap.c @@ -1,7 +1,7 @@ -/* $NetBSD: infomap.c,v 1.1.1.6 2004/07/12 23:26:55 wiz Exp $ */ +/* $NetBSD: infomap.c,v 1.1.1.7 2008/09/02 07:49:47 christos Exp $ */ /* infomap.c -- keymaps for Info. - Id: infomap.c,v 1.3 2004/03/14 00:57:29 karl Exp + Id: infomap.c,v 1.10 2004/07/30 20:43:40 karl Exp Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -706,8 +706,8 @@ initialize_vi_like_keymaps () map['H'].function = info_get_help_window; map['i'].function = info_index_search; map['I'].function = info_goto_invocation_node; - map['j'].function = info_down_line; - map['k'].function = info_up_line; + map['j'].function = info_next_line; + map['k'].function = info_prev_line; map['l'].function = info_history_node; map['m'].function = info_menu_item; map['n'].function = info_search_next; @@ -1184,8 +1184,8 @@ static unsigned char default_vi_like_info_keys[] = 'H', NUL, A_info_get_help_window, 'i', NUL, A_info_index_search, 'I', NUL, A_info_goto_invocation_node, - 'j', NUL, A_info_down_line, - 'k', NUL, A_info_up_line, + 'j', NUL, A_info_next_line, + 'k', NUL, A_info_prev_line, 'l', NUL, A_info_history_node, 'm', NUL, A_info_menu_item, 'n', NUL, A_info_search_next, diff --git a/gnu/dist/texinfo/info/infomap.h b/gnu/dist/texinfo/info/infomap.h index 880febc7cbf..d9698e7f3c8 100644 --- a/gnu/dist/texinfo/info/infomap.h +++ b/gnu/dist/texinfo/info/infomap.h @@ -1,7 +1,7 @@ -/* $NetBSD: infomap.h,v 1.1.1.3 2004/07/12 23:26:54 wiz Exp $ */ +/* $NetBSD: infomap.h,v 1.1.1.4 2008/09/02 07:49:47 christos Exp $ */ /* infomap.h -- description of a keymap in Info and related functions. - Id: infomap.h,v 1.3 2004/03/14 00:57:29 karl Exp + Id: infomap.h,v 1.3 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 2001, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/m-x.c b/gnu/dist/texinfo/info/m-x.c index 19be6580c42..8cc9b313b8b 100644 --- a/gnu/dist/texinfo/info/m-x.c +++ b/gnu/dist/texinfo/info/m-x.c @@ -1,7 +1,7 @@ -/* $NetBSD: m-x.c,v 1.1.1.4 2004/07/12 23:26:54 wiz Exp $ */ +/* $NetBSD: m-x.c,v 1.1.1.5 2008/09/02 07:49:47 christos Exp $ */ /* m-x.c -- Meta-x minibuffer reader. - Id: m-x.c,v 1.4 2004/03/20 22:15:57 karl Exp + Id: m-x.c,v 1.3 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1997, 1998, 2001, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/makedoc.c b/gnu/dist/texinfo/info/makedoc.c index a324a8d9c9d..927730c07be 100644 --- a/gnu/dist/texinfo/info/makedoc.c +++ b/gnu/dist/texinfo/info/makedoc.c @@ -1,7 +1,7 @@ -/* $NetBSD: makedoc.c,v 1.1.1.5 2004/07/12 23:26:52 wiz Exp $ */ +/* $NetBSD: makedoc.c,v 1.1.1.6 2008/09/02 07:50:15 christos Exp $ */ /* makedoc.c -- make doc.c and funs.h from input files. - Id: makedoc.c,v 1.4 2004/04/06 22:58:25 karl Exp + Id: makedoc.c,v 1.4 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/man.c b/gnu/dist/texinfo/info/man.c index 113475c32bc..5f1cfce4f05 100644 --- a/gnu/dist/texinfo/info/man.c +++ b/gnu/dist/texinfo/info/man.c @@ -1,7 +1,7 @@ -/* $NetBSD: man.c,v 1.1.1.5 2004/07/12 23:26:54 wiz Exp $ */ +/* $NetBSD: man.c,v 1.1.1.6 2008/09/02 07:49:49 christos Exp $ */ /* man.c: How to read and format man files. - Id: man.c,v 1.3 2004/03/14 00:57:29 karl Exp + Id: man.c,v 1.4 2004/04/11 17:56:46 karl Exp Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/man.h b/gnu/dist/texinfo/info/man.h index aa01136293f..00dbaa75a1f 100644 --- a/gnu/dist/texinfo/info/man.h +++ b/gnu/dist/texinfo/info/man.h @@ -1,7 +1,7 @@ -/* $NetBSD: man.h,v 1.1.1.3 2004/07/12 23:26:54 wiz Exp $ */ +/* $NetBSD: man.h,v 1.1.1.4 2008/09/02 07:49:49 christos Exp $ */ /* man.h: Defines and external function declarations for man.c. - Id: man.h,v 1.3 2004/03/14 00:57:29 karl Exp + Id: man.h,v 1.3 2004/04/11 17:56:46 karl Exp This file is part of GNU Info, a program for reading online documentation stored in Info format. diff --git a/gnu/dist/texinfo/info/nodemenu.c b/gnu/dist/texinfo/info/nodemenu.c index c62015e3416..8df0cdf39f0 100644 --- a/gnu/dist/texinfo/info/nodemenu.c +++ b/gnu/dist/texinfo/info/nodemenu.c @@ -1,7 +1,7 @@ -/* $NetBSD: nodemenu.c,v 1.1.1.5 2004/07/12 23:26:54 wiz Exp $ */ +/* $NetBSD: nodemenu.c,v 1.1.1.6 2008/09/02 07:49:49 christos Exp $ */ /* nodemenu.c -- produce a menu of all visited nodes. - Id: nodemenu.c,v 1.3 2004/03/14 00:57:29 karl Exp + Id: nodemenu.c,v 1.5 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1997, 1998, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/nodes.h b/gnu/dist/texinfo/info/nodes.h index 267acc77a9c..9c2639db1cb 100644 --- a/gnu/dist/texinfo/info/nodes.h +++ b/gnu/dist/texinfo/info/nodes.h @@ -1,7 +1,7 @@ -/* $NetBSD: nodes.h,v 1.1.1.4 2004/07/12 23:26:54 wiz Exp $ */ +/* $NetBSD: nodes.h,v 1.1.1.5 2008/09/02 07:49:51 christos Exp $ */ /* nodes.h -- How we represent nodes internally. - Id: nodes.h,v 1.3 2004/03/14 00:57:30 karl Exp + Id: nodes.h,v 1.3 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/pcterm.c b/gnu/dist/texinfo/info/pcterm.c index 78a0b3c2a6a..c6b93a756e7 100644 --- a/gnu/dist/texinfo/info/pcterm.c +++ b/gnu/dist/texinfo/info/pcterm.c @@ -1,7 +1,7 @@ -/* $NetBSD: pcterm.c,v 1.1.1.4 2004/07/12 23:26:52 wiz Exp $ */ +/* $NetBSD: pcterm.c,v 1.1.1.5 2008/09/02 07:50:19 christos Exp $ */ /* pcterm.c -- How to handle the PC terminal for Info under MS-DOS/MS-Windows. - Id: pcterm.c,v 1.2 2004/04/06 22:58:25 karl Exp + Id: pcterm.c,v 1.4 2004/04/11 17:56:46 karl Exp Copyright (C) 1998, 1999, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/search.c b/gnu/dist/texinfo/info/search.c index b3d780c1c94..c5e548ef51c 100644 --- a/gnu/dist/texinfo/info/search.c +++ b/gnu/dist/texinfo/info/search.c @@ -1,7 +1,7 @@ -/* $NetBSD: search.c,v 1.1.1.4 2004/07/12 23:26:54 wiz Exp $ */ +/* $NetBSD: search.c,v 1.1.1.5 2008/09/02 07:49:51 christos Exp $ */ /* search.c -- searching large bodies of text. - Id: search.c,v 1.3 2004/03/14 00:57:30 karl Exp + Id: search.c,v 1.3 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/search.h b/gnu/dist/texinfo/info/search.h index b17a41237e4..a34e42e9957 100644 --- a/gnu/dist/texinfo/info/search.h +++ b/gnu/dist/texinfo/info/search.h @@ -1,7 +1,7 @@ -/* $NetBSD: search.h,v 1.1.1.4 2004/07/12 23:26:54 wiz Exp $ */ +/* $NetBSD: search.h,v 1.1.1.5 2008/09/02 07:49:53 christos Exp $ */ /* search.h -- Structure used to search large bodies of text, with bounds. - Id: search.h,v 1.3 2004/03/14 00:57:30 karl Exp + Id: search.h,v 1.3 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1997, 1998, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/session.h b/gnu/dist/texinfo/info/session.h index b4b67eab1c7..07e04634706 100644 --- a/gnu/dist/texinfo/info/session.h +++ b/gnu/dist/texinfo/info/session.h @@ -1,7 +1,7 @@ -/* $NetBSD: session.h,v 1.1.1.4 2004/07/12 23:26:53 wiz Exp $ */ +/* $NetBSD: session.h,v 1.1.1.5 2008/09/02 07:50:07 christos Exp $ */ /* session.h -- Functions found in session.c. - Id: session.h,v 1.3 2004/03/14 00:57:30 karl Exp + Id: session.h,v 1.3 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1998, 1999, 2001, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/signals.c b/gnu/dist/texinfo/info/signals.c index 7542ebfa3d1..528c84d1f96 100644 --- a/gnu/dist/texinfo/info/signals.c +++ b/gnu/dist/texinfo/info/signals.c @@ -1,7 +1,7 @@ -/* $NetBSD: signals.c,v 1.1.1.5 2004/07/12 23:26:53 wiz Exp $ */ +/* $NetBSD: signals.c,v 1.1.1.6 2008/09/02 07:50:08 christos Exp $ */ /* signals.c -- install and maintain signal handlers. - Id: signals.c,v 1.4 2004/03/27 16:19:09 karl Exp + Id: signals.c,v 1.7 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/signals.h b/gnu/dist/texinfo/info/signals.h index 4173704c55b..01c8e31025a 100644 --- a/gnu/dist/texinfo/info/signals.h +++ b/gnu/dist/texinfo/info/signals.h @@ -1,7 +1,7 @@ -/* $NetBSD: signals.h,v 1.1.1.3 2004/07/12 23:26:53 wiz Exp $ */ +/* $NetBSD: signals.h,v 1.1.1.4 2008/09/02 07:50:08 christos Exp $ */ /* signals.h -- header to include system dependent signal definitions. - Id: signals.h,v 1.2 2004/03/20 01:44:23 karl Exp + Id: signals.h,v 1.2 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1994, 1995, 1997, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/termdep.h b/gnu/dist/texinfo/info/termdep.h index bec37bc9af2..c23e936e023 100644 --- a/gnu/dist/texinfo/info/termdep.h +++ b/gnu/dist/texinfo/info/termdep.h @@ -1,7 +1,7 @@ -/* $NetBSD: termdep.h,v 1.1.1.4 2004/07/12 23:26:53 wiz Exp $ */ +/* $NetBSD: termdep.h,v 1.1.1.5 2008/09/02 07:50:08 christos Exp $ */ /* termdep.h -- system things that terminal.c depends on. - Id: termdep.h,v 1.1.1.1 2003/12/06 01:33:07 karl Exp + Id: termdep.h,v 1.2 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1996, 1997, 1998, 2001, 2002 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/terminal.h b/gnu/dist/texinfo/info/terminal.h index 8fa542c75ea..69407febd80 100644 --- a/gnu/dist/texinfo/info/terminal.h +++ b/gnu/dist/texinfo/info/terminal.h @@ -1,7 +1,7 @@ -/* $NetBSD: terminal.h,v 1.1.1.3 2004/07/12 23:26:53 wiz Exp $ */ +/* $NetBSD: terminal.h,v 1.1.1.4 2008/09/02 07:50:09 christos Exp $ */ /* terminal.h -- The external interface to terminal I/O. - Id: terminal.h,v 1.3 2004/03/14 00:57:30 karl Exp + Id: terminal.h,v 1.3 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1996, 1997, 2001, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/tilde.c b/gnu/dist/texinfo/info/tilde.c index 0d455d47e2a..a65e35f0971 100644 --- a/gnu/dist/texinfo/info/tilde.c +++ b/gnu/dist/texinfo/info/tilde.c @@ -1,7 +1,7 @@ -/* $NetBSD: tilde.c,v 1.1.1.4 2004/07/12 23:26:53 wiz Exp $ */ +/* $NetBSD: tilde.c,v 1.1.1.5 2008/09/02 07:50:09 christos Exp $ */ /* tilde.c -- tilde expansion code (~/foo := $HOME/foo). - Id: tilde.c,v 1.3 2004/03/14 00:57:30 karl Exp + Id: tilde.c,v 1.3 2004/04/11 17:56:46 karl Exp Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1998, 1999, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/tilde.h b/gnu/dist/texinfo/info/tilde.h index 17cb2dab308..97e55a6b618 100644 --- a/gnu/dist/texinfo/info/tilde.h +++ b/gnu/dist/texinfo/info/tilde.h @@ -1,7 +1,7 @@ -/* $NetBSD: tilde.h,v 1.1.1.3 2004/07/12 23:26:53 wiz Exp $ */ +/* $NetBSD: tilde.h,v 1.1.1.4 2008/09/02 07:50:10 christos Exp $ */ /* tilde.h: Externally available variables and function in libtilde.a. - Id: tilde.h,v 1.3 2004/03/14 00:57:30 karl Exp + Id: tilde.h,v 1.3 2004/04/11 17:56:46 karl Exp This file has appeared in prior works by the Free Software Foundation; thus it carries copyright dates from 1988 through 1993. diff --git a/gnu/dist/texinfo/info/variables.c b/gnu/dist/texinfo/info/variables.c index 8c7be0389ee..a948deebf43 100644 --- a/gnu/dist/texinfo/info/variables.c +++ b/gnu/dist/texinfo/info/variables.c @@ -1,7 +1,7 @@ -/* $NetBSD: variables.c,v 1.1.1.4 2004/07/12 23:26:53 wiz Exp $ */ +/* $NetBSD: variables.c,v 1.1.1.5 2008/09/02 07:50:10 christos Exp $ */ /* variables.c -- how to manipulate user visible variables in Info. - Id: variables.c,v 1.3 2004/03/14 00:57:30 karl Exp + Id: variables.c,v 1.3 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1997, 2001, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/variables.h b/gnu/dist/texinfo/info/variables.h index d0b8d6ea38d..ef8ba24c2ee 100644 --- a/gnu/dist/texinfo/info/variables.h +++ b/gnu/dist/texinfo/info/variables.h @@ -1,7 +1,7 @@ -/* $NetBSD: variables.h,v 1.1.1.3 2004/07/12 23:26:53 wiz Exp $ */ +/* $NetBSD: variables.h,v 1.1.1.4 2008/09/02 07:50:10 christos Exp $ */ /* variables.h -- Description of user visible variables in Info. - Id: variables.h,v 1.3 2004/03/14 00:57:30 karl Exp + Id: variables.h,v 1.3 2004/04/11 17:56:46 karl Exp This file is part of GNU Info, a program for reading online documentation stored in Info format. diff --git a/gnu/dist/texinfo/info/window.c b/gnu/dist/texinfo/info/window.c index 4d3b188cac3..5c6fa23be55 100644 --- a/gnu/dist/texinfo/info/window.c +++ b/gnu/dist/texinfo/info/window.c @@ -1,7 +1,7 @@ -/* $NetBSD: window.c,v 1.1.1.5 2004/07/12 23:26:52 wiz Exp $ */ +/* $NetBSD: window.c,v 1.1.1.6 2008/09/02 07:50:14 christos Exp $ */ /* window.c -- windows in Info. - Id: window.c,v 1.3 2004/03/14 00:57:30 karl Exp + Id: window.c,v 1.4 2004/04/11 17:56:46 karl Exp Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/info/window.h b/gnu/dist/texinfo/info/window.h index c3cb20e42e2..eb0f1a8e9f5 100644 --- a/gnu/dist/texinfo/info/window.h +++ b/gnu/dist/texinfo/info/window.h @@ -1,7 +1,7 @@ -/* $NetBSD: window.h,v 1.1.1.3 2004/07/12 23:26:52 wiz Exp $ */ +/* $NetBSD: window.h,v 1.1.1.4 2008/09/02 07:50:14 christos Exp $ */ /* window.h -- Structure and flags used in manipulating Info windows. - Id: window.h,v 1.3 2004/03/14 00:57:30 karl Exp + Id: window.h,v 1.3 2004/04/11 17:56:46 karl Exp This file is part of GNU Info, a program for reading online documentation stored in Info format. diff --git a/gnu/dist/texinfo/install-sh b/gnu/dist/texinfo/install-sh index e4160c991dc..6ebe46de6cf 100755 --- a/gnu/dist/texinfo/install-sh +++ b/gnu/dist/texinfo/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2004-04-01.17 +scriptversion=2004-12-17.09 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -58,9 +58,6 @@ stripprog="${STRIPPROG-strip}" rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename= -transform_arg= -instcmd="$mvprog" chmodcmd="$chmodprog 0755" chowncmd= chgrpcmd= @@ -70,23 +67,27 @@ mvcmd="$mvprog" src= dst= dir_arg= +dstarg= +no_target_directory= -usage="Usage: $0 [OPTION]... SRCFILE DSTFILE +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 -d DIRECTORIES... + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... -In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default. -In the second, create the directory path DIR. +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. Options: --b=TRANSFORMBASENAME --c copy source (using $cpprog) instead of moving (using $mvprog). +-c (ignored) -d create directories instead of installing files. --g GROUP $chgrp installed files to GROUP. --m MODE $chmod installed files to MODE. --o USER $chown installed files to USER. --s strip installed files (using $stripprog). --t=TRANSFORM +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. --help display this help and exit. --version display version info and exit. @@ -96,12 +97,7 @@ Environment variables override the default commands: while test -n "$1"; do case $1 in - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - -c) instcmd=$cpprog - shift + -c) shift continue;; -d) dir_arg=true @@ -129,14 +125,20 @@ while test -n "$1"; do shift continue;; - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; --version) echo "$0 $scriptversion"; exit 0;; *) # When -d is used, all remaining arguments are directories to create. - test -n "$dir_arg" && break + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break # Otherwise, the last argument is the destination. Remove it from $@. for arg do @@ -174,13 +176,13 @@ do src= if test -d "$dst"; then - instcmd=: + mkdircmd=: chmodcmd= else - instcmd=$mkdirprog + mkdircmd=$mkdirprog fi else - # Waiting for this to be detected by the "$instcmd $src $dsttmp" command + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. if test ! -f "$src" && test ! -d "$src"; then @@ -202,12 +204,16 @@ do # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi dst=$dst/`basename "$src"` fi fi # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` # Make sure that the destination directory exists. @@ -220,7 +226,8 @@ do oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' - set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift IFS=$oIFS pathcomp= @@ -229,51 +236,42 @@ do pathcomp=$pathcomp$1 shift if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" || lasterr=$? + $mkdirprog "$pathcomp" # mkdir can fail with a `File exist' error in case several # install-sh are creating the directory concurrently. This # is OK. - test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; } + test -d "$pathcomp" || exit fi pathcomp=$pathcomp/ done fi if test -n "$dir_arg"; then - $doit $instcmd "$dst" \ + $doit $mkdircmd "$dst" \ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } else - # If we're going to rename the final executable, determine the name now. - if test -z "$transformarg"; then - dstfile=`basename "$dst"` - else - dstfile=`basename "$dst" $transformbasename \ - | sed $transformarg`$transformbasename - fi - - # don't allow the sed command to completely eliminate the filename. - test -z "$dstfile" && dstfile=`basename "$dst"` + dstfile=`basename "$dst"` # Make a couple of temp file names in the proper directory. dsttmp=$dstdir/_inst.$$_ rmtmp=$dstdir/_rm.$$_ # Trap to clean up those temp files at exit. - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 trap '(exit $?); exit' 1 2 13 15 - # Move or copy the file name to the temp name - $doit $instcmd "$src" "$dsttmp" && + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && # and set any options; do chmod last to preserve setuid bits. # # If any of these fail, we abort the whole thing. If we want to # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $instcmd $src $dsttmp" command. + # errors from the above "$doit $cpprog $src $dsttmp" command. # { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ @@ -298,7 +296,7 @@ do || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ || { echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit + (exit 1); exit 1 } else : @@ -309,12 +307,12 @@ do $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" } } - fi || { (exit 1); exit; } + fi || { (exit 1); exit 1; } done # The final little trick to "correctly" pass the exit status to the exit trap. { - (exit 0); exit + (exit 0); exit 0 } # Local variables: diff --git a/gnu/dist/texinfo/lib/Makefile.am b/gnu/dist/texinfo/lib/Makefile.am index 78f5c06c369..b94648347f5 100644 --- a/gnu/dist/texinfo/lib/Makefile.am +++ b/gnu/dist/texinfo/lib/Makefile.am @@ -1,4 +1,4 @@ -# Id: Makefile.am,v 1.2 2004/03/11 13:08:36 karl Exp +# Id: Makefile.am,v 1.7 2004/11/06 22:05:59 karl Exp # Makefile.am for texinfo/lib. # Run automake in .. to produce Makefile.in from this. # @@ -14,8 +14,10 @@ noinst_LIBRARIES = libtxi.a INCLUDES = -I../intl # Don't need to list alloca.c, etc., Automake includes them. -libtxi_a_SOURCES = getopt.c getopt.h getopt1.c getopt_int.h gettext.h \ - substring.c system.h xalloc.h xexit.c xmalloc.c xstrdup.c +libtxi_a_SOURCES = getopt.c getopt.h getopt1.c getopt_.h getopt_int.h \ + gettext.h \ + strcase.h strdup.h substring.c system.h \ + xalloc.h xexit.c xmalloc.c xstrdup.c libtxi_a_LIBADD = $(LIBOBJS) $(ALLOCA) libtxi_a_DEPENDENCIES = $(libtxi_a_LIBADD) diff --git a/gnu/dist/texinfo/lib/README b/gnu/dist/texinfo/lib/README index a335c2949a4..c23e1d53e3e 100644 --- a/gnu/dist/texinfo/lib/README +++ b/gnu/dist/texinfo/lib/README @@ -1,4 +1,4 @@ -Id: README,v 1.1.1.1 2003/12/06 01:33:12 karl Exp +Id: README,v 1.3 2004/04/11 17:56:46 karl Exp texinfo/lib/README Copyright (C) 2002 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/lib/alloca.c b/gnu/dist/texinfo/lib/alloca.c index 0cbb40b0138..a5830f13214 100644 --- a/gnu/dist/texinfo/lib/alloca.c +++ b/gnu/dist/texinfo/lib/alloca.c @@ -1,4 +1,4 @@ -/* $NetBSD: alloca.c,v 1.1.1.4 2004/07/12 23:26:57 wiz Exp $ */ +/* $NetBSD: alloca.c,v 1.1.1.5 2008/09/02 07:49:28 christos Exp $ */ /* alloca.c -- allocate automatically reclaimed memory (Mostly) portable public-domain implementation -- D A Gwyn @@ -27,6 +27,8 @@ # include <config.h> #endif +#include <alloca.h> + #include <string.h> #include <stdlib.h> diff --git a/gnu/dist/texinfo/lib/getopt.h b/gnu/dist/texinfo/lib/getopt.h index 79d7e4cea60..d62db39bb98 100644 --- a/gnu/dist/texinfo/lib/getopt.h +++ b/gnu/dist/texinfo/lib/getopt.h @@ -1,178 +1,12 @@ -/* $NetBSD: getopt.h,v 1.1.1.5 2004/07/12 23:26:57 wiz Exp $ */ +/* $NetBSD: getopt.h,v 1.1.1.6 2008/09/02 07:49:28 christos Exp $ */ -/* Declarations for getopt. - Copyright (C) 1989-1994,1996-1999,2001,2003,2004 - Free Software Foundation, Inc. - This file is part of the GNU C Library. +/* getopt.h -- wrapper for gnulib getopt_.h. + Id: getopt.h,v 1.6 2004/09/14 12:36:00 karl Exp + Copyright (C) 2004 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 - the Free Software Foundation; either version 2, or (at your option) - any later version. + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. +*/ - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#ifndef _GETOPT_H - -#ifndef __need_getopt -# define _GETOPT_H 1 -#endif - -/* If __GNU_LIBRARY__ is not already defined, either we are being used - standalone, or this is the first header included in the source file. - If we are being used with glibc, we need to include <features.h>, but - that does not exist if we are standalone. So: if __GNU_LIBRARY__ is - not defined, include <ctype.h>, which will pull in <features.h> for us - if it's from glibc. (Why ctype.h? It's guaranteed to exist and it - doesn't flood the namespace with stuff the way some other headers do.) */ -#if !defined __GNU_LIBRARY__ -# include <ctype.h> -#endif - -#ifndef __THROW -# ifndef __GNUC_PREREQ -# define __GNUC_PREREQ(maj, min) (0) -# endif -# if defined __cplusplus && __GNUC_PREREQ (2,8) -# define __THROW throw () -# else -# define __THROW -# endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* For communication from `getopt' to the caller. - When `getopt' finds an option that takes an argument, - the argument value is returned here. - Also, when `ordering' is RETURN_IN_ORDER, - each non-option ARGV-element is returned here. */ - -extern char *optarg; - -/* Index in ARGV of the next element to be scanned. - This is used for communication to and from the caller - and for communication between successive calls to `getopt'. - - On entry to `getopt', zero means this is the first call; initialize. - - When `getopt' returns -1, this is the index of the first of the - non-option elements that the caller should itself scan. - - Otherwise, `optind' communicates from one call to the next - how much of ARGV has been scanned so far. */ - -extern int optind; - -/* Callers store zero here to inhibit the error message `getopt' prints - for unrecognized options. */ - -extern int opterr; - -/* Set to an option character which was unrecognized. */ - -extern int optopt; - -#ifndef __need_getopt -/* Describe the long-named options requested by the application. - The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector - of `struct option' terminated by an element containing a name which is - zero. - - The field `has_arg' is: - no_argument (or 0) if the option does not take an argument, - required_argument (or 1) if the option requires an argument, - optional_argument (or 2) if the option takes an optional argument. - - If the field `flag' is not NULL, it points to a variable that is set - to the value given in the field `val' when the option is found, but - left unchanged if the option is not found. - - To have a long-named option do something other than set an `int' to - a compiled-in constant, such as set a value from `optarg', set the - option's `flag' field to zero and its `val' field to a nonzero - value (the equivalent single-letter option character, if there is - one). For long options that have a zero `flag' field, `getopt' - returns the contents of the `val' field. */ - -struct option -{ - const char *name; - /* has_arg can't be an enum because some compilers complain about - type mismatches in all the code that assumes it is an int. */ - int has_arg; - int *flag; - int val; -}; - -/* Names for the values of the `has_arg' field of `struct option'. */ - -# define no_argument 0 -# define required_argument 1 -# define optional_argument 2 -#endif /* need getopt */ - - -/* Get definitions and prototypes for functions to process the - arguments in ARGV (ARGC of them, minus the program name) for - options given in OPTS. - - Return the option character from OPTS just read. Return -1 when - there are no more options. For unrecognized options, or options - missing arguments, `optopt' is set to the option letter, and '?' is - returned. - - The OPTS string is a list of characters which are recognized option - letters, optionally followed by colons, specifying that that letter - takes an argument, to be placed in `optarg'. - - If a letter in OPTS is followed by two colons, its argument is - optional. This behavior is specific to the GNU `getopt'. - - The argument `--' causes premature termination of argument - scanning, explicitly telling `getopt' that there are no more - options. - - If OPTS begins with `--', then non-option arguments are treated as - arguments to the option '\0'. This behavior is specific to the GNU - `getopt'. */ - -#ifdef __GNU_LIBRARY__ -/* Many other libraries have conflicting prototypes for getopt, with - differences in the consts, in stdlib.h. To avoid compilation - errors, only prototype getopt for the GNU C library. */ -extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) - __THROW; -#else /* not __GNU_LIBRARY__ */ -extern int getopt (); -#endif /* __GNU_LIBRARY__ */ - -#ifndef __need_getopt -extern int getopt_long (int ___argc, char *const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind) - __THROW; -extern int getopt_long_only (int ___argc, char *const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind) - __THROW; - -#endif - -#ifdef __cplusplus -} -#endif - -/* Make sure we later can get all the definitions and declarations. */ -#undef __need_getopt - -#endif /* getopt.h */ +#include "getopt_.h" diff --git a/gnu/dist/texinfo/lib/getopt1.c b/gnu/dist/texinfo/lib/getopt1.c index f30bc35f2c1..185118da43e 100644 --- a/gnu/dist/texinfo/lib/getopt1.c +++ b/gnu/dist/texinfo/lib/getopt1.c @@ -1,4 +1,4 @@ -/* $NetBSD: getopt1.c,v 1.1.1.5 2004/07/12 23:26:57 wiz Exp $ */ +/* $NetBSD: getopt1.c,v 1.1.1.6 2008/09/02 07:49:29 christos Exp $ */ /* getopt_long and getopt_long_only entry points for GNU getopt. Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004 @@ -32,25 +32,6 @@ #include <stdio.h> -/* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C - Library, but also included in many other GNU distributions. Compiling - and linking in this code is a waste when using the GNU C library - (especially if it is a shared library). Rather than having every GNU - program understand `configure --with-gnu-libc' and omit the object files, - it is simpler to just do this in the source for each such file. */ - -#define GETOPT_INTERFACE_VERSION 2 -#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 -#include <gnu-versions.h> -#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION -#define ELIDE_CODE -#endif -#endif - -#ifndef ELIDE_CODE - - /* This needs to come after some library #include to get __GNU_LIBRARY__ defined. */ #ifdef __GNU_LIBRARY__ @@ -98,7 +79,6 @@ _getopt_long_only_r (int argc, char *const *argv, const char *options, 1, d); } -#endif /* Not ELIDE_CODE. */ #ifdef TEST diff --git a/gnu/dist/texinfo/lib/getopt_.h b/gnu/dist/texinfo/lib/getopt_.h new file mode 100644 index 00000000000..c9de89be2f1 --- /dev/null +++ b/gnu/dist/texinfo/lib/getopt_.h @@ -0,0 +1,178 @@ +/* $NetBSD: getopt_.h,v 1.1.1.1 2008/09/02 07:49:31 christos Exp $ */ + +/* Declarations for getopt. + Copyright (C) 1989-1994,1996-1999,2001,2003,2004 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _GETOPT_H + +#ifndef __need_getopt +# define _GETOPT_H 1 +#endif + +/* If __GNU_LIBRARY__ is not already defined, either we are being used + standalone, or this is the first header included in the source file. + If we are being used with glibc, we need to include <features.h>, but + that does not exist if we are standalone. So: if __GNU_LIBRARY__ is + not defined, include <ctype.h>, which will pull in <features.h> for us + if it's from glibc. (Why ctype.h? It's guaranteed to exist and it + doesn't flood the namespace with stuff the way some other headers do.) */ +#if !defined __GNU_LIBRARY__ +# include <ctype.h> +#endif + +#ifndef __THROW +# ifndef __GNUC_PREREQ +# define __GNUC_PREREQ(maj, min) (0) +# endif +# if defined __cplusplus && __GNUC_PREREQ (2,8) +# define __THROW throw () +# else +# define __THROW +# endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +extern char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +extern int optind; + +/* Callers store zero here to inhibit the error message `getopt' prints + for unrecognized options. */ + +extern int opterr; + +/* Set to an option character which was unrecognized. */ + +extern int optopt; + +#ifndef __need_getopt +/* Describe the long-named options requested by the application. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of `struct option' terminated by an element containing a name which is + zero. + + The field `has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field `flag' is not NULL, it points to a variable that is set + to the value given in the field `val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an `int' to + a compiled-in constant, such as set a value from `optarg', set the + option's `flag' field to zero and its `val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero `flag' field, `getopt' + returns the contents of the `val' field. */ + +struct option +{ + const char *name; + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the `has_arg' field of `struct option'. */ + +# define no_argument 0 +# define required_argument 1 +# define optional_argument 2 +#endif /* need getopt */ + + +/* Get definitions and prototypes for functions to process the + arguments in ARGV (ARGC of them, minus the program name) for + options given in OPTS. + + Return the option character from OPTS just read. Return -1 when + there are no more options. For unrecognized options, or options + missing arguments, `optopt' is set to the option letter, and '?' is + returned. + + The OPTS string is a list of characters which are recognized option + letters, optionally followed by colons, specifying that that letter + takes an argument, to be placed in `optarg'. + + If a letter in OPTS is followed by two colons, its argument is + optional. This behavior is specific to the GNU `getopt'. + + The argument `--' causes premature termination of argument + scanning, explicitly telling `getopt' that there are no more + options. + + If OPTS begins with `--', then non-option arguments are treated as + arguments to the option '\0'. This behavior is specific to the GNU + `getopt'. */ + +#ifdef __GNU_LIBRARY__ +/* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation + errors, only prototype getopt for the GNU C library. */ +extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) + __THROW; +#else /* not __GNU_LIBRARY__ */ +extern int getopt (); +#endif /* __GNU_LIBRARY__ */ + +#ifndef __need_getopt +extern int getopt_long (int ___argc, char *const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind) + __THROW; +extern int getopt_long_only (int ___argc, char *const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind) + __THROW; + +#endif + +#ifdef __cplusplus +} +#endif + +/* Make sure we later can get all the definitions and declarations. */ +#undef __need_getopt + +#endif /* getopt.h */ diff --git a/gnu/dist/texinfo/lib/strcase.h b/gnu/dist/texinfo/lib/strcase.h new file mode 100644 index 00000000000..41d3310e903 --- /dev/null +++ b/gnu/dist/texinfo/lib/strcase.h @@ -0,0 +1,37 @@ +/* $NetBSD: strcase.h,v 1.1.1.1 2008/09/02 07:49:31 christos Exp $ */ + +/* Case-insensitive string comparison functions. + Copyright (C) 1995-1996, 2001, 2003 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _STRCASE_H +#define _STRCASE_H + +#include <stddef.h> + +/* Compare strings S1 and S2, ignoring case, returning less than, equal to or + greater than zero if S1 is lexicographically less than, equal to or greater + than S2. + Note: This function does not work correctly in multibyte locales. */ +extern int strcasecmp (const char *s1, const char *s2); + +/* Compare no more than N characters of strings S1 and S2, ignoring case, + returning less than, equal to or greater than zero if S1 is + lexicographically less than, equal to or greater than S2. + Note: This function can not work correctly in multibyte locales. */ +extern int strncasecmp (const char *s1, const char *s2, size_t n); + +#endif /* _STRCASE_H */ diff --git a/gnu/dist/texinfo/lib/strdup.c b/gnu/dist/texinfo/lib/strdup.c index b7dba8236aa..3fcf729f953 100644 --- a/gnu/dist/texinfo/lib/strdup.c +++ b/gnu/dist/texinfo/lib/strdup.c @@ -1,4 +1,4 @@ -/* $NetBSD: strdup.c,v 1.1.1.4 2004/07/12 23:26:57 wiz Exp $ */ +/* $NetBSD: strdup.c,v 1.1.1.5 2008/09/02 07:49:28 christos Exp $ */ /* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -25,7 +25,7 @@ #ifndef _LIBC /* Get specification. */ -#include "strdup.h" +# include "strdup.h" #endif #include <stdlib.h> diff --git a/gnu/dist/texinfo/lib/strdup.h b/gnu/dist/texinfo/lib/strdup.h new file mode 100644 index 00000000000..28a7146651f --- /dev/null +++ b/gnu/dist/texinfo/lib/strdup.h @@ -0,0 +1,31 @@ +/* $NetBSD: strdup.h,v 1.1.1.1 2008/09/02 07:49:31 christos Exp $ */ + +/* strdup.h -- duplicate a string + Copyright (C) 2004 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 + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef STRDUP_H_ +#define STRDUP_H_ + +/* Get strdup declaration, if available. */ +#include <string.h> + +#if !HAVE_DECL_STRDUP && !defined strdup +/* Duplicate S, returning an identical malloc'd string. */ +extern char *strdup (const char *s); +#endif + +#endif /* STRDUP_H_ */ diff --git a/gnu/dist/texinfo/lib/substring.c b/gnu/dist/texinfo/lib/substring.c index e4e88004024..a89ea3df755 100644 --- a/gnu/dist/texinfo/lib/substring.c +++ b/gnu/dist/texinfo/lib/substring.c @@ -1,7 +1,7 @@ -/* $NetBSD: substring.c,v 1.1.1.3 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: substring.c,v 1.1.1.4 2008/09/02 07:49:29 christos Exp $ */ /* substring.c -- extract substring. - Id: substring.c,v 1.2 2004/02/19 00:13:00 karl Exp + Id: substring.c,v 1.2 2004/04/11 17:56:46 karl Exp Copyright (C) 1999, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/lib/xalloc.h b/gnu/dist/texinfo/lib/xalloc.h index c379850eeec..ff60e1e648b 100644 --- a/gnu/dist/texinfo/lib/xalloc.h +++ b/gnu/dist/texinfo/lib/xalloc.h @@ -1,9 +1,9 @@ -/* $NetBSD: xalloc.h,v 1.1.1.3 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: xalloc.h,v 1.1.1.4 2008/09/02 07:49:31 christos Exp $ */ /* xalloc.h -- malloc with out-of-memory checking Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2003 Free Software Foundation, Inc. + 1999, 2000, 2003, 2004 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 @@ -24,6 +24,12 @@ # include <stddef.h> + +# ifdef __cplusplus +extern "C" { +# endif + + # ifndef __attribute__ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__ # define __attribute__(x) @@ -34,18 +40,9 @@ # define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) # endif -/* If this pointer is non-zero, run the specified function upon each - allocation failure. It is initialized to zero. */ -extern void (*xalloc_fail_func) (void); - -/* If XALLOC_FAIL_FUNC is undefined or a function that returns, this - message is output. It is translated via gettext. - Its value is "memory exhausted". */ -extern char const xalloc_msg_memory_exhausted[]; - -/* This function is always triggered when memory is exhausted. It is - in charge of honoring the two previous items. It exits with status - exit_failure (defined in exitfail.h). This is the +/* This function is always triggered when memory is exhausted. + It must be defined by the application, either explicitly + or by using gnulib's xalloc-die module. This is the function to call when one wants the program to die because of a memory allocation failure. */ extern void xalloc_die (void) ATTRIBUTE_NORETURN; @@ -86,4 +83,10 @@ char *xstrdup (const char *str); # define XREALLOC(p, type, n) xnrealloc (p, n, sizeof (type)) # define XFREE(p) free (p) + +# ifdef __cplusplus +} +# endif + + #endif /* !XALLOC_H_ */ diff --git a/gnu/dist/texinfo/lib/xexit.c b/gnu/dist/texinfo/lib/xexit.c index 95e5683d8ed..68f5e6d2923 100644 --- a/gnu/dist/texinfo/lib/xexit.c +++ b/gnu/dist/texinfo/lib/xexit.c @@ -1,7 +1,7 @@ -/* $NetBSD: xexit.c,v 1.1.1.4 2004/07/12 23:26:56 wiz Exp $ */ +/* $NetBSD: xexit.c,v 1.1.1.5 2008/09/02 07:49:31 christos Exp $ */ /* xexit.c -- exit with attention to return values and closing stdout. - Id: xexit.c,v 1.2 2004/02/19 00:13:00 karl Exp + Id: xexit.c,v 1.5 2004/04/11 17:56:46 karl Exp Copyright (C) 1999, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/m4/check-decl.m4 b/gnu/dist/texinfo/m4/check-decl.m4 index 4a0fda06172..d70e1c90f8d 100644 --- a/gnu/dist/texinfo/m4/check-decl.m4 +++ b/gnu/dist/texinfo/m4/check-decl.m4 @@ -1,11 +1,11 @@ -#serial 19 +#serial 20 dnl This is just a wrapper function to encapsulate this kludge. dnl Putting it in a separate file like this helps share it between dnl different packages. -AC_DEFUN([jm_CHECK_DECLS], +AC_DEFUN([gl_CHECK_DECLS], [ - AC_REQUIRE([_jm_DECL_HEADERS]) + AC_REQUIRE([_gl_DECL_HEADERS]) AC_REQUIRE([AC_HEADER_TIME]) headers=' #include <stdio.h> @@ -67,7 +67,7 @@ AC_DEFUN([jm_CHECK_DECLS], dnl FIXME: when autoconf has support for it. dnl This is a little helper so we can require these header checks. -AC_DEFUN([_jm_DECL_HEADERS], +AC_DEFUN([_gl_DECL_HEADERS], [ AC_REQUIRE([AC_HEADER_STDC]) AC_CHECK_HEADERS(grp.h memory.h pwd.h string.h strings.h stdlib.h \ diff --git a/gnu/dist/texinfo/m4/gettext.m4 b/gnu/dist/texinfo/m4/gettext.m4 index a374f03fa57..a9225d3771d 100644 --- a/gnu/dist/texinfo/m4/gettext.m4 +++ b/gnu/dist/texinfo/m4/gettext.m4 @@ -1,4 +1,4 @@ -# gettext.m4 serial 28 (gettext-0.13) +# gettext.m4 serial 29 dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -358,19 +358,19 @@ AC_DEFUN([AM_INTL_SUBDIR], AC_REQUIRE([AC_C_INLINE])dnl AC_REQUIRE([AC_TYPE_OFF_T])dnl AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl + AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl AC_REQUIRE([gt_TYPE_WCHAR_T])dnl AC_REQUIRE([gt_TYPE_WINT_T])dnl - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) AC_REQUIRE([gt_TYPE_INTMAX_T]) AC_REQUIRE([gt_PRINTF_POSIX]) AC_REQUIRE([AC_FUNC_ALLOCA])dnl AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([jm_GLIBC21])dnl + AC_REQUIRE([gl_GLIBC21])dnl AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl AC_REQUIRE([gt_INTTYPES_PRI])dnl AC_REQUIRE([gl_XSIZE])dnl diff --git a/gnu/dist/texinfo/m4/glibc21.m4 b/gnu/dist/texinfo/m4/glibc21.m4 index 9c9f3db3036..32ca2242e04 100644 --- a/gnu/dist/texinfo/m4/glibc21.m4 +++ b/gnu/dist/texinfo/m4/glibc21.m4 @@ -1,5 +1,5 @@ -# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +# glibc21.m4 serial 3 +dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -9,7 +9,7 @@ dnl the same distribution terms as the rest of that program. # Test for the GNU C Library, version 2.1 or newer. # From Bruno Haible. -AC_DEFUN([jm_GLIBC21], +AC_DEFUN([gl_GLIBC21], [ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, ac_cv_gnu_library_2_1, diff --git a/gnu/dist/texinfo/m4/intmax.m4 b/gnu/dist/texinfo/m4/intmax.m4 index dfb08ccc9e1..80f6526c6d4 100644 --- a/gnu/dist/texinfo/m4/intmax.m4 +++ b/gnu/dist/texinfo/m4/intmax.m4 @@ -1,5 +1,5 @@ -# intmax.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +# intmax.m4 serial 2 +dnl Copyright (C) 2002-2004 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -12,11 +12,11 @@ dnl find a replacement if it is lacking. AC_DEFUN([gt_TYPE_INTMAX_T], [ - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, [AC_TRY_COMPILE([ -#include <stddef.h> +#include <stddef.h> #include <stdlib.h> #if HAVE_STDINT_H_WITH_UINTMAX #include <stdint.h> diff --git a/gnu/dist/texinfo/m4/inttypes_h.m4 b/gnu/dist/texinfo/m4/inttypes_h.m4 index f342eba39a5..79bba8763e1 100644 --- a/gnu/dist/texinfo/m4/inttypes_h.m4 +++ b/gnu/dist/texinfo/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ -# inttypes_h.m4 serial 5 (gettext-0.12) -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +# inttypes_h.m4 serial 6 +dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -11,16 +11,16 @@ dnl From Paul Eggert. # Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, # doesn't clash with <sys/types.h>, and declares uintmax_t. -AC_DEFUN([jm_AC_HEADER_INTTYPES_H], +AC_DEFUN([gl_AC_HEADER_INTTYPES_H], [ - AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, + AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, [AC_TRY_COMPILE( [#include <sys/types.h> #include <inttypes.h>], [uintmax_t i = (uintmax_t) -1;], - jm_ac_cv_header_inttypes_h=yes, - jm_ac_cv_header_inttypes_h=no)]) - if test $jm_ac_cv_header_inttypes_h = yes; then + gl_cv_header_inttypes_h=yes, + gl_cv_header_inttypes_h=no)]) + if test $gl_cv_header_inttypes_h = yes; then AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and declares uintmax_t. ]) diff --git a/gnu/dist/texinfo/m4/longlong.m4 b/gnu/dist/texinfo/m4/longlong.m4 index d7d7350b3f5..028422b6121 100644 --- a/gnu/dist/texinfo/m4/longlong.m4 +++ b/gnu/dist/texinfo/m4/longlong.m4 @@ -1,5 +1,5 @@ -# longlong.m4 serial 4 -dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. +# longlong.m4 serial 5 +dnl Copyright (C) 1999-2004 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -10,7 +10,7 @@ dnl From Paul Eggert. # Define HAVE_LONG_LONG if 'long long' works. -AC_DEFUN([jm_AC_TYPE_LONG_LONG], +AC_DEFUN([gl_AC_TYPE_LONG_LONG], [ AC_CACHE_CHECK([for long long], ac_cv_type_long_long, [AC_TRY_LINK([long long ll = 1LL; int i = 63;], diff --git a/gnu/dist/texinfo/m4/mkstemp.m4 b/gnu/dist/texinfo/m4/mkstemp.m4 index 3d379fd2bf1..82e1ce5853b 100644 --- a/gnu/dist/texinfo/m4/mkstemp.m4 +++ b/gnu/dist/texinfo/m4/mkstemp.m4 @@ -1,4 +1,4 @@ -#serial 4 +#serial 6 # On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a # silly limit that it can create no more than 26 files from a given template. @@ -6,14 +6,14 @@ # On OSF1/Tru64 V4.0F, the system-provided mkstemp function can create # only 32 files per process. # On systems like the above, arrange to use the replacement function. -AC_DEFUN([UTILS_FUNC_MKSTEMP], +AC_DEFUN([gl_FUNC_MKSTEMP], [dnl AC_REPLACE_FUNCS(mkstemp) if test $ac_cv_func_mkstemp = no; then - utils_cv_func_mkstemp_limitations=yes + gl_cv_func_mkstemp_limitations=yes else AC_CACHE_CHECK([for mkstemp limitations], - utils_cv_func_mkstemp_limitations, + gl_cv_func_mkstemp_limitations, [ AC_TRY_RUN([ # include <stdlib.h> @@ -31,21 +31,21 @@ AC_DEFUN([UTILS_FUNC_MKSTEMP], exit (0); } ], - utils_cv_func_mkstemp_limitations=no, - utils_cv_func_mkstemp_limitations=yes, - utils_cv_func_mkstemp_limitations=yes + gl_cv_func_mkstemp_limitations=no, + gl_cv_func_mkstemp_limitations=yes, + gl_cv_func_mkstemp_limitations=yes ) ] ) fi - if test $utils_cv_func_mkstemp_limitations = yes; then + if test $gl_cv_func_mkstemp_limitations = yes; then AC_LIBOBJ(mkstemp) AC_LIBOBJ(tempname) AC_DEFINE(mkstemp, rpl_mkstemp, [Define to rpl_mkstemp if the replacement function should be used.]) gl_PREREQ_MKSTEMP - jm_PREREQ_TEMPNAME + gl_PREREQ_TEMPNAME fi ]) @@ -55,12 +55,12 @@ AC_DEFUN([gl_PREREQ_MKSTEMP], ]) # Prerequisites of lib/tempname.c. -AC_DEFUN([jm_PREREQ_TEMPNAME], +AC_DEFUN([gl_PREREQ_TEMPNAME], [ AC_REQUIRE([AC_HEADER_STAT]) AC_CHECK_HEADERS_ONCE(fcntl.h sys/time.h unistd.h) AC_CHECK_HEADERS(stdint.h) AC_CHECK_FUNCS(__secure_getenv gettimeofday) AC_CHECK_DECLS_ONCE(getenv) - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T]) ]) diff --git a/gnu/dist/texinfo/m4/prereq.m4 b/gnu/dist/texinfo/m4/prereq.m4 index c7b39b3250d..e2588a29ed6 100644 --- a/gnu/dist/texinfo/m4/prereq.m4 +++ b/gnu/dist/texinfo/m4/prereq.m4 @@ -1,23 +1,24 @@ -#serial 37 +#serial 40 -dnl We use jm_ for non Autoconf macros. -m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl +dnl We use gl_ for non Autoconf macros. m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl # These are the prerequisite macros for files in the lib/ # directory of the coreutils package. -AC_DEFUN([jm_PREREQ], +AC_DEFUN([gl_PREREQ], [ # We don't yet use c-stack.c. # AC_REQUIRE([gl_C_STACK]) AC_REQUIRE([AM_FUNC_GETLINE]) AC_REQUIRE([AM_STDBOOL_H]) - AC_REQUIRE([UTILS_FUNC_MKDIR_TRAILING_SLASH]) - AC_REQUIRE([UTILS_FUNC_MKSTEMP]) + AC_REQUIRE([gl_FUNC_MKDIR_TRAILING_SLASH]) + AC_REQUIRE([gl_FUNC_MKSTEMP]) + AC_REQUIRE([gl_ALLOCSA]) AC_REQUIRE([gl_BACKUPFILE]) AC_REQUIRE([gl_CANON_HOST]) + AC_REQUIRE([gl_CLOEXEC]) AC_REQUIRE([gl_CLOSEOUT]) AC_REQUIRE([gl_DIRNAME]) AC_REQUIRE([gl_ERROR]) @@ -72,6 +73,7 @@ AC_DEFUN([jm_PREREQ], AC_REQUIRE([gl_HASH]) AC_REQUIRE([gl_HUMAN]) AC_REQUIRE([gl_IDCACHE]) + AC_REQUIRE([gl_INTTOSTR]) AC_REQUIRE([gl_LONG_OPTIONS]) AC_REQUIRE([gl_MAKEPATH]) AC_REQUIRE([gl_MBSWIDTH]) @@ -103,6 +105,7 @@ AC_DEFUN([jm_PREREQ], AC_REQUIRE([gl_UNICODEIO]) AC_REQUIRE([gl_UNISTD_SAFER]) AC_REQUIRE([gl_USERSPEC]) + AC_REQUIRE([gl_UTIMECMP]) AC_REQUIRE([gl_UTIMENS]) AC_REQUIRE([gl_XALLOC]) AC_REQUIRE([gl_XGETCWD]) @@ -110,64 +113,17 @@ AC_DEFUN([jm_PREREQ], AC_REQUIRE([gl_XSTRTOD]) AC_REQUIRE([gl_XSTRTOL]) AC_REQUIRE([gl_YESNO]) - AC_REQUIRE([jm_FUNC_GLIBC_UNLOCKED_IO]) - AC_REQUIRE([jm_FUNC_GNU_STRFTIME]) - AC_REQUIRE([jm_FUNC_LSTAT]) + AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO]) + AC_REQUIRE([gl_FUNC_GNU_STRFTIME]) + AC_REQUIRE([gl_FUNC_LSTAT]) AC_REQUIRE([AC_FUNC_MALLOC]) - AC_REQUIRE([jm_FUNC_MEMCMP]) - AC_REQUIRE([jm_FUNC_NANOSLEEP]) - AC_REQUIRE([jm_FUNC_PUTENV]) + AC_REQUIRE([gl_FUNC_MEMCMP]) + AC_REQUIRE([gl_FUNC_NANOSLEEP]) + AC_REQUIRE([gl_FUNC_PUTENV]) AC_REQUIRE([AC_FUNC_REALLOC]) - AC_REQUIRE([jm_FUNC_STAT]) - AC_REQUIRE([jm_FUNC_UTIME]) - AC_REQUIRE([jm_PREREQ_STAT]) - AC_REQUIRE([jm_XSTRTOIMAX]) - AC_REQUIRE([jm_XSTRTOUMAX]) + AC_REQUIRE([gl_FUNC_STAT]) + AC_REQUIRE([gl_FUNC_UTIME]) + AC_REQUIRE([gl_XSTRTOIMAX]) + AC_REQUIRE([gl_XSTRTOUMAX]) AC_REQUIRE([vb_FUNC_RENAME]) ]) - -AC_DEFUN([jm_PREREQ_STAT], -[ - AC_CHECK_HEADERS(sys/sysmacros.h sys/statvfs.h sys/vfs.h inttypes.h) - AC_CHECK_HEADERS(sys/param.h sys/mount.h) - AC_CHECK_FUNCS(statvfs) - - # For `struct statfs' on Ultrix 4.4. - AC_CHECK_HEADERS([netinet/in.h nfs/nfs_clnt.h nfs/vfs.h],,, - [AC_INCLUDES_DEFAULT]) - - AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) - - statxfs_includes="\ -$ac_includes_default -#if HAVE_SYS_STATVFS_H -# include <sys/statvfs.h> -#endif -#if HAVE_SYS_VFS_H -# include <sys/vfs.h> -#endif -#if !HAVE_SYS_STATVFS_H && !HAVE_SYS_VFS_H -# if HAVE_SYS_MOUNT_H && HAVE_SYS_PARAM_H -/* NetBSD 1.5.2 needs these, for the declaration of struct statfs. */ -# include <sys/param.h> -# include <sys/mount.h> -# elif HAVE_NETINET_IN_H && HAVE_NFS_NFS_CLNT_H && HAVE_NFS_VFS_H -/* Ultrix 4.4 needs these for the declaration of struct statfs. */ -# include <netinet/in.h> -# include <nfs/nfs_clnt.h> -# include <nfs/vfs.h> -# endif -#endif -" - AC_CHECK_MEMBERS([struct statfs.f_basetype],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statvfs.f_basetype],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statfs.f_type],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statvfs.f_type],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statfs.f_fsid.__val],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statvfs.f_fsid.__val],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statfs.f_namemax],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statvfs.f_namemax],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statfs.f_namelen],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statvfs.f_namelen],,,[$statxfs_includes]) -]) diff --git a/gnu/dist/texinfo/m4/stdint_h.m4 b/gnu/dist/texinfo/m4/stdint_h.m4 index 32ba7ae77b0..063c4344e3c 100644 --- a/gnu/dist/texinfo/m4/stdint_h.m4 +++ b/gnu/dist/texinfo/m4/stdint_h.m4 @@ -1,5 +1,5 @@ -# stdint_h.m4 serial 3 (gettext-0.12) -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +# stdint_h.m4 serial 5 +dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -11,16 +11,16 @@ dnl From Paul Eggert. # Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, # doesn't clash with <sys/types.h>, and declares uintmax_t. -AC_DEFUN([jm_AC_HEADER_STDINT_H], +AC_DEFUN([gl_AC_HEADER_STDINT_H], [ - AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, + AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, [AC_TRY_COMPILE( [#include <sys/types.h> #include <stdint.h>], [uintmax_t i = (uintmax_t) -1;], - jm_ac_cv_header_stdint_h=yes, - jm_ac_cv_header_stdint_h=no)]) - if test $jm_ac_cv_header_stdint_h = yes; then + gl_cv_header_stdint_h=yes, + gl_cv_header_stdint_h=no)]) + if test $gl_cv_header_stdint_h = yes; then AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares uintmax_t. ]) diff --git a/gnu/dist/texinfo/m4/uintmax_t.m4 b/gnu/dist/texinfo/m4/uintmax_t.m4 index b5f28d4404a..a2bc218ce79 100644 --- a/gnu/dist/texinfo/m4/uintmax_t.m4 +++ b/gnu/dist/texinfo/m4/uintmax_t.m4 @@ -1,5 +1,5 @@ -# uintmax_t.m4 serial 7 (gettext-0.12) -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. +# uintmax_t.m4 serial 9 +dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -13,12 +13,12 @@ AC_PREREQ(2.13) # Define uintmax_t to 'unsigned long' or 'unsigned long long' # if it is not already defined in <stdint.h> or <inttypes.h>. -AC_DEFUN([jm_AC_TYPE_UINTMAX_T], +AC_DEFUN([gl_AC_TYPE_UINTMAX_T], [ - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) - if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then - AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) + if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then + AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG]) test $ac_cv_type_unsigned_long_long = yes \ && ac_type='unsigned long long' \ || ac_type='unsigned long' diff --git a/gnu/dist/texinfo/m4/ulonglong.m4 b/gnu/dist/texinfo/m4/ulonglong.m4 index 1da8b809e95..1123ccb8372 100644 --- a/gnu/dist/texinfo/m4/ulonglong.m4 +++ b/gnu/dist/texinfo/m4/ulonglong.m4 @@ -1,5 +1,5 @@ -# ulonglong.m4 serial 3 -dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. +# ulonglong.m4 serial 4 +dnl Copyright (C) 1999-2004 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -10,7 +10,7 @@ dnl From Paul Eggert. # Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. -AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], +AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG], [ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], diff --git a/gnu/dist/texinfo/makeinfo/Makefile.am b/gnu/dist/texinfo/makeinfo/Makefile.am index a69d4a122e1..ea03a9e19f1 100644 --- a/gnu/dist/texinfo/makeinfo/Makefile.am +++ b/gnu/dist/texinfo/makeinfo/Makefile.am @@ -1,4 +1,4 @@ -# Id: Makefile.am,v 1.6 2004/03/08 22:45:54 karl Exp +# Id: Makefile.am,v 1.5 2004/04/11 17:56:46 karl Exp # Makefile.am for texinfo/makeinfo. # Run automake in .. to produce Makefile.in from this. # diff --git a/gnu/dist/texinfo/makeinfo/README b/gnu/dist/texinfo/makeinfo/README index 3341fbd5b33..d7e61b88971 100644 --- a/gnu/dist/texinfo/makeinfo/README +++ b/gnu/dist/texinfo/makeinfo/README @@ -1,4 +1,4 @@ -Id: README,v 1.1.1.1 2003/12/06 01:33:19 karl Exp +Id: README,v 1.3 2004/04/11 17:56:46 karl Exp texinfo/makeinfo/README Copyright (C) 2002 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/cmds.h b/gnu/dist/texinfo/makeinfo/cmds.h index 0c7f6940721..e74b54ed8af 100644 --- a/gnu/dist/texinfo/makeinfo/cmds.h +++ b/gnu/dist/texinfo/makeinfo/cmds.h @@ -1,7 +1,7 @@ -/* $NetBSD: cmds.h,v 1.1.1.3 2004/07/12 23:26:51 wiz Exp $ */ +/* $NetBSD: cmds.h,v 1.1.1.4 2008/09/02 07:50:24 christos Exp $ */ /* cmds.h -- declarations for cmds.c. - Id: cmds.h,v 1.5 2004/04/07 20:17:38 karl Exp + Id: cmds.h,v 1.9 2004/11/26 00:48:35 karl Exp Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -111,6 +111,7 @@ extern void cm_LaTeX (int arg), /* Emphasis and markup. */ extern void cm_acronym (int arg), + cm_abbr (int arg), cm_b (int arg), cm_cite (int arg, int position), cm_code (int arg), @@ -124,7 +125,9 @@ extern void cm_acronym (int arg), cm_math (int arg), cm_not_fixed_width (int arg, int start, int end), cm_r (int arg), + cm_sansserif (int arg), cm_sc (int arg, int start_pos, int end_pos), + cm_slanted (int arg), cm_strong (int arg, int start_pos, int end_pos), cm_tt (int arg), cm_indicate_url (int arg, int start, int end), diff --git a/gnu/dist/texinfo/makeinfo/defun.c b/gnu/dist/texinfo/makeinfo/defun.c index a40acec1e25..fde39378bad 100644 --- a/gnu/dist/texinfo/makeinfo/defun.c +++ b/gnu/dist/texinfo/makeinfo/defun.c @@ -1,7 +1,7 @@ -/* $NetBSD: defun.c,v 1.1.1.4 2004/07/12 23:26:51 wiz Exp $ */ +/* $NetBSD: defun.c,v 1.1.1.5 2008/09/02 07:50:24 christos Exp $ */ /* defun.c -- @defun and friends. - Id: defun.c,v 1.11 2004/03/01 14:24:00 dirt Exp + Id: defun.c,v 1.11 2004/04/11 17:56:46 karl Exp Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/defun.h b/gnu/dist/texinfo/makeinfo/defun.h index 1f0a2da5688..fe975a984e0 100644 --- a/gnu/dist/texinfo/makeinfo/defun.h +++ b/gnu/dist/texinfo/makeinfo/defun.h @@ -1,7 +1,7 @@ -/* $NetBSD: defun.h,v 1.1.1.3 2004/07/12 23:26:51 wiz Exp $ */ +/* $NetBSD: defun.h,v 1.1.1.4 2008/09/02 07:50:26 christos Exp $ */ /* defun.h -- declaration for defuns. - Id: defun.h,v 1.2 2004/02/13 22:01:38 dirt Exp + Id: defun.h,v 1.2 2004/04/11 17:56:47 karl Exp Copyright (C) 1999 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/float.c b/gnu/dist/texinfo/makeinfo/float.c index 79aadc2168c..a3969e68829 100644 --- a/gnu/dist/texinfo/makeinfo/float.c +++ b/gnu/dist/texinfo/makeinfo/float.c @@ -1,7 +1,7 @@ -/* $NetBSD: float.c,v 1.1.1.1 2004/07/12 23:26:51 wiz Exp $ */ +/* $NetBSD: float.c,v 1.1.1.2 2008/09/02 07:50:28 christos Exp $ */ /* float.c -- float environment functions. - Id: float.c,v 1.27 2004/03/25 00:20:16 karl Exp + Id: float.c,v 1.8 2004/07/05 22:23:22 karl Exp Copyright (C) 2003, 2004 Free Software Foundation, Inc. @@ -234,7 +234,7 @@ cm_listoffloats (void) add_word ("\">"); if (strlen (float_type) > 0) - execute_string (float_type); + execute_string ("%s", float_type); if (strlen (temp->id) > 0) { @@ -250,7 +250,7 @@ cm_listoffloats (void) || strlen (temp->id) > 0) insert_string (": "); - execute_string (temp->title); + execute_string ("%s", temp->title); } add_word ("</a>"); diff --git a/gnu/dist/texinfo/makeinfo/float.h b/gnu/dist/texinfo/makeinfo/float.h index d3fa77a0001..ea002173a98 100644 --- a/gnu/dist/texinfo/makeinfo/float.h +++ b/gnu/dist/texinfo/makeinfo/float.h @@ -1,7 +1,7 @@ -/* $NetBSD: float.h,v 1.1.1.1 2004/07/12 23:26:51 wiz Exp $ */ +/* $NetBSD: float.h,v 1.1.1.2 2008/09/02 07:50:28 christos Exp $ */ /* float.h -- declarations for the float environment. - Id: float.h,v 1.7 2004/02/13 22:01:38 dirt Exp + Id: float.h,v 1.5 2004/04/11 17:56:47 karl Exp Copyright (C) 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/footnote.c b/gnu/dist/texinfo/makeinfo/footnote.c index 684c2e90cdf..43fc8acb73d 100644 --- a/gnu/dist/texinfo/makeinfo/footnote.c +++ b/gnu/dist/texinfo/makeinfo/footnote.c @@ -1,7 +1,7 @@ -/* $NetBSD: footnote.c,v 1.1.1.3 2004/07/12 23:26:51 wiz Exp $ */ +/* $NetBSD: footnote.c,v 1.1.1.4 2008/09/02 07:50:28 christos Exp $ */ /* footnote.c -- footnotes for Texinfo. - Id: footnote.c,v 1.7 2004/04/06 20:15:42 dirt Exp + Id: footnote.c,v 1.7 2004/04/11 17:56:47 karl Exp Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/footnote.h b/gnu/dist/texinfo/makeinfo/footnote.h index 6646bceb5ea..7eac968a9ff 100644 --- a/gnu/dist/texinfo/makeinfo/footnote.h +++ b/gnu/dist/texinfo/makeinfo/footnote.h @@ -1,7 +1,7 @@ -/* $NetBSD: footnote.h,v 1.1.1.3 2004/07/12 23:26:51 wiz Exp $ */ +/* $NetBSD: footnote.h,v 1.1.1.4 2008/09/02 07:50:28 christos Exp $ */ /* footnote.h -- declarations for footnote.c. - Id: footnote.h,v 1.2 2004/02/13 22:01:38 dirt Exp + Id: footnote.h,v 1.2 2004/04/11 17:56:47 karl Exp Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/html.c b/gnu/dist/texinfo/makeinfo/html.c index 24618ff41fd..7e8693e21e0 100644 --- a/gnu/dist/texinfo/makeinfo/html.c +++ b/gnu/dist/texinfo/makeinfo/html.c @@ -1,7 +1,7 @@ -/* $NetBSD: html.c,v 1.1.1.4 2004/07/12 23:26:51 wiz Exp $ */ +/* $NetBSD: html.c,v 1.1.1.5 2008/09/02 07:50:29 christos Exp $ */ /* html.c -- html-related utilities. - Id: html.c,v 1.18 2004/03/20 22:17:10 karl Exp + Id: html.c,v 1.28 2004/12/06 01:13:06 karl Exp Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -310,12 +310,16 @@ rel=\"generator-home\" title=\"Texinfo Homepage\">\n"); /* Since HTML doesn't have a sc element, we use span with a bit of CSS spice instead. */ #define CSS_FONT_SMALL_CAPS "font-variant:small-caps" - add_word_args (" span.sc { %s }\n", CSS_FONT_SMALL_CAPS); + add_word_args (" span.sc { %s }\n", CSS_FONT_SMALL_CAPS); - /* Roman font class. */ -#define CSS_FONT_ROMAN "font-family: serif; font-weight: normal;" + /* Roman (default) font class, closest we can come. */ +#define CSS_FONT_ROMAN "font-family:serif; font-weight:normal;" add_word_args (" span.roman { %s } \n", CSS_FONT_ROMAN); + /* Sans serif font class. */ +#define CSS_FONT_SANSSERIF "font-family:sans-serif; font-weight:normal;" + add_word_args (" span.sansserif { %s } \n", CSS_FONT_SANSSERIF); + /* Write out any css code from the user's --css-file. */ if (css_inline) insert_string (css_inline); @@ -589,33 +593,59 @@ add_link (char *nodename, char *attributes) } /* Output NAME with characters escaped as appropriate for an anchor - name, i.e., escape URL special characters as %<n>. */ + name, i.e., escape URL special characters with our _00hh convention + if OLD is zero. (See the manual for details on the new scheme.) + + If OLD is nonzero, generate the node name with the 4.6-and-earlier + convention of %hh (and more special characters output as-is, notably + - and *). This is only so that external references to old names can + still work with HTML generated by the new makeinfo; the gcc folks + needed this. Our own HTML does not refer to these names. */ + void -add_escaped_anchor_name (char *name) +add_escaped_anchor_name (char *name, int old) { canon_white (name); + if (!old && !strchr ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", + *name)) + { /* XHTML does not allow anything but an ASCII letter to start an + identifier. Therefore kludge in this constant string if we + have a nonletter. */ + add_word ("g_t"); + } + for (; *name; name++) { if (cr_or_whitespace (*name)) add_char ('-'); - else if (! URL_SAFE_CHAR (*name)) + + else if (!old && !URL_SAFE_CHAR (*name)) /* Cast so characters with the high bit set are treated as >128, for example o-umlaut should be 246, not -10. */ add_word_args ("_00%x", (unsigned char) *name); + + else if (old && !URL_SAFE_CHAR (*name) && !OLD_URL_SAFE_CHAR (*name)) + /* Different output convention, but still cast as above. */ + add_word_args ("%%%x", (unsigned char) *name); + else add_char (*name); } } /* Insert the text for the name of a reference in an HTML anchor - appropriate for NODENAME. If HREF is nonzero, it will be - appropriate for a href= attribute, rather than name= i.e., including - the `#' if it's an internal reference. */ + appropriate for NODENAME. + + If HREF is zero, generate text for name= in the new node name + conversion convention. + If HREF is negative, generate text for name= in the old convention. + If HREF is positive, generate the name for an href= attribute, i.e., + including the `#' if it's an internal reference. */ void add_anchor_name (char *nodename, int href) { - if (href) + if (href > 0) { if (splitting) add_url_name (nodename, href); @@ -631,7 +661,7 @@ add_anchor_name (char *nodename, int href) else if (strcasecmp (nodename, "top") == 0) add_word ("Top"); else - add_escaped_anchor_name (nodename); + add_escaped_anchor_name (nodename, href < 0); } /* Insert the text for the name of a reference in an HTML url, aprropriate diff --git a/gnu/dist/texinfo/makeinfo/html.h b/gnu/dist/texinfo/makeinfo/html.h index 161902bc055..662d77f1ac1 100644 --- a/gnu/dist/texinfo/makeinfo/html.h +++ b/gnu/dist/texinfo/makeinfo/html.h @@ -1,7 +1,7 @@ -/* $NetBSD: html.h,v 1.1.1.3 2004/07/12 23:26:50 wiz Exp $ */ +/* $NetBSD: html.h,v 1.1.1.4 2008/09/02 07:50:29 christos Exp $ */ /* html.h -- declarations for html-related utilities. - Id: html.h,v 1.4 2004/03/19 18:54:49 karl Exp + Id: html.h,v 1.6 2004/11/30 02:03:23 karl Exp Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc. @@ -48,8 +48,8 @@ extern void insert_html_tag (int start_or_end, char *tag); /* Output HTML <link> to NODE, plus extra ATTRIBUTES. */ extern void add_link (char *nodename, char *attributes); -/* Escape URL-special characters as %xy. */ -extern void add_escaped_anchor_name (char *name); +/* Escape URL-special characters. */ +extern void add_escaped_anchor_name (char *name, int old); /* See html.c. */ extern void add_anchor_name (char *nodename, int href); diff --git a/gnu/dist/texinfo/makeinfo/index.c b/gnu/dist/texinfo/makeinfo/index.c index e469bbe002b..4fa1dc773ef 100644 --- a/gnu/dist/texinfo/makeinfo/index.c +++ b/gnu/dist/texinfo/makeinfo/index.c @@ -1,7 +1,7 @@ -/* $NetBSD: index.c,v 1.1.1.5 2004/07/12 23:26:50 wiz Exp $ */ +/* $NetBSD: index.c,v 1.1.1.6 2008/09/02 07:50:31 christos Exp $ */ /* index.c -- indexing for Texinfo. - Id: index.c,v 1.22 2004/03/25 00:24:07 karl Exp + Id: index.c,v 1.17 2004/11/30 02:03:23 karl Exp Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -182,8 +182,8 @@ index_add_arg (char *name) flush_output (); new->next = the_indices[which]; - new->entry_text = index_entry; new->entry = NULL; + new->entry_text = index_entry; /* Since footnotes are handled at the very end of the document, node name in the non-split HTML outputs always show the last node. We artificially make it ``Footnotes''. */ @@ -199,6 +199,11 @@ index_add_arg (char *name) else new->section_name = ""; } + else + { + new->section = NULL; + new->section_name = NULL; + } new->code = tem->code; new->defining_line = line_number - 1; new->output_line = no_headers ? output_line_number : node_line_number; @@ -206,9 +211,6 @@ index_add_arg (char *name) something that goes away, for example, inside a macro. (see the findexerr test). */ new->defining_file = xstrdup (input_filename); - the_indices[which] = new; - - new->entry_number = index_counter; if (html && splitting) { @@ -217,6 +219,11 @@ index_add_arg (char *name) else new->output_file = xstrdup (""); } + else + new->output_file = NULL; + + new->entry_number = index_counter; + the_indices[which] = new; #if 0 /* The index breaks if there are colons in the entry. @@ -242,7 +249,7 @@ index_add_arg (char *name) removed_empty_elt = 2; add_word ("<a name=\"index-"); - add_escaped_anchor_name (index_entry); + add_escaped_anchor_name (index_entry, 0); add_word_args ("-%d\"></a>", index_counter); if (removed_empty_elt == 1) @@ -818,33 +825,28 @@ cm_printindex (void) } if (html) - /* fixme: html: we should use specific index anchors pointing - to the actual location of the indexed position (but then we - have to find something to wrap the anchor around). */ { - /* In the HTML case, the expanded index entry is not - good for us, since it was expanded for non-HTML mode - inside sort_index. So we need to HTML-escape and - expand the original entry text here. */ - char *escaped_entry = xstrdup (index->entry_text); - char *expanded_entry; - - /* expansion() doesn't HTML-escape the argument, so need - to do it separately. */ - escaped_entry = escape_string (escaped_entry); - expanded_entry = expansion (escaped_entry, index->code); + /* For HTML, we need to expand and HTML-escape the + original entry text, at the same time. Consider + @cindex J@"urgen. We want Jüurgen. We can't + expand and then escape since we'll end up with + J&uuml;rgen. We can't escape and then expand + because then `expansion' will see J@"urgen, and + @"urgen is not a command. */ + char *html_entry = + maybe_escaped_expansion (index->entry_text, index->code, 1); + add_html_block_elt_args ("\n<li><a href=\"%s#index-", - (splitting ? index->output_file : ""), index_name); - add_escaped_anchor_name (index->entry_text); + (splitting && index->output_file) ? index->output_file : ""); + add_escaped_anchor_name (index->entry_text, 0); add_word_args ("-%d\">%s</a>: ", index->entry_number, - expanded_entry); - free (escaped_entry); - free (expanded_entry); + html_entry); + free (html_entry); add_word ("<a href=\""); if (index->node && *index->node) { - /* Make sure any non-macros in the node name are expanded. */ + /* Ensure any non-macros in the node name are expanded. */ char *expanded_index; in_fixed_width_font++; diff --git a/gnu/dist/texinfo/makeinfo/index.h b/gnu/dist/texinfo/makeinfo/index.h index 5e1528da428..a3a2b6a5cc9 100644 --- a/gnu/dist/texinfo/makeinfo/index.h +++ b/gnu/dist/texinfo/makeinfo/index.h @@ -1,7 +1,7 @@ -/* $NetBSD: index.h,v 1.1.1.3 2004/07/12 23:26:50 wiz Exp $ */ +/* $NetBSD: index.h,v 1.1.1.4 2008/09/02 07:50:31 christos Exp $ */ /* index.h -- declarations for index.c. - Id: index.h,v 1.6 2004/02/28 10:42:50 dirt Exp + Id: index.h,v 1.2 2004/04/11 17:56:47 karl Exp Copyright (C) 1998, 99 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/insertion.c b/gnu/dist/texinfo/makeinfo/insertion.c index 4bb5e6d5f64..600edd69c2d 100644 --- a/gnu/dist/texinfo/makeinfo/insertion.c +++ b/gnu/dist/texinfo/makeinfo/insertion.c @@ -1,7 +1,7 @@ -/* $NetBSD: insertion.c,v 1.1.1.5 2004/07/12 23:26:50 wiz Exp $ */ +/* $NetBSD: insertion.c,v 1.1.1.6 2008/09/02 07:50:34 christos Exp $ */ /* insertion.c -- insertions for Texinfo. - Id: insertion.c,v 1.39 2004/04/09 13:09:54 dirt Exp + Id: insertion.c,v 1.55 2004/11/11 18:34:28 karl Exp Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -1054,7 +1054,6 @@ end_insertion (int type) line_number--; break; - case documentdescription: case ifclear: case ifdocbook: case ifinfo: @@ -1106,6 +1105,12 @@ end_insertion (int type) close_insertion_paragraph (); break; + case documentdescription: + if (xml) + insert_string (document_description); + xml_insert_element (DOCUMENTDESCRIPTION, END); + break; + case menu: in_menu--; /* No longer hacking menus. */ if (html && !no_headers) @@ -1550,8 +1555,15 @@ cm_direntry (void) void cm_documentdescription (void) { - if (html || xml) + if (html) begin_insertion (documentdescription); + + else if (xml) + { + xml_insert_element (DOCUMENTDESCRIPTION, START); + begin_insertion (documentdescription); + } + else command_name_condition (); } diff --git a/gnu/dist/texinfo/makeinfo/insertion.h b/gnu/dist/texinfo/makeinfo/insertion.h index f6cbfaa1d5e..3a635d5a509 100644 --- a/gnu/dist/texinfo/makeinfo/insertion.h +++ b/gnu/dist/texinfo/makeinfo/insertion.h @@ -1,7 +1,7 @@ -/* $NetBSD: insertion.h,v 1.1.1.3 2004/07/12 23:26:50 wiz Exp $ */ +/* $NetBSD: insertion.h,v 1.1.1.4 2008/09/02 07:50:34 christos Exp $ */ /* insertion.h -- declarations for insertion.c. - Id: insertion.h,v 1.2 2004/02/13 22:01:38 dirt Exp + Id: insertion.h,v 1.10 2004/04/11 17:56:47 karl Exp Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/lang.c b/gnu/dist/texinfo/makeinfo/lang.c index b4a51d4db29..759cb130d1a 100644 --- a/gnu/dist/texinfo/makeinfo/lang.c +++ b/gnu/dist/texinfo/makeinfo/lang.c @@ -1,9 +1,10 @@ -/* $NetBSD: lang.c,v 1.1.1.4 2004/07/12 23:26:50 wiz Exp $ */ +/* $NetBSD: lang.c,v 1.1.1.5 2008/09/02 07:50:36 christos Exp $ */ /* lang.c -- language-dependent support. - Id: lang.c,v 1.10 2004/03/06 14:12:22 dirt Exp + Id: lang.c,v 1.14 2004/11/22 23:57:33 karl Exp - Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 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 @@ -143,6 +144,126 @@ static iso_map_type iso8859_1_map [] = { { NULL, 0, 0 } }; + +/* ISO 8859-15, also known as Latin 9, differs from Latin 1 in only a + few positions. http://www.cs.tut.fi/~jkorpela/latin9.html has a good + explanation and listing, summarized here. The names are abbreviated + from the official Unicode names, to fit in a decent line length. + + code position + dec oct hex latin1 latin1 name latin9 latin9 name + + 164 0244 0xA4 U+00A4 currency symbol U+20AC euro sign + 166 0246 0xA6 U+00A6 broken bar U+0160 S with caron + 168 0250 0xA8 U+00A8 diaeresis U+0161 s with caron + 180 0264 0xB4 U+00B4 acute accent U+017D Z with caron + 184 0270 0xB8 U+00B8 cedilla U+017E z with caron + 188 0274 0xBC U+00BC fraction 1/4 U+0152 ligature OE + 189 0275 0xBD U+00BD fraction 1/2 U+0153 ligature oe + 190 0276 0xBE U+00BE fraction 3/4 U+0178 Y with diaeresis +*/ + +static iso_map_type iso8859_15_map [] = { + { "nbsp", 0xA0, 0x00A0 }, + { "iexcl", 0xA1, 0x00A1 }, + { "cent", 0xA2, 0x00A2 }, + { "pound", 0xA3, 0x00A3 }, + { "euro", 0xA4, 0x20AC }, + { "yen", 0xA5, 0x00A5 }, + { "Scaron", 0xA6, 0x0160 }, + { "sect", 0xA7, 0x00A7 }, + { "scaron", 0xA8, 0x0161 }, + { "copy", 0xA9, 0x00A9 }, + { "ordf", 0xAA, 0x00AA }, + { "laquo", 0xAB, 0x00AB }, + { "not", 0xAC, 0x00AC }, + { "shy", 0xAD, 0x00AD }, + { "reg", 0xAE, 0x00AE }, + { "hibar", 0xAF, 0x00AF }, + { "deg", 0xB0, 0x00B0 }, + { "plusmn", 0xB1, 0x00B1 }, + { "sup2", 0xB2, 0x00B2 }, + { "sup3", 0xB3, 0x00B3 }, + { "Zcaron", 0xB4, 0x017D }, + { "micro", 0xB5, 0x00B5 }, + { "para", 0xB6, 0x00B6 }, + { "middot", 0xB7, 0x00B7 }, + { "zcaron", 0xB8, 0x017E }, + { "sup1", 0xB9, 0x00B9 }, + { "ordm", 0xBA, 0x00BA }, + { "raquo", 0xBB, 0x00BB }, + { "OElig", 0xBC, 0x0152 }, + { "oelig", 0xBD, 0x0153 }, + { "Yuml", 0xBE, 0x0178 }, + { "iquest", 0xBF, 0x00BF }, + { "Agrave", 0xC0, 0x00C0 }, + { "Aacute", 0xC1, 0x00C1 }, + { "Acirc", 0xC2, 0x00C2 }, + { "Atilde", 0xC3, 0x00C3 }, + { "Auml", 0xC4, 0x00C4 }, + { "Aring", 0xC5, 0x00C5 }, + { "AElig", 0xC6, 0x00C6 }, + { "Ccedil", 0xC7, 0x00C7 }, + { "Ccedil", 0xC7, 0x00C7 }, + { "Egrave", 0xC8, 0x00C8 }, + { "Eacute", 0xC9, 0x00C9 }, + { "Ecirc", 0xCA, 0x00CA }, + { "Euml", 0xCB, 0x00CB }, + { "Igrave", 0xCC, 0x00CC }, + { "Iacute", 0xCD, 0x00CD }, + { "Icirc", 0xCE, 0x00CE }, + { "Iuml", 0xCF, 0x00CF }, + { "ETH", 0xD0, 0x00D0 }, + { "Ntilde", 0xD1, 0x00D1 }, + { "Ograve", 0xD2, 0x00D2 }, + { "Oacute", 0xD3, 0x00D3 }, + { "Ocirc", 0xD4, 0x00D4 }, + { "Otilde", 0xD5, 0x00D5 }, + { "Ouml", 0xD6, 0x00D6 }, + { "times", 0xD7, 0x00D7 }, + { "Oslash", 0xD8, 0x00D8 }, + { "Ugrave", 0xD9, 0x00D9 }, + { "Uacute", 0xDA, 0x00DA }, + { "Ucirc", 0xDB, 0x00DB }, + { "Uuml", 0xDC, 0x00DC }, + { "Yacute", 0xDD, 0x00DD }, + { "THORN", 0xDE, 0x00DE }, + { "szlig", 0xDF, 0x00DF }, + { "agrave", 0xE0, 0x00E0 }, + { "aacute", 0xE1, 0x00E1 }, + { "acirc", 0xE2, 0x00E2 }, + { "atilde", 0xE3, 0x00E3 }, + { "auml", 0xE4, 0x00E4 }, + { "aring", 0xE5, 0x00E5 }, + { "aelig", 0xE6, 0x00E6 }, + { "ccedil", 0xE7, 0x00E7 }, + { "egrave", 0xE8, 0x00E8 }, + { "eacute", 0xE9, 0x00E9 }, + { "ecirc", 0xEA, 0x00EA }, + { "euml", 0xEB, 0x00EB }, + { "igrave", 0xEC, 0x00EC }, + { "iacute", 0xED, 0x00ED }, + { "icirc", 0xEE, 0x00EE }, + { "iuml", 0xEF, 0x00EF }, + { "eth", 0xF0, 0x00F0 }, + { "ntilde", 0xF1, 0x00F1 }, + { "ograve", 0xF2, 0x00F2 }, + { "oacute", 0xF3, 0x00F3 }, + { "ocirc", 0xF4, 0x00F4 }, + { "otilde", 0xF5, 0x00F5 }, + { "ouml", 0xF6, 0x00F6 }, + { "divide", 0xF7, 0x00F7 }, + { "oslash", 0xF8, 0x00F8 }, + { "ugrave", 0xF9, 0x00F9 }, + { "uacute", 0xFA, 0x00FA }, + { "ucirc", 0xFB, 0x00FB }, + { "uuml", 0xFC, 0x00FC }, + { "yacute", 0xFD, 0x00FD }, + { "thorn", 0xFE, 0x00FE }, + { "yuml", 0xFF, 0x00FF }, + { NULL, 0, 0 } +}; + /* Date: Mon, 31 Mar 2003 00:19:28 +0200 @@ -282,7 +403,7 @@ encoding_type encoding_table[] = { { ISO_8859_12, "iso-8859-12", NULL }, { ISO_8859_13, "iso-8859-13", NULL }, { ISO_8859_14, "iso-8859-14", NULL }, - { ISO_8859_15, "iso-8859-15", NULL }, + { ISO_8859_15, "iso-8859-15", (iso_map_type *) iso8859_15_map }, { last_encoding_code, NULL, NULL } }; @@ -572,7 +693,7 @@ current_document_encoding (void) } -/* If html or xml output, add HTML_STR to the output. If not html and +/* If html or xml output, add &HTML_STR; to the output. If not html and the user requested encoded output, add the real 8-bit character corresponding to HTML_STR from the translation tables. Otherwise, add INFO_STR. */ @@ -847,6 +968,10 @@ cm_special_char (int arg) add_encoded_char ("iexcl", "!"); else if (strcmp (command, "questiondown") == 0) add_encoded_char ("iquest", "?"); + else if (strcmp (command, "euro") == 0) + /* http://www.cs.tut.fi/~jkorpela/html/euro.html suggests that + € degrades best in old browsers. */ + add_encoded_char ("euro", "Euro "); else if (strcmp (command, "pounds") == 0) add_encoded_char ("pound" , "#"); else if (strcmp (command, "ordf") == 0) diff --git a/gnu/dist/texinfo/makeinfo/lang.h b/gnu/dist/texinfo/makeinfo/lang.h index 54fc8b8cfbf..082903ad691 100644 --- a/gnu/dist/texinfo/makeinfo/lang.h +++ b/gnu/dist/texinfo/makeinfo/lang.h @@ -1,7 +1,7 @@ -/* $NetBSD: lang.h,v 1.1.1.4 2004/07/12 23:26:50 wiz Exp $ */ +/* $NetBSD: lang.h,v 1.1.1.5 2008/09/02 07:50:36 christos Exp $ */ /* lang.h -- declarations for language codes etc. - Id: lang.h,v 1.4 2004/02/28 12:46:51 dirt Exp + Id: lang.h,v 1.6 2004/04/11 17:56:47 karl Exp Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/macro.c b/gnu/dist/texinfo/makeinfo/macro.c index fe6a0f99ca2..619a32c1eab 100644 --- a/gnu/dist/texinfo/makeinfo/macro.c +++ b/gnu/dist/texinfo/makeinfo/macro.c @@ -1,7 +1,7 @@ -/* $NetBSD: macro.c,v 1.1.1.4 2004/07/12 23:26:49 wiz Exp $ */ +/* $NetBSD: macro.c,v 1.1.1.5 2008/09/02 07:50:37 christos Exp $ */ /* macro.c -- user-defined macros for Texinfo. - Id: macro.c,v 1.2 2004/02/13 22:01:38 dirt Exp + Id: macro.c,v 1.6 2004/04/11 17:56:47 karl Exp Copyright (C) 1998, 1999, 2002, 2003 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/macro.h b/gnu/dist/texinfo/makeinfo/macro.h index 7ce282b43e5..5348f1f22c3 100644 --- a/gnu/dist/texinfo/makeinfo/macro.h +++ b/gnu/dist/texinfo/makeinfo/macro.h @@ -1,7 +1,7 @@ -/* $NetBSD: macro.h,v 1.1.1.3 2004/07/12 23:26:49 wiz Exp $ */ +/* $NetBSD: macro.h,v 1.1.1.4 2008/09/02 07:50:37 christos Exp $ */ /* macro.h -- declarations for macro.c. - Id: macro.h,v 1.2 2004/02/13 22:01:38 dirt Exp + Id: macro.h,v 1.2 2004/04/11 17:56:47 karl Exp Copyright (C) 1998, 99 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/makeinfo.h b/gnu/dist/texinfo/makeinfo/makeinfo.h index 3043a70cffe..b701ee914c5 100644 --- a/gnu/dist/texinfo/makeinfo/makeinfo.h +++ b/gnu/dist/texinfo/makeinfo/makeinfo.h @@ -1,9 +1,9 @@ -/* $NetBSD: makeinfo.h,v 1.1.1.6 2004/07/12 23:26:49 wiz Exp $ */ +/* $NetBSD: makeinfo.h,v 1.1.1.7 2008/09/02 07:50:44 christos Exp $ */ /* makeinfo.h -- declarations for Makeinfo. - Id: makeinfo.h,v 1.8 2004/03/10 22:34:21 dirt Exp + Id: makeinfo.h,v 1.17 2004/11/30 02:03:23 karl Exp - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -271,8 +271,15 @@ DECLARE (int, expensive_validation, 0); #define digit_value(c) ((c) - '0') #endif -/* #define HTML_SAFE "$-_.+!*'()" */ -/* #define URL_SAFE_CHAR(ch) (isalnum (ch) || strchr (HTML_SAFE, ch)) */ +/* These characters are not really HTML-safe (with strict XHTML), + and also there are possible collisions. That's the whole reason we + designed a new conversion scheme in the first place. But we + nevertheless need to generate the old names. See + `add_escaped_anchor_name' in html.c. */ +#define OLD_HTML_SAFE "$-_.+!*'()" +#define OLD_URL_SAFE_CHAR(ch) (strchr (OLD_HTML_SAFE, ch)) + +/* For the current/stable scheme. */ #define URL_SAFE_CHAR(ch) (isalnum (ch)) #define COMMAND_PREFIX '@' @@ -318,6 +325,7 @@ extern GENERIC_LIST * reverse_list (GENERIC_LIST *list); extern char *info_trailer (void), *expansion (char *str, int implicit_code), *text_expansion (char *str), + *maybe_escaped_expansion (char *str, int implicit_code, int do_escape_html), *full_expansion (char *str, int implicit_code); extern void free_and_clear (char **pointer), @@ -325,7 +333,7 @@ extern void free_and_clear (char **pointer), add_char (int character), add_meta_char (int character), close_single_paragraph (void), - insert_string (char *string), + insert_string (const char *), insert (int character), get_rest_of_line (int expand, char **string), add_html_block_elt (char *string), diff --git a/gnu/dist/texinfo/makeinfo/multi.c b/gnu/dist/texinfo/makeinfo/multi.c index b21a78572b4..a4bbac1c045 100644 --- a/gnu/dist/texinfo/makeinfo/multi.c +++ b/gnu/dist/texinfo/makeinfo/multi.c @@ -1,7 +1,7 @@ -/* $NetBSD: multi.c,v 1.1.1.4 2004/07/12 23:26:49 wiz Exp $ */ +/* $NetBSD: multi.c,v 1.1.1.5 2008/09/02 07:50:44 christos Exp $ */ /* multi.c -- multiple-column tables (@multitable) for makeinfo. - Id: multi.c,v 1.9 2004/02/29 12:44:24 dirt Exp + Id: multi.c,v 1.8 2004/04/11 17:56:47 karl Exp Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/multi.h b/gnu/dist/texinfo/makeinfo/multi.h index e228f326b81..b5a4223c469 100644 --- a/gnu/dist/texinfo/makeinfo/multi.h +++ b/gnu/dist/texinfo/makeinfo/multi.h @@ -1,7 +1,7 @@ -/* $NetBSD: multi.h,v 1.1.1.1 2004/07/12 23:26:49 wiz Exp $ */ +/* $NetBSD: multi.h,v 1.1.1.2 2008/09/02 07:50:44 christos Exp $ */ /* multi.h -- declarations for multi.c. - Id: multi.h,v 1.1 2004/02/13 21:30:41 dirt Exp + Id: multi.h,v 1.1 2004/04/11 17:56:47 karl Exp Copyright (C) 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/node.h b/gnu/dist/texinfo/makeinfo/node.h index 2715433ac7c..9c17d6e5de8 100644 --- a/gnu/dist/texinfo/makeinfo/node.h +++ b/gnu/dist/texinfo/makeinfo/node.h @@ -1,7 +1,7 @@ -/* $NetBSD: node.h,v 1.1.1.3 2004/07/12 23:26:48 wiz Exp $ */ +/* $NetBSD: node.h,v 1.1.1.4 2008/09/02 07:50:47 christos Exp $ */ /* node.h -- declarations for Node. - Id: node.h,v 1.4 2004/02/28 10:42:50 dirt Exp + Id: node.h,v 1.2 2004/04/11 17:56:47 karl Exp Copyright (C) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/sectioning.c b/gnu/dist/texinfo/makeinfo/sectioning.c index a76219b1a5d..e8f202ed700 100644 --- a/gnu/dist/texinfo/makeinfo/sectioning.c +++ b/gnu/dist/texinfo/makeinfo/sectioning.c @@ -1,7 +1,7 @@ -/* $NetBSD: sectioning.c,v 1.1.1.4 2004/07/12 23:26:48 wiz Exp $ */ +/* $NetBSD: sectioning.c,v 1.1.1.5 2008/09/02 07:50:20 christos Exp $ */ /* sectioning.c -- for @chapter, @section, ..., @contents ... - Id: sectioning.c,v 1.15 2004/04/06 22:48:30 karl Exp + Id: sectioning.c,v 1.25 2004/07/05 22:23:23 karl Exp Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -395,7 +395,7 @@ sectioning_underscore (char *cmd) xml_insert_element (TITLE, START); xml_open_section (level, secname); - execute_string (temp); + execute_string ("%s", temp); xml_insert_element (TITLE, END); free (temp); diff --git a/gnu/dist/texinfo/makeinfo/sectioning.h b/gnu/dist/texinfo/makeinfo/sectioning.h index 7993e5aec78..c279ec5688a 100644 --- a/gnu/dist/texinfo/makeinfo/sectioning.h +++ b/gnu/dist/texinfo/makeinfo/sectioning.h @@ -1,7 +1,7 @@ -/* $NetBSD: sectioning.h,v 1.1.1.3 2004/07/12 23:26:47 wiz Exp $ */ +/* $NetBSD: sectioning.h,v 1.1.1.4 2008/09/02 07:50:47 christos Exp $ */ /* sectioning.h -- all related stuff @chapter, @section... @contents - Id: sectioning.h,v 1.3 2004/03/14 03:26:36 dirt Exp + Id: sectioning.h,v 1.5 2004/04/11 17:56:47 karl Exp Copyright (C) 1999, 2003 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/tests/Makefile.am b/gnu/dist/texinfo/makeinfo/tests/Makefile.am index a5ef15f5d31..ff0a6435388 100644 --- a/gnu/dist/texinfo/makeinfo/tests/Makefile.am +++ b/gnu/dist/texinfo/makeinfo/tests/Makefile.am @@ -1,4 +1,4 @@ -# Id: Makefile.am,v 1.4 2004/04/09 21:21:07 karl Exp +# Id: Makefile.am,v 1.5 2004/04/11 17:56:47 karl Exp # Makefile.am for texinfo/tests/makeinfo. # # This file is free software; as a special exception the author gives diff --git a/gnu/dist/texinfo/makeinfo/tests/copying b/gnu/dist/texinfo/makeinfo/tests/copying index 00afbd960fa..a3a2f699b4e 100755 --- a/gnu/dist/texinfo/makeinfo/tests/copying +++ b/gnu/dist/texinfo/makeinfo/tests/copying @@ -1,8 +1,10 @@ #!/bin/sh +# Id: copying,v 1.2 2004/04/20 13:26:00 karl Exp # Test @copying. The configure script for tramp uses this to make sure # the makeinfo that is present supports @copying. -unset TEXINFO_OUTPUT +unset TEXINFO_OUTPUT LANG LANGUAGE +LC_ALL=POSIX; export LC_ALL : ${srcdir=.} ../makeinfo -o copying.out $srcdir/copying.txi || exit 1 diff --git a/gnu/dist/texinfo/makeinfo/tests/html-manuals b/gnu/dist/texinfo/makeinfo/tests/html-manuals index df2990a073c..3593cf634b4 100755 --- a/gnu/dist/texinfo/makeinfo/tests/html-manuals +++ b/gnu/dist/texinfo/makeinfo/tests/html-manuals @@ -1,5 +1,5 @@ #!/bin/sh -# Id: html-manuals,v 1.1.1.1 2003/12/06 01:33:57 karl Exp +# Id: html-manuals,v 1.3 2004/04/11 17:56:47 karl Exp # Test that all the distribution manuals can be converted to HTML. : ${srcdir=.} diff --git a/gnu/dist/texinfo/makeinfo/tests/include-value b/gnu/dist/texinfo/makeinfo/tests/include-value index 76148cdcf19..050a6178998 100644 --- a/gnu/dist/texinfo/makeinfo/tests/include-value +++ b/gnu/dist/texinfo/makeinfo/tests/include-value @@ -1,5 +1,5 @@ #!/bin/sh -# Id: include-value,v 1.2 2003/12/14 15:18:38 karl Exp +# Id: include-value,v 1.3 2004/04/11 17:56:47 karl Exp # Test @value expansion in @include and @verbatiminclude names. unset TEXINFO_OUTPUT diff --git a/gnu/dist/texinfo/makeinfo/tests/include-value.txi b/gnu/dist/texinfo/makeinfo/tests/include-value.txi index a8dece2d759..28c25e36bba 100644 --- a/gnu/dist/texinfo/makeinfo/tests/include-value.txi +++ b/gnu/dist/texinfo/makeinfo/tests/include-value.txi @@ -1,6 +1,6 @@ \input texinfo @setfilename include-value.info -@c Id: include-value.txi,v 1.1.1.1 2003/12/06 01:33:58 karl Exp +@c Id: include-value.txi,v 1.2 2004/04/11 17:56:47 karl Exp @set testvar incl-incl.txi diff --git a/gnu/dist/texinfo/makeinfo/tests/twofiles b/gnu/dist/texinfo/makeinfo/tests/twofiles index e1e2d3797f3..af836ecbc33 100644 --- a/gnu/dist/texinfo/makeinfo/tests/twofiles +++ b/gnu/dist/texinfo/makeinfo/tests/twofiles @@ -1,5 +1,5 @@ #!/bin/sh -# Id: twofiles,v 1.2 2003/12/14 15:18:38 karl Exp +# Id: twofiles,v 1.3 2004/04/11 17:56:47 karl Exp # Test that an existing and nonexisting file doesn't cause a # segmentation fault. # From: Arkadiusz Miskiewicz <misiek@pld.ORG.PL>, 15 Feb 2003 13:22:49 +0100. diff --git a/gnu/dist/texinfo/makeinfo/toc.c b/gnu/dist/texinfo/makeinfo/toc.c index 0130cc3ebc5..79ba21fd086 100644 --- a/gnu/dist/texinfo/makeinfo/toc.c +++ b/gnu/dist/texinfo/makeinfo/toc.c @@ -1,7 +1,7 @@ -/* $NetBSD: toc.c,v 1.1.1.3 2004/07/12 23:26:48 wiz Exp $ */ +/* $NetBSD: toc.c,v 1.1.1.4 2008/09/02 07:50:47 christos Exp $ */ /* toc.c -- table of contents handling. - Id: toc.c,v 1.8 2004/03/10 23:28:43 dirt Exp + Id: toc.c,v 1.6 2004/04/11 17:56:47 karl Exp Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/toc.h b/gnu/dist/texinfo/makeinfo/toc.h index 1dcc4f346bb..9c1a34a8037 100644 --- a/gnu/dist/texinfo/makeinfo/toc.h +++ b/gnu/dist/texinfo/makeinfo/toc.h @@ -1,7 +1,7 @@ -/* $NetBSD: toc.h,v 1.1.1.3 2004/07/12 23:26:48 wiz Exp $ */ +/* $NetBSD: toc.h,v 1.1.1.4 2008/09/02 07:50:47 christos Exp $ */ /* toc.h -- table of contents handling. - Id: toc.h,v 1.3 2004/02/13 22:01:39 dirt Exp + Id: toc.h,v 1.2 2004/04/11 17:56:47 karl Exp Copyright (C) 1999 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/makeinfo/xml.c b/gnu/dist/texinfo/makeinfo/xml.c index 0928de65d1d..5580255ad65 100644 --- a/gnu/dist/texinfo/makeinfo/xml.c +++ b/gnu/dist/texinfo/makeinfo/xml.c @@ -1,9 +1,9 @@ -/* $NetBSD: xml.c,v 1.1.1.4 2004/07/12 23:26:48 wiz Exp $ */ +/* $NetBSD: xml.c,v 1.1.1.5 2008/09/02 07:50:51 christos Exp $ */ /* xml.c -- xml output. - Id: xml.c,v 1.37 2004/03/01 15:45:18 dirt Exp + Id: xml.c,v 1.52 2004/12/19 17:02:23 karl Exp - Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004 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 @@ -48,6 +48,7 @@ element texinfoml_element_list [] = { { "setfilename", 0, 0, 0 }, { "titlefont", 0, 0, 0 }, { "settitle", 0, 0, 0 }, + { "documentdescription", 1, 0, 0 }, { "node", 1, 0, 0 }, { "nodenext", 0, 0, 0 }, @@ -93,6 +94,10 @@ element texinfoml_element_list [] = { { "acronymword", 0, 1, 0 }, { "acronymdesc", 0, 1, 0 }, + { "abbrev", 0, 1, 0 }, + { "abbrevword", 0, 1, 0 }, + { "abbrevdesc", 0, 1, 0 }, + { "tt", 0, 1, 0 }, { "code", 0, 1, 0 }, { "command", 0, 1, 0 }, @@ -113,6 +118,8 @@ element texinfoml_element_list [] = { { "i", 0, 1, 0 }, { "b", 0, 1, 0 }, { "r", 0, 1, 0 }, + { "slanted", 0, 1, 0 }, + { "sansserif", 0, 1, 0 }, { "exdent", 0, 0, 0 }, @@ -254,6 +261,7 @@ element docbook_element_list [] = { { "", 0, 0, 0 }, /* SETFILENAME */ { "", 0, 0, 0 }, /* TITLEINFO */ { "title", 0, 0, 0 }, /* SETTITLE */ + { "", 1, 0, 0 }, /* DOCUMENTDESCRIPTION (?) */ { "", 1, 0, 0 }, /* NODE */ { "", 0, 0, 0 }, /* NODENEXT */ @@ -299,6 +307,10 @@ element docbook_element_list [] = { { "", 0, 1, 0 }, /* ACRONYMWORD */ { "", 0, 1, 0 }, /* ACRONYMDESC */ + { "abbrev", 0, 1, 0 }, + { "", 0, 1, 0 }, /* ABBREVWORD */ + { "", 0, 1, 0 }, /* ABBREVDESC */ + { "literal", 0, 1, 0 }, /* TT */ { "literal", 0, 1, 0 }, /* CODE */ { "command", 0, 1, 0 }, /* COMMAND */ @@ -609,7 +621,7 @@ xml_begin_document (char *output_filename) print_warnings = save_print_warnings; } - insert_string ("?>"); + insert_string ("?>\n"); if (docbook) { @@ -1598,9 +1610,36 @@ xml_insert_text_file (char *name_arg) free (fullname); } +/* If NAME.EXT is accessible or FORCE is nonzero, insert a docbook + imagedata element for FMT. Return 1 if inserted something, 0 else. */ + +static int +try_docbook_image (const char *name, const char *ext, const char *fmt, + int force) +{ + int used = 0; + char *fullname = xmalloc (strlen (name) + 1 + strlen (ext) + 1); + sprintf (fullname, "%s.%s", name, ext); + + if (force || access (fullname, R_OK) == 0) + { + xml_insert_element (IMAGEOBJECT, START); + xml_insert_element_with_attribute (IMAGEDATA, START, + "fileref=\"%s\" format=\"%s\"", fullname, fmt); + xml_insert_element (IMAGEDATA, END); + xml_insert_element (IMAGEOBJECT, END); + used = 1; + } + + free (fullname); + return used; +} + + void xml_insert_docbook_image (char *name_arg) { + int found = 0; int elt = xml_in_para ? INLINEIMAGE : MEDIAOBJECT; if (is_in_insertion_of_type (floatenv)) @@ -1612,20 +1651,27 @@ xml_insert_docbook_image (char *name_arg) xml_insert_element (elt, START); - xml_insert_element (IMAGEOBJECT, START); - xml_insert_element_with_attribute (IMAGEDATA, - START, "fileref=\"%s.eps\" format=\"EPS\"", name_arg); - xml_insert_element (IMAGEDATA, END); - xml_insert_element (IMAGEOBJECT, END); - - xml_insert_element (IMAGEOBJECT, START); - xml_insert_element_with_attribute (IMAGEDATA, - START, "fileref=\"%s.jpg\" format=\"JPG\"", name_arg); - xml_insert_element (IMAGEDATA, END); - xml_insert_element (IMAGEOBJECT, END); - + /* A selected few from http://docbook.org/tdg/en/html/imagedata.html. */ + if (try_docbook_image (name_arg, "eps", "EPS", 0)) + found++; + if (try_docbook_image (name_arg, "gif", "GIF", 0)) + found++; + if (try_docbook_image (name_arg, "jpg", "JPG", 0)) + found++; + if (try_docbook_image (name_arg, "jpeg", "JPEG", 0)) + found++; + if (try_docbook_image (name_arg, "pdf", "PDF", 0)) + found++; + if (try_docbook_image (name_arg, "png", "PNG", 0)) + found++; + if (try_docbook_image (name_arg, "svg", "SVG", 0)) + found++; + + /* If no luck so far, just assume we'll eventually have a jpg. */ + if (!found) + try_docbook_image (name_arg, "jpg", "JPG", 1); + xml_insert_text_file (name_arg); - xml_insert_element (elt, END); xml_no_para--; @@ -1693,14 +1739,14 @@ xml_insert_indexterm (char *indexterm, char *index) in_indexterm = 1; xml_insert_element (PRIMARY, START); if (primary) - execute_string (primary); + execute_string ("%s", primary); else - execute_string (indexterm); + execute_string ("%s", indexterm); xml_insert_element (PRIMARY, END); if (primary) { xml_insert_element (SECONDARY, START); - execute_string (secondary); + execute_string ("%s", secondary); xml_insert_element (SECONDARY, END); } xml_insert_element (INDEXTERM, END); @@ -1864,7 +1910,7 @@ xml_insert_indexentry (char *entry, char *node) { xml_insert_element (SECONDARYIE, END); xml_insert_element (SECONDARYIE, START); - execute_string (secondary); + execute_string ("%s", secondary); } else { @@ -1872,10 +1918,10 @@ xml_insert_indexentry (char *entry, char *node) xml_insert_element (INDEXENTRY, START); in_indexentry = 1; xml_insert_element (PRIMARYIE, START); - execute_string (primary); + execute_string ("%s", primary); xml_insert_element (PRIMARYIE, END); xml_insert_element (SECONDARYIE, START); - execute_string (secondary); + execute_string ("%s", secondary); in_secondary = 1; } } @@ -1885,7 +1931,7 @@ xml_insert_indexentry (char *entry, char *node) xml_insert_element (INDEXENTRY, START); in_indexentry = 1; xml_insert_element (PRIMARYIE, START); - execute_string (entry); + execute_string ("%s", entry); } add_word (", "); diff --git a/gnu/dist/texinfo/makeinfo/xml.h b/gnu/dist/texinfo/makeinfo/xml.h index 56def2a0234..27517f3b90c 100644 --- a/gnu/dist/texinfo/makeinfo/xml.h +++ b/gnu/dist/texinfo/makeinfo/xml.h @@ -1,9 +1,9 @@ -/* $NetBSD: xml.h,v 1.1.1.2 2004/07/12 23:26:48 wiz Exp $ */ +/* $NetBSD: xml.h,v 1.1.1.3 2008/09/02 07:50:51 christos Exp $ */ /* xml.h -- xml output declarations. - Id: xml.h,v 1.13 2004/02/27 03:29:47 dirt Exp + Id: xml.h,v 1.24 2004/11/26 00:48:35 karl Exp - Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004 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 @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - Written by Philippe Martin <feloy@free.fr>. */ + Originally written by Philippe Martin <feloy@free.fr>. */ #ifndef XML_H #define XML_H @@ -51,24 +51,25 @@ extern int xml_keep_space; enum xml_element { - TEXINFO=0, SETFILENAME, TITLEFONT, SETTITLE, + TEXINFO=0, SETFILENAME, TITLEFONT, SETTITLE, DOCUMENTDESCRIPTION, /* Node */ - NODE /* 4 */, NODENEXT, NODEPREV, NODEUP, + NODE, NODENEXT, NODEPREV, NODEUP, /* Structuring */ - CHAPTER /* 8 */, SECTION, SUBSECTION, SUBSUBSECTION, - TOP /* 12 */, UNNUMBERED, UNNUMBEREDSEC, UNNUMBEREDSUBSEC, + CHAPTER, SECTION, SUBSECTION, SUBSUBSECTION, + TOP, UNNUMBERED, UNNUMBEREDSEC, UNNUMBEREDSUBSEC, UNNUMBEREDSUBSUBSEC, - APPENDIX /* 17 */, APPENDIXSEC, APPENDIXSUBSEC, APPENDIXSUBSUBSEC, - MAJORHEADING /* 21 */, CHAPHEADING, HEADING, SUBHEADING, SUBSUBHEADING, + APPENDIX, APPENDIXSEC, APPENDIXSUBSEC, APPENDIXSUBSUBSEC, + MAJORHEADING, CHAPHEADING, HEADING, SUBHEADING, SUBSUBHEADING, /* Titlepage */ - TITLEPAGE /* 26 */, AUTHOR, BOOKTITLE, BOOKSUBTITLE, + TITLEPAGE, AUTHOR, BOOKTITLE, BOOKSUBTITLE, /* Menu */ - MENU /* 30 */, DETAILMENU, MENUENTRY, MENUTITLE, MENUCOMMENT, MENUNODE, + MENU, DETAILMENU, MENUENTRY, MENUTITLE, MENUCOMMENT, MENUNODE, NODENAME, /* -- */ - ACRONYM/* 37 */, ACRONYMWORD, ACRONYMDESC, + ACRONYM, ACRONYMWORD, ACRONYMDESC, + ABBREV, ABBREVWORD, ABBREVDESC, TT, CODE, COMMAND_TAG, ENV, FILE_TAG, OPTION, SAMP, KBD, URL, KEY, - VAR, SC, DFN, EMPH, STRONG, CITE, NOTFIXEDWIDTH, I, B, R, + VAR, SC, DFN, EMPH, STRONG, CITE, NOTFIXEDWIDTH, I, B, R, SLANTED, SANSSERIF, EXDENT, TITLE, IFINFO, diff --git a/gnu/dist/texinfo/makeinfo/xref.c b/gnu/dist/texinfo/makeinfo/xref.c index bd95736eac5..481ce89b90c 100644 --- a/gnu/dist/texinfo/makeinfo/xref.c +++ b/gnu/dist/texinfo/makeinfo/xref.c @@ -1,7 +1,7 @@ -/* $NetBSD: xref.c,v 1.1.1.1 2004/07/12 23:26:48 wiz Exp $ */ +/* $NetBSD: xref.c,v 1.1.1.2 2008/09/02 07:50:51 christos Exp $ */ /* xref.c -- cross references for Texinfo. - Id: xref.c,v 1.12 2004/03/18 22:54:48 karl Exp + Id: xref.c,v 1.4 2004/12/21 17:28:35 karl Exp Copyright (C) 2004 Free Software Foundation, Inc. @@ -51,7 +51,7 @@ add_xref_punctuation (void) add_char ('.'); else if (next_char != ',' && next_char != '.') /* period and comma terminate xrefs, and nothing else. Instead - of generating an Info references that can't be followed, + of generating an Info reference that can't be followed, though, just insert a period. Not pretty, but functional. */ add_char ('.'); } @@ -144,7 +144,7 @@ cm_xref (int arg) xml_insert_element_with_attribute (XREFNODENAME, START, "linkend=\"%s\"", arg1_id); free (arg1_id); - execute_string (*arg3 ? arg3 : arg2); + execute_string ("%s", *arg3 ? arg3 : arg2); xml_insert_element (XREFNODENAME, END); } else @@ -174,30 +174,30 @@ cm_xref (int arg) xml_insert_element (XREF, START); xml_insert_element (XREFNODENAME, START); - execute_string (arg1); + execute_string ("%s", arg1); xml_insert_element (XREFNODENAME, END); if (*arg2) { xml_insert_element (XREFINFONAME, START); - execute_string (arg2); + execute_string ("%s", arg2); xml_insert_element (XREFINFONAME, END); } if (*arg3) { xml_insert_element (XREFPRINTEDDESC, START); - execute_string (arg3); + execute_string ("%s", arg3); xml_insert_element (XREFPRINTEDDESC, END); } if (*arg4) { xml_insert_element (XREFINFOFILE, START); - execute_string (arg4); + execute_string ("%s", arg4); xml_insert_element (XREFINFOFILE, END); } if (*arg5) { xml_insert_element (XREFPRINTEDNAME, START); - execute_string (arg5); + execute_string ("%s", arg5); xml_insert_element (XREFPRINTEDNAME, END); } xml_insert_element (XREF, END); @@ -273,7 +273,7 @@ cm_xref (int arg) add_anchor_name (tem, 1); free (tem); add_word ("\">"); - execute_string ("%s (%s)",ref_name, *arg5 ? arg5 : file_arg); + execute_string ("%s",ref_name); add_word ("</a>"); } else @@ -437,16 +437,16 @@ cm_inforef (int arg) { xml_insert_element (INFOREF, START); xml_insert_element (INFOREFNODENAME, START); - execute_string (node); + execute_string ("%s", node); xml_insert_element (INFOREFNODENAME, END); if (*pname) { xml_insert_element (INFOREFREFNAME, START); - execute_string (pname); + execute_string ("%s", pname); xml_insert_element (INFOREFREFNAME, END); } xml_insert_element (INFOREFINFONAME, START); - execute_string (file); + execute_string ("%s", file); xml_insert_element (INFOREFINFONAME, END); xml_insert_element (INFOREF, END); @@ -499,29 +499,29 @@ cm_uref (int arg) xml_insert_element_with_attribute (UREF, START, "url=\"%s\"", text_expansion (url)); if (*replacement) - execute_string (replacement); + execute_string ("%s", replacement); else if (*desc) - execute_string (desc); + execute_string ("%s", desc); else - execute_string (url); + execute_string ("%s", url); xml_insert_element (UREF, END); } else if (xml) { xml_insert_element (UREF, START); xml_insert_element (UREFURL, START); - execute_string (url); + execute_string ("%s", url); xml_insert_element (UREFURL, END); if (*desc) { xml_insert_element (UREFDESC, START); - execute_string (desc); + execute_string ("%s", desc); xml_insert_element (UREFDESC, END); } if (*replacement) { xml_insert_element (UREFREPLACEMENT, START); - execute_string (replacement); + execute_string ("%s", replacement); xml_insert_element (UREFREPLACEMENT, END); } xml_insert_element (UREF, END); @@ -578,19 +578,19 @@ cm_email (int arg) { xml_insert_element_with_attribute (EMAIL, START, "url=\"mailto:%s\"", addr); if (*name) - execute_string (name); + execute_string ("%s", name); xml_insert_element (EMAIL, END); } else if (xml) { xml_insert_element (EMAIL, START); xml_insert_element (EMAILADDRESS, START); - execute_string (addr); + execute_string ("%s", addr); xml_insert_element (EMAILADDRESS, END); if (*name) { xml_insert_element (EMAILNAME, START); - execute_string (name); + execute_string ("%s", name); xml_insert_element (EMAILNAME, END); } xml_insert_element (EMAIL, END); diff --git a/gnu/dist/texinfo/makeinfo/xref.h b/gnu/dist/texinfo/makeinfo/xref.h index 1cc8d5c08af..b1d25fa144e 100644 --- a/gnu/dist/texinfo/makeinfo/xref.h +++ b/gnu/dist/texinfo/makeinfo/xref.h @@ -1,7 +1,7 @@ -/* $NetBSD: xref.h,v 1.1.1.1 2004/07/12 23:26:47 wiz Exp $ */ +/* $NetBSD: xref.h,v 1.1.1.2 2008/09/02 07:50:51 christos Exp $ */ /* xref.h -- declarations for the cross references. - Id: xref.h,v 1.2 2004/02/13 22:01:39 dirt Exp + Id: xref.h,v 1.1 2004/04/11 17:56:47 karl Exp Copyright (C) 2004 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/missing b/gnu/dist/texinfo/missing index e7ef83a1c25..64b5f901dd5 100755 --- a/gnu/dist/texinfo/missing +++ b/gnu/dist/texinfo/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2003-09-02.23 +scriptversion=2004-09-07.08 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -60,11 +60,6 @@ case "$1" in msg="probably too old" fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -92,10 +87,12 @@ Supported PROGRAM values: yacc create \`y.tab.[ch]', if possible, from existing .[ch] Send bug reports to <bug-automake@gnu.org>." + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" + exit 0 ;; -*) @@ -104,12 +101,42 @@ Send bug reports to <bug-automake@gnu.org>." exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want @@ -119,11 +146,6 @@ WARNING: \`$1' is $msg. You should only need it if ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -133,11 +155,6 @@ WARNING: \`$1' is $msg. You should only need it if ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -157,11 +174,6 @@ WARNING: \`$1' is $msg. You should only need it if ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. @@ -173,11 +185,6 @@ WARNING: \`$1' is $msg. You should only need it if ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -254,11 +261,6 @@ WARNING: \`$1' is $msg. You should only need it if ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -279,11 +281,6 @@ WARNING: \`$1' is $msg. You should only need it if ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -301,10 +298,6 @@ WARNING: \`$1' is $msg. You should only need it if tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error diff --git a/gnu/dist/texinfo/po/cs.gmo b/gnu/dist/texinfo/po/cs.gmo Binary files differindex 5d27c41b63d..03297906b1c 100644 --- a/gnu/dist/texinfo/po/cs.gmo +++ b/gnu/dist/texinfo/po/cs.gmo diff --git a/gnu/dist/texinfo/po/cs.po b/gnu/dist/texinfo/po/cs.po index 8e8a420bd3b..14c7d5ef5b3 100644 --- a/gnu/dist/texinfo/po/cs.po +++ b/gnu/dist/texinfo/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: texinfo 4.0\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" "PO-Revision-Date: 2000-10-31 15:17+01:00\n" "Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -125,15 +125,15 @@ msgstr "Jedno doplnìní:\n" msgid "%d completions:\n" msgstr "%d doplnìní:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Vlo¾ení doplnìní" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Hledám doplnìní..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Odrolování obsahu okna s doplnìními" @@ -233,7 +233,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "Více informací mù¾ete získat pomocí pøepínaèe --help.\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, fuzzy, c-format msgid "" @@ -340,7 +340,7 @@ msgstr "" "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n" "zasílejte na adresu <cs@li.org> (èesky).\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 #, fuzzy msgid "" @@ -1121,7 +1121,7 @@ msgstr "Pøesun na konec øádku" msgid "Move to the start of the line" msgstr "Pøesun na zaèátek øádku" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "Dal¹í" @@ -1700,172 +1700,172 @@ msgstr "-%s%s-Info: (%s)%s, øádkù: %d --%s--" msgid " Subfile: %s" msgstr " Podsoubor: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: pøepínaè `%s' není jednoznaèný\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: pøepínaè `--%s' musí být zadán bez argumentu\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: pøepínaè `%c%s' musí být zadán bez argumentu\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: pøepínaè `%s' vy¾aduje argument\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: neznámý pøepínaè `--%s'\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: neznámý pøepínaè `%c%s'\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: neznámý pøepínaè -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: neznámý pøepínaè -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: pøepínaè vy¾aduje argument -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: pøepínaè `-W %s' musí být zadán bez argumentu\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, fuzzy, c-format msgid "arguments to @%s ignored" msgstr "©patný argument pro %c%s" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "Leden" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "Únor" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "Bøezen" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "Duben" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "Kvìten" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "Èerven" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "Èervenec" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "Srpen" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "Záøí" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "Øíjen" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "Listopad" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "Prosinec" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "nepravdìpodobný znak %c ve @var" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "@sc argument je celý velkými písmeny, zbyteènì" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, fuzzy, c-format msgid "`{' expected, but saw `%c'" msgstr "`@end' vy¾aduje `%s', ale vidí `%s'" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, fuzzy, c-format msgid "`}' expected, but saw `%c'" msgstr "`@end' vy¾aduje `%s', ale vidí `%s'" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "Pøíkaz %c%s je zastaralý" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp vy¾aduje kladný èíselný argument a ne `%s'" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "©patný argument pro %c%s" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "none" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, fuzzy, c-format msgid "Bad argument to @%s" msgstr "©patný argument pro %c%s" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "" @@ -1902,12 +1902,12 @@ msgid "Method" msgstr "Metoda" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "z" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "" @@ -1916,22 +1916,22 @@ msgstr "" msgid "Must be in `@%s' environment to use `@%s'" msgstr "" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "" @@ -1972,11 +1972,11 @@ msgstr "" msgid "Untitled" msgstr "Neoznaèeno" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, fuzzy, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "%s: neznámý pøepínaè `--%s'\n" @@ -1986,45 +1986,45 @@ msgstr "%s: neznámý pøepínaè `--%s'\n" msgid "Unknown index `%s'" msgstr "Neznámý rejstøík `%s'" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "Rejstøík `%s' ji¾ existuje" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Neznámý rejstøík `%s' a/nebo `%s' v @synindex" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Neznámý rejstøík `%s' v @printindex" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "Polo¾ka pro rejstøík `%s' je mimo v¹echny uzly" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(mimo v¹echny uzly)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "Viz" @@ -2060,105 +2060,105 @@ msgstr "" msgid "`@end' expected `%s', but saw `%s'" msgstr "`@end' vy¾aduje `%s', ale vidí `%s'" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "Chybí odpovídající `%cend %s'" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s vy¾aduje písmeno nebo èíslici" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, fuzzy, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "@%s není myslitelné uvnitø `@%s' bloku" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" "proto¾e vá¹ uzel @top by mìl být uzavøen v @ifnottex spí¹e ne¾ v @ifinfo?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu spatøeno pøed prvním uzlem, vytvoøen uzel `Top'" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, fuzzy, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "@%s není myslitelné uvnitø `@%s' bloku" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "Nepárový `%c%s'" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "`%c%s' potøebuje nìjaký argument" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, fuzzy, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "Chybný argument pro `%s', `%s', pou¾ívám `%s'" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s není myslitelné uvnitø `@%s' bloku" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "@itemx není myslitelný uvnitø `%s' bloku" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s nalezen mimo vkládaný blok" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s není platný kód jazyka (podle ISO 639)" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, fuzzy, c-format msgid "unrecognized encoding name `%s'" msgstr "%s: neznámý pøepínaè `--%s'\n" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s vy¾aduje `i' nebo `j' jako argument, ne `%c'" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s vy¾aduje jeden znak `i' nebo `j' jako argument" @@ -2202,33 +2202,33 @@ msgstr "pomíchané @end %s s @%s" msgid "Too many errors! Gave up.\n" msgstr "Pøíli¹ mnoho chyb! Konec.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: varování: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "©patnì umístìný znak %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Více informací získáte pøíkazem `%s --help'.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, fuzzy, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" msgstr "" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2243,7 +2243,7 @@ msgid "" " --version display version information and exit.\n" msgstr "" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2253,7 +2253,7 @@ msgid "" " --plaintext output plain text rather than Info.\n" msgstr "" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2269,7 +2269,7 @@ msgid "" " -o, --output=FILE output to FILE (directory if split HTML),\n" msgstr "" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2288,14 +2288,14 @@ msgid "" " --split-size=NUM split Info files at size NUM (default %d).\n" msgstr "" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" " read stdin if FILE is -.\n" msgstr "" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2305,7 +2305,7 @@ msgid "" "dropped.\n" msgstr "" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2315,7 +2315,7 @@ msgid "" " -U VAR undefine the variable VAR, as with @clear.\n" msgstr "" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2331,9 +2331,11 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2342,7 +2344,7 @@ msgid "" " if generating XML, --ifxml is on and the others are off.\n" msgstr "" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 #, fuzzy msgid "" "Examples:\n" @@ -2379,84 +2381,84 @@ msgstr "" "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n" "zasílejte na <cs@li.org> (èesky)." -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: %s argument musí být èíslo ne `%s'.\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, fuzzy, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, fuzzy, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: argument pro --paragraph-indent musí být èíslo|`none'|`asis', ale ne `%" "s'.\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s: argument k --footnote-style musí být `separate'|`end', ale ne `%s'.\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: chybí argument jména souboru.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "Oèekáváno `%s'" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "Soubor `%s' nenalezen v `%s'" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" "%s: Vynechávám expanzi makra na stdout a expanze jde jako Info výstup.\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "Vytváøím %s soubor `%s' ze souboru `%s'.\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "" "Toto je Info soubor %s, produkován programem makeinfo verze %s ze souboru %" "s.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2464,81 +2466,81 @@ msgstr "" "%s: Výstupní soubor maker `%s' byl odstranìn, proto¾e byly nalezeny chyby;\n" "u¾ijte pøepínaè --force k ponechání souboru.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: Výstupní soubor `%s' byl odstranìn, proto¾e byly nalezeny chyby;\n" "u¾ijte pøepínaè --force k ponechání souboru.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "Neznámý pøíkaz `%s'" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "Pou¾ijte závorky k zadání pøíkazu jako argumentu @%s" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, fuzzy, c-format msgid "%c%s expected braces" msgstr "%c%s oèekáváno `{...}'" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "Nepárová }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "Funkce neexistuje!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s chybìjící uzavírací závorka" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, fuzzy, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, fuzzy, c-format msgid "No such file `%s'" msgstr "Soubor `%s' nenalezen v `%s'" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, fuzzy, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "pøíkaz @image postrádá jméno souboru" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{Pro `%s' není hodnota}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s po¾aduje jméno" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "Vstupní soubor skonèil a pøíkaz `@end %s' nebyl nalezen" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "" @@ -2581,129 +2583,129 @@ msgstr "* sloupec #%d: výstup = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "Uzel `%s' ji¾ byl definován na øádku %d" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "Formátování uzlu %s...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, fuzzy, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "Uzel `%s' vy¾aduje pøíkaz na vytváøení sekcí (tøeba %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "Pøíkazu `%c%s' nebyl zadán název uzlu" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "Dal¹í:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "Pøedchozí:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "Nahoru:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, fuzzy, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "%s se odkazuje na neexistující uzel `%s'" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "Menu" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "Odkaz" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, fuzzy, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "Následující uzel uzlu `%s' neukazuje na tento" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "Tento uzel (%s) má chybný odkaz na pøedchozí uzel" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "Pøedchozí" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "Pøedchozí uzel uzlu `%s' neukazuje na tento" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "Tento uzel (%s) má chybný odkaz na následující uzel" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "Nahoru" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" "Uzel `%s' postrádá polo¾ku menu pro `%s' navzdory tomu, ¾e je jeho vy¹¹ím " "uzlem" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "na uzel `%s' se bylo odkazováno %d krát" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "uzel `%s' - nesmìøuje na nìj ¾ádný odkaz" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, fuzzy, c-format msgid "Can't remove file `%s': %s" msgstr "Výstupní soubor `%s' nelze vytvoøit." @@ -2751,12 +2753,12 @@ msgstr "Obsah" msgid "Short Contents" msgstr "Krátký obsah" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/da.gmo b/gnu/dist/texinfo/po/da.gmo Binary files differindex 091810cf7f1..55e147567a4 100644 --- a/gnu/dist/texinfo/po/da.gmo +++ b/gnu/dist/texinfo/po/da.gmo diff --git a/gnu/dist/texinfo/po/da.po b/gnu/dist/texinfo/po/da.po index 487fdceaaa1..1b5524a8bc1 100644 --- a/gnu/dist/texinfo/po/da.po +++ b/gnu/dist/texinfo/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: texinfo 4.2e\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" "PO-Revision-Date: 2002-11-08 09:13GMT\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -124,15 +124,15 @@ msgstr "Én afslutning:\n" msgid "%d completions:\n" msgstr "%d afslutninger:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Indsæt afslutning" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Opbygger afslutninger..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Rul afslutningsvinduet" @@ -228,7 +228,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "Prøv --help for mere information.\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, fuzzy, c-format msgid "" @@ -325,7 +325,7 @@ msgstr "" "tilvalg\n" " info -f ./xxx.info vis filen ./xxx.info uden at søge i katalog\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1119,7 +1119,7 @@ msgstr "Gå til linjeslutning" msgid "Move to the start of the line" msgstr "Gå til linjestart" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "Næste" @@ -1693,172 +1693,172 @@ msgstr "-%s%s-Info: (%s)%s, %d linjer -%s--" msgid " Subfile: %s" msgstr " Underfil: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: tilvalg '%s' er flertydig\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: tilvalg '--%s' tillader ikke en parameter\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: tilvalg '%c%s' tillader ikke en parameter\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: tilvalg '%s' kræver en parameter\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ukendt tilvalg '--%s'\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ukendt tilvalg '%c%s'\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ugyldigt tilvalg -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ugyldigt tilvalg -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: tilvalg kræver en parameter -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: tilvalg '-W %s' er flertydigt\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: tilvalg '-W %s' tillader ikke en parameter\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, fuzzy, c-format msgid "arguments to @%s ignored" msgstr "Ugyldigt argument til %c%s" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "januar" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "februar" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "marts" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "april" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "maj" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "juni" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "juli" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "august" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "september" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "oktober" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "november" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "december" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "usandsynligt tegn %c i @var" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "@sc parameter er kun versaler, derfor ingen virkning" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "'{' forventedes, men fandt '%c'" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "filslutning inden i en verb-blok" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "'}' forventedes, men fandt '%c'" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s er forældet" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp kræver et positivt tal, ikke '%s'" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "Ugyldigt argument til %c%s" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "none" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, fuzzy, c-format msgid "Bad argument to @%s" msgstr "Ugyldigt argument til %c%s" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "" @@ -1895,12 +1895,12 @@ msgid "Method" msgstr "Metode" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "for" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "på" @@ -1909,22 +1909,22 @@ msgstr "på" msgid "Must be in `@%s' environment to use `@%s'" msgstr "Skal være i '%s' indsætning for at bruge '%sx'" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "" @@ -1964,11 +1964,11 @@ msgstr "" msgid "Untitled" msgstr "Uden titel" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "[uventet] ingen html-mærker at \"pop\"'e" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "[uventet] ugyldigt emnenavn: '%s'" @@ -1978,45 +1978,45 @@ msgstr "[uventet] ugyldigt emnenavn: '%s'" msgid "Unknown index `%s'" msgstr "Ukendt indeks '%s'" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "Info kan ikke håndtere ':' i indeksindgangen '%s'" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "Indeks '%s' eksisterer allerede" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Ukendt indeks '%s' og/eller '%s' i @synindex" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Ukendt indeks '%s' i @printindex" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "Indgang til indeks '%s' udenfor et emne" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(udenfor et emne)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "Se " @@ -2052,104 +2052,104 @@ msgstr "" msgid "`@end' expected `%s', but saw `%s'" msgstr "'@end' forventede '%s', men fandt '%s'" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "Mangler en tilsvarende '%cend %s'" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s kræver et bogstav eller ciffer" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "filslutning indeni en verbatim-blok" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, fuzzy, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "@%s giver ingen mening i en '@%s'-blok" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu fundet før første @node, opretter 'Top' emne" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "måske skulle dit @top emne indsættes i @ifnottex i stedet for @ifinfo?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu fundet før første emne, opretter emnet 'Top'" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, fuzzy, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "@%s giver ingen mening i en '@%s'-blok" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "Uparret '%c%s'" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "'%c%s' kræver noget efterfølgende" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, fuzzy, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "Ugyldigt parameter '%s', '%s', benytter '%s'" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s giver ingen mening i en '@%s'-blok" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "@itemx giver ingen mening i en '%s'-blok" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s fundet udenfor en indsætningsblok" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s er ikke en gyldig ISO 639 sprogkode" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, fuzzy, c-format msgid "unrecognized encoding name `%s'" msgstr "ukendt indkodningsnavn '%s'" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "beklager, indkodningen '%s' understøttes ikke" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "ugyldig indkodet tegn '%s'" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s kræver 'i' eller 'j' som parameter, ikke '%c'" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s kræver et enkelt tegn 'i' eller 'j' som parameter" @@ -2193,27 +2193,27 @@ msgstr "uparret @end %s med @%s" msgid "Too many errors! Gave up.\n" msgstr "For mange fejl! Gav op.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: advarsel: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "Fejlplaceret %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv '%s --help' for mere information.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Brug: %s [TILVALG]... TEXINFO-FIL...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2223,7 +2223,7 @@ msgstr "" "Info-filer, der er lavet til at blive læst på skærmen med Emacs eller GNU " "Info.\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2248,7 +2248,7 @@ msgstr "" " -v, --verbose forklar, hvad der sker.\n" " --version vis versionsoplysninger og afslut.\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, fuzzy, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2262,7 +2262,7 @@ msgstr "" " --html lav HTML i stedet for Info.\n" " --xml lav Texinfo XML i stedet for Info.\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2288,7 +2288,7 @@ msgstr "" " --number-sections lav afsnits- og sektionsnumre.\n" " -o, --output=FILE send til FIL (katalog i tilfældet opdelt HTML),\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2326,14 +2326,14 @@ msgstr "" " --split-size=ANTAL opdel Info-filer ved størrelsen ANTAL " "(standard %d).\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" " read stdin if FILE is -.\n" msgstr "" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2343,7 +2343,7 @@ msgid "" "dropped.\n" msgstr "" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 #, fuzzy msgid "" "Input file options:\n" @@ -2361,7 +2361,7 @@ msgstr "" "søgestien.\n" " -U VAR afdefinér variablen VAR som med @clear.\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 #, fuzzy msgid "" "Conditional processing in input:\n" @@ -2378,6 +2378,8 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "Betinget behandling i inddata:\n" " --ifhtml behandl @ifhtml og @html selvom der ikke laves HTML.\n" @@ -2391,7 +2393,7 @@ msgstr "" " --no-iftex behandl ikke @iftex og @tex-tekst.\n" " --no-ifxml behandl ikke @ifxml og @xml-tekst.\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 #, fuzzy msgid "" " The defaults for the @if... conditionals depend on the output format:\n" @@ -2407,7 +2409,7 @@ msgstr "" " hvis der laves ren tekst er --ifplaintext aktiveret og de andre " "deaktiverede.\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2431,161 +2433,161 @@ msgstr "" " makeinfo --number-sections xxx.texi skriv Info med nummererede afsnit\n" " makeinfo --no-split xxx.texi skriv én Info-fil, uanset størrelsen\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: %s parameter skal være et tal, ikke '%s'.\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, fuzzy, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, fuzzy, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: --paragraph-indent parameter skal være tal/'none'/'asis', ikke '%s'.\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s: --footnote-style parameter skal være 'separate' eller 'end', ikke '%s'.\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: mangler filparameter.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "Forventede '%s'" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "Kan ikke oprette kataloget '%s': %s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "Ingen '%s' fundet i '%s'" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" "%s: Undlader makroudfoldelse til standard-ud, da Info-uddata sendes der.\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "Producerer %s file '%s' ud fra '%s'.\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "Dette er %s, produceret med makeinfo version %s ud fra %s.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: Fjerner makro uddatafil '%s' grundet fejl; brug --force for at beholde.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: Fjerner uddatafil '%s' grundet fejl; brug --force for at beholde.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "Ukendt kommando '%s'" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "Benyt parenteser for at angive en kommando som parameter til @%s" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, fuzzy, c-format msgid "%c%s expected braces" msgstr "%c%s forventede '{...}'" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "Uparret }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "INTET_NAVN!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s mangler højre parentes" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "@image-fil '%s' (for HTML) er ulæselig: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, fuzzy, c-format msgid "No such file `%s'" msgstr "Ingen '%s' fundet i '%s'" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "@image-fil '%s' (for tekst) er ulæselig: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "@image mangler filnavnsparameter" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{Ingen værdi for '%s'}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s kræver et navn" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "Nåede filslutning før samhørende @end %s" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "`%.40s...' er for langt til ekspansion; blev ikke ekspanderet" @@ -2628,128 +2630,128 @@ msgstr "* kolonne %d: uddata = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "Emne '%s' er tidligere defineret på linje %d" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "Formatterer emne %s...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, fuzzy, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "Emne '%s' kræver en sektionsopdelende kommando (f.eks. %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "Intet emnenavn angivet for '%c%s'-kommandoen" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "Mål '%s' og emne '%s' ender med at have samme filnavn" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "Denne @anchor-kommando er ignoreret; referencer til den vil ikke virke" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "Omdøb dette mål eller brug tilvalget '--no-split'" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "Uventet streng i slutningen af opdelt HTML-fil '%s'" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "Næste:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "Forrige:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "Op:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "Målene '%s' og '%s' ender med at have samme filnavn" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "@anchor-kommandoen ignoreres. Referencer til den vil ikke fungere" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, fuzzy, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "%s reference til ikke-eksisterende emne '%s'" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "Menu" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "Kryds" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, fuzzy, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "'Næste'-felt i emne '%s' blive ikke peget på" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "Dette emne (%s) har den ugyldige 'Forrige'" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "Forrige" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "Feltet 'Forrige' i emne '%s' bliver ikke peget på" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "Dette emne (%s) har den ugyldige 'Næste'-felt" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "Op" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" "Emnet '%s' mangler menupunkt for '%s' på trods af at det er dens 'Op'-mål" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "emne '%s' blev refereret %d gange" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "ikke-refereret emne '%s'" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, fuzzy, c-format msgid "Can't remove file `%s': %s" msgstr "Kan ikke oprette kataloget '%s': %s" @@ -2797,12 +2799,12 @@ msgstr "Indhold" msgid "Short Contents" msgstr "Kort indhold" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "@image-fil '%s' er ulæselig: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/de.gmo b/gnu/dist/texinfo/po/de.gmo Binary files differindex 947af6b63ae..af525d76fe9 100644 --- a/gnu/dist/texinfo/po/de.gmo +++ b/gnu/dist/texinfo/po/de.gmo diff --git a/gnu/dist/texinfo/po/de.po b/gnu/dist/texinfo/po/de.po index 526e437231c..6a63baa7534 100644 --- a/gnu/dist/texinfo/po/de.po +++ b/gnu/dist/texinfo/po/de.po @@ -59,10 +59,10 @@ # msgid "" msgstr "" -"Project-Id-Version: texinfo 4.6.93\n" +"Project-Id-Version: texinfo 4.7.91\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" -"PO-Revision-Date: 2004-04-06 11:46 +0200\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" +"PO-Revision-Date: 2004-12-13 11:53 +0100\n" "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n" "Language-Team: German <de@li.org>\n" "MIME-Version: 1.0\n" @@ -179,15 +179,15 @@ msgstr "Eine Vervollständigung:\n" msgid "%d completions:\n" msgstr "%d Vervollständigungen:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Vervollständigung einfügen" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Vervollständigungen werden erstellt..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Im Vervollständigungs-Fenster blättern" @@ -238,7 +238,7 @@ msgstr "Keine Index-Einträge." # checkit # kann im Deutschen nachgebildet werden, aber... -ke- #: info/indices.c:375 -#, fuzzy, c-format +#, c-format msgid "No %sindex entries containing `%s'." msgstr "Keine %sindex-Einträge enthalten „%s“." @@ -251,17 +251,17 @@ msgid "CAN'T SEE THIS" msgstr "DIES IST NICHT ZU SEHEN" #: info/indices.c:422 -#, fuzzy, c-format +#, c-format msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)" msgstr "„%s“ in %s gefunden. (Nächster Eintrag mit „\\[next-index-match]“.)" #: info/indices.c:541 -#, fuzzy, c-format +#, c-format msgid "Scanning indices of `%s'..." msgstr "Indizes von „%s“ werden durchsucht..." #: info/indices.c:596 -#, fuzzy, c-format +#, c-format msgid "No available info files have `%s' in their indices." msgstr "Keine der verfügbaren Info-Dateien hat „%s“ in ihren Indizes." @@ -276,7 +276,7 @@ msgid "Index apropos: " msgstr "Index-Apropos: " #: info/indices.c:654 -#, fuzzy, c-format +#, c-format msgid "" "\n" "* Menu: Nodes whose indices contain `%s':\n" @@ -290,7 +290,7 @@ msgid "Try --help for more information.\n" msgstr "„--help“ gibt weitere Informationen.\n" # Hier de-Standard-Formulierung einsetzen! -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, c-format msgid "" @@ -398,7 +398,7 @@ msgstr "" " beginnen\n" " info -f ./foo.info datei ./foo.info anzeigen\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1212,7 +1212,7 @@ msgstr "Zum Ende dieser Zeile bewegen" msgid "Move to the start of the line" msgstr "Zum Anfang der Zeile bewegen" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "nächstes" @@ -1689,7 +1689,7 @@ msgid "\"%s\" is invalid" msgstr "„%s“ ist ungültig" #: info/session.c:4495 -#, fuzzy, c-format +#, c-format msgid "`%s' is invalid" msgstr "„%s“ ist ungültig" @@ -1801,174 +1801,174 @@ msgstr "-%s%s-Info: (%s)%s, %d Zeilen --%s--" msgid " Subfile: %s" msgstr " Unterdatei: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: Option „%s“ ist nicht eindeutig\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: Option „--%s“ erlaubt kein Argument\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: Option „%c%s“ erlaubt kein Argument\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: Option „%s“ benötigt ein Argument\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: nicht erkannte Option „--%s“\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: nicht erkannte Option „%c%s“\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ungültige Option -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ungültige Option -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: Option benötigt ein Argument -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: Option „-W %s“ ist nicht eindeutig\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: Option „-W %s“ erlaubt kein Argument\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, c-format msgid "arguments to @%s ignored" msgstr "Argumente zu @%s ignoriert" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "Januar" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "Februar" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "März" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "April" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "Mai" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "Juni" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "Juli" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "August" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "September" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "Oktober" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "November" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "Dezember" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "wahrscheinlich falsches Zeichen „%c“ in @var" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "Argument von @sc besteht nur aus Großbuchstaben, somit keine Wirkung" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "„{“ erwartet, jedoch „%c“ bekommen" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "Dateiende innerhalb eines @verb-Blocks" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "„}“ erwartet, jedoch „%c“ bekommen" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -"@strong{Bemerkung:} erzeugt einen Pseudo-Querverweis in Info; umformulieren, " -"um das zu vermeiden" +"@strong{Bemerkung...} erzeugt einen Pseudo-Querverweis in Info; " +"umformulieren, um das zu vermeiden" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s ist obsolet" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp erfordert ein positives numerisches Argument, nicht „%s“" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "Fehlerhaftes Argument zu %c%s" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "genau" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "kein" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, c-format msgid "Bad argument to @%s" msgstr "Fehlerhafte Argumente zu @%s" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "Einfügen" @@ -2008,12 +2008,12 @@ msgid "Method" msgstr "Methode" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "aus" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "ein" @@ -2022,22 +2022,22 @@ msgstr "ein" msgid "Must be in `@%s' environment to use `@%s'" msgstr "Muss in einer „@%s“-Umgebung sein, um „@%s“ zu benutzen" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "„%s“ weggelassen vor Ausgabedateiname" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "„%s“ weggelassen, da in Standardausgabe geschrieben wird" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "Ausgabepuffer nicht leer." @@ -2078,11 +2078,11 @@ msgstr "%s:%d: CSS-Datei endete inmitten eines Kommentars" msgid "Untitled" msgstr "Ohne Titel" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "[unerwartet] kein HTML-Tag für Pop-Operation" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "[unerwartet] ungültiger Knotenname: „%s“" @@ -2092,45 +2092,45 @@ msgstr "[unerwartet] ungültiger Knotenname: „%s“" msgid "Unknown index `%s'" msgstr "Unbekannter Index „%s“" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "Info kann nicht mit „:“ im Indexeintrag „%s“ umgehen" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "Index „%s“ existiert bereits" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Unbekannter Index „%s“ und/oder „%s“ in @synindex" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "(Zeile )" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "(Zeile %*d)" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Unbekannter Index „%s“ in @printindex" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "Eintrag für Index „%s“ außerhalb jeglichen Knotens" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(außerhalb jeglichen Knotens)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "Siehe " @@ -2170,108 +2170,108 @@ msgstr "%cfloat-Umgebungen können nicht verschachtelt sein" msgid "`@end' expected `%s', but saw `%s'" msgstr "„@end“ erwartete „%s“, bekam jedoch „%s“" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "Kein übereinstimmendes „%cend %s“" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s benötigt einen Buchstaben oder eine Zahl" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "Dateiende innerhalb eines „Verbatim“-Blocks" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "@%s nicht sinnvoll außerhalb einer „@float“-Umgebung" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu vor ersten @node gefunden. „Top“-Knoten wird angelegt" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" "vielleicht sollte der @top-Knoten eher von @ifnottex als von @ifinfo " "umschlossen werden?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu vor ersten @node gefunden. „Top“-Knoten wird angelegt" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" "@%s nicht sinnvoll außerhalb von „@titlepage“- und „@quotation“-Umgebungen" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "@%s nicht sinnvoll außerhalb einer „@titlepage“-Umgebung" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "Nicht übereinstimmendes „%c%s“" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "„%c%s“ benötigt etwas nachfolgendes" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "Fehlerhaftes Argument „%s“ zu „@%s“, benutze „%s“" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s nicht sinnvoll innerhalb eines „@%s“-Blocks" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "@itemx nicht sinnvoll innerhalb eines „%s“-Blocks" # checkit -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s außerhalb eines Einfügungsblocks gefunden" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s ist kein gültiges ISO-639-Sprachkürzel" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, c-format msgid "unrecognized encoding name `%s'" msgstr "nicht erkannter Kodierungsname „%s“" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "Kodierung „%s“ wird leider nicht unterstützt." -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "Ungültiges kodiertes Zeichen: „%s“" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s erwartet „i“ oder „j“ als Argument, nicht „%c“" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s erwartet einen einzelnen Buchstaben „i“ oder „j“ als Argument" @@ -2316,27 +2316,27 @@ msgstr "@end %s stimmt nicht mit @%s überein" msgid "Too many errors! Gave up.\n" msgstr "Zu viele Fehler! Abbruch.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: Warnung: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "Fehlplazierte %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "„%s --help“ gibt weitere Informationen.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Aufruf: %s [OPTION]... TEXINFO-DATEI...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2345,7 +2345,7 @@ msgstr "" "standardmäßig in Info-Dateien, die online mit einem Info-Leser wie\n" "GNU Info (oder auch Emacs, TkInfo, etc.) gelesen werden können.\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2371,7 +2371,7 @@ msgstr "" " -v, --verbose ausführlich die Bearbeitungschritte anzeigen\n" " --version Programmversion anzeigen und beenden\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2386,7 +2386,7 @@ msgstr "" " --xml Texinfo XML anstelle von Info ausgeben\n" " --plaintext einfachen Text anstelle von Info ausgeben\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2417,7 +2417,7 @@ msgstr "" " -o, --output=DATEI Ausgabe nach DATEI (bzw. Verzeichnis wenn\n" " aufgeteiltes HTML)\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2455,7 +2455,7 @@ msgstr "" " --split-size=GRÖSSE in GRÖSSE große Dateien splitten (Standard %" "d)\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" @@ -2465,7 +2465,7 @@ msgstr "" " --css-include=DATEI DATEI in HTML-<style>-Ausgabe einfügen;\n" " aus Standardeingabe, wenn DATEI „-“ ist\n" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2480,7 +2480,7 @@ msgstr "" "wird\n" " ignorierbarer Leerraum weggelassen.\n" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2497,7 +2497,7 @@ msgstr "" "voranstellen\n" " -U VAR eine Variable aufheben (wie mit @clear)\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2513,6 +2513,8 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "Bedingte Verarbeitung in Eingabe:\n" " --ifdocbook @ifdocbook und @docbook bearbeiten, selbst wenn kein " @@ -2531,8 +2533,11 @@ msgstr "" " --no-ifplaintext @ifplaintext-Text nicht bearbeiten\n" " --no-iftex @iftex- und @tex-Text nicht bearbeiten\n" " --no-ifxml @ifxml und @xml nicht bearbeiten\n" +"\n" +" Außerdem werden bei den --no-ifFORMAT-Optionen auch die entsprechenden\n" +" @ifnoFORMAT-Abschnitte bearbeitet.\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2548,7 +2553,7 @@ msgstr "" " wird XML erzeugt, ist --ifxml an und die anderen sind aus.\n" # Die "." am Zeilenende habe ich entfernt. -ke- -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2579,84 +2584,84 @@ msgstr "" " makeinfo --no-split foo.texi nur eine Info-Datei (kann groß " "sein)\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "%s: Ignoriere nicht erkannten Wert „%s“ für TEXINFO_OUTPUT_FORMAT.\n" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: %s Argument muss numerisch sein, nicht „%s“.\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "%s: Makro-Expansions-Ausgabedatei „%s“ kann nicht geöffnet werden" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "%s: ignoriere zweite Makro-Expansions-Ausgabedatei „%s“.\n" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: Argument für --paragraph-indent muss numerisch, „none“ oder „asis“ sein, " "nicht „%s“.\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s: Argument für --footnote-style muss „separate“ oder „end“ sein, nicht „%" "s“.\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: Datei-Angabe fehlt.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "Mehrzeilen-Befehl %c%s inkorrekt verwendet" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "Habe „%s“ erwartet" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "Kann Verzeichnis „%s“ nicht anlegen: %s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "Kein „%s“ in „%s“ gefunden" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" "%s: Keine Makro-Auflösung nach der Standard-Ausgabe, da auch die Info-" "Ausgabe dorthin geht.\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "%s-Datei „%s“ von „%s“ wird erzeugt.\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "Dies ist %s, hergestellt von Makeinfo Version %s aus %s.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2664,84 +2669,84 @@ msgstr "" "%s: Entferne Makro-Ausgabe-Datei „%s“ wegen Fehler; --force benutzen, um " "Datei beizubehalten.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: Entferne Ausgabe-Datei „%s“ wegen Fehler; --force benutzen, um diese " "beizubehalten.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "Unbekannter Befehl „%s“" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "" "Geschweifte Klammern verwenden, um einen Befehl als Argument an „@%s“ zu " "geben" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, c-format msgid "%c%s expected braces" msgstr "%c%s erwartete geschweifte Klammern" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "Nicht übereinstimmende }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "Kein_NAME!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s fehlende schließende Klammer" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "@image-Datei „%s“ (für HTML) nicht lesbar: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, c-format msgid "No such file `%s'" msgstr "Kein Datei namens „%s“" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "@image-Datei „%s“ (für Text) nicht lesbar: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "@image fehlt als Argument ein Dateiname" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "undefiniertes Flag: %s" # checkit -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{Kein Wert für „%s“}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s erfordert einen Namen" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "Dateiende vor erforderlichem „@end %s“ erreicht" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "„%.40s...“ ist zum Expandieren zu lang; nicht expandiert" @@ -2785,141 +2790,141 @@ msgstr "* Spalte %d: Ausgabe = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "Knoten „%s“ bereits in Zeile %d definiert" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "Knoten „%s“ wird formatiert...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "Knoten „%s“ benötigt einen Abschnittsbefehl (z.B. %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "Kein Knotenname für den Befehl „%c%s“ angegeben" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "Anker „%s“ und Knoten „%s“ zeigen auf gleichen Dateinamen." -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" "Dieser @anchor-Befehl wird ignoriert, da Verweise auf ihn nicht funktionieren" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "Entweder diesen Anker umbenennen oder Option „--no-split“ verwenden" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "Unerwartete Zeichenkette am Ende der gesplitteten HTML-Datei „%s“" # HTML -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "nächstes:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "voriges:" # HTML -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "aufwärts:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "Anker „%s“ und „%s“ zeigen auf gleichen Dateinamen." -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "" "@anchor-Befehl wird ignoriert, da Referenzen auf ihn nicht funktionieren" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "" "%sverweis auf nicht existierenden Knoten „%s“ (vielleicht @section statt " "@subsection o.ä.?)" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "Menü" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "Quer" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" "Auf das Feld „nächstes“ (Next) des Knotens „%s“ wird nicht verwiesen " "(vielleicht @section statt @subsection o.ä.?)" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "" "Dieser Knoten (%s) hat den fehlerhaften Eintrag im Feld „voriges“ (Prev)" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "voriges" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "Auf das Feld „voriges“ (Prev) des Knotens „%s“ wird nicht verwiesen" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "" "Dieser Knoten (%s) hat den fehlerhaften Eintrag im Feld „nächstes“ (Next)" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "" "„%s“ hat kein Feld „aufwärts“ (Up) (vielleicht @section statt @subsection o." "ä.?)" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "aufwärts" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" "Dem Knoten „%s“ fehlt ein Menüeintrag für „%s“, obwohl er dessen Ziel für " "„aufwärts“ (Up) ist" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "Knoten „%s“ wurde %d mal referenziert" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "Nicht referenzierter Knoten „%s“" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "Entferne %s\n" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, c-format msgid "Can't remove file `%s': %s" msgstr "Kann Datei „%s“ nicht entfernen: %s" @@ -2930,7 +2935,7 @@ msgid "Appendix %c" msgstr "Anhang %c" #: makeinfo/sectioning.c:467 -#, fuzzy, c-format +#, c-format msgid "Internal error (search_sectioning) `%s'!" msgstr "Interner Fehler (search_sectioning) „%s“!" @@ -2967,12 +2972,12 @@ msgstr "Inhaltsverzeichnis" msgid "Short Contents" msgstr "Inhalt in Kurzform" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "@image-Datei „%s“ nicht lesbar: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" @@ -3260,19 +3265,3 @@ msgstr "Eintrag „%s“ direkt nach einem Untereintrag" #~ msgid "`%s' has no Up field" #~ msgstr "„%s“ hat kein „Up“-Feld" - -#, fuzzy -#~ msgid "\\%-10[scroll-forward] Scroll forward 1 line.\n" -#~ msgstr "\\%-10[scroll-forward] Eine Seite vorblättern.\n" - -#, fuzzy -#~ msgid "\\%-10[scroll-backward] Scroll backward 1 line.\n" -#~ msgstr "\\%-10[scroll-backward] Eine Seite zurückblättern.\n" - -#, fuzzy -#~ msgid "Basic Commands in Info Windows\n" -#~ msgstr "Befehle, die in Info-Fenstern verfügbar sind:\n" - -#, fuzzy -#~ msgid "Moving within a node:\n" -#~ msgstr "Bewegung innerhalb eines Knotens:\n" diff --git a/gnu/dist/texinfo/po/de_AT.gmo b/gnu/dist/texinfo/po/de_AT.gmo Binary files differindex 1196464c337..2e74709de3b 100644 --- a/gnu/dist/texinfo/po/de_AT.gmo +++ b/gnu/dist/texinfo/po/de_AT.gmo diff --git a/gnu/dist/texinfo/po/de_AT.po b/gnu/dist/texinfo/po/de_AT.po index c5545c4988b..51e8201c4cc 100644 --- a/gnu/dist/texinfo/po/de_AT.po +++ b/gnu/dist/texinfo/po/de_AT.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: texinfo 3.12d\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" "PO-Revision-Date: 1999-02-16 21:14+01:00\n" "Last-Translator: Karl Eichwalder <ke@suse.de>\n" "Language-Team: German <de@li.org>\n" @@ -126,15 +126,15 @@ msgstr "" msgid "%d completions:\n" msgstr "" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "" -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "" @@ -227,7 +227,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, c-format msgid "" @@ -285,7 +285,7 @@ msgid "" " info -f ./foo.info show file ./foo.info, not searching dir\n" msgstr "" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1000,7 +1000,7 @@ msgstr "" msgid "Move to the start of the line" msgstr "" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "" @@ -1569,172 +1569,172 @@ msgstr "" msgid " Subfile: %s" msgstr "" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, c-format msgid "arguments to @%s ignored" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "Jänner" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, c-format msgid "Bad argument to @%s" msgstr "" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "" @@ -1771,12 +1771,12 @@ msgid "Method" msgstr "" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "" @@ -1785,22 +1785,22 @@ msgstr "" msgid "Must be in `@%s' environment to use `@%s'" msgstr "" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "" @@ -1840,11 +1840,11 @@ msgstr "" msgid "Untitled" msgstr "" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "" @@ -1854,45 +1854,45 @@ msgstr "" msgid "Unknown index `%s'" msgstr "" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "" @@ -1928,104 +1928,104 @@ msgstr "" msgid "`@end' expected `%s', but saw `%s'" msgstr "" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, c-format msgid "unrecognized encoding name `%s'" msgstr "" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "" @@ -2069,33 +2069,33 @@ msgstr "" msgid "Too many errors! Gave up.\n" msgstr "" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "" -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" msgstr "" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2110,7 +2110,7 @@ msgid "" " --version display version information and exit.\n" msgstr "" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2120,7 +2120,7 @@ msgid "" " --plaintext output plain text rather than Info.\n" msgstr "" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2136,7 +2136,7 @@ msgid "" " -o, --output=FILE output to FILE (directory if split HTML),\n" msgstr "" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2155,14 +2155,14 @@ msgid "" " --split-size=NUM split Info files at size NUM (default %d).\n" msgstr "" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" " read stdin if FILE is -.\n" msgstr "" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2172,7 +2172,7 @@ msgid "" "dropped.\n" msgstr "" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2182,7 +2182,7 @@ msgid "" " -U VAR undefine the variable VAR, as with @clear.\n" msgstr "" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2198,9 +2198,11 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2209,7 +2211,7 @@ msgid "" " if generating XML, --ifxml is on and the others are off.\n" msgstr "" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2224,156 +2226,156 @@ msgid "" " makeinfo --no-split foo.texi write one Info file however big\n" msgstr "" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" msgstr "" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, c-format msgid "%c%s expected braces" msgstr "" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, c-format msgid "No such file `%s'" msgstr "" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "" @@ -2416,127 +2418,127 @@ msgstr "" msgid "Node `%s' previously defined at line %d" msgstr "" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, c-format msgid "Can't remove file `%s': %s" msgstr "" @@ -2584,12 +2586,12 @@ msgstr "" msgid "Short Contents" msgstr "" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/eo.gmo b/gnu/dist/texinfo/po/eo.gmo Binary files differindex 3c1be46798e..483829a6a6d 100644 --- a/gnu/dist/texinfo/po/eo.gmo +++ b/gnu/dist/texinfo/po/eo.gmo diff --git a/gnu/dist/texinfo/po/eo.po b/gnu/dist/texinfo/po/eo.po index 5eb0c49c71b..9fef8519299 100644 --- a/gnu/dist/texinfo/po/eo.po +++ b/gnu/dist/texinfo/po/eo.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: texinfo 4.3c\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" "PO-Revision-Date: 2003-01-25 11:47+06:00\n" "Last-Translator: Sergio Pokrovskij <pok@iis.nsk.su>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" @@ -123,15 +123,15 @@ msgstr "Unu kompletigo:\n" msgid "%d completions:\n" msgstr "%d kompletigoj:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Ensxovu la kompletigon" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Kompletigoj estas sercxataj ..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Rulumu la fenestron de kompletigoj" @@ -227,7 +227,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "Por ricevi pli da informoj uzu la opcion \"--help\".\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, fuzzy, c-format msgid "" @@ -326,7 +326,7 @@ msgstr "" " info --show-options emacs komencu per la Emaksaj komandliniaj opcioj\n" " info -f ./um.info eligu la dosieron ./um.info sen atenti \"dir\"\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1117,7 +1117,7 @@ msgstr "Iru al la fino de la linio" msgid "Move to the start of the line" msgstr "Iru al la komenco de la linio" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "Sekva" @@ -1696,172 +1696,172 @@ msgstr "-%s%s-Info: (%s)%s, %d linioj --%s--" msgid " Subfile: %s" msgstr " Subdosiero: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: opcio \"%s\" estas ambigua\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: opcio \"--%s\" ne toleras argumenton\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: opcio \"%c%s\" ne toleras argumenton\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: opcio \"%s\" bezonas argumenton\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: nekonata opcio \"--%s\"\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: nekonata opcio \"%c%s\"\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: misa opcio -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: nevalida opcio -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: opcio bezonas argumenton -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: opcio \"-W %s\" estas ambigua\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opcio \"-W %s\" ne toleras argumenton\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, fuzzy, c-format msgid "arguments to @%s ignored" msgstr "Misa argumento por %c%s" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "januaro" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "februaro" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "marto" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "aprilo" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "majo" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "junio" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "julio" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "auxgusto" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "septembro" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "oktobro" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "novembro" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "decembro" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "dubinda signo \"%c\" en @var" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "argumento de @sc tuta majuskla, do neniel sxangxita" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "\"{\" atendata, sed \"%c\" ricevita" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "dosierfino ene de pretarangxita bloko (verb block)" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "\"}\" atendata, sed \"%c\" ricevita" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s arkaikigxis" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp bezonas ne \"%s\" sed pozitivan argumenton nombran" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "Misa argumento por %c%s" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "none" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, fuzzy, c-format msgid "Bad argument to @%s" msgstr "Misa argumento por %c%s" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "" @@ -1898,12 +1898,12 @@ msgid "Method" msgstr "Metodo" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "de" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "sur" @@ -1912,22 +1912,22 @@ msgstr "sur" msgid "Must be in `@%s' environment to use `@%s'" msgstr "Nur en \"%s\"-ensxovo uzeblas \"%sx\"." -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "" @@ -1967,11 +1967,11 @@ msgstr "" msgid "Untitled" msgstr "Sen titolo" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "[neatendite] mankas HTML-etikedo por elstakigo" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "[neatendite] misa nodnomo: \"%s\"" @@ -1981,45 +1981,45 @@ msgstr "[neatendite] misa nodnomo: \"%s\"" msgid "Unknown index `%s'" msgstr "Nekonata indekso \"%s\"" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "Info ne povas trakti \":\" en indeksa artikolo \"%s\"" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "Jam estas indekso \"%s\"" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Nekonata indekso \"%s\" kajaux \"%s\" en @synindex" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Nekonata indekso \"%s\" en @printindex" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "Artikolo por indekso \"%s\" estas ekster iu ajn nodo" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(ekster iu ajn nodo)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "Vidu " @@ -2055,104 +2055,104 @@ msgstr "" msgid "`@end' expected `%s', but saw `%s'" msgstr "\"@end\" atendis \"%s\", sed renkontis \"%s\"" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "Mankas para \"%cend %s\"" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s bezonas literon aux ciferon" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "dosierfino ene de pretarangxita bloko" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, fuzzy, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "@%s estas sensenca ene de bloko \"@%s\"" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu jam antaux la unua @nodo; nodo \"Top\" kreitas" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "eble via @top-nodo staru sub @ifnottex anstataux sub @ifinfo?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu renkontita jam antaux la unua nodo; nodo \"Top\" kreitas" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, fuzzy, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "@%s estas sensenca ene de bloko \"@%s\"" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "Mankas para \"%c%s\"" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "\"%c%s\" bezonas post si ion" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, fuzzy, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "Misa argumento por \"%s\", \"%s\", uzanta \"%s\"" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s estas sensenca ene de bloko \"@%s\"" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "@itemx estas sensenca ene de bloko \"%s\"" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s renkontita ekster \"insertion block\"" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s ne estas valida lingvokodo laux ISO 639" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, fuzzy, c-format msgid "unrecognized encoding name `%s'" msgstr "nekonata nomo de kodosistemo: %s\"" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "Pardonon, la kodo \"%s\" ne estas disponebla" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "misa kodoprezento: \"%s\"" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s atendas argumenton \"i\" aux \"j\", ne \"%c\"" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s akceptas nur solsignan argumenton \"i\" aux \"j\"" @@ -2197,27 +2197,27 @@ msgstr "misa @end %s por @%s" msgid "Too many errors! Gave up.\n" msgstr "Tro multe da eraroj! Halt'.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: averto: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "Misloka %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Por pluaj detaloj tajpu \"%s --help\".\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Uzmaniero: %s [OPCIO]... TEXINFO-DOSIERO...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2227,7 +2227,7 @@ msgstr "" "Info-dosierojn tauxgajn por dialoga legado per Emakso aux per auxtonoma GNU-" "Info.\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2254,7 +2254,7 @@ msgstr "" " --version Eligu la nomon, la version de la programo kaj " "eliru.\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, fuzzy, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2268,7 +2268,7 @@ msgstr "" " --html Generu en HTML anstataux en Info.\n" " --xml Generu en XML (TexinfoML) anstataux en Info.\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2298,7 +2298,7 @@ msgstr "" " -o, --output=DOSIER Skribu en DOSIERon (DOSIERujon, por fenda " "HTML).\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2334,14 +2334,14 @@ msgstr "" "ensxovon.\n" " --split-size=N Fendu en dosierojn po N (defauxlte %d).\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" " read stdin if FILE is -.\n" msgstr "" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2351,7 +2351,7 @@ msgid "" "dropped.\n" msgstr "" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 #, fuzzy msgid "" "Input file options:\n" @@ -2371,7 +2371,7 @@ msgstr "" " -U VAR Maldifinu la variablon VAR, kiel per " "@clear.\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 #, fuzzy msgid "" "Conditional processing in input:\n" @@ -2388,6 +2388,8 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "Kondicxa traktado cxe enigo:\n" " --ifhtml Traktu la pecojn sub @ifhtml kaj @html ecx se ne\n" @@ -2404,7 +2406,7 @@ msgstr "" " --no-iftex Ne traktu la pecojn sub @iftex kaj @tex\n" " --no-ifxml Ne traktu la pecojn sub @ifxml kaj @xml\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 #, fuzzy msgid "" " The defaults for the @if... conditionals depend on the output format:\n" @@ -2419,7 +2421,7 @@ msgstr "" "se plata teksto estas generata, --ifplaintext sxaltigxas kaj la ceteraj,\n" "malsxaltigxas.\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2448,83 +2450,83 @@ msgstr "" " makeinfo --no-split UM.texi faru unu Info-dosieron, kiom ajn " "grandan\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: la argumento %s devas esti nombra, ne \"%s\".\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, fuzzy, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "Fiaskis malfermo de makrotraktada eligdosiero \"%s\"" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, fuzzy, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "Fiaskis malfermo de makrotraktada eligdosiero \"%s\"" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: argumento de la opcio --paragraph-indent estu nombra, \"none\" aux\n" "\"asis\", ne \"%s\".\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s: argumento de la opcio --footnote-style estu \"separate\" aux\n" "\"end\", ne \"%s\".\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: mankas dosiera argumento.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "\"%s\" atendatas" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "Provo krei dosierujon \"%s\" malsukcesis: %s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "Neniu \"%s\" trovita en \"%s\"" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" "%s: Makrotraktitajxo ne trafos en la cxefeligujon cxar Info iras tien.\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "%s-dosiero \"%s\" estas generata el \"%s\".\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "Cxi tiun dosieron %s generis Makeinfo-%s el %s.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2532,81 +2534,81 @@ msgstr "" "%s: La eligdosiero \"%s\" por makrotraktitajxo forigitas cxar estis eraroj;\n" "uzu la opcion --force por gxin reteni.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: La eligdosiero \"%s\" forigitas cxar estis eraroj;\n" "uzu la opcion --force por gxin reteni.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "Nekonata komando \"%s\"." -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "Uzu vinkulojn por pasigi al \"@%s\" komandan argumenton" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, fuzzy, c-format msgid "%c%s expected braces" msgstr "%c%s postulas vinkulojn \"{...}\"" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "Senpara \"}\"" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "SEN_NOMO!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s sen \"}\"" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "por HTML, la dosiero \"%s\" en la komando @image estas nelegebla: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, fuzzy, c-format msgid "No such file `%s'" msgstr "Neniu \"%s\" trovita en \"%s\"" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "bilddosiero \"%s\" (por teksto) estas nelegebla: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "mankas dosiera argumento en la komando @image" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{Mankas Valoro Por \"%s\"}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s bezonas nomon" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "Pli frue ol la para @end %s renkontigxis dosierfino" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "\"%.40s...\" tro longas por malvolvo; malvolvo ne okazos" @@ -2649,130 +2651,130 @@ msgstr "* kolumno %d-a: eligajxo = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "Nodo \"%s\" jam difinita en la linio %d" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "Estas arangxata la nodo \"%s\" ...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "Nodo \"%s\" bezonas subdividan komandon (ekz-e %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "Mankas nodnomo por la komando \"%c%s\"" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "Dosiernoma kolizio por la ankro \"%s\" kaj la nodo \"%s\"" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" "Cxi tiu @anchor-komando estas ignorita; la referencoj al gxi ne funkcios" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "Alinomu la ankron aux uzu la opcion \"--no-split\"" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "Nekonvena signocxeno fine de disfendita HTML-dosiero \"%s\"" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "Sekva:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "Antauxa:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "Supre:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "Dosiernoma kolizio por la ankroj \"%s\" kaj \"%s\"" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "Ignorita @anchor-komando; la referencoj al gxi ne funkcios" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "%s referencas neekzistantan nodon \"%s\" (cxu eraro en sekciarangxo?)" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "Menuo" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "Referenco" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" "La kampo \"Next\" de la nodo \"%s\" ne estas reciprokita (cxu misa " "sekciarangxo?)" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "Cxi tiu nodo (\"%s\") havas eraran kampon \"Prev\"" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "Antauxa" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "La kampo \"Prev\" de la nodo \"%s\" ne estas reciprokita" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "Cxi tiu nodo (\"%s\") havas eraran kampon \"Next\"" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "\"%s\" malhavas kampon \"Up\" (cxu eraro en sekciarangxo?)" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "Supre" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "En \"%s\" mankas menuero por \"%s\", malgraux ties ligilo \"Up\"\"" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "la nodo \"%s\" estis referencita %d fojojn" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "la nodo \"%s\" ne estas referencita" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, fuzzy, c-format msgid "Can't remove file `%s': %s" msgstr "Provo krei dosierujon \"%s\" malsukcesis: %s" @@ -2820,12 +2822,12 @@ msgstr "Enhavtabelo" msgid "Short Contents" msgstr "Maldetala enhavtabelo" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "dosiero \"%s\" en la komando @image estas nelegebla: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/fr.gmo b/gnu/dist/texinfo/po/fr.gmo Binary files differindex b0225ab4384..daa9765f606 100644 --- a/gnu/dist/texinfo/po/fr.gmo +++ b/gnu/dist/texinfo/po/fr.gmo diff --git a/gnu/dist/texinfo/po/fr.po b/gnu/dist/texinfo/po/fr.po index 3321b0bdb2f..59e25de8c9c 100644 --- a/gnu/dist/texinfo/po/fr.po +++ b/gnu/dist/texinfo/po/fr.po @@ -1,19 +1,24 @@ # Version française du progiciel texinfo -# Copyright © 1999, 2001 Free Software Foundation, Inc. -# Laurent Bourbeau <bourbeau@progiciels-bpi.ca>, 2001. +# Copyright © 2004 Free Software Foundation, Inc. # Michel Robitaille <robitail@iro.umontreal.ca>, traducteur depuis/since 1996. # +# Laurent Bourbeau est le traducteur officiel mais depuis plus d'un +# an, Michel assume la traduction avec l'accord de Laurent. +# +# Laurent Bourbeau <bourbeau@progiciels-bpi.ca>, 2001. +# msgid "" msgstr "" -"Project-Id-Version: texinfo 4.6.93\n" +"Project-Id-Version: texinfo 4.7.90\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" -"PO-Revision-Date: 2004-03-27 08:00-05:00\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" +"PO-Revision-Date: 2004-12-06 08:00-05:00\n" "Last-Translator: Laurent Bourbeau <bourbeau@progiciels-bpi.ca>\n" "Language-Team: French <traduc@traduc.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: info/echo-area.c:284 info/session.c:689 msgid "Move forward a character" @@ -124,15 +129,15 @@ msgstr "Une complétion:\n" msgid "%d completions:\n" msgstr "%d complétions:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Insérer la complétion" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Construction des complétions..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Dérouler la fenêtre des complétions" @@ -182,7 +187,7 @@ msgid "No index entries." msgstr "Aucune entrée d'index." #: info/indices.c:375 -#, fuzzy, c-format +#, c-format msgid "No %sindex entries containing `%s'." msgstr "Aucune entrée %sindex contenant « %s »." @@ -195,20 +200,20 @@ msgid "CAN'T SEE THIS" msgstr "NE PEUT PAS VOIR CECI" #: info/indices.c:422 -#, fuzzy, c-format +#, c-format msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)" msgstr "" -"Trouver « %s » dans %s. (« \\[next-index-match] » cherchera le prochain.)" +"« %s » repéré dans %s. (« \\[next-index-match] » cherchera le prochain.)" #: info/indices.c:541 -#, fuzzy, c-format +#, c-format msgid "Scanning indices of `%s'..." msgstr "Fouille des indices de « %s »..." #: info/indices.c:596 -#, fuzzy, c-format +#, c-format msgid "No available info files have `%s' in their indices." -msgstr "Aucun fichier info disponible n'a « %s » dans leur indices." +msgstr "Aucun fichier info disponible n'a « %s » dans leurs indices." #: info/indices.c:622 msgid "Grovel all known info file's indices for a string and build a menu" @@ -221,7 +226,7 @@ msgid "Index apropos: " msgstr "Index à-propos: " #: info/indices.c:654 -#, fuzzy, c-format +#, c-format msgid "" "\n" "* Menu: Nodes whose indices contain `%s':\n" @@ -234,7 +239,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "Utiliser --help pour plus d'informations.\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, c-format msgid "" @@ -343,7 +348,7 @@ msgstr "" " info -f ./foo.info Montrer le fichier ./foo.info, sans chercher " "dir\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1162,7 +1167,7 @@ msgstr "Aller à la fin de la ligne" msgid "Move to the start of the line" msgstr "Aller au début de la ligne" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "Noeud « Next »" @@ -1637,7 +1642,7 @@ msgid "\"%s\" is invalid" msgstr "« %s » est invalide" #: info/session.c:4495 -#, fuzzy, c-format +#, c-format msgid "`%s' is invalid" msgstr "« %s » est invalide" @@ -1755,174 +1760,174 @@ msgstr "-%s%s-Info: (%s)%s, %d lignes --%s--" msgid " Subfile: %s" msgstr " Sous-fichier: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: l'option « %s » est ambiguë\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: l'option « --%s » ne permet pas un argument\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: l'option « %c%s » ne permet pas un argument\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: l'option « %s » exige un argument\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: option non reconnue « --%s »\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: option non reconnue « %c%s »\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: option illégale -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: option invalide -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: l'option exige un argument -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: l'option « -W %s » est ambiguë\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: l'option « -W %s » ne permet pas un argument\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, c-format msgid "arguments to @%s ignored" msgstr "arguments à @%s ignorés" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "janvier" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "février" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "mars" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "avril" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "mai" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "juin" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "juillet" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "août" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "septembre" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "octobre" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "novembre" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "décembre" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "caractère %c improbable dans la macro @var" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "argument de la macro @sc tout en majuscules, alors aucun effet" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "« { » attendu, mais a vu « %c »" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "fin de fichier à l'intérieur du bloc verbe" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "« } » attendu, mais a vu « %c »" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -"@strong{Note:} produit une table douteuse de références croisées dans Info; " -"reécrire pour éviter cela" +"@strong{Note...} produit une table douteuse de références croisées dans " +"Info; réécrire pour éviter cela" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s est périmé" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "La macro @sp exige un argument numérique positif, pas « %s »" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "Mauvais argument à %c%s" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "« asis »" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "« none »" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, c-format msgid "Bad argument to @%s" msgstr "Mauvais argument à @%s" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "insérer" @@ -1959,12 +1964,12 @@ msgid "Method" msgstr "Méthode" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "de" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "sur" @@ -1973,22 +1978,22 @@ msgstr "sur" msgid "Must be in `@%s' environment to use `@%s'" msgstr "Doit être dans une insertion « @%s » afin d'utiliser « @%s »." -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "« %s » omis avant le nom de fichier de sortie" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "« %s » omis avant l'écriture sur la sortie standard" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "Tampon de sortie n'est pas vide." @@ -2029,11 +2034,11 @@ msgstr "%s%d: --css-file terminé dans le commentaire" msgid "Untitled" msgstr "Sans titre" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "[inattendu] pas d'étiquette html à dépiler" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "[inattendu] nom de noeud invalide: « %s »" @@ -2043,45 +2048,45 @@ msgstr "[inattendu] nom de noeud invalide: « %s »" msgid "Unknown index `%s'" msgstr "Nom d'index inconnu « %s »" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "Info ne peut traiter « : » dans l'entrée d'index « %s »" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "L'index « %s » existe toujours" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Nom d'index « %s » inconnu et/ou « %s » dans @synindex" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "(ligne )" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "(ligne %*d)" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Nom d'index « %s » inconnu dans @printindex" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "Entrée pour l'index « %s » à l'extérieure de tout noeud" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(à l'extérieur de tout noeud)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "Voir " @@ -2117,108 +2122,108 @@ msgstr "%cenvironnements float ne peuvent être imbriqués" msgid "`@end' expected `%s', but saw `%s'" msgstr "« @end » s'attendait à « %s », mais a vu « %s »" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "« %cend %s » non apparié" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s exige une lettre ou un chiffre" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "fin de fichier à l'intérieur du bloc verbatim" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "@%s n'a aucun sens à l'extérieur de l'environnement « @float »" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu vu avant le premier @node, création du noeud « Top »" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" "votre noeud @top devrait se retrouver peut-être dans @ifnottex plutôt que " "dans @ifinfo?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu vu avant le premier noeud, création du noeud « Top »" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" "@%s n'a aucun sens à l'extérieur des environnements « @titlepage » et « " "@quotation »" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "@%s n'a aucun sens à l'extérieur de l'environnement « @titlepage »" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "« %c%s » non apparié" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "« %c%s » a besoin de quelque chose après lui" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "Mauvais argument « %s » à « @%s » utilisant « %s »" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "macro @%s inactive à l'intérieur d'un bloc « %s »" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "macro @itemx inactive à l'intérieur d'un bloc « %s »" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s est trouvé à l'extérieur d'un bloc d'insertion" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s n'est pas un code ISO 639 valide pour l'identification de langue" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, c-format msgid "unrecognized encoding name `%s'" msgstr "nom d'encodage non reconnu « %s »" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "désolé, l'encodage « %s » n'est pas supporté" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "caractère encodé invalide « %s »" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s s'attend à argument « i » ou « j », non pas « %c »" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s attend un argument d'un seul caractère « i » ou « j »" @@ -2263,27 +2268,27 @@ msgstr "macro @end %s non balancée avec @%s" msgid "Too many errors! Gave up.\n" msgstr "Beaucoup trop d'erreurs! Abandon.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: avertissement: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "%c égarée ou mal placée" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Utiliser « %s --help » pour plus d'informations.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Usage: %s [OPTION]... FICHIER-TEXINFO...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2291,7 +2296,7 @@ msgstr "" "Traduire une documentation Texinfo source en divers autres formats:\n" "Fichiers Info adéquats pour lire en ligne avec Emacs ou GNU Info autonome\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2318,7 +2323,7 @@ msgstr "" " -v, --verbose En mode bavard, expliquer ce qui a été fait.\n" " --version Afficher la version du logiciel et quitter.\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2333,7 +2338,7 @@ msgstr "" " --xml Produire en Texinfo XML plutôt qu'en format Info.\n" " --plaintext Produire en formast plein texte plutôt qu'en format Info.\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2363,7 +2368,7 @@ msgstr "" " -o, --output=FICHIER produire la sortie dans le FICHIER (répertoire " "si division en HTML),\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2399,7 +2404,7 @@ msgstr "" " --split-size=NUM séparer les fichiers Info selon la taille NUM (par " "défaut %d).\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" @@ -2409,7 +2414,7 @@ msgstr "" "sortie HTML;\n" " lire de stdin si le FICHIER est -.\n" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2423,7 +2428,7 @@ msgstr "" " Si VAL vaut 0, les espaces pouvant être " "ignorés sont éliminés.\n" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2443,7 +2448,7 @@ msgstr "" " -U VAR Rendre indéfinie une variable, comme avec " "@clear.\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2459,6 +2464,8 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "Traitement conditionel de l'entrée:\n" " --ifdocbook Traiter @ifdocbook et @docbook même s'il\n" @@ -2472,15 +2479,16 @@ msgstr "" " --iftex Traiter le textuel sous @iftex et @tex.\n" " implique l'option --no-split.\n" " --ifxml Traiter le textuel sous @ifxml et sous @xml.\n" -" --no-ifdocbook Ne pas traiter le textuel sous @ifdocbook et " -"@docbook.\n" " --no-ifhtml Ne pas traiter le textuel sous @ifhtml et @html.\n" " --no-ifinfo Ne pas traiter le textuel sous @ifinfo.\n" " --no-ifplaintext Ne pas traiter le textuel sous @ifplaintext.\n" " --no-iftex Ne pas traiter le textuel sous @iftex et @tex.\n" " --no-ifxml Ne pas traiter le textuel sous @ifxml et @xml.\n" +"\n" +" Aussi pour l'options --no-ifFORMAT, ne pas traiter le textuel " +"@ifnotFORMAT.\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2496,7 +2504,7 @@ msgstr "" "» ;\n" "en génération XML, --ifxml est « on » et les autres sont « off ».\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2529,28 +2537,28 @@ msgstr "" " makeinfo --no-split foo.texi Écrire un fichier Info même " "volumineux\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "%s: valeur TEXINFO_OUTPUT_FORMAT non reconnue est ignoré « %s »\n" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: l'argument %s doit être numérique, non pas « %s ».\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "%s: ne peut ouvrir la sortie d'expansion de macro « %s »" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "%s: ignorer la sortie de l'expansion de la seconde macro « %s »\n" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" @@ -2558,56 +2566,56 @@ msgstr "" "ou\n" "« asis », non pas « %s ».\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s: l'argument de l'option --footnote-style doit être « separate » ou\n" "« end », non pas « %s ».\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: absence d'un argument fichier.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "Commande multilignes %c%s utilisé de manière incorrecte" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "« %s » attendue" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "Ne peut créer le répertoire « %s »: %s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "Aucun « %s » trouvé dans « %s »" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" "%s: Sauter l'expansion de macro qui irait sur stdout comme la sortie Info.\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "Fabrication du fichier %s « %s » à partir de « %s ».\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "" "Ceci est le fichier Info %s, produit par Makeinfo version %s à partir %s.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2615,82 +2623,82 @@ msgstr "" "%s: Enlèvement du fichier de sortie de macro « %s » à cause d'erreurs;\n" "utiliser l'option --force pour préserver.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: Enlèvement du fichier de sortie « %s » à cause d'erreurs;\n" "utiliser l'option --force pour préserver.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "Commande inconnue « %s »." -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "" "Utiliser des accolades pour donner une commande comme argument à « @%s »" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, c-format msgid "%c%s expected braces" msgstr "%c%s accolades attendues" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "Accolade « } » non appariée" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "NOM_INCONNU!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s accolade fermante manquante" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "commande @image dans un fichier (pour HTML) « %s » illisible: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, c-format msgid "No such file `%s'" msgstr "Aucun fichier « %s »" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "commande @image avec un fichier (texte) « %s » illisible: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "commande @image ayant un argument fichier absent" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "fanion indéfini: %s" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{Aucune valeur pour « %s »}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s exige un nom" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "Fin de fichier rencontré avant l'appariement de @end %s" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "" @@ -2735,138 +2743,138 @@ msgstr "* colonne #%d: sortie = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "Le noeud « %s » défini antérieurement à la ligne %d" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "Écriture du noeud « %s »...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "Le noeud « %s » exige une commande de subdivision (i.e. %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "Aucun nom de noeud spécifié pour la commande « %c%s »" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "Ancre « %s » et mode « %s » pointe vers le même nom de fichier" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" "Commande @anchor ignorée; les références vers celle-ci ne fonctionneront pas" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "Renommer cette ancre ou utiliser l'option « --no-split »" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "Chaîne inattendue à la fin du fichier morcelé HTML « %s »" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "Noeud « Next »:" # Est-ce vraiment un message à traduire? -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "Noeud « Previous »:" # Est-ce vraiment un message à traduire? -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "Noeud « Up »:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "Ancre « %s » et mode « %s » pointe vers le même nom de fichier" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "" "Commande @anchor ignorée; les références vers celle-ci ne fonctionneront pas" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "" "%s réfère à un noeud « %s » inexistant (à mois d'un sectionnement incorrect?)" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "Menu" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "Référence" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" "Le champ Next du noeud « %s » n'a pas de pointeur de retour en amont (à " "moins d'un sectionnement incorrect?)" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "Ce noeud (%s) a un noeud « Prev » erroné" # Est-ce vraiment un message à traduire? -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "Noeud « Previous »" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "Le champ Prev du noeud « %s » n'a pas de pointeur de retour en amont" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "Ce noeud (%s) a un noeud « Next » erroné" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "« %s » n'a pas de champ Up (à moins d'un sectionnement incorrect?)" # Est-ce vraiment un message à traduire? -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "Noeud « Up »" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" "Le noeud « %s » manque d'un item menu pour « %s » en dépit d'être son noeud " "« Up » cible" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "Le noeud « %s » a été référencé %d fois" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "noeud « %s » non référencé" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "Retrait de %s\n" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, c-format msgid "Can't remove file `%s': %s" msgstr "Ne peut enlever le fichier « %s »: %s" @@ -2877,7 +2885,7 @@ msgid "Appendix %c" msgstr "Annexe %c" #: makeinfo/sectioning.c:467 -#, fuzzy, c-format +#, c-format msgid "Internal error (search_sectioning) `%s'!" msgstr "Erreur interne (search_sectioning) « %s »!" @@ -2914,12 +2922,12 @@ msgstr "Table des matières" msgid "Short Contents" msgstr "Sommaire" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "commande @image avec un fichier « %s » illisible: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/he.gmo b/gnu/dist/texinfo/po/he.gmo Binary files differindex a41abea6cdb..37652ea6973 100644 --- a/gnu/dist/texinfo/po/he.gmo +++ b/gnu/dist/texinfo/po/he.gmo diff --git a/gnu/dist/texinfo/po/he.po b/gnu/dist/texinfo/po/he.po index ea8500d82b8..9f4f519bfac 100644 --- a/gnu/dist/texinfo/po/he.po +++ b/gnu/dist/texinfo/po/he.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: texinfo 4.2\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" "PO-Revision-Date: 2002-04-03 12:31+0300\n" "Last-Translator: Eli Zaretskii <eliz@gnu.org>\n" "Language-Team: Hebrew <eliz@gnu.org>\n" @@ -123,15 +123,15 @@ msgstr " :úçà äîìùä\n" msgid "%d completions:\n" msgstr " :úåîìùä %d\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "äîìùä óñåä" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "...úåîìùä úîéùø áéëøî" -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "úåîìùää ïåìç úà ìåìâ" @@ -227,7 +227,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr ".øúåé áø òãéî úâöäì --help äñð\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, fuzzy, c-format msgid "" @@ -327,7 +327,7 @@ msgstr "" " ,bug-texinfo@gnu.org-ì äì÷ú éçååéã çåìùì àð\n" " .help-texinfo@gnu.org-ì ïåéãì íéàùåðå úåéììë úåìàùå\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1101,7 +1101,7 @@ msgstr "äøåùä óåñì ïîñ ææä" msgid "Move to the start of the line" msgstr "äææ ñîï ìúçéìú äùåøä" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "Next äãù" @@ -1683,172 +1683,172 @@ msgstr "-%s%s-Info: (%s)%s, %d lines --%s--" msgid " Subfile: %s" msgstr " Subfile: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `%c%s' ïééôàî\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s úéðëú øåáò `%c%s' ääåæî-éúìá ïééôàî\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: é÷åç-éúìá ïééôàî -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s úéðëú øåáò éåâù ïééôàî -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: èðîåâøà áééçî ïééôàî -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `-W %s' ïééôàî\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `-W %s' ïééôàî\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, fuzzy, c-format msgid "arguments to @%s ignored" msgstr "%c%s-ì éåâù èðîåâøà" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "øàåðé" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "øàåøáô" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "õøî" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "ìéøôà" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "éàî" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "éðåé" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "éìåé" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "èñåâåà" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "øáîèôñ" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "øáåè÷åà" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "øáîáåð" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "øáîöã" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "@var êåúá %c øéáñ-éúìá åú" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "è÷ôà ìë @sc-ì ïéà ïëì ,úåìåãâ úåéúåàá åìåë @sc ìù èðîåâøà" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "%c àöîð êà ,`{' ì\"ö" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "verb êåúá õáå÷ óåñ" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "%c àöîð êà ,`}' ì\"ö" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "ïùåéî åðéä %c%s" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "`%s' àì ,éáåéç øôñî àåäù èðîåâøà ùøåã @sp" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "%c%s-ì éåâù èðîåâøà" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "àåäù åîë" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "ïéà" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, fuzzy, c-format msgid "Bad argument to @%s" msgstr "%c%s-ì éåâù èðîåâøà" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "" @@ -1886,12 +1886,12 @@ msgid "Method" msgstr "Method" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "of" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "on" @@ -1900,22 +1900,22 @@ msgstr "on" msgid "Must be in `@%s' environment to use `@%s'" msgstr "`%s' êåúá ÷øå êà ùåîéùá øúåî `%sx'" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s úéðëúá %s-å %s øåáò äàéâù ìò çååéã getwd/getcwd\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "" @@ -1955,11 +1955,11 @@ msgstr "" msgid "Untitled" msgstr "úøúåë àìì" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, fuzzy, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "`%s' :éåâù (node) ä÷ñéô íù" @@ -1969,45 +1969,45 @@ msgstr "`%s' :éåâù (node) ä÷ñéô íù" msgid "Unknown index `%s'" msgstr "`%s' øëåî-éúìá ñ÷ãðéà" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "`%s' ñ÷ãðéà èéøôá `:' ììâá ìùëéé Info" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "øãâåî øáë `%s' ñ÷ãðéà" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "øëåî-éúìá ñ÷ãðéà åðéä @synindex-á `%s' åà `%s'" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "@printindex-á `%s' øëåî-éúìá ñ÷ãðéà" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "ä÷ñéô ìëì õåçî øãâåî `%s' ñ÷ãðéà èéøô" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(ä÷ñéô ìëì õåçî)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "See " @@ -2043,104 +2043,104 @@ msgstr "" msgid "`@end' expected `%s', but saw `%s'" msgstr "`%s' àöîð íìåà ,`%s' ì\"ö `@end' éøçà" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "íàåú `%cend %s' øñç" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "äøôñ åà úåà ùøåã %s" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "verbatim êåúá õáå÷ óåñ" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, fuzzy, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "?@ifinfo íå÷îá @ifnottex-á úô÷åî úåéäì äúéä äëéøö @top ú÷ñéô éë ïëúééä" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @detailmenu" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, fuzzy, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "âåæ-ïá åì ïéàù `%c%s'" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "åéøçà àåáéù åäùî êéøö `%c%s'" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, fuzzy, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "`%s'-ì èðîåâøàë íéàúî åðéà `%s'-ù íåùî `%s'-á éúùîúùä" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "`%s' êåúá @itemx-ì úåòîùî ïéà" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "äñðëä ÷åìá ìëì õåçî %c%s àöîð" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "ISO 639 é\"ò íéøëåîä ïåùìä éðîéñî ãçà åðéà %s" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, fuzzy, c-format msgid "unrecognized encoding name `%s'" msgstr "`%s' øëåî-éúìá ãåãé÷ íù" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "êîúð åðéà `%s' ãåãé÷ ,íéøòèöî" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "`%s' éåâù ããå÷î åú" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "`j' åà `i' úåéäì áééç øùà ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%c'" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "èðîåâøàë `j' åà `i' ãéçé åú ìá÷î %c%s" @@ -2185,27 +2185,27 @@ msgid "Too many errors! Gave up.\n" msgstr ".íééãé éúîøä !úàéâù éãî øúåé\n" # Not translated because Emacs recognizes warningsby this template. -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: warning: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "åîå÷îá åðéàù %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr ".`%s --help' äñð øúé èåøôì\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "%s [íéðééôàî]... TEXINFO-õáå÷... :ùåîéùä ïôåà\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2213,7 +2213,7 @@ msgstr "" " ìãçî úøéøáë ,íéøçà íéðåù íéèîøåôì Texinfo øå÷î úôùá ãåòéú íâøú\n" ".GNU Info úéðëú åà Emacs úøæòá äàéø÷ì íéîéàúîä Info éöá÷ øöééî \n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2237,7 +2237,7 @@ msgstr "" " .úéðëúä úìåòô ìò èåøô âöä -v, --verbose\n" " .àöå äðëúä úñøéâ éáâì òãéî âöä --version\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, fuzzy, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2251,7 +2251,7 @@ msgstr "" " .Info íå÷îá HTML èîøåôá èìô ïëä --html\n" " .Info íå÷îá XML èîøåôá èìô ïëä --xml\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2277,7 +2277,7 @@ msgstr "" " .èìô õáå÷á úåà÷ñéôå íé÷øô øøôñ --number-sections\n" " .(HTML èìô íà äé÷éú) FILE õáå÷ì èìô áåúë -o, --output=FILE\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2308,14 +2308,14 @@ msgstr "" " .øå÷îá äúéäù éôë äææä ìò øåîù ,`asis'\n" " .(%d ç\"îøá) NUM ìãåâá íéöá÷-úúì Info ÷ìç --split-size=NUM\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" " read stdin if FILE is -.\n" msgstr "" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2325,7 +2325,7 @@ msgid "" "dropped.\n" msgstr "" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 #, fuzzy msgid "" "Input file options:\n" @@ -2342,7 +2342,7 @@ msgstr "" " .@include ìù ùåôéç úîéùø ùàøá DIR óñåä -P DIR\n" " .@clear úãå÷ôá åîë ,VAR äðúùî úøãâä ìèá -U VAR\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 #, fuzzy msgid "" "Conditional processing in input:\n" @@ -2359,6 +2359,8 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" " :èì÷á äðúåî ãåáéò\n" " .HTML åðéà èìôä íà åìéôà @html-å @ifhtml ãáò --ifhtml\n" @@ -2370,7 +2372,7 @@ msgstr "" " .@ifplaintext-á èñëè ãáòú ìà --no-ifplaintext\n" " .@tex-å @iftex-á èñëè ãáòú ìà --no-iftex\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 #, fuzzy msgid "" " The defaults for the @if... conditionals depend on the output format:\n" @@ -2384,7 +2386,7 @@ msgstr "" " .íéìòôåî íðéà øúéä ìëå ìòôåî --ifinfo ,èñëè åà Info àåä èìôä íà\n" " .íéìòôåî íðéà øúéä ìëå ìòôåî --ifplaintext ,èñëè àåä èìôä íà\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 #, fuzzy msgid "" "Examples:\n" @@ -2410,158 +2412,158 @@ msgstr "" " úåà÷ñéô øåøôñ íò Info èìô makeinfo --number-sections foo.texi\n" " äéäéù ìëë ìåãâ ,ãéçé õáå÷á Info èìô makeinfo --no-split foo.texi\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, fuzzy, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, fuzzy, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr ".õáå÷ íù øñç %s úéðëúì\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "`%s' éåôö äéä ïàë" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "`%s' àöîð àì `%s' õáå÷á" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "%s: .íùì ïååëî èìôù íåùî åèîùåé éð÷ú èìô õåøòì åø÷àî úåáçøä\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr ".%s èîøåôá `%s'-ì `%s' õáå÷ ãáòî\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "This is %s, produced by makeinfo version %s from %s.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" msgstr "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' åø÷àî úåáçøä õáå÷\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' èìô õáå÷\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "`%s' úøëåî-éúìá äàøåä" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, fuzzy, c-format msgid "%c%s expected braces" msgstr "`{...}'-ì äôéö %c%s" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "âåæ-ïá åì ïéàù }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "NO_NAME!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s-ì øñç éðîé øâåñ" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "(HTML øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, fuzzy, c-format msgid "No such file `%s'" msgstr "`%s' àöîð àì `%s' õáå÷á" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "(èñëè øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "@image úàøåäá øñç õáå÷ íù" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{No value for `%s'}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "íù ùøåã %c%s" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "íàåú @end %s éðôì øîâð èì÷ õáå÷" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "áçøåé àì ;åáéçøäì éãëî êåøà `%.40s...'" @@ -2605,127 +2607,127 @@ msgstr "* column #%d: output = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "`%s' ä÷ñéô úøãâä øáë %d äøåùá" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "...%s ä÷ñéô ãáòî úòë\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, fuzzy, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "`%s' ä÷ñéôá (%c%s ïåâë) ÷åñéô úàøåäá êøåö ùé" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "ä÷ñéô íù àìì `%c%s' äàøåä" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "õáå÷ íù åúåàì úåîâøåúî `%s' øåùé÷ úéåúå `%s' ä÷ñéô" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "åìòôé àì åæ úéåú ìà íéøåùé÷ ;òöåáú àì åæ @anchor úàøåä" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "`--no-split' ïééôàîá ùîúùä åà úéåúä íù äðù" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "`%s' ÷ìåçî HTML õáå÷ íåéñá äéåôö-éúìá úæåøçî" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "Next:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "Previous:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "Up:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "õáå÷ íù åúåàì úåîâøåúî `%s-å `%s' øåùé÷ úåéåú" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "åìòôé àì åæ úéåú ìà íéøåùé÷ ;òöåáú àì @anchor úàøåä" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, fuzzy, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "%sá `%s' úîéé÷ äððéàù ä÷ñéôì äééðôä" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "èéøôú" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "øåùé÷" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, fuzzy, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "äøæç äòéáöî äðéà `%s' ä÷ñéô ìù Next äãùá ä÷ñéôä" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "éåâù Prev äãù úìòá àéä (%s) åæ ä÷ñéô" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "Prev äãù" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "äøæç äòéáöî äðéà `%s' ä÷ñéô ìù Prev äãùá ä÷ñéôä" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "éåâù Next äãù úìòá àéä (%s) åæ ä÷ñéô" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "Up äãù" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "äøæçá òéáöîù èéøôú óéòñ ïéà ìáà ,`%s' ìò òéáöî `%s' ä÷ñéô ìù Up äãù" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "`%s' ä÷ñéôì íéøåùé÷ %d éúøôñ" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, fuzzy, c-format msgid "Can't remove file `%s': %s" msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú" @@ -2773,12 +2775,12 @@ msgstr "Table of Contents" msgid "Short Contents" msgstr "Short Contents" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/hr.gmo b/gnu/dist/texinfo/po/hr.gmo Binary files differindex 2d8c792fb88..35e246213b3 100644 --- a/gnu/dist/texinfo/po/hr.gmo +++ b/gnu/dist/texinfo/po/hr.gmo diff --git a/gnu/dist/texinfo/po/hr.po b/gnu/dist/texinfo/po/hr.po index e75606ec55f..abde350e683 100644 --- a/gnu/dist/texinfo/po/hr.po +++ b/gnu/dist/texinfo/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: texinfo 4.2\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" "PO-Revision-Date: 2002-04-26 13:49-MET+DST (UTC+2)\n" "Last-Translator: Mirsad Todorovac <mtodorov_69@yahoo.com>\n" "Language-Team: Croatian <lokalizacija@linux.hr>\n" @@ -124,15 +124,15 @@ msgstr "Jedno kompletiranje:\n" msgid "%d completions:\n" msgstr "%d kompletiranja:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Umetni kompletiranje" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Izgraðujem varijante kompletiranja..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "'Skrolaj' prozor za varijante kompletiranja" @@ -230,7 +230,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "Poku¹ajte --help za vi¹e informacija.\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, fuzzy, c-format msgid "" @@ -332,7 +332,7 @@ msgstr "" " info --show-options emacs zapoèni u èvoru s emacsovim komandnim opcijama\n" " info -f ./foo.info prika¾i datoteku ./foo.info, zaobilazeæi dir\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1135,7 +1135,7 @@ msgstr "Pomakni se do kraja retka" msgid "Move to the start of the line" msgstr "Pomakni se na poèetak retka" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "Next" @@ -1715,172 +1715,172 @@ msgstr "-%s%s-Info: (%s)%s, %d redaka --%s--" msgid " Subfile: %s" msgstr " Poddatoteka: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: opcija `%s' nije jednoznaèna\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: opcija `--%s' ne dopu¹ta argument\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: opcija `%c%s' ne dopu¹ta argument\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: opcija `%s' tra¾i neophodan argument\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: nepoznata opcija `--%s'\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: nepoznata opcija `%c%s'\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: nedozvoljena opcija -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: pogre¹na opcija -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: opcija zahtijeva argument -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: opcija `-W %s' nije jednoznaèna\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opcija `-W %s' ne dopu¹ta argument\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, c-format msgid "arguments to @%s ignored" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, c-format msgid "Bad argument to @%s" msgstr "" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "" @@ -1917,12 +1917,12 @@ msgid "Method" msgstr "" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "" @@ -1931,22 +1931,22 @@ msgstr "" msgid "Must be in `@%s' environment to use `@%s'" msgstr "" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "" @@ -1986,11 +1986,11 @@ msgstr "" msgid "Untitled" msgstr "" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "" @@ -2000,45 +2000,45 @@ msgstr "" msgid "Unknown index `%s'" msgstr "" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "" @@ -2074,104 +2074,104 @@ msgstr "" msgid "`@end' expected `%s', but saw `%s'" msgstr "" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, fuzzy, c-format msgid "unrecognized encoding name `%s'" msgstr "%s: nepoznata opcija `%c%s'\n" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "" @@ -2215,33 +2215,33 @@ msgstr "" msgid "Too many errors! Gave up.\n" msgstr "" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "" -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" msgstr "" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2256,7 +2256,7 @@ msgid "" " --version display version information and exit.\n" msgstr "" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2266,7 +2266,7 @@ msgid "" " --plaintext output plain text rather than Info.\n" msgstr "" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2282,7 +2282,7 @@ msgid "" " -o, --output=FILE output to FILE (directory if split HTML),\n" msgstr "" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2301,14 +2301,14 @@ msgid "" " --split-size=NUM split Info files at size NUM (default %d).\n" msgstr "" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" " read stdin if FILE is -.\n" msgstr "" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2318,7 +2318,7 @@ msgid "" "dropped.\n" msgstr "" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2328,7 +2328,7 @@ msgid "" " -U VAR undefine the variable VAR, as with @clear.\n" msgstr "" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2344,9 +2344,11 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2355,7 +2357,7 @@ msgid "" " if generating XML, --ifxml is on and the others are off.\n" msgstr "" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2370,156 +2372,156 @@ msgid "" " makeinfo --no-split foo.texi write one Info file however big\n" msgstr "" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, fuzzy, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "Ne mogu kreirati izlaznu datoteku `%s'." -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" msgstr "" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, c-format msgid "%c%s expected braces" msgstr "" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, fuzzy, c-format msgid "No such file `%s'" msgstr "Nema menija u èvoru `%s'." -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "" @@ -2562,127 +2564,127 @@ msgstr "" msgid "Node `%s' previously defined at line %d" msgstr "" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, fuzzy, c-format msgid "Can't remove file `%s': %s" msgstr "ne mogu kreirati izlaznu datoteku `%s'" @@ -2730,12 +2732,12 @@ msgstr "" msgid "Short Contents" msgstr "" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/ja.gmo b/gnu/dist/texinfo/po/ja.gmo Binary files differindex d98fe2fc063..ff3f98bcc5e 100644 --- a/gnu/dist/texinfo/po/ja.gmo +++ b/gnu/dist/texinfo/po/ja.gmo diff --git a/gnu/dist/texinfo/po/ja.po b/gnu/dist/texinfo/po/ja.po index ab528c02ee0..c94fc3ad937 100644 --- a/gnu/dist/texinfo/po/ja.po +++ b/gnu/dist/texinfo/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU texinfo 4.0f\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" "PO-Revision-Date: 2002-01-23 20:46+0900\n" "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n" "Language-Team: Japanese <ja@li.org>\n" @@ -123,15 +123,15 @@ msgstr "1 ¤Ä¤ÎÊä´°:\n" msgid "%d completions:\n" msgstr "%d ¸Ä¤ÎÊä´°\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Êä´°¤òÁÞÆþ" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Êä´°¥ê¥¹¥È¤òºîÀ®Ãæ..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Êä´°¥¦¥£¥ó¥É¥¦¤ò¥¹¥¯¥í¡¼¥ë" @@ -227,7 +227,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "¾Ü¤·¤¯¤Ï --help ¥ª¥×¥·¥ç¥ó¤ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, fuzzy, c-format msgid "" @@ -332,7 +332,7 @@ msgstr "" "Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï bug-texinfo@gnu.org¡¢\n" "°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï help-texinfo@gnu.org ¤Þ¤Ç¡£\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 #, fuzzy msgid "" @@ -1140,7 +1140,7 @@ msgstr "¹ÔËö¤Ë°Üư" msgid "Move to the start of the line" msgstr "¹ÔƬ¤Ë°Üư" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "¼¡" @@ -1713,172 +1713,172 @@ msgstr "-%s%s-Info: (%s)%s, %d ¹Ô --%s--" msgid " Subfile: %s" msgstr " Éû¥Õ¥¡¥¤¥ë: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï¡¢°ú¿ô¤¬É¬ÍפǤ¹\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: `--%s' ¤Ïǧ¼±¤Ç¤¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: `%c%s' ¤Ïǧ¼±¤Ç¤¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹ -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: `-W %s' ¥ª¥×¥·¥ç¥ó¤¬Û£Ëæ¤Ç¤¹\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, fuzzy, c-format msgid "arguments to @%s ignored" msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "°ì·î" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "Æó·î" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "»°·î" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "»Í·î" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "¸Þ·î" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "Ï»·î" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "¼··î" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "Ȭ·î" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "¶å·î" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "½½·î" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "½½°ì·î" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "½½Æó·î" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "@var ¤Ç»È¤¨¤½¤¦¤Ë¤Ê¤¤Ê¸»ú %c" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "Á´¤ÆÂçʸ»ú¤Î @sc °ú¿ô¡¢½¾¤Ã¤Æ¸ú²Ì¤¬¤¢¤ê¤Þ¤»¤ó" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "`{' ¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¤¬¡¢`%c' ¤Ç¤·¤¿" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "verb ¥Ö¥í¥Ã¥¯Æâ¤Ç¥Õ¥¡¥¤¥ëËöÈø¤È¤Ê¤ê¤Þ¤·¤¿" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "`}' ¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¤¬¡¢`%c' ¤Ç¤·¤¿" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s ¤ÏÇѤ줿̿Îá¤Ç¤¹" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp ¤Ë¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¡¢Àµ¤Î¿ôÃͤòÍ¿¤¨¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "¤½¤Î¤Þ¤Þ" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "¤Ê¤·" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, fuzzy, c-format msgid "Bad argument to @%s" msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "" @@ -1915,12 +1915,12 @@ msgid "Method" msgstr "¥á¥½¥Ã¥É" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "of" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "on" @@ -1929,22 +1929,22 @@ msgstr "on" msgid "Must be in `@%s' environment to use `@%s'" msgstr "`%2$sx' ¤ò»È¤¦¤¿¤á¤Ë¤Ï `%1$s' ÁÞÆþ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "" @@ -1985,11 +1985,11 @@ msgstr "" msgid "Untitled" msgstr "̵Âê" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, fuzzy, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "ÉÔŬÀڤʥΡ¼¥É̾¤Ç¤¹: `%s'" @@ -1999,45 +1999,45 @@ msgstr "ÉÔŬÀڤʥΡ¼¥É̾¤Ç¤¹: `%s'" msgid "Unknown index `%s'" msgstr "ÉÔÌÀ¤Ê¥¤¥ó¥Ç¥Ã¥¯¥¹ `%s'" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "¸«½Ð¤· `%s' ¤Ï´û¤Ë¸ºß¤·¤Þ¤¹" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "@synindex ¤Ë¡¢ÃΤé¤Ê¤¤¸«½Ð¤· `%s' ¤ä `%s' ¤¬¤¢¤ê¤Þ¤¹" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "@printindex ¤Ë¡¢ÃΤé¤Ê¤¤¸«½Ð¤· `%s' ¤¬¤¢¤ê¤Þ¤¹" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "¸«½Ð¤· `%s' ¤Î¥¨¥ó¥È¥ê¤Ï¤¢¤é¤æ¤ë¥Î¡¼¥É¤Î³°Â¦¤Ç¤¹" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(¤¢¤é¤æ¤ë¥Î¡¼¥É¤Î³°Â¦)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "See " @@ -2073,104 +2073,104 @@ msgstr "" msgid "`@end' expected `%s', but saw `%s'" msgstr "`@end' ¤Ë¤Ï `%s' ¤¬É¬ÍפǤ¹¤¬¡¢`%s' ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "`%cend %s' ¤È¤ÎÂбþ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s ¤Ë¤Ï±Ñ¿ôʸ»ú¤¬É¬ÍפǤ¹" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "verbatim ¥Ö¥í¥Ã¥¯Ãæ¤Ç¥Õ¥¡¥¤¥ë¤ÎËöÈø¤È¤Ê¤ê¤Þ¤·¤¿" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, fuzzy, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "`@%2$s' ¥Ö¥í¥Ã¥¯Æâ¦¤Ç¤Î @%1$s ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu ¤¬ºÇ½é¤Î @node °ÊÁ°¤Ë¸½¤ì¤Þ¤·¤¿¡£`Top' ¥Î¡¼¥É¤ò¤Ä¤¯¤ê¤Þ¤¹" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "¿ʬ @top ¥Î¡¼¥É¤Ï @ifinfo ¤è¤ê¤Ï @ifnottex ¤Ëʤ¤ï¤ì¤ë¤Ù¤¤Ç¤Ï¡©" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu ¤¬ºÇ½é¤Î¥Î¡¼¥É°ÊÁ°¤Ë¸½¤ì¤Þ¤·¤¿¡£`ĺÅÀ' ¥Î¡¼¥É¤òºî¤ê¤Þ¤¹" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, fuzzy, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "`@%2$s' ¥Ö¥í¥Ã¥¯Æâ¦¤Ç¤Î @%1$s ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "`%c%s' ¤È¤ÎÂбþ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "`%c%s' ¤Î¸å¤í¤Ë¤Ï²¿¤«¤¬É¬ÍפǤ¹" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, fuzzy, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "`%s' ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô `%s'¡£`%s' ¤ò»È¤¤¤Þ¤¹" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "`@%2$s' ¥Ö¥í¥Ã¥¯Æâ¦¤Ç¤Î @%1$s ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "`%s' ¥Ö¥í¥Ã¥¯Æâ¦¤Ç¤Î @itemx ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "ÁÞÆþ¥Ö¥í¥Ã¥¯³°¤Ç¡¢%c%s ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s ¤Ï͸ú¤Ê ISO 639 ¸À¸ì¥³¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, fuzzy, c-format msgid "unrecognized encoding name `%s'" msgstr "¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾ `%s' ¤òǧ¼±¤Ç¤¤Þ¤»¤ó" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "»Äǰ¤Ê¤¬¤é¡¢¥¨¥ó¥³¡¼¥É `%s' ¤Ï¼õ¤±ÉÕ¤±¤é¤ì¤Þ¤»¤ó" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "¥¨¥ó¥³¡¼¥Éʸ»ú `%s' ¤¬Ìµ¸ú¤Ç¤¹" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s ¤Ï `%c' ¤Ç¤Ï¤Ê¤¯¡¢`i' ¤« `j' ¤ò°ú¿ô¤È¤·¤ÆÉ¬ÍפȤ·¤Þ¤¹" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s ¤Ï°ú¿ô¤È¤·¤Æ `i' ¤« `j' ¤Î¤¤¤º¤ì¤«°ìʸ»ú¤¬É¬ÍפǤ¹" @@ -2214,27 +2214,27 @@ msgstr "@%2$s ¤È°ìÃפ·¤Ê¤¤ @end %1$s" msgid "Too many errors! Gave up.\n" msgstr "¥¨¥é¡¼¤¬Â¿¤¹¤®¤Þ¤¹! Äü¤á¤Þ¤·¤¿¡£\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: ·Ù¹ð: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "´Ö°ã¤Ã¤¿°ÌÃÖ¤Ë %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "¾Ü¤·¤¯¤Ï `%s --help' ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... TEXINFO¥Õ¥¡¥¤¥ë...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2242,7 +2242,7 @@ msgstr "" "Texinfo ¥½¡¼¥¹Ê¸½ñ¤òÍÍ¡¹¤Ê·Á¼°¤ÇÆÉ¤á¤ë¤è¤¦¤ËÊÑ´¹¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï\n" "¥ª¥ó¥é¥¤¥ó¤Ç Emacs ¤äñÆÈ¤Î GNU Info ¤ÇÆÉ¤à¤Î¤ËŬ¤·¤¿ Info ¥Õ¥¡¥¤¥ë¤Ç¤¹¡£\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2268,7 +2268,7 @@ msgstr "" " -v, --verbose ¹Ô¤Ê¤ï¤ì¤ë»ö¤òÀâÌÀ¤¹¤ë¡£\n" " --version ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë¡£\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, fuzzy, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2285,7 +2285,7 @@ msgstr "" " ¤Ä¤±¤Ê¤¤¤Èɸ½à½ÐÎϤ˽ñ¤¹þ¤à\n" " --xml Info ¤Ç¤Ï¤Ê¤¯ XML (TexinfoML) ·Á¼°¤Ç½ÐÎϤ¹¤ë¡£\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 #, fuzzy msgid "" "General output options:\n" @@ -2310,7 +2310,7 @@ msgstr "" " -o, --output=FILE FILE ¤Ø½ÐÎϤ¹¤ë (ʬ³ä HTML ¤Î¾ì¹ç¥Ç¥£¥ì¥¯¥È" "¥ê)¡£\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2342,14 +2342,14 @@ msgstr "" " ¤À¤È¡¢´û¸¤Î»ú²¼¤²¤ò¤½¤Î¤Þ¤Þ»È¤¦¡£\n" " --split-size=NUM Info ¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤ò NUM ¤Çʬ³ä (default %d)\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" " read stdin if FILE is -.\n" msgstr "" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2359,7 +2359,7 @@ msgid "" "dropped.\n" msgstr "" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 #, fuzzy msgid "" "Input file options:\n" @@ -2376,7 +2376,7 @@ msgstr "" " -P DIR @include õº÷¥Ñ¥¹¤ÎÀèÆ¬¤Ë DIR ¤òÁÞÆþ¤¹¤ë¡£\n" " -U VAR ÊÑ¿ô VAR ¤ò̤ÄêµÁ¤Ë¤¹¤ë¡£@clear ¤ÈƱ¤¸¡£\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 #, fuzzy msgid "" "Conditional processing in input:\n" @@ -2393,6 +2393,8 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "ÆþÎϤξò·ïŪ½èÍý:\n" " --ifhtml HTML À¸À®¤Ç¤Ê¤¯¤Æ¤â¡¢@ifhtml ¤ä @html ¤ò½èÍý¤¹¤ë¡£\n" @@ -2402,7 +2404,7 @@ msgstr "" " --no-ifinfo @ifinfo ¥Æ¥¯¥¹¥È¤ò½èÍý¤·¤Ê¤¤¡£\n" " --no-iftex @iftex ¤ä @tex ¥Æ¥¯¥¹¥È¤ò½èÍý¤·¤Ê¤¤¡£\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 #, fuzzy msgid "" " The defaults for the @if... conditionals depend on the output format:\n" @@ -2415,7 +2417,7 @@ msgstr "" " HTML ¤òÀ¸À®¤¹¤ë¤Ê¤é --ifhtml ¤¬Í¸ú¤Ç¾¤Ï̵¸ú¤Ç¤¹¡£\n" " Info ¤ä¥×¥ì¥¤¥ó¥Æ¥¯¥¹¥È¤òÀ¸À®¤¹¤ë¤Ê¤é --ifinfo ¤¬Í¸ú¤Ç¾¤Ï̵¸ú¤Ç¤¹¡£\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 #, fuzzy msgid "" "Examples:\n" @@ -2437,83 +2439,83 @@ msgstr "" " makeinfo --number-sections foo.texi Àá¤ËÈÖ¹æ¤òÉÕ¤±¤¿ Info ¤ò½ÐÎÏ\n" " makeinfo --no-split foo.texi Â礤µ¤Ë´Ø¤ï¤é¤º°ì¤Ä¤Î Info ¤ò½ÐÎÏ\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: %s °ú¿ô¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¤Æ¡¢¿ôÃͤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, fuzzy, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "¥Þ¥¯¥í³ÈÄ¥½ÐÎÏ `%s' ¤ò³«¤±¤Þ¤»¤ó" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, fuzzy, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "¥Þ¥¯¥í³ÈÄ¥½ÐÎÏ `%s' ¤ò³«¤±¤Þ¤»¤ó" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: --paragraph-indent °ú¿ô¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¡¢¿ôÃÍ/`none'/`asis' ¤Ç¤Ê¤±¤ì¤Ð\n" " ¤Ê¤ê¤Þ¤»¤ó¡£\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s: --footnote-style °ú¿ô¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¡¢`separate' Ëô¤Ï `end' ¤Ç¤Ê¤±¤ì¤Ð\n" " ¤Ê¤ê¤Þ¤»¤ó¡£\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: ¥Õ¥¡¥¤¥ë°ú¿ô¤ò˺¤ì¤Æ¤¤¤Þ¤¹¤è\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "¤³¤³¤Ç¤Ï `%s' ¤¬Í׵ᤵ¤ì¤Þ¤¹" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê `%s' ¤òºîÀ®¤Ç¤¤Þ¤»¤ó: %s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "`%2$s' ¤Ë `%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "%s: Info ¤Î½ÐÎϤò¹Ô¤Ê¤¦¤Î¤Ç¡¢¥Þ¥¯¥í³ÈÄ¥¤òɸ½à½ÐÎϤ˽ÐÎϤ·¤Þ¤»¤ó¡£\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "`%3$s' ¤«¤é %1$s ¥Õ¥¡¥¤¥ë `%2$s' ¤òºîÀ®¤·¤Þ¤¹¡£\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "" "¤³¤ì¤Ï %1$s¡¢%3$s ¤è¤ê makeinfo ¥Ð¡¼¥¸¥ç¥ó %2$s ¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤Þ¤·¤¿¡£\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2521,81 +2523,81 @@ msgstr "" "%s: ¥¨¥é¡¼¤Ë¤è¤ê¡¢¥Þ¥¯¥í½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òºï½ü¤·¤Þ¤¹¡£\n" " -- »Ä¤·¤¿¤¤¾ì¹ç¤Ë¤Ï `--force' ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: ¥¨¥é¡¼¤Ë¤è¤ê¡¢½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òºï½ü¤·¤Þ¤¹¡£\n" " -- »Ä¤·¤¿¤¤¾ì¹ç¤Ë¤Ï `--force' ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "ÃΤé¤Ê¤¤¥³¥Þ¥ó¥É `%s'" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "@%s ¤Ø¤Î°ú¿ô¤È¤·¤Æ¥³¥Þ¥ó¥É¤òÍ¿¤¨¤ë¤Ë¤Ï¡¢¥Ö¥ì¡¼¥¹¤ò»È¤¤¤Þ¤·¤ç¤¦" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, fuzzy, c-format msgid "%c%s expected braces" msgstr "%c%s ¤Ë¤Ï `{...}' ¤¬É¬ÍפǤ¹" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "Âбþ¤Î¤Ê¤¤ }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "̾Á°¤¬Ìµ¤¤¡ª" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "ÊĤ¸¤ë¥Ö¥ì¡¼¥¹¤Î¤Ê¤¤ %c%s" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "@image ¥Õ¥¡¥¤¥ë `%s' (HTML ÍÑ) ¤¬ÆÉ¤á¤Þ¤»¤ó: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, fuzzy, c-format msgid "No such file `%s'" msgstr "`%2$s' ¤Ë `%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "@image ¥Õ¥¡¥¤¥ë `%s' (text ÍÑ) ¤¬ÆÉ¤á¤Þ¤»¤ó: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "@image ¤Ë¥Õ¥¡¥¤¥ë̾¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{`%s' ¤ÎÃͤ¬¤Ê¤¤}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s ¤Ë¤Ï̾Á°¤¬É¬ÍפǤ¹" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "@end %s ¤ÎÂбþ¤ÎÁ°¤Ë¥Õ¥¡¥¤¥ë¤Î½ª¤ê¤Ë½Ð¤¯¤ï¤·¤Þ¤·¤¿" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "" @@ -2638,128 +2640,128 @@ msgstr "* Âè %d ¥«¥é¥à: ½ÐÎÏ = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "¥Î¡¼¥É `%s' Á°(%d ¹ÔÌÜ)¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "¥Î¡¼¥É %s ¤òÀ°·ÁÃæ...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, fuzzy, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "¥Î¡¼¥É `%s' ¤Ë¤Ï¥»¥¯¥·¥ç¥óÍÑ¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹(Îã: %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "`%c%s' ¥³¥Þ¥ó¥É¤Ë»ØÄꤵ¤ì¤¿¥Î¡¼¥É̾¤¬¤¢¤ê¤Þ¤»¤ó" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "¥¢¥ó¥«¡¼ `%s' ¤È¥Î¡¼¥É `%s' ¤¬Æ±¤¸¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤·¤Æ¤¤¤Þ¤¹" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "¤³¤Î @anchor ¥³¥Þ¥ó¥É¤Ï̵»ë¤µ¤ì¤Þ¤¹ -- ¤½¤³¤Ø¤Î»²¾È¤Ïưºî¤·¤Þ¤»¤ó" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "¤³¤Î¥¢¥ó¥«¡¼Ì¾¤òÊѹ¹¤¹¤ë¤« `--no-split' ¥ª¥×¥·¥ç¥ó¤ò»È¤¤¤Þ¤·¤ç¤¦" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "split-HTML ¥Õ¥¡¥¤¥ë `%s' ¤Î½ª¤ê¤Ë¡¢¤¢¤ë¤Ï¤º¤Î¤Ê¤¤Ê¸»úÎ󤬤¢¤ê¤Þ¤¹" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "¼¡:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "Á°:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "¾å:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "¥¢¥ó¥«¡¼ `%s' ¤È `%s' ¤¬Æ±¤¸¥Õ¥¡¥¤¥ë̾¤Ë¥Þ¥Ã¥×¤·¤Æ¤¤¤Þ¤¹" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "@anchor ¥³¥Þ¥ó¥É¤Ï̵»ë¤µ¤ì¤Þ¤¹ -- ¤½¤³¤Ø¤Î»²¾È¤Ïưºî¤·¤Þ¤»¤ó" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, fuzzy, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "%s ¤Ï¸ºß¤·¤Ê¤¤¥Î¡¼¥É `%s' ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "¥á¥Ë¥å¡¼" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "Áê¸ß" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, fuzzy, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "¥Î¡¼¥É `%s' ¤Î¼¡¤Î¥Õ¥£¡¼¥ë¥É¤¬¥Î¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤»¤ó -- " -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "¤³¤Î¥Î¡¼¥É (%s) ¤Ï¤¤Á¤ó¤È Á° ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "Á°" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "¥Î¡¼¥É `%s' ¤ÎÁ°¤Î¥Õ¥£¡¼¥ë¥É¤¬¥Î¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤»¤ó -- " -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "¤³¤Î¥Î¡¼¥É (%s) ¤Ï¤¤Á¤ó¤È ¼¡ ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "¾å" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" "¥Î¡¼¥É `%s' ¤Ë¤Ï ¾å°Ì¹àÌܤ¬¤¢¤ë¤Î¤Ë¡¢`%s' ¤Ø¤Î¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤ò·ç¤¤¤Æ¤¤¤Þ¤¹" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "¥Î¡¼¥É `%s' ¤Ï´û¤Ë %d ²ó»²¾È¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "»²¾È¤µ¤ì¤Æ¤¤¤Ê¤¤¥Î¡¼¥É `%s'" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, fuzzy, c-format msgid "Can't remove file `%s': %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê `%s' ¤òºîÀ®¤Ç¤¤Þ¤»¤ó: %s" @@ -2807,12 +2809,12 @@ msgstr "Ìܼ¡" msgid "Short Contents" msgstr "´Ê°×Ìܼ¡" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "@image ¥Õ¥¡¥¤¥ë `%s' ¤¬ÆÉ¤á¤Þ¤»¤ó: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/nb.gmo b/gnu/dist/texinfo/po/nb.gmo Binary files differindex df165b9deef..d29bd4223a4 100644 --- a/gnu/dist/texinfo/po/nb.gmo +++ b/gnu/dist/texinfo/po/nb.gmo diff --git a/gnu/dist/texinfo/po/nb.po b/gnu/dist/texinfo/po/nb.po index 97848431584..316de2e825d 100644 --- a/gnu/dist/texinfo/po/nb.po +++ b/gnu/dist/texinfo/po/nb.po @@ -7,9 +7,9 @@ # with the subject: # TP-Robot PACKAGE-VERSION.TEAM.po # -# The subject for the Norwegian bokmål translation of GNU Texinfo 4.6.93 +# The subject for the Norwegian bokmål translation of GNU Texinfo 4.7.90 # would then be: -# TP-Robot texinfo-4.6.93.nb.po +# TP-Robot texinfo-4.7.90.nb.po # # Here's the URL for the Norwegian translation team: # http://www2.iro.umontreal.ca/~pinard/po/registry.cgi?team=no @@ -19,10 +19,10 @@ # msgid "" msgstr "" -"Project-Id-Version: texinfo 4.6.93\n" +"Project-Id-Version: texinfo 4.7.90\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" -"PO-Revision-Date: 2004-03-27 11:31+0100\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" +"PO-Revision-Date: 2004-12-05 15:37+0100\n" "Last-Translator: Trond Endrestøl <Trond.Endrestol@gtf.ol.no>\n" "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n" "MIME-Version: 1.0\n" @@ -138,15 +138,15 @@ msgstr "En fullføring:\n" msgid "%d completions:\n" msgstr "%d fullføringer:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Sett inn fullføring" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Bygger fullføringer..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Rulle fullføringsvinduet" @@ -194,7 +194,7 @@ msgid "No index entries." msgstr "Ingen indeksinnslag." #: info/indices.c:375 -#, fuzzy, c-format +#, c-format msgid "No %sindex entries containing `%s'." msgstr "Ingen %sindeksinnslag inneholdende «%s»." @@ -207,17 +207,17 @@ msgid "CAN'T SEE THIS" msgstr "KAN IKKE SE DETTE" #: info/indices.c:422 -#, fuzzy, c-format +#, c-format msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)" msgstr "Fant «%s» i %s. («\\[next-index-match]» prøver å finne den neste.)" #: info/indices.c:541 -#, fuzzy, c-format +#, c-format msgid "Scanning indices of `%s'..." msgstr "Sjekker indekser i «%s»..." #: info/indices.c:596 -#, fuzzy, c-format +#, c-format msgid "No available info files have `%s' in their indices." msgstr "Ingen av de tilgjengelig infofilene har «%s» i deres indekser." @@ -232,7 +232,7 @@ msgid "Index apropos: " msgstr "Indeksapropos: " #: info/indices.c:654 -#, fuzzy, c-format +#, c-format msgid "" "\n" "* Menu: Nodes whose indices contain `%s':\n" @@ -245,7 +245,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "Prøv --help for mer informasjon.\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, c-format msgid "" @@ -343,7 +343,7 @@ msgstr "" " info --show-options emacs starte ved emacs kommandolinjevalg\n" " info -f ./foo.info vise filen ./foo.info, ikke søke gjennom dir\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1144,7 +1144,7 @@ msgstr "Flytte til slutten av linjen" msgid "Move to the start of the line" msgstr "Flytte til starten av linjen" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "neste" @@ -1614,7 +1614,7 @@ msgid "\"%s\" is invalid" msgstr "«%s» er ugyldig" #: info/session.c:4495 -#, fuzzy, c-format +#, c-format msgid "`%s' is invalid" msgstr "«%s» er ugyldig" @@ -1722,174 +1722,174 @@ msgstr "-%s%s-Info: (%s)%s, %d linjer --%s--" msgid " Subfile: %s" msgstr " Delfil: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: valget «%s» er flertydig\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: valget «--%s» tillater ikke et argument\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: valget «%c%s» tillater ikke et argument\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: valget «%s» krever et argument\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ukjent valg «--%s»\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ukjent valg «%c%s»\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ulovlig valg -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ugyldig valg -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: valget krever et argument -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: valget «-W %s» er flertydig\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: valget «-W %s» tillater ikke et argument\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, c-format msgid "arguments to @%s ignored" msgstr "argumentene til @%s ble ignorert" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "januar" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "februar" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "mars" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "april" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "mai" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "juni" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "juli" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "august" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "september" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "oktober" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "november" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "desember" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "usannsynlig tegn %c i @var" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "@sc-argument med store bokstaver, dermed ingen effekt" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "«{» forventet, men så «%c»" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "slutt-på-fila inne i verb-blokk" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "«{» forventet, men så «%c»" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -"@strong{Note:} lager en overflødig kryssreferanse i Info; omskriv for å " -"unngå det" +"@strong{Note...} lager en overflødig kryssreferanse i Info; skriv om for å " +"unngå dette" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s er utgått" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp krever et positivt numerisk argument, ikke `%s'" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "Ugyldig argument til %c%s" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "none" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, c-format msgid "Bad argument to @%s" msgstr "Ugyldig argument til @%s" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "insert" @@ -1926,12 +1926,12 @@ msgid "Method" msgstr "Metode" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "av" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "på" @@ -1940,22 +1940,22 @@ msgstr "på" msgid "Must be in `@%s' environment to use `@%s'" msgstr "Må være i et «@%s»-miljø for å bruke «@%s»" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "`%s' utelatt før outputfilnavn" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "`%s' utelatt pga skriving til stdout" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "Outputbuffer er ikke tomt." @@ -1995,11 +1995,11 @@ msgstr "%s:%d: --css-file endte i en kommentar" msgid "Untitled" msgstr "Uten navn" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "[uforventet] kunne ikke poppe neste htmltagg" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "[uforventet] ugyldig nodenavn: «%s»" @@ -2009,45 +2009,45 @@ msgstr "[uforventet] ugyldig nodenavn: «%s»" msgid "Unknown index `%s'" msgstr "Ukjent indeks «%s»" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "Info kan ikke håndtere `:' i indeksinnslaget `%s'" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "Indeksen «%s» eksisterer allerede" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Ukjent indeks «%s» og/eller «%s» i @synindex" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "(linje )" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "(linje %*d)" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Ukjent indeks «%s» i @printindex" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "Innslag for indeksen «%s» utenfor node" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(utenfor noder)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "Se " @@ -2083,105 +2083,105 @@ msgstr "%cfloat-miljøer kan ikke nøstes" msgid "`@end' expected `%s', but saw `%s'" msgstr "`@end' forventet «%s», men så «%s»" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "Ingen tilsvarende «%cend %s»" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s krever en bokstav eller et siffer" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "slutt-på-filen inne i verbatimblokk" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "@%s er meningsløs utenfor et «@float»-miljø" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu sett før første @node, oppretter «Top»-noden" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" "kanskje burde din @top-node bli pakket inn i @ifnottex istedet for @ifinfo?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu sett før første node, oppretter «Top»-noden" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "@%s gir ikke mening utenfor «@titlepage»- og «@quotation»-miljøer" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "@%s er meningsløs utenfor et «@titlepage»-miljø" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "Umatchet «%c%s»" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "«%c%s» trenger noe etter den" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "Ugyldig argument «%s» til «%s», bruker «%s»" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s er meningsløs innenfor en «@%s»-blokk" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "@itemx er meningsløs innenfor en «@%s»-blokk" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s funnet utenfor en innsettingsblokk" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s er ikke en gyldig ISO 639-språkkode" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, c-format msgid "unrecognized encoding name `%s'" msgstr "ugjenkjennelig kodingsnavn «%s»" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "beklager, kodingen «%s» er ikke støttet" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "Ugyldig kodet tegn «%s»" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s forventer «i» eller «j» som argument, ikke «%c»" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s forventer et enkelt tegn, «i» eller «j» som argument" @@ -2225,27 +2225,27 @@ msgstr "umatchet @end %s med @%s" msgid "Too many errors! Gave up.\n" msgstr "For mange feil! Ga opp.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: advarsel: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "Feilplassert %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv «%s --help» for mer informasjon.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2253,7 +2253,7 @@ msgstr "" "Oversette Texinfodokumentasjon til forskjellige andre formater:\n" "Infofiler for lesing online med Emacs eller den frittstående GNU Info.\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2278,7 +2278,7 @@ msgstr "" " -v, --verbose forklare hva som blir gjort.\n" " --version vise programversjon og avslutte.\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2293,7 +2293,7 @@ msgstr "" " --xml generere Texinfo XML i stedet for Info.\n" " --plaintext generere ren tekst i stedet for Info.\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2325,7 +2325,7 @@ msgstr "" " -o, --output=FIL sende output til FIL (eller katalog dersom " "splittet HTML),\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2362,7 +2362,7 @@ msgstr "" " --split-size=ANT splitte Infofilene ved lengde ANT (standard %" "d).\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" @@ -2372,7 +2372,7 @@ msgstr "" " --css-include=FIL inkluder FIL i HTML <style>-taggen;\n" " les stdin dersom FIL er -.\n" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2387,7 +2387,7 @@ msgstr "" " Dersom ANT er 0, blir ignorerbart tomrom " "ikke brukt.\n" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2407,7 +2407,7 @@ msgstr "" " -U VAR udefiner variabelen VAR, som om @clear " "brukes.\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2423,13 +2423,15 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "Betinget behandling av input:\n" -" --ifdocbook behandle @ifdocbook og @docbook selv om DocBook ikke " -"skal genereres.\n" +" --ifdocbook behandle @ifdocbook og @docbook selv om\n" +" DocBook ikke skal genereres.\n" " --ifhtml behandle @ifhtml og @html selv om HTML ikke skal " "genereres.\n" -" --ifinfo behandle @ifinfo selv når HTML skal genereres.\n" +" --ifinfo behandle @ifinfo selv når info ikke skal genereres.\n" " --ifplaintext behandle @ifplaintext selv om ren tekst ikke skal " "genereres.\n" " --iftex behandle @iftex og @tex; innebærer --no-split.\n" @@ -2441,7 +2443,7 @@ msgstr "" " --no-iftex ikke behandle @iftex og @tex.\n" " --no-ifxml ikke behandle @ifxml og @xml.\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2455,7 +2457,7 @@ msgstr "" " dersom ren tekst genereres er --ifplaintext påslått og de andre av;\n" " dersom XML genereres er --ifxml påslått og de andre av.\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2480,81 +2482,81 @@ msgstr "" " makeinfo --number-sections foo.texi skrive Info med nummererte avsnitt\n" " makeinfo --no-split foo.texi skrive en Infofil uansett størrelse\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "%s: Ignorerer ugjenkjennelig TEXINFO_OUTPUT_FORMAT-verdi «%s».\n" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: %s arg må være numerisk, ikke «%s».\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "%s: kunne ikke åpne makroekspansjonoutput «%s»" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "%s: ignorerer sekundær makroekspansjonoutpur «%s».\n" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: mangler filargument.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "Flerlinjekommandoen %c%s brukes ikke riktig" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "Forventet «%s»" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "Kan ikke opprette katalogen «%s»: %s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "Ingen «%s» funnet i «%s»" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" "%s: Hopper over makroekspansjon til stdout siden Info-output også sendes " "dit.\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "Lager %s-filen «%s» fra «%s».\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "Dette er %s, produsert av makeinfo versjon %s fra %s.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2562,81 +2564,81 @@ msgstr "" "%s: Fjerner makroutskriftsfilen «%s» på grunn av feil; bruk --force for å " "bevare.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: Fjerner utskriftsfilen «%s» på grunn av feil; bruk --force for å " "bevare.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "Ukjent kommando «%s»" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "Bruk krøllparenteser for å gi en kommando som et argument til @%s" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, c-format msgid "%c%s expected braces" msgstr "%c%s forventet krøllparanteser" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "Umatchet }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "INTET_NAVN!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s mangler avsluttende krøllparentes" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "@image-fil «%s» (for HTML) er uleselig: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, c-format msgid "No such file `%s'" msgstr "«%s» er ingen fil" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "@image-fil «%s» (for tekstformat) er uleselig: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "@image mangler filnavn" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "udefinert flagg: %s" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{Ingen verdi for «%s»}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s krever et navn" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "Traff slutt-på-filen før matchende @end %s" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "`%.40s...' er for lang for ekspansjon; ikke ekspandert" @@ -2679,130 +2681,130 @@ msgstr "* kolonne #%d output = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "Noden «%s» er tidligere definert ved linje %d" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "Skriver noden %s...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "Noden «%s» krever en inndelingskommando (f.eks. %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "Ingen nodenavn spesifisert for «%c%s»-kommandoen" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "Ankeret «%s» og noden «%s» blir knyttet til det samme filnavnet" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" "Denne @anchor-kommandoen ble ignorert, referanser til den vil ikke virke" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "Omdøpe dette ankeret eller bruk «--no-split»-valget" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "Uforventet streng ved slutten av splitt-HTML-fila «%s»" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "Neste:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "Forrige:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "Opp:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "Ankrene «%s» og «%s» peker til det samme filnavnet" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "@anchor-kommando ignorert; referanser til den vil ikke virke" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "" "%s referanse til ikke-eksisterende node «%s» (kanskje ugyldig inndeling?)" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "Meny" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "Kryss" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" "Nestefeltet til noden «%s» er ikke pekt på (kanskje ugyldig inndeling?)" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "Denne noden (%s) har den dårlige forrigepekeren" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "forrige" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "Forrigefeltet til noden «%s» er ikke pekt på" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "Denne noden (%s) har den dårlige nestepekeren" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "`%s' har ingen Up-felt (kanskje feil inndeling?)" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "opp" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "Noden «%s» mangler et menypunkt for «%s» selv om den er dens oppmål" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "noden «%s» har blitt referert %d ganger" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "ureferert node «%s»" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "Fjerner %s\n" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, c-format msgid "Can't remove file `%s': %s" msgstr "Kan ikke slette filen «%s»: %s" @@ -2813,7 +2815,7 @@ msgid "Appendix %c" msgstr "Vedlegg %c" #: makeinfo/sectioning.c:467 -#, fuzzy, c-format +#, c-format msgid "Internal error (search_sectioning) `%s'!" msgstr "Intern feil (search_sectioning) «%s»!" @@ -2850,12 +2852,12 @@ msgstr "Innholdsfortegnelse" msgid "Short Contents" msgstr "Kort innholdsfortegnelse" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "@image-fil «%s» er uleselig: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/nl.gmo b/gnu/dist/texinfo/po/nl.gmo Binary files differindex e4b56b356fa..81ecd32f915 100644 --- a/gnu/dist/texinfo/po/nl.gmo +++ b/gnu/dist/texinfo/po/nl.gmo diff --git a/gnu/dist/texinfo/po/nl.po b/gnu/dist/texinfo/po/nl.po index 84188b1c0da..20ae5111ce1 100644 --- a/gnu/dist/texinfo/po/nl.po +++ b/gnu/dist/texinfo/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: texinfo 3.12\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" "PO-Revision-Date: 1998-04-16 22:35+02:00\n" "Last-Translator: Ivo Timmermans <zarq@iname.com>\n" "Language-Team: Dutch <nl@li.org>\n" @@ -130,15 +130,15 @@ msgstr "Een voltooiïng:\n" msgid "%d completions:\n" msgstr "%d voltooiïngen:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Voeg voltooiïng in" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Voltooiïngen aan het bouwen..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Verschuif het voltooiïngsvenster" @@ -244,7 +244,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "Probeer --help voor meer informatie." -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, fuzzy, c-format msgid "" @@ -334,7 +334,7 @@ msgstr "" "Meld fouten in het programma aan bug-texinfo@gnu.org;\n" "meld onjuistheden in de vertaling aan nl@li.org." -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1099,7 +1099,7 @@ msgstr "Ga naar het einde van de regel" msgid "Move to the start of the line" msgstr "Ga naar het begin van de regel" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 #, fuzzy msgid "Next" msgstr "Volgende" @@ -1704,174 +1704,174 @@ msgstr "-%s%s-Info: (%s)%s, %d regels --%s--" msgid " Subfile: %s" msgstr "Sub-bestand: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: optie `%s' is dubbelzinnig\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: optie `--%s' staat geen argumenten toe\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: optie `%c%s' staat geen argumenten toe\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: optie `%s' vereist een argument\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: onbekende optie `--%s'\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: onbekende optie `%c%s'\n" # Dit is de POSIX versie van de volgende melding -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ongeldige optie -- %c\n" # Dezelfde tekst als hiervoor -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ongeldige optie -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: optie vereist een argument -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: optie `-W %s' is dubbelzinnig\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: optie `-W %s' staat geen argumenten toe\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, fuzzy, c-format msgid "arguments to @%s ignored" msgstr "Verkeerd argument voor %c%s" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "Januari" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "Februari" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "Maart" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "April" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "Mei" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "Juni" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "Juli" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "Augustus" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "September" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "Oktober" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "November" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "December" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, fuzzy, c-format msgid "`{' expected, but saw `%c'" msgstr "`%cend' verwachtte `%s', maar heb `%s' gezien" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, fuzzy, c-format msgid "`}' expected, but saw `%c'" msgstr "`%cend' verwachtte `%s', maar heb `%s' gezien" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s is verouderd" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, fuzzy, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "%csp vereist een postief numeriek argument" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "Verkeerd argument voor %c%s" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "geen" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, fuzzy, c-format msgid "Bad argument to @%s" msgstr "Verkeerd argument voor %c%s" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "" @@ -1909,12 +1909,12 @@ msgid "Method" msgstr "Methode" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 #, fuzzy msgid "on" msgstr "geen" @@ -1925,22 +1925,22 @@ msgstr "geen" msgid "Must be in `@%s' environment to use `@%s'" msgstr "Moet in een `%s' `insertion' zitten om `%s'x te gebruiken" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "" @@ -1984,11 +1984,11 @@ msgstr "" msgid "Untitled" msgstr "" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, fuzzy, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "%s: onbekende optie `--%s'\n" @@ -1998,45 +1998,45 @@ msgstr "%s: onbekende optie `--%s'\n" msgid "Unknown index `%s'" msgstr "Onbekende index `%s'" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "Index `%s' bestaat al" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Onbekende index `%s' en/of `%s' in @synindex" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Onbekende index `%s' in @printindex" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "" @@ -2074,106 +2074,106 @@ msgstr "" msgid "`@end' expected `%s', but saw `%s'" msgstr "`%cend' verwachtte `%s', maar heb `%s' gezien" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "Geen overeenkomende `%cend %s'" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s vereist een letter of cijfer" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, fuzzy, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "%citemx is zinloos in een `%s' blok" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 #, fuzzy msgid "@menu seen before first @node, creating `Top' node" msgstr "%cmenu gezien voor de eerste pagina" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 #, fuzzy msgid "@detailmenu seen before first node, creating `Top' node" msgstr "%cmenu gezien voor de eerste pagina" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, fuzzy, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "%citemx is zinloos in een `%s' blok" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "Niet overeenkomende `%c%s'" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "`%c%s' verwacht er iets na" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, fuzzy, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "Verkeerd argument voor `%s', `%s', gebruik `%s'" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, fuzzy, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "%citemx is zinloos in een `%s' blok" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, fuzzy, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "%citemx is zinloos in een `%s' blok" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s buiten een invoeg-blok gevonden" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, fuzzy, c-format msgid "unrecognized encoding name `%s'" msgstr "%s: onbekende optie `--%s'\n" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s verwacht `i' of `j' als argument, niet `%c'" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s verwacht één enkele `i' of `j' als argument" @@ -2219,33 +2219,33 @@ msgstr "" msgid "Too many errors! Gave up.\n" msgstr "Te veel fouten! Ik heb het maar opgegeven.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: waarschuwing: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "Verkeerd geplaatste %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Probeer `%s --help' voor meer informatie.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, fuzzy, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Aanroep: %s [OPTIE]... BESTAND...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" msgstr "" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2260,7 +2260,7 @@ msgid "" " --version display version information and exit.\n" msgstr "" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2270,7 +2270,7 @@ msgid "" " --plaintext output plain text rather than Info.\n" msgstr "" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2286,7 +2286,7 @@ msgid "" " -o, --output=FILE output to FILE (directory if split HTML),\n" msgstr "" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2305,14 +2305,14 @@ msgid "" " --split-size=NUM split Info files at size NUM (default %d).\n" msgstr "" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" " read stdin if FILE is -.\n" msgstr "" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2322,7 +2322,7 @@ msgid "" "dropped.\n" msgstr "" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2332,7 +2332,7 @@ msgid "" " -U VAR undefine the variable VAR, as with @clear.\n" msgstr "" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2348,9 +2348,11 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2359,7 +2361,7 @@ msgid "" " if generating XML, --ifxml is on and the others are off.\n" msgstr "" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2374,69 +2376,69 @@ msgid "" " makeinfo --no-split foo.texi write one Info file however big\n" msgstr "" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: %s argument moet numeriek zijn, niet `%s'.\n" # Vanaf hier -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, fuzzy, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "Kon uitvoer `%s' voor makro-uitbreiding niet openen" # Vanaf hier -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, fuzzy, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "Kon uitvoer `%s' voor makro-uitbreiding niet openen" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: argument voor --paragraph-indent moet numeriek, `none' of `asis' zijn, " "niet `%s'.\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s: argument voor --footnote-style moet `separate' of `end' zijn, niet `%" "s'.\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: ontbrekend bestandsargument\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "Verwachtte `%s'" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "Geen `%s' gevonden in `%s'" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" @@ -2444,17 +2446,17 @@ msgstr "" "uitvoer\n" "van Info gaat daar al heen.\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "Bezig met het maken van een %s-bestand `%s' van `%s'.\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, fuzzy, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "Dit is Info bestand %s, gemaakt door Makeinfo versie %d.%d" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2462,81 +2464,81 @@ msgstr "" "%s: makro uitvoer bestand `%s' weggehaald wegens fouten; gebruik --force om " "te bewaren.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: uitvoer bestand `%s' weggehaald wegens fouten; gebruik --force om te " "bewaren.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "Onbekend commando `%s'" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, fuzzy, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "commandoregel-argument `%s' te veel" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, fuzzy, c-format msgid "%c%s expected braces" msgstr "%c%s verwachtte `{...}'" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "Niet-overeenkomende }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "GEEN_NAAM!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s ontbrekende afsluitende accolade" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, fuzzy, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "@image bestand `%s' onleesbaar: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, fuzzy, c-format msgid "No such file `%s'" msgstr "Geen `%s' gevonden in `%s'" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, fuzzy, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "@image bestand `%s' onleesbaar: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "ontbrekend bestandsnaam argument voor @image" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, fuzzy, c-format msgid "{No value for `%s'}" msgstr "{Geen waarde voor \"%s\"}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s vereist een naam" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "Kwam bestandseinde tegen voor een overeenkomende @end %s" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "" @@ -2580,138 +2582,138 @@ msgstr "* kolom #%d: uitvoer = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "makro `%s' al eerder gedefinieerd" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "Pagina %s wordt geformatteerd...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, fuzzy, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "Pagina `%s' vereist een sectiecommando (bijv. %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 #, fuzzy msgid "Next:" msgstr "Volgende" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 #, fuzzy msgid "Previous:" msgstr "Vorige" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 #, fuzzy msgid "Up:" msgstr "Omhoog" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, fuzzy, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "%s verwijst naar niet-bestaande pagina `%s'" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 #, fuzzy msgid "Menu" msgstr "* Menu:\n" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "" # Deze zes meldingen: # next, prev en up niet vertalen, dit is wat er in de broncode staat. # Het is duidelijker indien onvertaald. -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, fuzzy, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "Het `next'-veld van pagina `%s' wijst niet terug op" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, fuzzy, c-format msgid "This node (%s) has the bad Prev" msgstr "Deze node (`%s') is degene met het foute `next'-veld" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 #, fuzzy msgid "Prev" msgstr "Vorige" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, fuzzy, c-format msgid "Prev field of node `%s' not pointed to" msgstr "Het `prev'-veld van node (`%s') wijst niet terug op" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, fuzzy, c-format msgid "This node (%s) has the bad Next" msgstr "Deze node (`%s') is degene met het foute `next'-veld" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 #, fuzzy msgid "Up" msgstr "Omhoog" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" # Eigenlijk zouden hier de %s en de %d omgedraaid moeten worden: # `Er wordt %d keer naar %s verwezen' -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "er wordt naar pagina `%s' %d keer verwezen" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "naar pagina `%s' wordt niet verwezen" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, fuzzy, c-format msgid "Can't remove file `%s': %s" msgstr "Kan uitvoerbestand \"%s\" niet vinden." @@ -2759,12 +2761,12 @@ msgstr "" msgid "Short Contents" msgstr "" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "@image bestand `%s' onleesbaar: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/no.gmo b/gnu/dist/texinfo/po/no.gmo Binary files differindex 96749ac775d..af281d5266d 100644 --- a/gnu/dist/texinfo/po/no.gmo +++ b/gnu/dist/texinfo/po/no.gmo diff --git a/gnu/dist/texinfo/po/no.po b/gnu/dist/texinfo/po/no.po index 597163f7b92..c117a14ea93 100644 --- a/gnu/dist/texinfo/po/no.po +++ b/gnu/dist/texinfo/po/no.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Texinfo 4.6\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" "PO-Revision-Date: 2003-07-14 13:13+02:00\n" "Last-Translator: Trond Endrestøl <trond@ramstind.gtf.ol.no>\n" "Language-Team: Norwegian-bokmål <no@li.org>\n" @@ -123,15 +123,15 @@ msgstr "En fullføring:\n" msgid "%d completions:\n" msgstr "%d fullføringer:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Sett inn fullføring" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Bygger fullføringer..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Rulle fullføringsvinduet" @@ -230,7 +230,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "Prøv --help for mer informasjon.\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, fuzzy, c-format msgid "" @@ -332,7 +332,7 @@ msgstr "" "Send bugrapport til bug-texinfo@gnu.org,\n" "generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1133,7 +1133,7 @@ msgstr "Flytte til slutten av linjen" msgid "Move to the start of the line" msgstr "Flytte til starten av linjen" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "neste" @@ -1711,172 +1711,172 @@ msgstr "-%s%s-Info: (%s)%s, %d linjer --%s--" msgid " Subfile: %s" msgstr " Delfil: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: valget «%s» er flertydig\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: valget «--%s» tillater ikke et argument\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: valget «%c%s» tillater ikke et argument\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: valget «%s» krever et argument\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ukjent valg «--%s»\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ukjent valg «%c%s»\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ulovlig valg -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ugyldig valg -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: valget krever et argument -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: valget «-W %s» er flertydig\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: valget «-W %s» tillater ikke et argument\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, fuzzy, c-format msgid "arguments to @%s ignored" msgstr "Ugyldig argument til %c%s" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "januar" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "februar" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "mars" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "april" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "mai" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "juni" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "juli" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "august" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "september" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "oktober" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "november" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "desember" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "usannsynlig tegn %c i @var" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "@sc-argument med store bokstaver, dermed ingen effekt" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "«{» forventet, men så «%c»" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "slutt-på-fila inne i verb-blokk" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "«{» forventet, men så «%c»" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s er utgått" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp krever et positivt numerisk argument, ikke `%s'" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "Ugyldig argument til %c%s" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "none" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, fuzzy, c-format msgid "Bad argument to @%s" msgstr "Ugyldig argument til %c%s" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "insert" @@ -1913,12 +1913,12 @@ msgid "Method" msgstr "Metode" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "av" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "på" @@ -1927,22 +1927,22 @@ msgstr "på" msgid "Must be in `@%s' environment to use `@%s'" msgstr "Må være i et «@%s»-miljø for å bruke «@%s»" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "" @@ -1982,11 +1982,11 @@ msgstr "%s:%d: --css-file endte i en kommentar" msgid "Untitled" msgstr "Uten navn" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "[uforventet] kunne ikke poppe neste htmltagg" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "[uforventet] ugyldig nodenavn: «%s»" @@ -1996,45 +1996,45 @@ msgstr "[uforventet] ugyldig nodenavn: «%s»" msgid "Unknown index `%s'" msgstr "Ukjent indeks «%s»" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "Info kan ikke håndtere `:' i indeksinnslaget `%s'" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "Indeksen «%s» eksisterer allerede" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Ukjent indeks «%s» og/eller «%s» i @synindex" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Ukjent indeks «%s» i @printindex" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "Innslag for indeksen «%s» utenfor node" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(utenfor noder)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "Se " @@ -2070,105 +2070,105 @@ msgstr "" msgid "`@end' expected `%s', but saw `%s'" msgstr "`@end' forventet «%s», men så «%s»" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "Ingen tilsvarende «%cend %s»" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s krever en bokstav eller et siffer" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "slutt-på-filen inne i verbatimblokk" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, fuzzy, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "@%s er meningsløs innenfor en «%s»-blokk" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu sett før første @node, oppretter «Top»-noden" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" "kanskje burde din @top-node bli pakket inn i @ifnottex istedet for @ifinfo?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu sett før første node, oppretter «Top»-noden" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, fuzzy, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "@%s er meningsløs innenfor en «%s»-blokk" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "Umatchet «%c%s»" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "«%c%s» trenger noe etter den" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, fuzzy, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "Ugyldig argument til «%s», «%s», bruker «%s»" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s er meningsløs innenfor en «%s»-blokk" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "@itemx er meningsløs innenfor en «%s»-blokk" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s funnet utenfor en innsettingsblokk" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s er ikke en gyldig ISO 639-språkkode" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, c-format msgid "unrecognized encoding name `%s'" msgstr "ugjenkjennelig kodingsnavn «%s»" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "beklager, kodingen «%s» er ikke støttet" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "Ugyldig kodet tegn «%s»" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s forventer «i» eller «j» som argument, ikke «%c»" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s forventer et enkelt tegn, «i» eller «j» som argument" @@ -2212,27 +2212,27 @@ msgstr "umatchet @end %s med @%s" msgid "Too many errors! Gave up.\n" msgstr "For mange feil! Ga opp.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: advarsel: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "Feilplassert %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv «%s --help» for mer informasjon.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2240,7 +2240,7 @@ msgstr "" "Oversette Texinfodokumentasjon til forskjellige andre formater:\n" "Infofiler for lesing online med Emacs eller den frittstående GNU Info.\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2265,7 +2265,7 @@ msgstr "" " -v, --verbose forklare hva som blir gjort.\n" " --version vise programversjon og avslutte.\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, fuzzy, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2279,7 +2279,7 @@ msgstr "" " --html generere HTML i stedet for Info.\n" " --xml generere Texinfo XML i stedet for Info.\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2312,7 +2312,7 @@ msgstr "" "splittet HTML),\n" # Denne mangler oversettelse, må rettes snarest. -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2350,7 +2350,7 @@ msgstr "" " --split-size=ANT splitte Infofilene ved lengde ANT (standard %" "d).\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" @@ -2360,7 +2360,7 @@ msgstr "" " --css-include=FIL inkluder FIL i HTML <style>-taggen;\n" " les stdin dersom FIL er -.\n" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, fuzzy, c-format msgid "" "Options for XML and Docbook:\n" @@ -2373,7 +2373,7 @@ msgstr "" " --css-include=FIL inkluder FIL i HTML <style>-taggen;\n" " les stdin dersom FIL er -.\n" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2393,7 +2393,7 @@ msgstr "" " -U VAR udefiner variabelen VAR, som om @clear " "brukes.\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 #, fuzzy msgid "" "Conditional processing in input:\n" @@ -2410,6 +2410,8 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "Betinget behandling av input:\n" " --ifhtml behandle @ifhtml og @html selv om HTML ikke skal " @@ -2425,7 +2427,7 @@ msgstr "" " --no-iftex ikke behandle @iftex og @tex.\n" " --no-ifxml ikke behandle @ifxml og @xml.\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2439,7 +2441,7 @@ msgstr "" " dersom ren tekst genereres er --ifplaintext påslått og de andre av;\n" " dersom XML genereres er --ifxml påslått og de andre av.\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2464,81 +2466,81 @@ msgstr "" " makeinfo --number-sections foo.texi skrive Info med nummererte avsnitt\n" " makeinfo --no-split foo.texi skrive en Infofil uansett størrelse\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: %s arg må være numerisk, ikke «%s».\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, fuzzy, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "Kunne ikke åpne filen «%s» for utskrift av makroekspansjon" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, fuzzy, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "Kunne ikke åpne filen «%s» for utskrift av makroekspansjon" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: mangler filargument.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "Forventet «%s»" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "Kan ikke opprette katalogen «%s»: %s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "Ingen «%s» funnet i «%s»" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" "%s: Hopper over makroekspansjon til stdout siden Info-output også sendes " "dit.\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "Lager %s-filen «%s» fra «%s».\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "Dette er %s, produsert av makeinfo versjon %s fra %s.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2546,81 +2548,81 @@ msgstr "" "%s: Fjerner makroutskriftsfilen «%s» på grunn av feil; bruk --force for å " "bevare.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: Fjerner utskriftsfilen «%s» på grunn av feil; bruk --force for å " "bevare.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "Ukjent kommando «%s»" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "Bruk krøllparenteser for å gi en kommando som et argument til @%s" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, c-format msgid "%c%s expected braces" msgstr "%c%s forventet krøllparanteser" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "Umatchet }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "INTET_NAVN!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s mangler avsluttende krøllparentes" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "@image-fil «%s» (for HTML) er uleselig: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, c-format msgid "No such file `%s'" msgstr "«%s» er ingen fil" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "@image-fil «%s» (for tekstformat) er uleselig: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "@image mangler filnavn" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "udefinert flagg: %s" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{Ingen verdi for «%s»}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s krever et navn" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "Traff slutt-på-filen før matchende @end %s" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "`%.40s...' er for lang for ekspansjon; ikke ekspandert" @@ -2663,130 +2665,130 @@ msgstr "* kolonne #%d output = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "Noden «%s» er tidligere definert ved linje %d" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "Skriver noden %s...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "Noden «%s» krever en inndelingskommando (f.eks. %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "Ingen nodenavn spesifisert for «%c%s»-kommandoen" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "Ankeret «%s» og noden «%s» blir knyttet til det samme filnavnet" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" "Denne @anchor-kommandoen ble ignorert, referanser til den vil ikke virke" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "Omdøpe dette ankeret eller bruk «--no-split»-valget" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "Uforventet streng ved slutten av splitt-HTML-fila «%s»" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "Neste:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "Forrige:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "Opp:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "Ankrene «%s» og «%s» peker til det samme filnavnet" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "@anchor-kommando ignorert; referanser til den vil ikke virke" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "" "%s referanse til ikke-eksisterende node «%s» (kanskje ugyldig inndeling?)" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "Meny" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "Kryss" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" "Nestefeltet til noden «%s» er ikke pekt på (kanskje ugyldig inndeling?)" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "Denne noden (%s) har den dårlige forrigepekeren" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "forrige" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "Forrigefeltet til noden «%s» er ikke pekt på" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "Denne noden (%s) har den dårlige nestepekeren" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "`%s' har ingen Up-felt (kanskje feil inndeling?)" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "opp" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "Noden «%s» mangler et menypunkt for «%s» selv om den er dens oppmål" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "noden «%s» har blitt referert %d ganger" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "ureferert node «%s»" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, fuzzy, c-format msgid "Can't remove file `%s': %s" msgstr "Kan ikke opprette katalogen «%s»: %s" @@ -2834,12 +2836,12 @@ msgstr "Innholdsfortegnelse" msgid "Short Contents" msgstr "Kort innholdsfortegnelse" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "@image-fil «%s» er uleselig: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/pl.gmo b/gnu/dist/texinfo/po/pl.gmo Binary files differindex 8c783f8fe8b..a09723256aa 100644 --- a/gnu/dist/texinfo/po/pl.gmo +++ b/gnu/dist/texinfo/po/pl.gmo diff --git a/gnu/dist/texinfo/po/pl.po b/gnu/dist/texinfo/po/pl.po index 0c131fe4569..60f787a0f62 100644 --- a/gnu/dist/texinfo/po/pl.po +++ b/gnu/dist/texinfo/po/pl.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: texinfo 4.6.93\n" +"Project-Id-Version: texinfo 4.7.90\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" -"PO-Revision-Date: 2004-03-27 10:50+0100\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" +"PO-Revision-Date: 2004-12-05 12:24+0100\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" @@ -124,15 +124,15 @@ msgstr "Jedno uzupe³nienie:\n" msgid "%d completions:\n" msgstr "%d uzupe³nieñ:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Wstawienie uzupe³nienia" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Tworzenie uzupe³nieñ..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Przewijanie okna uzupe³nieñ" @@ -179,9 +179,9 @@ msgid "No index entries." msgstr "Brak wpisów w indeksie." #: info/indices.c:375 -#, fuzzy, c-format +#, c-format msgid "No %sindex entries containing `%s'." -msgstr "Nie ma %swpisów zawieraj±cych \"%s\"." +msgstr "Nie ma %swpisów w indeksie zawieraj±cych `%s'." #: info/indices.c:376 msgid "more " @@ -192,20 +192,20 @@ msgid "CAN'T SEE THIS" msgstr "NIE MO¯NA TEGO ZOBACZYÆ" #: info/indices.c:422 -#, fuzzy, c-format +#, c-format msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)" msgstr "" -"Znaleziono \"%s\" w %s. (`\\[next-index-match]' próbuje znale¼æ nastêpne.)" +"Znaleziono `%s' w %s. (`\\[next-index-match]' próbuje znale¼æ nastêpne.)" #: info/indices.c:541 -#, fuzzy, c-format +#, c-format msgid "Scanning indices of `%s'..." -msgstr "Przeszukiwanie indeksów \"%s\"..." +msgstr "Przeszukiwanie indeksów `%s'..." #: info/indices.c:596 -#, fuzzy, c-format +#, c-format msgid "No available info files have `%s' in their indices." -msgstr "¯aden z dostêpnych plików info nie zawiera \"%s\" w swoich indeksach." +msgstr "¯aden z dostêpnych plików info nie zawiera `%s' w swoich indeksach." #: info/indices.c:622 msgid "Grovel all known info file's indices for a string and build a menu" @@ -216,20 +216,20 @@ msgid "Index apropos: " msgstr "Indeks dla ³añcucha: " #: info/indices.c:654 -#, fuzzy, c-format +#, c-format msgid "" "\n" "* Menu: Nodes whose indices contain `%s':\n" msgstr "" "\n" -"* Menu: Wêz³y, których indeksy zawieraj± \"%s\":\n" +"* Menu: Wêz³y, których indeksy zawieraj± `%s':\n" #: info/info.c:275 info/infokey.c:899 #, c-format msgid "Try --help for more information.\n" msgstr "Wiêcej informacji mo¿na uzyskaæ przez --help.\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, c-format msgid "" @@ -336,7 +336,7 @@ msgstr "" " info -f ./foo.info pokazanie pliku ./foo.info, z pominiêciem " "katalogu\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1132,7 +1132,7 @@ msgstr "Przej¶cie na koniec linii" msgid "Move to the start of the line" msgstr "Przej¶cie na pocz±tek linii" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "Nastêpny" @@ -1599,9 +1599,9 @@ msgid "\"%s\" is invalid" msgstr "\"%s\" jest niepoprawne" #: info/session.c:4495 -#, fuzzy, c-format +#, c-format msgid "`%s' is invalid" -msgstr "\"%s\" jest niepoprawne" +msgstr "`%s' jest niepoprawne" #: info/session.c:4709 msgid "Add this digit to the current numeric argument" @@ -1705,174 +1705,174 @@ msgstr "-%s%s-Info: (%s)%s, %d linii --%s--" msgid " Subfile: %s" msgstr " Podplik: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: opcja `%s' jest niejednoznaczna\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: opcja `--%s' nie przyjmuje argumentów\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: opcja `%c%s' nie przyjmuje argumentów\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: opcja `%s' wymaga argumentu\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: nierozpoznana opcja `--%s'\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: nierozpoznana opcja `%c%s'\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: nieprawid³owa opcja -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: b³êdna opcja -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: opcja wymaga argumentu -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: opcja `-W %s' jest niejednoznaczna\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opcja `-W %s' nie przyjmuje argumentu\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, c-format msgid "arguments to @%s ignored" msgstr "zignorowano argumenty dla @%s" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "stycznia" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "lutego" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "marca" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "kwietnia" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "maja" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "czerwca" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "lipca" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "sierpnia" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "wrze¶nia" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "pa¼dziernika" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "listopada" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "grudnia" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "niechciany znak %c w @var" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "argument @sc zawiera same wielkie litery, wiêc brak efektu" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "oczekiwano `{', ale napotkano `%c'" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "koniec pliku wewn±trz bloku verb" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "oczekiwano `}', ale napotkano `%c'" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -"@string{Note:} tworzy nieprawdziwe odniesienia w Info; nale¿y przeredagowaæ " -"aby zapobiec temu" +"@string{Note...} tworzy nieprawdziwe odniesienia w Info; nale¿y " +"przeredagowaæ aby zapobiec temu" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s jest przestarza³e" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp wymaga argumentu bêd±cego liczb± dodatni±, a nie `%s'" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "Z³y argument dla %c%s" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "zachowaj" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "brak" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, c-format msgid "Bad argument to @%s" msgstr "Z³y argument dla @%s" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "wstaw" @@ -1909,12 +1909,12 @@ msgid "Method" msgstr "Metoda" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "typu" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "na" @@ -1923,22 +1923,22 @@ msgstr "na" msgid "Must be in `@%s' environment to use `@%s'" msgstr "Trzeba byæ w ¶rodowisku `@%s', aby u¿yæ `@%s'" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "Pominiêto `%s' przed nazw± pliku wyj¶ciowego" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "Pominiêto `%s' przy zapisie na standardowe wyj¶cie" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "Bufor wyj¶ciowy niepusty." @@ -1978,11 +1978,11 @@ msgstr "%s:%d: plik css zakoñczy³ siê wewn±trz komentarza" msgid "Untitled" msgstr "Bez tytu³u" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "[nieoczekiwane] brak znacznika html do zdjêcia" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "[nieoczekiwane] b³êdna nazwa wêz³a: `%s'" @@ -1992,45 +1992,45 @@ msgstr "[nieoczekiwane] b³êdna nazwa wêz³a: `%s'" msgid "Unknown index `%s'" msgstr "Nieznany indeks `%s'" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "Info nie mo¿e obs³u¿yæ `:' we wpisie indeksu `%s'" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "Indeks `%s' ju¿ istnieje" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Nieznany indeks `%s' i/lub `%s' w @synindex" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "(linia )" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "(linia %*d)" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Nieznany indeks `%s' w @printindex" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "Wpis dla indeksu `%s' poza jakimkolwiek wêz³em" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(poza jakimkolwiek wêz³em)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "Patrz " @@ -2066,104 +2066,104 @@ msgstr "¦rodowiska %cfloat nie mog± byæ zagnie¿d¿one" msgid "`@end' expected `%s', but saw `%s'" msgstr "`@end' oczekiwa³o `%s', ale napotkano `%s'" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "Brak pasuj±cego `%cend %s'" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s wymaga litery lub cyfry" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "koniec pliku wewn±trz bloku dos³ownego" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "@%s nic nie znaczy poza ¶rodowiskiem `@float'" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "napotkano @menu przed pierwszym @node, tworzenie wêz³a `Top'" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "mo¿e wêze³ @top powinien byæ otoczony @ifnottex, a nie @ifinfo?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "napotkano @detailmenu przed pierwszym wêz³em, tworzenie wêz³a `Top'" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "@%s nic nie znaczy poza ¶rodowiskami `@titlepage' i `@quotation'" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "@%s nic nie znaczy poza ¶rodowiskiem `@titlepage'" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "Niedopasowane `%c%s'" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "`%c%s' wymaga czego¶ po sobie" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "Z³y argument `%s' dla `@%s', u¿ycie `%s'" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s nic nie znaczy wewn±trz bloku `@%s'" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "@itemx nic nie znaczy wewn±trz bloku `%s'" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "znaleziono %c%s na zewn±trz bloku wstawki" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s nie jest poprawnym kodem jêzyka zgodnym z ISO 639" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, c-format msgid "unrecognized encoding name `%s'" msgstr "nierozpoznana nazwa kodowania `%s'" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "niestety kodowanie `%s' nie jest obs³ugiwane" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "b³êdnie zakodowany znak `%s'" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s oczekuje `i' lub `j' jako argumentu, a nie `%c'" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s oczekuje pojedynczego znaku `i' lub `j' jako argumentu" @@ -2207,27 +2207,27 @@ msgstr "niedopasowane @end %s do @%s" msgid "Too many errors! Gave up.\n" msgstr "Zbyt du¿o b³êdów! Poddajê siê.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: uwaga: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "¬le umieszczone %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Polecenie `%s --help' poda wiêcej informacji.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Sk³adnia: %s [OPCJA]... PLIK-TEXINFO...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2237,7 +2237,7 @@ msgstr "" "samodzielnym\n" "GNU Info.\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2263,7 +2263,7 @@ msgstr "" " --version wy¶wietlenie informacji o wersji i " "zakoñczenie.\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2278,7 +2278,7 @@ msgstr "" " --xml wyprodukowanie Texinfo XML zamiast Info.\n" " --plaintext wyprodukowanie czystego tekstu zamiast Info.\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2308,7 +2308,7 @@ msgstr "" "dzielonego\n" " HTML), ignoruj±c wszelkie @setfilename.\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2347,7 +2347,7 @@ msgstr "" " --split-size=ROZMIAR podzia³ Info na pliki o ROZMIARZE (domy¶lnie %" "d).\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" @@ -2358,7 +2358,7 @@ msgstr "" " je¶li PLIK to -, czytane jest standardowe\n" " wej¶cie\n" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2374,7 +2374,7 @@ msgstr "" "s±\n" " usuwane.\n" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2393,7 +2393,7 @@ msgstr "" " -U ZMIENNA usuniêcie definicji ZMIENNEJ, tak jak " "@clear.\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2409,6 +2409,8 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "Warunkowe przetwarzanie wej¶cia:\n" " --ifdocbook przetwarzanie @ifdocbook i @docbook nawet je¶li nie " @@ -2429,8 +2431,10 @@ msgstr "" " --no-ifplaintext nie przetwarzanie tekstu @ifplaintext.\n" " --no-iftex nie przetwarzanie tekstu @iftex i @tex.\n" " --no-ifxml nie przetwarzanie tekstu @ifxml i @xml.\n" +"\n" +" Ponadto opcje --no-ifFORMAT powoduj± przetwarzanie tekstu @ifnotFORMAT.\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2445,7 +2449,7 @@ msgstr "" "wy³±czone;\n" " je¶li generowany jest XML, --ifxml jest w³±czone, a reszta wy³±czona.\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2477,81 +2481,81 @@ msgstr "" " makeinfo --no-split foo.texi zapisanie jednego wielkiego pliku " "Info\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "%s: Zignorowano nierozpoznan± warto¶æ TEXINFO_OUTPUT_FORMAT `%s'.\n" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: argument %s musi byæ liczb±, a nie `%s'.\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "%s: nie mo¿na otworzyæ wyj¶cia `%s' do zapisu rozwiniêæ makr" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "%s: zignorowano drugie wyj¶cie `%s' do zapisu rozwiniêæ makr.\n" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: argument --paragraph-indent musi byæ liczb±/`none'/`asis', a nie `%s'.\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s: argumentem --footnote-style musi byæ `separate' lub `end', a nie `%s'.\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: brakuj±cy argument plikowy.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "Niew³a¶ciwie u¿yte wieloliniowe polecenie %c%s" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "Oczekiwano `%s'" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "Nie mo¿na utworzyæ katalogu `%s': %s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "Nie znaleziono `%s' w `%s'" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" "%s: nie zapisywanie rozwiniêæ makr na stdout, bo tam zapisywane jest Info.\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "Tworzenie pliku %s `%s' z `%s'.\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "To jest %s, wyprodukowany przez makeinfo w wersji %s z %s.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2559,82 +2563,82 @@ msgstr "" "%s: Usuwanie pliku wyj¶cia makr `%s' z powodu b³êdów; --force pozwoli " "zachowaæ.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: Usuwanie pliku wyj¶ciowego `%s' z powodu b³êdów; --force pozwoli " "zachowaæ.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "Nieznane polecenie `%s'" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "" "Nale¿y u¿yæ nawiasów klamrowych, aby podaæ polecenie jako argument dla @%s" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, c-format msgid "%c%s expected braces" msgstr "%c%s oczekiwa³o nawiasów klamrowych" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "Niedopasowany }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "BEZ_NAZWY!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "w %c%s brakuje klamry zamykaj±cej" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "Plik @image `%s' (dla HTML) nieczytelny: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, c-format msgid "No such file `%s'" msgstr "Nie ma pliku `%s'" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "Plik @image `%s' (dla tekstu) nieczytelny: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "Po @image brakuje argumentu plikowego" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "niezdefiniowana flaga: %s" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{Brak warto¶ci dla `%s'}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s wymaga nazwy" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "Osi±gniêto koniec pliku przed znalezieniem @end %s" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "`%.40s...' jest zbyt d³ugie do rozwiniêcia; nie rozwiniêto" @@ -2677,130 +2681,130 @@ msgstr "* kolumna #%d: wyj¶cie = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "Wêze³ `%s' poprzednio zdefiniowany w linii %d" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "Formatowanie wêz³a %s...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "Wêze³ `%s' wymaga polecenia wybieraj±cego (np. %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "Nie podano nazwy wêz³a dla polecenia `%c%s'" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "Znacznik `%s' i wêze³ `%s' odwzorowuj± siê na t± sam± nazwê pliku" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "Zignorowano to polecenie @anchor; wskazania na nie nie bêd± dzia³a³y" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "Nale¿y zmieniæ ten znacznik lub u¿yæ opcji `--no-split'" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "Nieoczekiwany ³añcuch na koñcu pliku dzielonego HTML `%s'" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "Nastêpny:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "Poprzedni:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "W górê:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "Znaczniki `%s' i `%s' odwzorowuj± siê na t± sam± nazwê pliku" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "zignorowano polecenie @anchor; wskazania na nie nie bêd± dzia³a³y" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "" "%s wskazuje na nieistniej±cy wêze³ `%s' (mo¿e b³êdny podzia³ na sekcje?)" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "Menu" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "Odsy³acz" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" "Pole Nastêpny wêz³a `%s' nie wskazywane (mo¿e b³êdny podzia³ na sekcje?)" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "Ten wêze³ (%s) ma z³e pole Poprzedni" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "Poprzedni" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "Pole Poprzedni wêz³a `%s' nie wskazywane" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "Ten wêze³ (%s) ma z³e pole Nastêpny" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "`%s' nie ma pola W górê (mo¿e b³êdny podzia³ na sekcje?)" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "W górê" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" "Wêze³ `%s' nie ma elementu menu dla `%s' pomimo bycia jego celem W górê" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "wêze³ `%s' by³ wskazywany %d razy" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "nie wskazywany wêze³ `%s'" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "Usuwanie %s\n" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, c-format msgid "Can't remove file `%s': %s" msgstr "Nie mo¿na usun±æ pliku `%s': %s" @@ -2811,9 +2815,9 @@ msgid "Appendix %c" msgstr "Za³±cznik %c" #: makeinfo/sectioning.c:467 -#, fuzzy, c-format +#, c-format msgid "Internal error (search_sectioning) `%s'!" -msgstr "B³±d wewnêtrzny (search_sectioning) \"%s\"!" +msgstr "B³±d wewnêtrzny (search_sectioning) `%s'!" #: makeinfo/sectioning.c:562 #, c-format @@ -2848,12 +2852,12 @@ msgstr "Spis tre¶ci" msgid "Short Contents" msgstr "Skrót tre¶ci" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "Plik @image `%s' nieczytelny: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/ro.gmo b/gnu/dist/texinfo/po/ro.gmo Binary files differindex 72804eb1769..3a4129a8a99 100644 --- a/gnu/dist/texinfo/po/ro.gmo +++ b/gnu/dist/texinfo/po/ro.gmo diff --git a/gnu/dist/texinfo/po/ro.po b/gnu/dist/texinfo/po/ro.po index b6d529d65c9..7979e8f3ff2 100644 --- a/gnu/dist/texinfo/po/ro.po +++ b/gnu/dist/texinfo/po/ro.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: texinfo 4.6.94\n" +"Project-Id-Version: texinfo 4.7.90\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" -"PO-Revision-Date: 2004-04-02 12:00+05\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" +"PO-Revision-Date: 2004-12-04 12:00+05\n" "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" @@ -126,15 +126,15 @@ msgstr "O completare:\n" msgid "%d completions:\n" msgstr "%d completãri:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Insereazã completarea" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Construim completãrile..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Scroll fereastra de completãri" @@ -182,9 +182,9 @@ msgid "No index entries." msgstr "Nici o intrare în index." #: info/indices.c:375 -#, fuzzy, c-format +#, c-format msgid "No %sindex entries containing `%s'." -msgstr "Nici o intrare în %sindex conþinând \"%s\"." +msgstr "Nici o intrare în %sindex conþinând `%s'." #: info/indices.c:376 msgid "more " @@ -195,21 +195,20 @@ msgid "CAN'T SEE THIS" msgstr "NU POT VEDEA ACEASTA" #: info/indices.c:422 -#, fuzzy, c-format +#, c-format msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)" msgstr "" -"Am gãsit \"%s\" în %s. (`\\[next-index-match]' încearcã sã gãseascã " -"urmãtorul.)" +"Am gãsit `%s' în %s. (`\\[next-index-match]' încearcã sã gãseascã urmãtorul.)" #: info/indices.c:541 -#, fuzzy, c-format +#, c-format msgid "Scanning indices of `%s'..." -msgstr "Scanãm indexurile pentru \"%s\"..." +msgstr "Scanãm indexurile pentru `%s'..." #: info/indices.c:596 -#, fuzzy, c-format +#, c-format msgid "No available info files have `%s' in their indices." -msgstr "Nici un fiºier info nu are \"%s\" în indexurile lor." +msgstr "Nici un fiºier info nu are `%s' în indexurile lor." #: info/indices.c:622 msgid "Grovel all known info file's indices for a string and build a menu" @@ -221,20 +220,20 @@ msgid "Index apropos: " msgstr "Index apropos: " #: info/indices.c:654 -#, fuzzy, c-format +#, c-format msgid "" "\n" "* Menu: Nodes whose indices contain `%s':\n" msgstr "" "\n" -"* Meniu: Noduri a cãror indexurile conþin \"%s\":\n" +"* Meniu: Noduri a cãror indexurile conþin `%s':\n" #: info/info.c:275 info/infokey.c:899 #, c-format msgid "Try --help for more information.\n" msgstr "Încercaþi --help pentru informaþii suplimentare.\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, c-format msgid "" @@ -341,7 +340,7 @@ msgstr "" " comandã pentru emacs\n" " info -f ./foo.info aratã fiºierul ./foo.info, nu cãuta dir\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1143,7 +1142,7 @@ msgstr "Mergi la sfârºitul liniei" msgid "Move to the start of the line" msgstr "Mergi la începutul liniei" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "Urmãtor" @@ -1614,9 +1613,9 @@ msgid "\"%s\" is invalid" msgstr "\"%s\" este invalid" #: info/session.c:4495 -#, fuzzy, c-format +#, c-format msgid "`%s' is invalid" -msgstr "\"%s\" este invalid" +msgstr "`%s' este invalid" #: info/session.c:4709 msgid "Add this digit to the current numeric argument" @@ -1726,174 +1725,174 @@ msgstr "-%s%s-Info: (%s)%s, %d linii --%s--" msgid " Subfile: %s" msgstr " Subfiºier: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: opþiunea `%s' este ambiguã\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: opþiunea `--%s' nu permite un argument\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: opþiunea `%c%s' nu permite un argument\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: opþiunea `%s' necesitã un argument\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opþiune nerecunoscutã `--%s'\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opþiune nerecunoscutã `%c%s'\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opþiune ilegalã -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opþiune invalidã -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: opþiunea necesitã un argument -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: opþiunea `-W %s' este ambiguã\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opþiunea `-W %s' nu permite un argument\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, c-format msgid "arguments to @%s ignored" msgstr "argumentele pentru @%s ignorate" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "Ianuarie" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "Februarie" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "Martie" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "Aprilie" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "Mai" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "Iunie" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "Iulie" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "August" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "Septembrie" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "Octombrie" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "Noiembrie" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "Decembrie" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "caracter neverosimil %c în @var" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "argumentul @sc în litere mari, prin urmare fãrã efect" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "`{' aºteptat, dar am vãzut `%c'" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "sfârºit de fiºier în interiorul blocului de verb" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "`}' aºteptat, dar am vãzut `%c'" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -"@strong{Notã:] produce o referinþã încruciºatã falsã; reformulaþi pentru a " -"evita acest fapt" +"@strong{Notã...] produce o referinþã încruciºatã falsã în Info; reformulaþi " +"pentru a o evita" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s este depãsit" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp necesitã un argument numeric pozitiv, nu `%s'" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "Argument nepotrivit pentru %c%s" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "aºacume" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "nimic" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, c-format msgid "Bad argument to @%s" msgstr "Argument nepotrivit pentru @%s" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "insereazã" @@ -1930,12 +1929,12 @@ msgid "Method" msgstr "Metodã" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "din" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "pe" @@ -1944,22 +1943,22 @@ msgstr "pe" msgid "Must be in `@%s' environment to use `@%s'" msgstr "Trebuie sã fiþi în mediul `@%s' pentru a folosi `@%s'" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "`%s' omis înainte de numele fiºierului de ieºire" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "`%s' omis întrucât scriu la ieºirea standard (stdout)" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "Buffer-ul de ieºire nu este gol." @@ -1999,11 +1998,11 @@ msgstr "%s:%d: --css-file s-a terminat cu un comentariu" msgid "Untitled" msgstr "Fãrã titlu" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "[neaºteptat] nici un tag html de ridicat" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "[neaºteptat] nume de nod invalid: `%s'" @@ -2013,45 +2012,45 @@ msgstr "[neaºteptat] nume de nod invalid: `%s'" msgid "Unknown index `%s'" msgstr "Index necunoscut `%s'" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "Info nu poate folosi `:' în intrarea de index `%s'" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "Indez-ul `%s' existã deja" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Index-ul necunoscut `%s' ºi/sau `%s' în @synindex" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "(linie )" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "(linia %*d)" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Index necunoscut `%s' în @printindex" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "Intrarea pentru index-ul `%s' în afara oricãrui nod" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(în afara oricãrui nod)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "Vezi " @@ -2087,106 +2086,106 @@ msgstr "mediile %cfloat nu pot fi încuibãrite" msgid "`@end' expected `%s', but saw `%s'" msgstr "`@end' a aºteptat `%s', dar a vãzut `%s'" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "Nici o potrivire %cend %s'" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s necesitã litere sau cifre" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "sfârºit de fiºier în interiorul blocului neformatat (verbatim)" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "@%s nu are sens în exteriorul mediului `@float'" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" "probabil cã nodul d-voastrã @top ar trebui împachetat în @ifnottex în loc de " "@ifinfo?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu vãzut înainte de primul nod, creez nodul `Vârf'" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "@%s nu are sens în exteriorul mediilor `@titlepage' ºi `@quotation'" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "@%s nu are sens în exteriorul mediului `@titlepage'" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "`%c%s' fãrã pereche" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "`%c%s' necesitã ceva dupã el" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "Argument greºit `%s' pentru `@%s', folosesc `%s'" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s nu are sens în interiorul blocului `@%s'" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "@itemx nu are sens în interiorul blocului `%s'" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s gãsit în afara unui bloc de inserare" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s nu este un cod de limbã valid conform ISO 639" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, c-format msgid "unrecognized encoding name `%s'" msgstr "nume de codare nerecunoscut `%s'" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "ne pare rãu, codarea `%s' nu este suportatã" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "caracter codat invalid `%s'" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s aºteaptã `i' sau `j' ca argument, nu `%c'" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s aºteaptã un singur caracter `i' sau `j' ca argument" @@ -2230,27 +2229,27 @@ msgstr "nepotrivire @end %s cu @%s" msgid "Too many errors! Gave up.\n" msgstr "Prea multe erori! Am renunþat.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: avertisment: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "%c nelalocul lui" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Încercaþi `%s --help' pentru informaþii suplimentare.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Folosire: %s [OPÞIUNE]... FIªIER-TEXINFO...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2258,7 +2257,7 @@ msgstr "" "Translateazã documentaþia sursã Texinfo în diferite alte formate, implicit\n" "fiºiere Info potrivite pentru citit online cu Emacs sau GNU Info.\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2284,7 +2283,7 @@ msgstr "" " --version afiºeazã informaþii despre versiune ºi " "terminã.\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2299,7 +2298,7 @@ msgstr "" " --xml ieºire Texinfo XML în loc de Info.\n" " --plaintext ieºire text simplu în loc de Info.\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2328,7 +2327,7 @@ msgstr "" " --number-sections scrie numere de capitole ºi secþiuni.\n" " -o, --output=FIªIER scrie în FIªIER (director dacã multiple HTML),\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2365,7 +2364,7 @@ msgstr "" " --split-size=NUM împarte fiºierele Info de dimens. NUM " "(implicit %d).\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" @@ -2375,7 +2374,7 @@ msgstr "" " --css-include=FIªIER include FIªIER în HTML <stil> ieºire;\n" " citeºte stdin dacã FIªIER este -.\n" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2390,7 +2389,7 @@ msgstr "" " dacã VAL e 0, spaþiile goale ce pot fi " "ignorate nu sunt afiºate.\n" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2406,7 +2405,7 @@ msgstr "" " -P DIR prepend DIR la calea de cãutare @include.\n" " -U VAR nedefineºte variabila VAR, ca ºi @clear.\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2422,6 +2421,8 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "Procesare condiþionalã în intrare:\n" " --ifdocbook proceseazã @ifdocbook º @docbook chiar dacã\n" @@ -2433,13 +2434,17 @@ msgstr "" "simplu.\n" " --iftex proceseazã @iftex ºi @tex; implicã --no-split.\n" " --ifxml proceseazã @ifxml ºi @xml.\n" +" --no-ifdocbook nu procesa text @ifdocbook ºi @docbook.\n" " --no-ifhtml nu procesa text @ifhtml ºi @html.\n" " --no-ifinfo nu procesa text @ifinfo.\n" " --no-ifplaintext nu procesa text @ifplaintext.\n" " --no-iftex nu procesa text @iftex ºi @tex.\n" " --no-ifxml nu procesa text @ifxml ºi @xml.\n" +"\n" +" De asemenea, pentru opþiunile --no-ifFORMAT, proceseazã text " +"@ifnotFORMAT.\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2454,7 +2459,7 @@ msgstr "" " dacã generaþi text simplu, --ifplaintext este selectat iar restul sunt " "deselectate;\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2483,81 +2488,81 @@ msgstr "" " makeinfo --no-split foo.texi scrie un singur fiºier Info " "indiferent cât de mare\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "%s: Ignor valoare nerecunoscutã TEXINFO_OUTPUT_FORMAT `%s'.\n" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "%s: nu am putut deschide ieºirea expansiunii macro-ului `%s'" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "%s: nu am putut deschide ieºirea expansiunii macro-ului `%s'.\n" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: lipseºte fiºierul argument.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "Comandã pe multiple linii %c%s folositã incorect" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "Am aºteptat `%s'" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "Nu pot crea directorul `%s': %s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "Nici un `%s' nu a fost gãsit în `%s'" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" "%s: Omite expasiunea macro la ieºire întrucât ieºirea Info merge acolo.\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "Creez fiºierul %s `%s' din `%s'.\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "Acesta este %s, produs de makeinfo versiunea %s din %s.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2565,81 +2570,81 @@ msgstr "" "%s: ªterg fiºierul de ieºire macro `%s' din cauza erorilor; folosiþi --force " "pentru a-l pãstra.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: fiºierul de ieºire `%s' din cauza erorilor; folosiþi --force pentru a-l " "pãstra.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "Comandã necunoscutã `%s'" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, c-format msgid "%c%s expected braces" msgstr "%c%s am aºteptat paranteze" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "} fãrã pereche" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "NICI_UN_NUME!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s lipseºte paranteza de închidere" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "Fiºierul @image `%s' (pentru HTML) nu poate fi citit: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, c-format msgid "No such file `%s'" msgstr "Nici un fiºier `%s'" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "Fiºierul @image `%s' (pentru text) nu poate fi citit: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "@image lipseºte fiºierul argument." -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "marcaj nedefinit: %s" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{Nici o valoare pentru `%s'}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s necesitã un nume" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "Am ajuns la eof înainte de a potrivi @end %s" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "`%.40s...' este prea lung pentru expansiune; nu a fost expandat" @@ -2682,130 +2687,130 @@ msgstr "* coloana #%d: ieºire = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "Nodul `%s' definit anterior la linia %d" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "Formatez nodul %s...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "Nodul `%s' cere o comandã de secþionare (ex., %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "Nici un nume specificat pentru comanda `%c%s'" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "Ancoraj `%s' ºi nodul `%s' aratã cãtre acelaºi nume de fiºier" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" "Aceastã comandã @anchor ignoratã; referinþele cãtre acesta nu vor merge" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "Redenumeºte acest ancoraj sau foloseºte opþiunea `--no-split'" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "ªir neaºteptat la sfârºitul fiºierului HTML spart `%s'" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "Urmãtor:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "Precedent:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "Sus:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "Ancoraj `%s' ºi `%s' aratã cãtre acelaºi nume de fiºier" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "Comandã @anchor ignoratã; referinþele cãtre acesta nu vor merge" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "" "referinþa %s cãtre nodul inexistent `%s' (probabil secþionare incorectã?)" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "Meniu" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "Traverseazã" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" "Urmãtorul câmp de nod `%s' nu este referit (probabil secþionare incorectã?)" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "Acest nod (%s) are un Prec incorect" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "Prec" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "Câmpul Prec al nodului `%s' nu este referit" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "Acest nod (%s) are referinþa Urmãtor incorectã" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "`%s' nu are nici un câmp Sus (probabil secþionare incorectã?)" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "Sus" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "Nodului `%s' îi lipseºte articolul pentru `%s' deºi îi este þinta Sus" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "nodul `%s' a fost referit de %d ori" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "nod nereferit `%s'" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "ªterg %s\n" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, c-format msgid "Can't remove file `%s': %s" msgstr "Nu pot ºterge fisierul `%s': %s" @@ -2816,9 +2821,9 @@ msgid "Appendix %c" msgstr "Anexã %c" #: makeinfo/sectioning.c:467 -#, fuzzy, c-format +#, c-format msgid "Internal error (search_sectioning) `%s'!" -msgstr "Eroare internã (search_sectioning) \"%s\"!" +msgstr "Eroare internã (search_sectioning) `%s'!" #: makeinfo/sectioning.c:562 #, c-format @@ -2853,12 +2858,12 @@ msgstr "Cuprins" msgid "Short Contents" msgstr "Rezumate" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "Fiºierul @image `%s' nu poate fi citit: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/ru.gmo b/gnu/dist/texinfo/po/ru.gmo Binary files differindex 3122dc0c3a6..04eba1eaeea 100644 --- a/gnu/dist/texinfo/po/ru.gmo +++ b/gnu/dist/texinfo/po/ru.gmo diff --git a/gnu/dist/texinfo/po/ru.po b/gnu/dist/texinfo/po/ru.po index 289e2acc7c6..b245a565d08 100644 --- a/gnu/dist/texinfo/po/ru.po +++ b/gnu/dist/texinfo/po/ru.po @@ -1,13 +1,13 @@ # ðÅÒÅ×ÏÄÙ ÓÏÏÂÝÅÎÉÊ ÄÌÑ GNU Texinfo. # Copyright (C) 1999 Free Software Foundation, Inc. -# Oleg S. Tihonov <ost@tatnipi.ru>, 1999, 2001, 2002, 2003 +# Oleg S. Tihonov <ost@tatnipi.ru>, 1999, 2001, 2002, 2003, 2004 # msgid "" msgstr "" -"Project-Id-Version: texinfo 4.5.91\n" +"Project-Id-Version: texinfo 4.7.92\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" -"PO-Revision-Date: 2003-05-19 10:08+0400\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" +"PO-Revision-Date: 2004-12-16 08:19+0300\n" "Last-Translator: Oleg S. Tihonov <ost@tatnipi.ru>\n" "Language-Team: Russian <ru@li.org>\n" "MIME-Version: 1.0\n" @@ -123,15 +123,15 @@ msgstr "åÄÉÎÓÔ×ÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ:\n" msgid "%d completions:\n" msgstr "úÁ×ÅÒÛÅÎÉÊ: %d :\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "÷ÓÔÁ×ÉÔØ ÚÁ×ÅÒÛÅÎÉÅ" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "óÏÓÔÁ×ÌÅÎÉÅ ÚÁ×ÅÒÛÅÎÉÊ..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "ðÒÏËÒÕÔÉÔØ ÏËÎÏ ÚÁ×ÅÒÛÅÎÉÊ" @@ -179,9 +179,9 @@ msgid "No index entries." msgstr "îÅ ÎÁÊÄÅÎ ÁÌÆÁ×ÉÔÎÙÊ ÕËÁÚÁÔÅÌØ." #: info/indices.c:375 -#, fuzzy, c-format +#, c-format msgid "No %sindex entries containing `%s'." -msgstr "÷ ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ %sÎÅ ÎÁÊÄÅÎÏ ÐÕÎËÔÏ×, ÓÏÄÅÒÖÁÝÉÈ \"%s\"." +msgstr "÷ ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ %s ÎÅ ÎÁÊÄÅÎÏ ÐÕÎËÔÏ×, ÓÏÄÅÒÖÁÝÉÈ `%s'." #: info/indices.c:376 msgid "more " @@ -192,21 +192,20 @@ msgid "CAN'T SEE THIS" msgstr "üÔÏ ÎÅ×ÉÄÉÍÙÊ ÔÅËÓÔ!" #: info/indices.c:422 -#, fuzzy, c-format +#, c-format msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)" msgstr "" -"îÁÊÄÅÎÁ \"%s\" × %s. (`\\[next-index-match]' ÚÁÐÕÓËÁÅÔ ÐÏ×ÔÏÒÎÙÊ ÐÏÉÓË.)" +"îÁÊÄÅÎÁ `%s' × %s. (`\\[next-index-match]' ÎÁÈÏÄÉÔ ÓÌÅÄÕÀÝÅÅ ÓÏ×ÐÁÄÅÎÉÅ.)" #: info/indices.c:541 -#, fuzzy, c-format +#, c-format msgid "Scanning indices of `%s'..." -msgstr "ðÏÉÓË × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÆÁÊÌÁ \"%s\"..." +msgstr "ðÏÉÓË × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÆÁÊÌÁ `%s'..." #: info/indices.c:596 -#, fuzzy, c-format +#, c-format msgid "No available info files have `%s' in their indices." -msgstr "" -"îÉ ÏÄÉÎ ÉÚ info-ÆÁÊÌÏ× ÎÅ ÓÏÄÅÒÖÉÔ \"%s\" × Ó×ÏÉÈ ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ." +msgstr "îÉ ÏÄÉÎ ÉÚ info-ÆÁÊÌÏ× ÎÅ ÓÏÄÅÒÖÉÔ `%s' × ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ." #: info/indices.c:622 msgid "Grovel all known info file's indices for a string and build a menu" @@ -219,28 +218,27 @@ msgid "Index apropos: " msgstr "ëÌÀÞÅ×ÏÅ ÓÌÏ×Ï ÄÌÑ ÐÏÉÓËÁ: " #: info/indices.c:654 -#, fuzzy, c-format +#, c-format msgid "" "\n" "* Menu: Nodes whose indices contain `%s':\n" msgstr "" "\n" -"* Menu: îÏÄÙ, ÞØÉ ÁÌÆÁ×ÉÔÎÙÅ ÕËÁÚÁÔÅÌÉ ÓÏÄÅÒÖÁÔ \"%s\":\n" +"* Menu: îÏÄÙ, ÞØÉ ÁÌÆÁ×ÉÔÎÙÅ ÕËÁÚÁÔÅÌÉ ÓÏÄÅÒÖÁÔ `%s':\n" #: info/info.c:275 info/infokey.c:899 #, c-format msgid "Try --help for more information.\n" msgstr "ðÏÐÒÏÂÕÊÔÅ --help ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 -#, fuzzy, c-format +#, c-format msgid "" "There is NO warranty. You may redistribute this software\n" "under the terms of the GNU General Public License.\n" "For more information about these matters, see the files named COPYING.\n" msgstr "" -"Copyright (C) %s Free Software Foundation, Inc.\n" "íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ. ÷Ù ÍÏÖÅÔÅ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÜÔÉ ÐÒÏÇÒÁÍÍÙ, ÐÒÉ\n" "ÓÏÂÌÀÄÅÎÉÉ ÕÓÌÏ×ÉÊ õÎÉ×ÅÒÓÁÌØÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU.\n" "äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ Ï ×ÏÚÍÏÖÎÏÓÔÉ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÓÍÏÔÒÉÔÅ\n" @@ -258,7 +256,7 @@ msgstr "" "ÒÅÞÉ.\n" #: info/info.c:597 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s [OPTION]... [MENU-ITEM...]\n" "\n" @@ -305,15 +303,17 @@ msgstr "" " ×ÓÅÈ ÒÕËÏ×ÏÄÓÔ×.\n" " -d, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë INFOPATH.\n" " --dribble=æáêì ÚÁÐÉÓÁÔØ ××ÏÄÉÍÙÅ ÐÏÌØÚÏ×ÁÔÅÌÅÍ ÚÎÁËÉ × æáêì.\n" -" -f, --file=æáêì ÐÒÏÓÍÏÔÒÅÔØ ÚÁÄÁÎÎÙÊ æáêì.\n" +" -f, --file=æáêì ÐÏËÁÚÁÔØ ÚÁÄÁÎÎÙÊ æáêì.\n" " -h, --help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ.\n" " --index-search=óôòïëá ÐÅÒÅÊÔÉ Ë ÎÏÄÅ, ÎÁ ËÏÔÏÒÕÀ ÓÓÙÌÁÅÔÓÑ " "ÚÁÄÁÎÎÏÅ\n" " óôòïëïê ×ÈÏÖÄÅÎÉÅ ÉÍÅÎÎÏÇÏ ÕËÁÚÁÔÅÌÑ.\n" " -n, --node=îïäá ÎÁÞÁÔØ ÐÒÏÓÍÏÔÒ Ó ÚÁÄÁÎÎÏÊ îïäù.\n" " -o, --output=æáêì ÚÁÐÉÓÁÔØ ×ÙÂÒÁÎÎÙÅ ÎÏÄÙ × æáêì.\n" -" -R, --raw-escapes ÎÅ ÕÄÁÌÑÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ÉÚ ÓÔÒÁÎÉà " -"man.\n" +" -R, --raw-escapes ×Ù×ÏÄÉÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ANSI (ÐÏ " +"ÕÍÏÌÞÁÎÉÀ).\n" +" --no-raw-escapes ×Ù×ÏÄÉÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ËÁË ÂÕË×ÁÌØÎÙÊ " +"ÔÅËÓÔ.\n" " --restore=æáêì ÐÒÏÞÉÔÁÔØ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÎÁÖÁÔÙÈ ËÌÁ×ÉÛ ÉÚ " "æáêìá.\n" " -O, --show-options, --usage ÐÅÒÅÊÔÉ Ë ÎÏÄÅ, ÏÐÉÓÙ×ÁÀÝÅÊ ËÌÀÞÉ ËÏÍÁÎÄÎÏÊ " @@ -336,7 +336,7 @@ msgstr "" " info --show-options emacs ÎÁÞÁÔØ Ó ÎÏÄÙ, ÏÐÉÓÙ×ÁÀÝÅÊ ËÌÀÞÉ emacs\n" " info -f ./foo.info ÐÏËÁÚÁÔØ ÆÁÊÌ ./foo.info, ÎÅ ÉÓËÁÔØ dir\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1039,9 +1039,9 @@ msgid "Cannot execute an `echo-area' command here." msgstr "úÄÅÓØ ÎÅÌØÚÑ ×ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ ÜÈÏ-ÏÂÌÁÓÔÉ." #: info/m-x.c:154 -#, fuzzy, c-format +#, c-format msgid "Undefined command: %s" -msgstr "ÎÅÏÐÒÅÄÅÌÅÎÎÙÊ ÆÌÁÇ: %s" +msgstr "îÅÏÐÒÅÄÅÌÅÎÎÁÑ ËÏÍÁÎÄÁ: %s" #: info/m-x.c:160 msgid "Set the height of the displayed window" @@ -1128,7 +1128,7 @@ msgstr "óÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÓÔÒÏËÉ" msgid "Move to the start of the line" msgstr "óÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÓÔÒÏËÉ" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "óÌÅÄÕÀÝÁÑ" @@ -1595,9 +1595,9 @@ msgid "\"%s\" is invalid" msgstr "\"%s\" ÎÅ×ÅÒÎÁÑ ËÏÍÁÎÄÁ" #: info/session.c:4495 -#, fuzzy, c-format +#, c-format msgid "`%s' is invalid" -msgstr "\"%s\" ÎÅ×ÅÒÎÁÑ ËÏÍÁÎÄÁ" +msgstr "`%s' ÎÅ×ÅÒÎÏ" #: info/session.c:4709 msgid "Add this digit to the current numeric argument" @@ -1703,173 +1703,175 @@ msgstr "-%s%s-Info: (%s)%s, ÓÔÒÏË: %d --%s--" msgid " Subfile: %s" msgstr " æÁÊÌ: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 -#, fuzzy, c-format +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 +#, c-format msgid "arguments to @%s ignored" -msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %c%s" +msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ @%s ÉÇÎÏÒÉÒÏ×ÁÎÙ" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "ÑÎ×ÁÒÑ" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "ÆÅ×ÒÁÌÑ" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "ÍÁÒÔÁ" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "ÁÐÒÅÌÑ" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "ÍÁÑ" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "ÉÀÎÑ" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "ÉÀÌÑ" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "Á×ÇÕÓÔÁ" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "ÓÅÎÔÑÂÒÑ" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "ÏËÔÑÂÒÑ" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "ÎÏÑÂÒÑ" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "ÄÅËÁÂÒÑ" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "ÍÁÌÏ×ÅÒÏÑÔÎÙÊ ÚÎÁË %c × @var" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "×ÅÓØ ÁÒÇÕÍÅÎÔ @sc ÎÁÂÒÁÎ ÚÁÇÌÁ×ÎÙÍÉ ÂÕË×ÁÍÉ, ÒÅÚÕÌØÔÁÔÁ ÎÅ ÂÕÄÅÔ" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "ÏÖÉÄÁÌÏÓØ `{', ×ÓÔÒÅÞÅÎÏ `%c'" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "ËÏÎÅà ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÎÅÏËÏÎÞÅÎÎÏÇÏ ÂÌÏËÁ" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "ÏÖÉÄÁÌÏÓØ `}', ×ÓÔÒÅÞÅÎÏ `%c'" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" +"@strong{Note...} ÓÏÚÄÁÅÔ × Info ÌÏÖÎÕÀ ÐÅÒÅËÒÅÓÔÎÕÀ ÓÓÙÌËÕ; ÐÅÒÅÆÒÁÚÉÒÕÊÔÅ " +"ÔÅËÓÔ, ÞÔÏÂÙ ÉÚÂÅÖÁÔØ ÜÔÏÇÏ" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "ëÏÍÁÎÄÁ %c%s ÕÓÔÁÒÅÌÁ É ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "ËÏÍÁÎÄÅ @sp ÎÕÖÎÏ ÕËÁÚÁÔØ ÐÏÌÏÖÉÔÅÌØÎÙÊ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ, Á ÎÅ `%s'" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %c%s" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "none" -#: makeinfo/cmds.c:1722 -#, fuzzy, c-format +#: makeinfo/cmds.c:1789 +#, c-format msgid "Bad argument to @%s" -msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %c%s" +msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ @%s" # ??? -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "insert" @@ -1906,38 +1908,38 @@ msgid "Method" msgstr "íÅÔÏÄ" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "ÉÚ" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "ÎÁÄ" #: makeinfo/defun.c:711 -#, fuzzy, c-format +#, c-format msgid "Must be in `@%s' environment to use `@%s'" -msgstr "Must be in `@%s' environment to use `@%s'" +msgstr "îÕÖÎÏ ÂÙÔØ × ÂÌÏËÅ `@%s', ÞÔÏÂÙ ÉÓÐÏÌØÚÏ×ÁÔØ `@%s'" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" -msgstr "" +msgstr "ÐÅÒÅÄ ÉÍÅÎÅÍ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ ÏÐÕÝÅÎÏ `%s'" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" -msgstr "" +msgstr "`%s' ÏÐÕÝÅÎÏ, ÐÏÓËÏÌØËÕ ÐÅÞÁÔØ ÉÄÅÔ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." -msgstr "" +msgstr "÷ÙÈÏÄÎÏÊ ÂÕÆÅÒ ÎÅ ÐÕÓÔ." #: makeinfo/footnote.c:150 #, c-format @@ -1975,12 +1977,12 @@ msgstr "%s:%d: css-ÆÁÊÌ ÏÂÒÙ×ÁÅÔÓÑ × ËÏÍÍÅÎÔÁÒÉÉ" msgid "Untitled" msgstr "âÅÚ ÚÁÇÏÌÏ×ËÁ" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "" "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] × ÓÔÅËÅ html-ÔÅÇÏ× ÎÅÔ ÜÌÅÍÅÎÔÁ ÄÌÑ ×ÙÔÁÌËÉ×ÁÎÉÑ" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] ÎÅ×ÅÒÎÏÅ ÉÍÑ ÎÏÄÙ: `%s'" @@ -1990,46 +1992,46 @@ msgstr "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] ÎÅ×ÅÒÎÏÅ ÉÍÑ ÎÏÄÙ: `%s'" msgid "Unknown index `%s'" msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÎÅÉÚ×ÅÓÔÅÎ" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "" "Info ÎÅ ÍÏÖÅÔ ÏÂÒÁÂÏÔÁÔØ ÚÎÁË `:' ×Ï ×ÈÏÖÄÅÎÉÉ ÁÌÆÁ×ÉÔÎÏÇÏ ÕËÁÚÁÔÅÌÑ `%s'" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "îÅÉÚ×ÅÓÔÅÎ ÉÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' É/ÉÌÉ `%s' × @synindex" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" -msgstr "" +msgstr "(ÓÔÒÏËÁ )" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" -msgstr "" +msgstr "(ÓÔÒÏËÁ %*d)" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "îÅÉÚ×ÅÓÔÅÎ ÉÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' × @printindex" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "÷ÈÏÖÄÅÎÉÅ ÄÌÑ ÉÍÅÎÎÏÇÏ ÕËÁÚÁÔÅÌÑ `%s' ×ÎÅ ÎÏÄÙ" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(×ÎÅ ËÁËÏÊ-ÌÉÂÏ ÎÏÄÙ)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "óÍÏÔÒÉÔÅ " @@ -2058,112 +2060,112 @@ msgstr "%s ÄÏÌÖÎÁ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ: ÆÏÒÍÁÔÏÍ ÄÌÑ %citem" #: makeinfo/insertion.c:719 #, c-format msgid "%cfloat environments cannot be nested" -msgstr "" +msgstr "ÂÌÏËÉ %cfloat ÎÅÌØÚÑ ×ËÌÁÄÙ×ÁÔØ ÄÒÕÇ × ÄÒÕÇÁ" #: makeinfo/insertion.c:973 #, c-format msgid "`@end' expected `%s', but saw `%s'" msgstr "ÏÖÉÄÁÌÏÓØ `@end' Ó `%s', ×ÓÔÒÅÞÅÎÏ `%s'" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "îÅÔ ÐÁÒÎÏÊ `%cend %s'" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s ÔÒÅÂÕÅÔ ÂÕË×Ù ÉÌÉ ÃÉÆÒÙ" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "ËÏÎÅà ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÎÅÏËÏÎÞÅÎÎÏÇÏ ÂÌÏËÁ" -#: makeinfo/insertion.c:1901 -#, fuzzy, c-format +#: makeinfo/insertion.c:1913 +#, c-format msgid "@%s not meaningful outside `@float' environment" -msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ `@%s'" +msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ `@float'" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" "×ÅÒÏÑÔÎÏ, ×ÁÛÁ ÎÏÄÁ @top ÄÏÌÖÎÁ ÂÙÔØ × ÂÌÏËÅ @ifnottex, Á ÎÅ × @ifinfo?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" -msgstr "" +msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ `@titlepage' ÉÌÉ `@quotation'" -#: makeinfo/insertion.c:2020 -#, fuzzy, c-format +#: makeinfo/insertion.c:2032 +#, c-format msgid "@%s not meaningful outside `@titlepage' environment" -msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ `@%s'" +msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ `@titlepage'" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "îÅÐÁÒÎÁÑ `%c%s'" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "ðÏÓÌÅ `%c%s' ÄÏÌÖÎÏ ÞÔÏ-ÔÏ ÉÄÔÉ" -#: makeinfo/insertion.c:2062 -#, fuzzy, c-format +#: makeinfo/insertion.c:2074 +#, c-format msgid "Bad argument `%s' to `@%s', using `%s'" -msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ `%s', `%s', ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ `%s'" +msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ `%s' ÄÌÑ `@%s', ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ `%s'" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ `@%s'" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "@itemx ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ `%s'" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s ×ÓÔÒÅÞÅÎÁ ×ÎÅ ÂÌÏËÁ ×ÓÔÁ×ËÉ" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ËÏÄÏÍ ÑÚÙËÁ ÉÚ ISO 639" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, c-format msgid "unrecognized encoding name `%s'" msgstr "ÉÍÑ ËÏÄÉÒÏ×ËÉ `%s' ÎÅ ÒÁÓÐÏÚÎÁÎÏ" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "ÉÚ×ÉÎÉÔÅ, ËÏÄÉÒÏ×ËÁ `%s' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "ÎÅÐÒÁ×ÉÌØÎÏ ÚÁËÏÄÉÒÏ×ÁÎÎÙÊ ÚÎÁË `%s'" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ `i' ÉÌÉ `j', Á ÎÅ `%c'" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ ÏÄÉÎ ÓÉÍ×ÏÌ `i' ÉÌÉ `j'" @@ -2179,9 +2181,9 @@ msgid "here is the previous definition of `%s'" msgstr "ÍÅÓÔÏ ÐÒÅÄÙÄÕÝÅÇÏ ÏÐÒÅÄÅÌÅÎÉÑ `%s'" #: makeinfo/macro.c:355 -#, fuzzy, c-format +#, c-format msgid "\\ in macro expansion followed by `%s' instead of parameter name" -msgstr "ÐÏÓÌÅ \\ × ÒÁÓËÒÙÔÉÉ ÍÁËÒÏ ÓÔÏÉÔ `%s', Á ÎÅ \\ ÉÌÉ ÉÍÑ ÐÁÒÁÍÅÔÒÁ" +msgstr "ÐÏÓÌÅ \\ × ÒÁÓËÒÙÔÉÉ ÍÁËÒÏ ÓÔÏÉÔ `%s', Á ÎÅ ÉÍÑ ÐÁÒÁÍÅÔÒÁ" #: makeinfo/macro.c:401 #, c-format @@ -2207,27 +2209,27 @@ msgstr "ÎÅÐÁÒÎÙÅ @end %s É @%s" msgid "Too many errors! Gave up.\n" msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË! ïÓÔÁÎÏ×ËÁ.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "úÄÅÓØ ÎÅ ÄÏÌÖÎÏ ÂÙÔØ %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... TEXINFO-æáêì...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2236,7 +2238,7 @@ msgstr "" "ÕÍÏÌÞÁÎÉÀ × Info-ÆÁÊÌÙ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÞÉÔÁÔØ Ó ÐÏÍÏÝØÀ Emacs ÉÌÉ\n" "ÏÔÄÅÌØÎÏÊ ÐÒÏÇÒÁÍÍÙ GNU Info.\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2264,8 +2266,8 @@ msgstr "" " -v, --verbose ÐÏÑÓÎÑÔØ ÄÅÊÓÔ×ÉÑ.\n" " --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n" -#: makeinfo/makeinfo.c:363 -#, fuzzy, no-wrap +#: makeinfo/makeinfo.c:364 +#, no-wrap msgid "" "Output format selection (default is to produce Info):\n" " --docbook output Docbook XML rather than Info.\n" @@ -2277,8 +2279,9 @@ msgstr "" " --docbook ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ DocBook XML, Á ÎÅ Info.\n" " --html ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ HTML, Á ÎÅ Info.\n" " --xml ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ Texinfo XML, Á ÎÅ × Info.\n" +" --plaintext ×Ù×ÏÄÉÔØ ÐÒÏÓÔÏÊ ÔÅËÓÔ, Á ÎÅ Info.\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2309,7 +2312,7 @@ msgstr "" " -o, --output=æáêì ×Ù×ÏÄÉÔØ × ÕËÁÚÁÎÎÙÊ æáêì (ËÁÔÁÌÏÇ ÄÌÑ HTML Ó \n" " ÒÁÚÂÉÅÎÉÅÍ).\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2347,7 +2350,7 @@ msgstr "" " --split-size=òáúíåò ÒÁÚÂÉ×ÁÔØ ÎÁ ÆÁÊÌÙ ÚÁÄÁÎÎÏÇÏ òáúíåòá (ÐÏ\n" " ÕÍÏÌÞÁÎÉÀ %d).\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" @@ -2358,8 +2361,8 @@ msgstr "" " ÞÉÔÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ, ÅÓÌÉ æáêì ÚÁÄÁÎ ËÁË " "-.\n" -#: makeinfo/makeinfo.c:408 -#, fuzzy, c-format +#: makeinfo/makeinfo.c:409 +#, c-format msgid "" "Options for XML and Docbook:\n" " --output-indent=VAL indent XML elements by VAL spaces (default %" @@ -2367,12 +2370,14 @@ msgid "" " If VAL is 0, ignorable whitespace is " "dropped.\n" msgstr "" -"ëÌÀÞÉ ÄÌÑ HTML:\n" -" --css-include=æáêì ×ËÌÀÞÉÔØ æáêì × ÔÅÇ <style> × ×Ù×ÏÄÅ HTML;\n" -" ÞÉÔÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ, ÅÓÌÉ æáêì ÚÁÄÁÎ ËÁË " -"-.\n" +"ëÌÀÞÉ ÄÌÑ XML É Docbook:\n" +" --output-indent=þéóìï ÄÅÌÁÔØ ÄÌÑ XML-ÜÌÅÍÅÎÔÏ× ÏÔÓÔÕÐÙ ÎÁ " +"ÚÁÄÁÎÎÏÅ \n" +" þéóìï ÐÒÏÂÅÌÏ× (ÐÏ ÕÍÏÌÞÁÎÉÀ %d).\n" +" åÓÌÉ þéóìï ÒÁ×ÎÏ ÎÕÌÀ, ÎÅÚÎÁÞÁÝÉÅ ÐÒÏÂÅÌÙ " +"ÏÐÕÓËÁÀÔÓÑ.\n" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2393,8 +2398,7 @@ msgstr "" " -U ðåòåíåîîáñ ÓÄÅÌÁÔØ ðåòåíåîîõà ÎÅÏÐÒÅÄÅÌÅÎÎÏÊ, ÁÎÁÌÏÇÉÞÎÏ\n" " ÉÓÐÏÌØÚÏ×ÁÎÉÀ @clear.\n" -#: makeinfo/makeinfo.c:424 -#, fuzzy +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2410,6 +2414,8 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "õÓÌÏ×ÎÁÑ ÏÂÒÁÂÏÔËÁ ÉÓÈÏÄÎÏÇÏ ÔÅËÓÔÁ:\n" " --ifhtml ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifhtml É @html,\n" @@ -2426,8 +2432,10 @@ msgstr "" " --no-ifplaintext ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifplaintext.\n" " --no-iftex ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @iftex É @tex.\n" " --no-ifxml ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifxml É @xml.\n" +"\n" +" ëÒÏÍÅ ÔÏÇÏ, ÄÌÑ ËÌÀÞÅÊ --no-ifæïòíáô, ÏÂÒÁÂÁÔÙ×ÁÔØ ÂÌÏËÉ @ifnotæïòíáô.\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2441,7 +2449,7 @@ msgstr "" " ÐÒÉ ×Ù×ÏÄÅ ÐÒÏÓÔÏÇÏ ÔÅËÓÔÁ ×ËÌÀÞÅÎ --ifplaintext, ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ;\n" " ÐÒÉ ×Ù×ÏÄÅ XML ×ËÌÀÞÅÎ --ifxml, ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ.\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2469,83 +2477,83 @@ msgstr "" "ÒÁÚÄÅÌÁÍÉ\n" " makeinfo --no-split foo.texi ÚÁÐÉÓÁÔØ ÏÄÉÎ ÂÏÌØÛÏÊ Info-ÆÁÊÌ\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" -msgstr "" +msgstr "%s: ÎÅÉÚ×ÅÓÔÎÏÅ ÚÎÁÞÅÎÉÅ TEXINFO_OUTPUT_FORMAT `%s' ÉÇÎÏÒÉÒÏ×ÁÎÏ.\n" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: %s ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÎÅ `%s'.\n" -#: makeinfo/makeinfo.c:633 -#, fuzzy, c-format +#: makeinfo/makeinfo.c:660 +#, c-format msgid "%s: could not open macro expansion output `%s'" -msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s'" +msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s'" -#: makeinfo/makeinfo.c:638 -#, fuzzy, c-format +#: makeinfo/makeinfo.c:665 +#, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" -msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s'" +msgstr "%s: ×ÔÏÒÏÊ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s' ÉÇÎÏÒÉÒÏ×ÁÎ.\n" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: ÁÒÇÕÍÅÎÔ --paragraph-indent ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÉÌÉ\n" "`none', ÉÌÉ `asis'; ÎÅ `%s'.\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s: ÁÒÇÕÍÅÎÔ --footnote-style ÄÏÌÖÅÎ ÂÙÔØ `separate' ÉÌÉ `end'; Á ÎÅ `%s'.\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ, ÚÁÄÁÀÝÉÊ ÆÁÊÌ.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" -msgstr "" +msgstr "îÅÐÒÁ×ÉÌØÎÏ ÉÓÐÏÌØÚÏ×ÁÎÁ ÍÎÏÇÏÓÔÒÏÞÎÁÑ ËÏÍÁÎÄÁ %c%s" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "ïÖÉÄÁÅÔÓÑ `%s'" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ `%s': %s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "`%s' ÎÅ ÎÁÊÄÅÎ × `%s'" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" "%s: òÁÓËÒÙÔÉÅ ÍÁËÒÏÓÏ× × ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ ÎÅ ÐÒÏÉÚ×ÏÄÉÔÓÑ,\n" "ÔÁË ËÁË ÔÕÄÁ ÎÁÐÒÁ×ÌÅÎ ×Ù×ÏÄ × ÆÏÒÍÁÔÅ Info.\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "óÏÚÄÁÎÉÅ %s-ÆÁÊÌÁ `%s' ÉÚ `%s'.\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "üÔÏ %s, ÓÏÚÄÁÎÎÙÊ makeinfo ×ÅÒÓÉÉ %s ÉÚ %s.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2553,82 +2561,82 @@ msgstr "" "%s: õÄÁÌÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÊ `%s' -- ÂÙÌÉ ÏÛÉÂËÉ;\n" "ÉÓÐÏÌØÚÕÊÔÅ --force, ÞÔÏÂÙ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÓÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: õÄÁÌÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ `%s' -- ÂÙÌÉ ÏÛÉÂËÉ;\n" "ÉÓÐÏÌØÚÕÊÔÅ --force, ÞÔÏÂÙ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÓÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ `%s'" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "" "éÓÐÏÌØÚÕÊÔÅ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ, ÞÔÏÂÙ ÐÅÒÅÄÁÔØ @%s ËÏÍÁÎÄÕ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, c-format msgid "%c%s expected braces" msgstr "%c%s ÐÏÄÒÁÚÕÍÅ×ÁÅÔ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "îÅÐÁÒÎÁÑ }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "âåú_éíåîé!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s ÐÒÏÐÕÝÅÎÁ ÚÁËÒÙ×ÁÀÝÁÑ ÓËÏÂËÁ" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ HTML): %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, c-format msgid "No such file `%s'" msgstr "æÁÊÌ `%s' ÎÅ ÓÕÝÅÓÔ×ÕÅÔ" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ ÔÅËÓÔÁ): %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "ÐÏÓÌÅ @image ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ ÚÁÄÁÀÝÉÊ ÆÁÊÌ " -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "ÎÅÏÐÒÅÄÅÌÅÎÎÙÊ ÆÌÁÇ: %s" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{úÎÁÞÅÎÉÅ `%s' ÎÅ ÚÁÄÁÎÏ}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "ËÏÍÁÎÄÅ %c%s ÎÕÖÎÏ ÕËÁÚÁÔØ ÉÍÑ" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "ëÏÎÅà ÆÁÊÌÁ ÒÁÎØÛÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ËÏÍÁÎÄÙ @end %s" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "`%.40s...' ÓÌÉÛËÏÍ ×ÅÌÉËÏ; ÎÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ" @@ -2671,146 +2679,146 @@ msgstr "* ËÏÌÏÎËÁ %d: ×Ù×ÏÄ = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "îÏÄÁ `%s' ÂÙÌÁ ÒÁÎÅÅ ÏÐÒÅÄÅÌÅÎÁ × ÓÔÒÏËÅ %d" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "æÏÒÍÁÔÉÒÏ×ÁÎÉÅ ÎÏÄÙ %s...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "äÌÑ ÎÏÄÙ `%s' ÔÒÅÂÕÅÔÓÑ ËÏÍÁÎÄÁ ÏÐÉÓÁÎÉÑ ÓÔÒÕËÔÕÒÙ ÇÌÁ× (ÎÁÐÒ. %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "äÌÑ ËÏÍÁÎÄÙ `%c%s' ÎÅ ÚÁÄÁÎÏ ÉÍÑ ÎÏÄÙ" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "íÁÒËÅÒ `%s' É ÎÏÄÁ `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "äÁÎÎÁÑ ËÏÍÁÎÄÁ @anchor ÉÇÎÏÒÉÒÕÅÔÓÑ; ÓÓÙÌËÉ ÎÁ ÎÅÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "ðÅÒÅÉÍÅÎÕÊÔÅ ÜÔÏÔ ÍÁÒËÅÒ ÉÌÉ ÉÓÐÏÌØÚÕÊÔÅ ËÌÀÞ `--no-split'" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "îÅÏÖÉÄÁÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÒÁÚÂÉÔÏÇÏ HTML-ÆÁÊÌÁ `%s'" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "óÌÅÄÕÀÝÁÑ:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "ðÒÅÄÙÄÕÝÁÑ:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "÷×ÅÒÈ:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "íÁÒËÅÒÙ `%s' É `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "ëÏÍÁÎÄÁ @anchor ÉÇÎÏÒÉÒÕÅÔÓÑ; ÓÓÙÌËÉ ÎÁ ÎÅÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ" # ÚÄÅÓØ %s ÍÏÖÅÔ ÂÙÔØ `cross' ÉÌÉ `menu' -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "" "%s ÎÁ ÎÅÓÕÝÅÓÔ×ÕÀÝÕÀ ÎÏÄÕ `%s' (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ " "ÇÌÁ×?)" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "óÓÙÌËÁ ÉÚ ÍÅÎÀ" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "ðÅÒÅËÒÅÓÔÎÁÑ ÓÓÙÌËÁ" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" "îÁ ÐÏÌÅ Next ÎÏÄÙ `%s' ÎÅÔ ÓÓÙÌÏË (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ " "ÇÌÁ×?)" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "÷ ÜÔÏÊ ÎÏÄÅ (%s) ÎÅÐÒÁ×ÉÌØÎÙÊ ÕËÁÚÁÔÅÌØ Prev" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "ðÒÅÄÙÄÕÝÁÑ" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "îÁ ÐÏÌÅ Prev ÎÏÄÙ `%s' ÎÅÔ ÓÓÙÌÏË" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "÷ ÜÔÏÊ ÎÏÄÅ (%s) ÎÅÐÒÁ×ÉÌØÎÙÊ ÕËÁÚÁÔÅÌØ Next" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "" "÷ ÎÏÄÅ `%s' ÎÅÔ ÐÏÌÑ Up (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ ÇÌÁ×?)" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "÷×ÅÒÈ" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "îÏÄÁ `%s' ÎÅ ÉÍÅÅÔ ÐÕÎËÔÁ ÍÅÎÀ ÄÌÑ `%s', ÈÏÔÑ ÎÁ ÎÅÅ ÓÓÙÌÁÅÔÓÑ ÐÏÌÅ Up" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "ÎÁ ÎÏÄÕ `%s' ÐÏÑ×ÉÌÏÓØ %d ÓÓÙÌÏË" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "ÎÁ ÎÏÄÕ `%s' ÎÅÔ ÓÓÙÌÏË" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" -msgstr "" +msgstr "õÄÁÌÅÎÉÅ %s\n" -#: makeinfo/node.c:1683 -#, fuzzy, c-format +#: makeinfo/node.c:1727 +#, c-format msgid "Can't remove file `%s': %s" -msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ `%s': %s" +msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÆÁÊÌ `%s': %s" #: makeinfo/sectioning.c:122 -#, fuzzy, c-format +#, c-format msgid "Appendix %c" -msgstr "ðÒÉÌÏÖÅÎÉÅ %c " +msgstr "ðÒÉÌÏÖÅÎÉÅ %c" #: makeinfo/sectioning.c:467 -#, fuzzy, c-format +#, c-format msgid "Internal error (search_sectioning) `%s'!" -msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ (search_sectioning) \"%s\"!" +msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ (search_sectioning) `%s'!" #: makeinfo/sectioning.c:562 #, c-format @@ -2845,15 +2853,17 @@ msgstr "óÏÄÅÒÖÁÎÉÅ" msgid "Short Contents" msgstr "ëÒÁÔËÏÅ ÓÏÄÅÒÖÁÎÉÅ" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ @image ÆÁÊÌ `%s': %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" +"ÉÓÐÏÌØÚÏ×ÁÎÉÅ @headitem × ËÁÞÅÓÔ×Å ÐÏÓÌÅÄÎÅÇÏ ÜÌÅÍÅÎÔÁ @multitable ×ÙÄÁÅÔ " +"ÎÅËÏÒÒÅËÔÎÙÅ ÄÏËÕÍÅÎÔÙ Docbook" #: util/install-info.c:154 #, c-format @@ -2998,7 +3008,7 @@ msgstr "END-INFO-DIR-ENTRY ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ START-INFO-DIR-ENTRY" #: util/install-info.c:1191 util/install-info.c:1201 #, c-format msgid "%s: already have dir file: %s\n" -msgstr "" +msgstr "%s: ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ ÆÁÊÌ dir: %s\n" #: util/install-info.c:1236 #, c-format @@ -3103,48 +3113,3 @@ msgstr "÷ %s ÎÅÔ ÎÏÍÅÒÁ ÓÔÒÁÎÉÃÙ" #, c-format msgid "entry %s follows an entry with a secondary name" msgstr "ÚÁ ×ÈÏÖÄÅÎÉÅÍ %s ÓÌÅÄÕÅÔ ×ÈÏÖÄÅÎÉÅ Ó ×ÔÏÒÉÞÎÙÍ ÉÍÅÎÅÍ" - -#~ msgid "%s: Specify the Info directory only once.\n" -#~ msgstr "%s: íÏÖÎÏ ÚÁÄÁÔØ ÔÏÌØËÏ ÏÄÉÎ ËÁÔÁÌÏÇ Info.\n" - -#~ msgid "\"\" is invalid" -#~ msgstr "\"\" ÎÅ×ÅÒÎÁÑ ËÏÍÁÎÄÁ" - -#~ msgid "%s is an invalid ISO code, using %c" -#~ msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ËÏÄÏÍ ISO, ÉÓÐÏÌØÚÕÅÔÓÑ %c" - -#~ msgid "Cannot specify more than one macro expansion output" -#~ msgstr "íÏÖÎÏ ÚÁÄÁÔØ ÔÏÌØËÏ ÏÄÉÎ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ" - -#~ msgid "File exists, but is not a directory" -#~ msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ, ÎÏ ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ" - -#~ msgid "First argument to cross-reference may not be empty" -#~ msgstr "ðÅÒ×ÙÊ ÁÒÇÕÍÅÎÔ ÐÅÒÅËÒÅÓÔÎÏÊ ÓÓÙÌËÉ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÕÓÔÙÍ" - -#~ msgid "see " -#~ msgstr "ÓÍÏÔÒÉÔÅ " - -#~ msgid "`.' or `,' must follow cross reference, not %c" -#~ msgstr "ÐÏÓÌÅ ÓÓÙÌËÉ ÄÏÌÖÎÙ ÓÌÅÄÏ×ÁÔØ `.' ÉÌÉ `,', ×ÓÔÒÅÞÅÎÏ %c" - -#~ msgid "First argument to @inforef may not be empty" -#~ msgstr "ðÅÒ×ÙÊ ÁÒÇÕÍÅÎÔ @inforef ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÕÓÔÙÍ" - -#~ msgid "Node:" -#~ msgstr "óÌÅÄÕÀÝÁÑ:" - -#~ msgid "%s: TOC should be here, but it was not found" -#~ msgstr "%s: ÚÄÅÓØ ÄÏÌÖÎÏ ÂÙÔØ ÓÏÄÅÒÁÖÁÎÉÅ, ÎÏ ÏÎÏ ÎÅ ÎÁÊÄÅÎÏ" - -#~ msgid "virtual memory exhausted" -#~ msgstr "×ÉÒÔÕÁÌØÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ" - -#~ msgid "No `%s.png' or `.jpg', and no extension supplied" -#~ msgstr "îÅ ÎÁÊÄÅÎ ÆÁÊÌ `%s.png' ÉÌÉ `.jpg', Á ÒÁÓÛÉÒÅÎÉÅ ÎÅ ÚÁÄÁÎÏ" - -#~ msgid "%s; for file `%s'.\n" -#~ msgstr "%s; ÄÌÑ ÆÁÊÌÁ `%s'.\n" - -#~ msgid "`%s' has no Up field" -#~ msgstr "÷ ÎÏÄÅ `%s' ÎÅÔ ÐÏÌÑ Up" diff --git a/gnu/dist/texinfo/po/sv.gmo b/gnu/dist/texinfo/po/sv.gmo Binary files differindex 14302e744e5..ab3833a478c 100644 --- a/gnu/dist/texinfo/po/sv.gmo +++ b/gnu/dist/texinfo/po/sv.gmo diff --git a/gnu/dist/texinfo/po/sv.po b/gnu/dist/texinfo/po/sv.po index 6c953084d9c..ad89cd65aca 100644 --- a/gnu/dist/texinfo/po/sv.po +++ b/gnu/dist/texinfo/po/sv.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: texinfo 4.6.94\n" +"Project-Id-Version: texinfo 4.7.91\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" -"PO-Revision-Date: 2004-04-04 16:02+0200\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" +"PO-Revision-Date: 2004-12-12 22:41+0100\n" "Last-Translator: Christian Rose <menthos@menthos.com>\n" "Language-Team: Swedish <sv@li.org>\n" "MIME-Version: 1.0\n" @@ -123,15 +123,15 @@ msgstr "En komplettering:\n" msgid "%d completions:\n" msgstr "%d kompletteringar:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Infoga komplettering" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Bygger kompletteringar..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Rulla kompletteringsfönstret" @@ -187,7 +187,7 @@ msgstr "Inga indexposter." # instead and an outer if statement. # #: info/indices.c:375 -#, fuzzy, c-format +#, c-format msgid "No %sindex entries containing `%s'." msgstr "Inga %sindexposter som innehåller \"%s\"." @@ -200,17 +200,17 @@ msgid "CAN'T SEE THIS" msgstr "KAN INTE SE DETTA" #: info/indices.c:422 -#, fuzzy, c-format +#, c-format msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)" -msgstr "Hittade \"%s\" i %s (\"\\[next-index-match]\" försöker hitta nästa)." +msgstr "Hittade \"%s\" i %s. (\"\\[next-index-match]\" försöker hitta nästa)." #: info/indices.c:541 -#, fuzzy, c-format +#, c-format msgid "Scanning indices of `%s'..." msgstr "Genomsöker index av \"%s\"..." #: info/indices.c:596 -#, fuzzy, c-format +#, c-format msgid "No available info files have `%s' in their indices." msgstr "Inga tillgängliga infofiler har \"%s\" i deras index." @@ -223,7 +223,7 @@ msgid "Index apropos: " msgstr "Index-apropos: " #: info/indices.c:654 -#, fuzzy, c-format +#, c-format msgid "" "\n" "* Menu: Nodes whose indices contain `%s':\n" @@ -236,7 +236,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "Prova --help för mer information.\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, c-format msgid "" @@ -335,7 +335,7 @@ msgstr "" " info --show-options emacs börja på noden med emacs kommandoradsflaggor\n" " info -f ./foo.info visa filen ./foo.info, sök inte i katalogen\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1171,7 +1171,7 @@ msgid "Move to the start of the line" msgstr "Gå till början på raden" # src/menus.c:332 -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "Nästa" @@ -1657,7 +1657,7 @@ msgid "\"%s\" is invalid" msgstr "\"%s\" är ogiltigt" #: info/session.c:4495 -#, fuzzy, c-format +#, c-format msgid "`%s' is invalid" msgstr "\"%s\" är ogiltigt" @@ -1766,62 +1766,62 @@ msgstr "-%s%s-Info: (%s)%s, %d rader --%s--" msgid " Subfile: %s" msgstr " Underfil: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: flaggan \"%s\" är flertydig\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: flaggan \"--%s\" tillåter inget argument\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: flaggan \"%c%s\" tillåter inget argument\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: flaggan \"%s\" kräver ett argument\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: okänd flagga \"--%s\"\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: okänd flagga \"%c%s\"\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: otillåten flagga -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ogiltig flagga -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: flaggan kräver ett argument -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: flaggan \"-W %s\" är flertydig\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: flaggan \"-W %s\" tillåter inget argument\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, c-format msgid "arguments to @%s ignored" msgstr "argument till @%s ignorerades" @@ -1831,117 +1831,117 @@ msgstr "argument till @%s ignorerades" # The translator should not need to translate this - it is all present # in libc and can be used with nl_langinfo(), strftime() and friends. # -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "januari" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "februari" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "mars" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "april" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "maj" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "juni" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "juli" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "augusti" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "september" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "oktober" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "november" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "december" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "osannolikt tecken %c i @var" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "" "@sc-argumentet är enbart med stora bokstäver, därför har det ingen effekt" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "\"{\" förväntades, men såg \"%c\"" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "filslut inuti verb-block" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "\"}\" förväntades, men såg \"%c\"" -# Är det kombinationen "@strong{Note:}" eller bara @strong{} rent allmänt som +# Är det kombinationen "@strong{Note:.." eller bara @strong{} rent allmänt som # orsakar problem? -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -"@strong{Obs:} skapar en falsk korsreferens i Info; formulera om för att " +"@strong{Obs...} skapar en falsk korsreferens i Info; formulera om för att " "undvika detta" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s är föråldrat" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp kräver ett positivt numeriskt argument, inte \"%s\"" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "Felaktigt argument till %c%s" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "oförändrad" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "ingen" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, c-format msgid "Bad argument to @%s" msgstr "Felaktigt argument till @%s" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "infoga" @@ -1978,12 +1978,12 @@ msgid "Method" msgstr "Metod" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "av" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "på" @@ -1992,22 +1992,22 @@ msgstr "på" msgid "Must be in `@%s' environment to use `@%s'" msgstr "Måste vara i \"@%s\"-omgivning för att använda \"@%s\"" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "\"%s\" utelämnades innan utdatafilnamnet" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "\"%s\" utelämnades efter skrivning till standard ut" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "Utdatabufferten är inte tom." @@ -2048,11 +2048,11 @@ msgid "Untitled" msgstr "Namnlös" # to pop? -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "[oväntat] ingen html-tagg att poppa" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "[oväntat] ogiltigt nodnamn: \"%s\"" @@ -2062,45 +2062,45 @@ msgstr "[oväntat] ogiltigt nodnamn: \"%s\"" msgid "Unknown index `%s'" msgstr "Okänt index \"%s\"" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "Info kan inte hantera \":\" i indexposten \"%s\"" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "Indexet \"%s\" finns redan" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Okänt index \"%s\" och/eller \"%s\" i @synindex" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "(rad )" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "(rad %*d)" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Okänt index \"%s\" i @printindex" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "Posten för index \"%s\" är utanför alla noder" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(utanför alla noder)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "Se " @@ -2136,105 +2136,105 @@ msgstr "%cfloat-omgivningar kan inte nästlas" msgid "`@end' expected `%s', but saw `%s'" msgstr "\"@end\" förväntade \"%s\", men såg \"%s\"" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "Inget matchande \"%cend %s\"" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s kräver bokstav eller siffra" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "filslut inuti bokstavligt block" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "@%s är inte meningsfullt utanför \"@float\"-omgivning" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu sågs innan första @node, skapar \"Top\"-nod" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "din @top-nod ska kanske packas i @ifnottex istället för @ifinfo?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu sågs innan första noden, skapar \"Top\"-nod" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" "@%s är inte meningsfullt utanför \"@titlepage\"- och \"@quotation\"-omgivning" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "@%s är inte meningsfullt utanför \"@titlepage\"-omgivning" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "Ensamt \"%c%s\"" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "\"%c%s\" kräver någonting efter sig" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "Felaktigt argument \"%s\" till \"@%s\", använder \"%s\"" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s är inte meningsfullt inuti \"@%s\"-block" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "@itemx är inte meningsfullt inuti \"%s\"-block" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s hittades utanför ett insättningsblock" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s är inte en giltig landskod enligt ISO 639" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, c-format msgid "unrecognized encoding name `%s'" msgstr "okänt kodningsnamn \"%s\"" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "tyvärr, kodningen \"%s\" stöds inte" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "ogiltigt kodat tecken \"%s\"" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s förväntar \"i\" eller \"j\" som argument, inte \"%c\"" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s förväntar ett ensamt tecken \"i\" eller \"j\" som argument" @@ -2278,27 +2278,27 @@ msgstr "@end %s och @%s passar inte" msgid "Too many errors! Gave up.\n" msgstr "För många fel! Gav upp.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: varning: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "Felplacerat %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prova \"%s --help\" för mer information.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Användning: %s [FLAGGA]... TEXINFO-FIL...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2306,7 +2306,7 @@ msgstr "" "Översätt Texinfo-källdokumentation till diverse andra format, som standard\n" "infofiler som är lämpliga för läsning med Emacs eller GNU Info.\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2331,7 +2331,7 @@ msgstr "" " -v, --verbose förklara vad som görs.\n" " --version visa versionsinformation och avsluta.\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2346,7 +2346,7 @@ msgstr "" " --xml generera Texinfo XML istället för Info.\n" " --plaintext generera vanlig text istället för Info.\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2374,7 +2374,7 @@ msgstr "" " --number-sections generera kapitel- och avsnittsnummer.\n" " -o, --output=FIL generera till FIL (katalog om delad HTML),\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2411,7 +2411,7 @@ msgstr "" " --split-size=ANTAL dela upp Info-filer vid storleken ANTAL\n" " (standardvärde %d).\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" @@ -2421,7 +2421,7 @@ msgstr "" " --css-include=FIL inkludera FIL i HTML <style>-utdata;\n" " läs standard in om FIL är -.\n" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2435,7 +2435,7 @@ msgstr "" " (standard %d). Om VÄRDE är 0 kastas\n" " mellanrum som kan ignoreras.\n" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2454,7 +2454,7 @@ msgstr "" " -U VARIABEL odefiniera variabeln VARIABEL, som med " "@clear.\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2470,13 +2470,15 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "Villkorlig behandling i indata:\n" " --ifdocbook behandla @ifdocbook och @docbook även om inte\n" " Docbook genereras.\n" " --ifhtml behandla @ifhtml och @html även om inte HTML genereras.\n" " --ifinfo behandla @ifinfo-text även om inte Info genereras.\n" -" --ifplaintex behandla @ifplaintext även om inte vanlig text\n" +" --ifplaintext behandla @ifplaintext även om inte vanlig text\n" " genereras.\n" " --iftex behandla @iftex och @tex-text; medför --no-split.\n" " --ifxml behandla @ifxml och @xml.\n" @@ -2486,8 +2488,10 @@ msgstr "" " --no-ifplaintext behandla inte @ifplaintext-text.\n" " --no-iftex behandla inte @iftex- och @tex-text.\n" " --no-ifxml behandla inte @ifxml- och @xml-text.\n" +"\n" +" Dessutom, för flaggorna --no-ifFORMAT, behandla @ifnotFORMAT-text.\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2501,7 +2505,7 @@ msgstr "" " om vanlig text genereras är --ifplaintext på och de andra av;\n" " om XML genereras är --ifxml på och de andra av.\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2526,67 +2530,67 @@ msgstr "" " makeinfo --no-split apa.texi skriv en Info-fil hur stor den än " "är\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "%s: Ignorerar okänt TEXINFO_OUTPUT_FORMAT-värde \"%s\".\n" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: argumentet %s måste vara numeriskt, inte \"%s\".\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "%s: kunde inte öppna makroexpansionsutdata \"%s\"" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "%s: ignorerar andra makroexpansionsutdata \"%s\".\n" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s: argumentet --paragraph-indent måste vara numeriskt/\"none\"/\"asis\", " "inte \"%s\".\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s: argumentet --footnote-style måste vara \"separate\" eller \"end\", inte " "\"%s\".\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: filargument saknas.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "Flerradskommandot %c%s används felaktigt" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "\"%s\" förväntades" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "Kan inte skapa katalogen \"%s\": %s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "Inget \"%s\" hittades i \"%s\"" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" @@ -2597,17 +2601,17 @@ msgstr "" # no_headers ? "text" : (html ? "HTML" : "info"), # output_filename, input_filename); # -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "Skapar %s-fil \"%s\" från \"%s\".\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "Detta är %s, skapad av makeinfo version %s från %s.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2615,81 +2619,81 @@ msgstr "" "%s: Tar bort makroutdatafilen \"%s\" på grund av fel; använd --force för att " "bevara.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: Tar bort utdatafilen \"%s\" på grund av fel; använd --force för att " "bevara.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "Okänt kommando \"%s\"" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "Använd klamrar för att ge ett komamndo som ett argument till @%s" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, c-format msgid "%c%s expected braces" msgstr "%c%s förväntade klamrar" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "Ensam }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "INGET_NAMN!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s saknar avslutande klammer" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "@image-filen \"%s\" (för HTML) är oläslig: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, c-format msgid "No such file `%s'" msgstr "Det finns ingen sådan fil \"%s\"" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "@image-filen \"%s\" (för text) är oläslig: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "@image saknar filnamnsargument" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "odefinierad flagga: %s" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{Inget värde för \"%s\"}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s kräver ett namn" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "Nådde filslut innan matchande @end %s" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "\"%.40s...\" är för lång för expansion; inte expanderad" @@ -2732,134 +2736,134 @@ msgstr "* kolumn %d: utdata = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "Noden \"%s\" är tidigare definierad på rad %d" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "Formaterar noden %s...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "Noden \"%s\" kräver ett kommando för avsnittsindelning (t.ex. %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "Inget nodnamn angivet för kommandot \"%c%s\"" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "Ankaret \"%s\" och noden \"%s\" mappas till samma filnamn" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" "Detta @anchor-kommando ignoreras; referenser till det kommer inte att fungera" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "Byt namn på detta ankare eller använd flaggan \"--no-split\"" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "Oväntad sträng vid slutet på den delade HTML-filen \"%s\"" # src/menus.c:332 -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "Nästa:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "Föregående:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "Upp:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "Ankarna \"%s\" och \"%s\" mappas till samma filnamn" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "" "@anchor-kommandot ignoreras; referenser till det kommer inte att fungera" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "" "%s-referens till ickeexisterande noden \"%s\" (kanske felaktig " "avsnittsindelning?)" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "Meny" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "Kors" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" "Nästa fält i noden \"%s\" pekas inte till (kanske felaktig " "avsnittsindelning?)" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "Denna nod (%s) har den felaktiga föregående-noden" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "Föreg" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "Föregående-fältet i noden \"%s\" pekas inte till" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "Denna nod (%s) har den felaktiga nästa-noden" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "\"%s\" har inget upp-fält (kanske felaktig avsnittsindelning?)" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "Upp" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "Noden \"%s\" saknar menypost för \"%s\" trots att den är dess Upp-mål" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "noden \"%s\" har refererats %d gånger" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "orefererad nod \"%s\"" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "Tar bort %s\n" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, c-format msgid "Can't remove file `%s': %s" msgstr "Kan inte ta bort filen \"%s\": %s" @@ -2870,7 +2874,7 @@ msgid "Appendix %c" msgstr "Appendix %c" #: makeinfo/sectioning.c:467 -#, fuzzy, c-format +#, c-format msgid "Internal error (search_sectioning) `%s'!" msgstr "Internt fel (search_sectioning) \"%s\"!" @@ -2907,12 +2911,12 @@ msgstr "Innehållsförteckning" msgid "Short Contents" msgstr "Kort innehållsförteckning" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "@image-filen \"%s\" är oläslig: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/texinfo.pot b/gnu/dist/texinfo/po/texinfo.pot index fc2c7d934ff..90756421544 100644 --- a/gnu/dist/texinfo/po/texinfo.pot +++ b/gnu/dist/texinfo/po/texinfo.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -125,15 +125,15 @@ msgstr "" msgid "%d completions:\n" msgstr "" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "" -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "" @@ -226,7 +226,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, c-format msgid "" @@ -284,7 +284,7 @@ msgid "" " info -f ./foo.info show file ./foo.info, not searching dir\n" msgstr "" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -999,7 +999,7 @@ msgstr "" msgid "Move to the start of the line" msgstr "" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "" @@ -1568,172 +1568,172 @@ msgstr "" msgid " Subfile: %s" msgstr "" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, c-format msgid "arguments to @%s ignored" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, c-format msgid "Bad argument to @%s" msgstr "" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "" @@ -1770,12 +1770,12 @@ msgid "Method" msgstr "" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "" @@ -1784,22 +1784,22 @@ msgstr "" msgid "Must be in `@%s' environment to use `@%s'" msgstr "" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "" @@ -1839,11 +1839,11 @@ msgstr "" msgid "Untitled" msgstr "" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "" @@ -1853,45 +1853,45 @@ msgstr "" msgid "Unknown index `%s'" msgstr "" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "" @@ -1927,104 +1927,104 @@ msgstr "" msgid "`@end' expected `%s', but saw `%s'" msgstr "" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, c-format msgid "unrecognized encoding name `%s'" msgstr "" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "" @@ -2068,33 +2068,33 @@ msgstr "" msgid "Too many errors! Gave up.\n" msgstr "" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "" -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" msgstr "" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2109,7 +2109,7 @@ msgid "" " --version display version information and exit.\n" msgstr "" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2119,7 +2119,7 @@ msgid "" " --plaintext output plain text rather than Info.\n" msgstr "" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2135,7 +2135,7 @@ msgid "" " -o, --output=FILE output to FILE (directory if split HTML),\n" msgstr "" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2154,14 +2154,14 @@ msgid "" " --split-size=NUM split Info files at size NUM (default %d).\n" msgstr "" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" " read stdin if FILE is -.\n" msgstr "" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2171,7 +2171,7 @@ msgid "" "dropped.\n" msgstr "" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2181,7 +2181,7 @@ msgid "" " -U VAR undefine the variable VAR, as with @clear.\n" msgstr "" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2197,9 +2197,11 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2208,7 +2210,7 @@ msgid "" " if generating XML, --ifxml is on and the others are off.\n" msgstr "" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2223,156 +2225,156 @@ msgid "" " makeinfo --no-split foo.texi write one Info file however big\n" msgstr "" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" msgstr "" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, c-format msgid "%c%s expected braces" msgstr "" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, c-format msgid "No such file `%s'" msgstr "" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "" @@ -2415,127 +2417,127 @@ msgstr "" msgid "Node `%s' previously defined at line %d" msgstr "" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, c-format msgid "Can't remove file `%s': %s" msgstr "" @@ -2583,12 +2585,12 @@ msgstr "" msgid "Short Contents" msgstr "" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/tr.gmo b/gnu/dist/texinfo/po/tr.gmo Binary files differindex 6fbc9fc5dc8..09fa6558c68 100644 --- a/gnu/dist/texinfo/po/tr.gmo +++ b/gnu/dist/texinfo/po/tr.gmo diff --git a/gnu/dist/texinfo/po/tr.po b/gnu/dist/texinfo/po/tr.po index c5b2bd9de84..6745a02f04f 100644 --- a/gnu/dist/texinfo/po/tr.po +++ b/gnu/dist/texinfo/po/tr.po @@ -1,22 +1,20 @@ -# translation of texinfo-4.6.94.po to Turkish -# texinfo-4.6 Türkçe Çevirisi +# translation of texinfo-4.7.92.po to Turkish +# texinfo-4.7.92 Türkçe Çevirisi # Copyright (C) 2002, 2004 Free Software Foundation, Inc. # This file is distributed under the same license as the texinfo package. -# Eyüp Hakan Duran <hakan_duran@hotmail.com>, 2002. # Eyüp Hakan Duran <hakan_duran@hotmail.com>, 2002, 2004. -# msgid "" msgstr "" -"Project-Id-Version: texinfo-4.6.94\n" +"Project-Id-Version: texinfo-4.7.92\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" -"PO-Revision-Date: 2004-04-03 22:47+0300\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" +"PO-Revision-Date: 2004-12-21 21:22+0200\n" "Last-Translator: Eyüp Hakan Duran <hakan_duran@hotmail.com>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-9\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.0.2\n" +"X-Generator: KBabel 1.3\n" #: info/echo-area.c:284 info/session.c:689 msgid "Move forward a character" @@ -127,15 +125,15 @@ msgstr "Bir tamamlama:\n" msgid "%d completions:\n" msgstr "%d tamamlama:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "Tamamlamayý yerleþtir" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "Tamamlamalarý oluþturuyor..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "Tamamlama penceresini kaydýrýr" @@ -182,9 +180,9 @@ msgid "No index entries." msgstr "Hiç indeks girdisi yok." #: info/indices.c:375 -#, fuzzy, c-format +#, c-format msgid "No %sindex entries containing `%s'." -msgstr "\"%s\" içeren %sindex girdisi yok." +msgstr "`%s' içeren %sindex girdisi yok." #: info/indices.c:376 msgid "more " @@ -195,20 +193,20 @@ msgid "CAN'T SEE THIS" msgstr "BU GÖRÜLMEZ" #: info/indices.c:422 -#, fuzzy, c-format +#, c-format msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)" msgstr "" -"\"%s\" bulundu - %s içinde. (`\\[next-index-match]' sonrakini bulmayý dener.)" +"`%s' bulundu - %s içinde. (`\\[next-index-match]' sonrakini bulmayý dener.)" #: info/indices.c:541 -#, fuzzy, c-format +#, c-format msgid "Scanning indices of `%s'..." -msgstr "\"%s\" indislerini tarýyor..." +msgstr "`%s' indislerini tarýyor..." #: info/indices.c:596 -#, fuzzy, c-format +#, c-format msgid "No available info files have `%s' in their indices." -msgstr "Mevcut bilgi dosyalarýndan hiçbirisinin indisinde \"%s\" yok." +msgstr "Mevcut bilgi dosyalarýndan hiçbirisinin indisinde `%s' yok." #: info/indices.c:622 msgid "Grovel all known info file's indices for a string and build a menu" @@ -221,20 +219,20 @@ msgid "Index apropos: " msgstr "Ýndeks hakkýnda:" #: info/indices.c:654 -#, fuzzy, c-format +#, c-format msgid "" "\n" "* Menu: Nodes whose indices contain `%s':\n" msgstr "" "\n" -"* Menü: \"%s\" indislerini içeren düðümler:\n" +"* Menü: `%s' indislerini içeren düðümler:\n" #: info/info.c:275 info/infokey.c:899 #, c-format msgid "Try --help for more information.\n" msgstr "Daha fazla bilgi için --help seçeneðini kullanýn.\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, c-format msgid "" @@ -334,7 +332,7 @@ msgstr "" "baþla\n" " info -f ./foo.info dir'i aramadan ./foo.info dosyasýný göster\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1126,7 +1124,7 @@ msgstr "Satýr sonuna gider" msgid "Move to the start of the line" msgstr "Satýr baþýna gider" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "Sonraki" @@ -1593,9 +1591,9 @@ msgid "\"%s\" is invalid" msgstr "\"%s\" geçersiz" #: info/session.c:4495 -#, fuzzy, c-format +#, c-format msgid "`%s' is invalid" -msgstr "\"%s\" geçersiz" +msgstr "`%s' geçersiz" #: info/session.c:4709 msgid "Add this digit to the current numeric argument" @@ -1704,174 +1702,174 @@ msgstr "-%s%s-Info: (%s)%s, %d satýr --%s--" msgid " Subfile: %s" msgstr " Altdosya: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: `%s' seçeneði belirsiz\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: `--%s' seçeneði argümansýz kullanýlýr\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' seçeneði argümansýz kullanýlýr\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: `--%s' seçeneði bilinmiyor\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: `%c%s' seçeneði bilinmiyor\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: kuraldýþý seçenek -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: geçersiz seçenek -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: seçenek bir argümanla kullanýlýr -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: `-W %s' seçeneði belirsiz\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' seçeneði argümansýz kullanýlýr\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, c-format msgid "arguments to @%s ignored" msgstr "@%s'ye argümanlar yok sayýldý" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "Ocak" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "Þubat" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "Mart" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "Nisan" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "Mayýs" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "Haziran" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "Temmuz" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "Aðustos" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "Eylül" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "Ekim" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "Kasým" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "Aralýk" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "@var içinde düþük olasýlýklý karakter %c" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "@sc argümaný tamamen büyükharf(le yazýlmýþ), etkisiz" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "`{' beklenirdi, `%c' görüldü" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "fiil bloðu içinde dosya sonu" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "`}' beklenirdi, `%c' görüldü" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -"@strong{Not:} Info'da sahte bir çapraz-baþvuru oluþturur; bundan kaçýnmak " +"@strong{Not...} Info'da sahte bir çapraz-baþvuru oluþturur; bundan kaçýnmak " "için yazýmý deðiþtirin" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s kullanýmdan kalkmýþ" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp pozitif bir sayýsal argüman gerektirir, `%s' deðil" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "%c%s'ye hatalý argüman" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "yok" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, c-format msgid "Bad argument to @%s" msgstr "@%s'ye hatalý argüman" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "ekle" @@ -1908,12 +1906,12 @@ msgid "Method" msgstr "Yöntem" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "kapalý" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "açýk" @@ -1922,22 +1920,22 @@ msgstr "açýk" msgid "Must be in `@%s' environment to use `@%s'" msgstr "`@%s' kullanmak için `@%s' ortamý içinde ol(un)malýdýr" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "`%s' çýktý dosya adýndan önce yok sayýldý" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "stdout'a yazýlýyor olduðundan `%s' yok sayýldý" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "Çýktý tamponu boþ deðil" @@ -1977,11 +1975,11 @@ msgstr "%s:%d: --css-dosyasý yorum içinde sonlandý" msgid "Untitled" msgstr "Adsýz" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "hayýr :" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "[beklenmeyen] geçersiz düðüm ismi: `%s'" @@ -1991,45 +1989,45 @@ msgstr "[beklenmeyen] geçersiz düðüm ismi: `%s'" msgid "Unknown index `%s'" msgstr "Bilinmeyen indeks `%s'" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "Info, `%s' indeks girdisindeki `:''yi kullanamýyor" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "Ýndeks `%s' zaten mevcut" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Bilinmeyen indeks `%1$s' ve/veya @synindex içinde `%2$s'" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "(satýr )" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "(satýr %*d)" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "@printindex içinde bilinmeyen indeks `%s'" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "`%s' indeks girdisi tüm düðümlerin dýþýnda" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(tüm düðümlerin dýþýnda)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "Bkz " @@ -2065,106 +2063,106 @@ msgstr "%cfloat çevreler içiçelendirilemez" msgid "`@end' expected `%s', but saw `%s'" msgstr "`@end' `%1$s' beklerdi, `%2$s' gördü" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "Eþleþen `%cend %s' yok" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s harf ya da rakam gerektirir" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "verbatim bloðu içinde dosya sonu" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "`@float' çevresi dýþýnda @%s anlamlý deðil" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "önce Üst" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" "belki de sizin @top düðümünüz, @ifinfo'dan ziyade @ifnottex içine " "sarýlmalýdýr?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu ilk düðümden önce görüldü, `En Üst' düðüm oluþturuluyor" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "`@titlepage' ve `@quotation' çevreleri dýþýnda @%s anlamlý deðil" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "`@titlepage' çevresi dýþýnda @%s anlamlý deðil" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "Eþleþmeyen `%c%s'" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "`%c%s' sonrasýnda birþeyler gereklidir" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "`%2$s''e hatalý argüman, `%1$s', `%3$s' kullanýlýyor" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "`@%s' bloðu içinde @%s anlamlý deðil" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "`%s' bloðunun içinde @itemx anlamlý deðil" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s, bir ekleme bloðunun dýþýnda bulundu" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s geçerli bir ISO 639 dil kodu deðildir" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, c-format msgid "unrecognized encoding name `%s'" msgstr "tanýnmayan kodlama adý `%s'" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "üzgünüm, `%s' kodlamasý desteklenmiyor" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "geçersiz kodlanmýþ karakter `%s'" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s argüman olarak `i' ya da `j' gerektirir, %c deðil" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s argüman olarak tek karakter, `i' ya da `j' gerektirir" @@ -2208,27 +2206,27 @@ msgstr "@%s ile eþleþmeyen @end %s" msgid "Too many errors! Gave up.\n" msgstr "Çok sayýda hata! Vazgeçildi.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: uyarý: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "Yanlýþ yerleþtirilmiþ %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazýn.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Kullaným: %s [SEÇENEK]... TEXINFO-DOSYASI...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2237,7 +2235,7 @@ msgstr "" "Info dosyalarý çevrimiçi Emacs ya da tek baþýna GNU Info'yla okunmak için " "uygundur.\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2261,7 +2259,7 @@ msgstr "" " -v, --verbose ne yapýlýyor olduðunu açýklar.\n" " --version sürüm bilgisini görüntüler ve çýkar.\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2276,7 +2274,7 @@ msgstr "" " --xml Info yerine XML (TexinfoML) çýktýsý üretir.\n" " --plaintext Info yerine salt metin çýktýsý üretir.\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2307,7 +2305,7 @@ msgstr "" " -o, --output=DOSYA çýktýyý DOSYA'ya yazar (bölünmüþ HTML ise " "dizine).\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2343,7 +2341,7 @@ msgstr "" " --spilt-size=NUM Info dosyalarýný NUM boyutuna böler (öntanýmlý " "%d).\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" @@ -2353,7 +2351,7 @@ msgstr "" " --css-include=DOSYA DOSYA'yý HTML <style> çýktýsýnda içer;\n" " eðer DOSYA - ise stdin'i oku.\n" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2368,7 +2366,7 @@ msgstr "" " eðer DEÐER 0 ise yok sayýlabilen beyaz " "boþluk silinir..\n" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2386,7 +2384,7 @@ msgstr "" " -U VAR VAR deðiþkeninin tanýmýný, @clear ile " "olduðu gibi geri alýr.\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2402,6 +2400,8 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "Girdide koþullu iþlem:\n" " --ifdocbook Docbook oluþturulmuyorsa bile @ifdocbook\n" @@ -2417,8 +2417,10 @@ msgstr "" " --no-ifplaintext @ifplintext metin iþlemez.\n" " --no-iftex @iftex ve @tex metin iþlemez.\n" " --no-ifxml @ifxml ve @xml metin iþlemez.\n" +"\n" +" Ayrýca --no-ifFORMAT seçenekleri için ifnotFORMAT metnini iþler.\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2432,7 +2434,7 @@ msgstr "" " eðer salt metin oluþturuluyorsa, --ifplaintext açýk, diðerleri kapalýdýr;\n" " eðer XML oluþturuluyorsa, --ifxml açýk, deiðerleri kapalýdýr.\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 msgid "" "Examples:\n" " makeinfo foo.texi write Info to foo's @setfilename\n" @@ -2459,83 +2461,83 @@ msgstr "" " makeinfo --no-split foo.texi ne büyüklükte olursa olsun tek Info " "dosyasý yazar\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "%s: Tanýnamayan TEXINFO_OUTPUT_FORMAT deðeri `%s' yok sayýlýyor.\n" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%1$s: %2$s arg sayýsal olmalýdýr, `%3$s' deðil.\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "%s:makro geniþleme çýktýsý `%s' açýlamadý" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "%s: ikinci makro geniþleme çýktýsý yok sayýlýyor `%s'.\n" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%1$s: --paragraph-indent arg. sayýsal/`none'/`asis' olmalýdýr, `%2$s' " "deðil.\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%1$s: --footnote-style arg. `separate' ya da `end' olmalýdýr, `%2$s' deðil.\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: dosya argümaný eksik.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "Çok satýrlý komut %c%s uygunsuz kullanýldý" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "`%s' gerekir" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "`%1$s' dizini oluþturulamýyor: %2$s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "`%2$s' içinde `%1$s' yok" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" "%s: Makro geniþlemesini, Info çýktýsý da oraya gittiðinden, stdout'a " "atlatýyor.\n" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "`%3$s''den %1$s dosya `%2$s' yapýlýyor.\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "Bu %1$s, makeinfo sürümü %2$s tarafýndan, %3$s'den üretilmiþtir.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2543,81 +2545,81 @@ msgstr "" "%1$s: Makro çýktý dosyasý `%2$s' hatalardan dolayý siliniyor; korumak için --" "force kullanýnýz.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%1$s: Çýktý dosyasý `%2$s' hatalardan dolayý siliniyor; korumak için --force " "kullanýnýz.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "Bilinmeyen komut `%s'" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "@%s'e argüman olarak bir komut vermek için {} kullanýn" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, c-format msgid "%c%s expected braces" msgstr "%c%s küme parantezi bekledi" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "Eþleþmemiþ }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "ÝSÝMSÝZ!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s eksik kapama }" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "@image dosyasý `%1$s' (HTML için) okunamýyor: %2$s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, c-format msgid "No such file `%s'" msgstr "`%s' adýnda dosya yok" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "@image dosyasý `%1$s' (metin için) okunamýyor: %2$s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "@image eksik dosyaadý argümaný" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "tanýmlanmamýþ bayrak: %s" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "(`%s' için deðer yok)" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s bir isim gerektirir" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "Eþleþen @end %s'den önce dosya sonuna ulaþýldý" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "`%.40s...' geniþleme için çok uzun; geniþletilmedi" @@ -2660,131 +2662,131 @@ msgstr "* sütun #%d: çýktý = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "Düðüm `%s' daha önce satýr %d'de tanýmlandý" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "Düðüm %s biçimleniyor...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "Düðüm `%s' bir bölümleme komutu gerektirir (ör: %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "`%c%s' komutu için bir düðüm adý belirtilmedi" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "Çýpa `%1$s' ve düðüm `%2$s' ayný dosya adýna yönlendiriyor" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "Bu @anchor komutu yoksayýldý; buraya yönelik baþvurular çalýþmayacak" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "Bu çýpayý yeniden adlandýrýn ya da `--no-split' seçeneðini kullanýn" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "Bölünmüþ-HTML dosyasýnýn sonunda beklenmeyen dizge `%s'" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "Sonraki:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "Önceki:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "Yukarý:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "`%1$s' ve `%2$s' çýpalarý ayný dosya adýna yönlendiriyor" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "@anchor komutu yoksayýldý; buraya yönelik baþvurular çalýþmayacak" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "%s baþvuru mevcut olmayan düðüme `%s' (yanlýþ bölümleme nedeniyle?)" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "Menü" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "Çapraz" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" "Düðüm `%s''in sonraki alaný þuraya iþaret etmiyor (yanlýþ bölümleme " "nedeniyle?)" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "Bu düðüm (%s) hatalý Önceki'ne sahip" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "Önceki" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "Düðüm `%s''in önceki alaný þuraya iþaret etmiyor" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "Bu düðüm (%s) hatalý Sonraki'ne sahip" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "`%s''in Yukarý alaný yok (yanlýþ bölümleme nedeniyle?)" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "Yukarý" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" "Düðüm `%s', Yukarý hedefi olmasýna karþýn, `%s' için eksik menü öðesi " "içeriyor" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "düðüm `%s''e %d kez baþvuruldu" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "baþvurulmamýþ düðüm `%s'" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "%s siliniyor\n" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, c-format msgid "Can't remove file `%s': %s" msgstr "`%s' dosyasý silinemiyor: %s" @@ -2795,9 +2797,9 @@ msgid "Appendix %c" msgstr "Ek %c " #: makeinfo/sectioning.c:467 -#, fuzzy, c-format +#, c-format msgid "Internal error (search_sectioning) `%s'!" -msgstr "Dahili hata (search_sectioning) \"%s\"!" +msgstr "Dahili hata (search_sectioning) `%s'!" #: makeinfo/sectioning.c:562 #, c-format @@ -2832,12 +2834,12 @@ msgstr "Ýçindekiler Tablosu" msgid "Short Contents" msgstr "Kýsa Ýçerik" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "@image dosyasý `%1$s' okunamýyor: %2$s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "@multitable'ýn son öðesi @headitem geçersiz Docbook belgeleri üretiyor" diff --git a/gnu/dist/texinfo/po/zh_CN.gmo b/gnu/dist/texinfo/po/zh_CN.gmo Binary files differindex 8b20fbb9e48..2c5fc242354 100644 --- a/gnu/dist/texinfo/po/zh_CN.gmo +++ b/gnu/dist/texinfo/po/zh_CN.gmo diff --git a/gnu/dist/texinfo/po/zh_CN.po b/gnu/dist/texinfo/po/zh_CN.po index 67e36c0d18b..3ac45341101 100644 --- a/gnu/dist/texinfo/po/zh_CN.po +++ b/gnu/dist/texinfo/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: texinfo 4.2\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" "PO-Revision-Date: 2002-05-06 16:10+0800\n" "Last-Translator: Wang Li <charles@linux.net.cn>\n" "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n" @@ -124,15 +124,15 @@ msgstr "Ò»¸ö²¹Æë£º\n" msgid "%d completions:\n" msgstr "%d ¸ö²¹Æë£º\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "²åÈë²¹Æë" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "ÕýÔÚ´´½¨²¹Æë..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "¹ö¶¯²¹Æë´°¿Ú" @@ -228,7 +228,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "³¢ÊÔ --¸ü¶àµÄÇóÖúÐÅÏ¢¡£\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, fuzzy, c-format msgid "" @@ -321,7 +321,7 @@ msgstr "" " info --show-options emacs ´Ó emacs µÄÃüÁîÐÐÑ¡Ïî½Úµã¿ªÊ¼\n" " info -f ./foo.info ÏÔʾÎļþ ./foo.info£¬¶ø²»ÊÇËÑË÷Ŀ¼\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 msgid "" "\n" @@ -1092,7 +1092,7 @@ msgstr "ÒÆ¶¯µ½ÐеÄĩβ" msgid "Move to the start of the line" msgstr "ÒÆ¶¯µ½ÐеĿªÍ·" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "ÏÂÒ»¸ö" @@ -1661,172 +1661,172 @@ msgstr "-%s%s-Info£º(%s)%s£¬%d ÐÐ --%s--" msgid " Subfile: %s" msgstr " ×ÓÎļþ£º%s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s£ºÑ¡Ïî¡°%s¡±º¬Òå²»Ã÷È·\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s£ºÑ¡Ïî¡°--%s¡±²»½ÓÊܲÎÊý\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s£ºÑ¡Ïî¡°%c%s¡±²»½ÓÊܲÎÊý\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s£ºÑ¡Ïî¡°%s¡±ÐèÒªÒ»¸ö²ÎÊý\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s£º²»ÄÜʶ±ðµÄÑ¡Ïî¡°--%s¡±\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s£º²»ÄÜʶ±ðµÄÑ¡Ïî¡°%c%s¡±\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s£º·Ç·¨Ñ¡Ïî -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s£ºÎÞЧѡÏî -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s£ºÑ¡ÏîÐèÒªÒ»¸ö²ÎÊý -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s£ºÑ¡Ïî¡°-W %s¡±µÄº¬Òå²»Çå\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s£ºÑ¡Ïî¡°-W %s¡±²»½ÓÊܲÎÊý\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, fuzzy, c-format msgid "arguments to @%s ignored" msgstr "%c%s µÄ´íÎó²ÎÊý" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "Ò»ÔÂ" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "¶þÔÂ" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "ÈýÔÂ" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "ËÄÔÂ" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "ÎåÔÂ" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "ÁùÔÂ" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "ÆßÔÂ" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "°ËÔÂ" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "¾ÅÔÂ" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "Ê®ÔÂ" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "ʮһÔÂ" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "Ê®¶þÔÂ" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "@var Öв»¿É¿¿µÄ×Ö·û %c" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "@sc µÄ²ÎÊýÈ«²¿Îª´óд£¬Òò´ËÎÞЧ" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "ӦΪ¡°{¡±£¬µ«¿´µ½ÁË¡°%c¡±" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "ÎļþÔÚÔÎÄ¿éÖнáÊø" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "ӦΪ¡°}¡±£¬µ«¿´µ½ÁË¡°%c¡±" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s Òѹýʱ" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp ÐèÒªÕýÊý²ÎÊý£¬¶ø²»ÊÇ¡°%s¡±" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "%c%s µÄ´íÎó²ÎÊý" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "none" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, fuzzy, c-format msgid "Bad argument to @%s" msgstr "%c%s µÄ´íÎó²ÎÊý" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "" @@ -1863,12 +1863,12 @@ msgid "Method" msgstr "·½·¨" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "" @@ -1877,22 +1877,22 @@ msgstr "" msgid "Must be in `@%s' environment to use `@%s'" msgstr "" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s£ºgetwd£º%s£¬%s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "" @@ -1932,11 +1932,11 @@ msgstr "" msgid "Untitled" msgstr "ÎÞ±êÌâ" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, fuzzy, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "ÎÞЧµÄ½Å×¢Ãû£º¡°%s¡±" @@ -1946,45 +1946,45 @@ msgstr "ÎÞЧµÄ½Å×¢Ãû£º¡°%s¡±" msgid "Unknown index `%s'" msgstr "δ֪µÄË÷Òý¡°%s¡±" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "Info ÎÞ·¨´¦ÀíË÷ÒýÌõÄ¿¡°%s¡±Öеġ°:¡±" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "Ë÷Òý¡°%s¡±ÒѾ´æÔÚ" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "@synindex ÖеÄδ֪Ë÷Òý¡°%s¡±ºÍ/»ò¡°%s¡±" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "@printindex ÖеÄδ֪Ë÷Òý¡°%s¡±" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "¹ØÓÚË÷Òý¡°%s¡±µÄÌõÄ¿³¬³öÁËËùÓнڵã" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(³¬³öÈκνڵã)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "²ÎÔÄ " @@ -2020,104 +2020,104 @@ msgstr "" msgid "`@end' expected `%s', but saw `%s'" msgstr "¡°@end¡±ÐèÒª¡°%s¡±£¬µ«¿´µ½¡°%s¡±" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "ûÓÐÆ¥ÅäµÄ¡°%cend %s¡±" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s ÐèÒª×Öĸ»òÊý×Ö" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "ÎļþÔÚÔÎÄ¿éÖнáÊø" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, fuzzy, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "ÔÚ¡°@%2$s¡±¿éÖС°@%1$s¡±ÊÇûÓÐÒâÒåµÄ" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "ÔÚµÚÒ»¸ö½Úµã֮ǰÓöµ½ @menu£¬ÕýÔÚ´´½¨¡°¶¥¡±½Úµã" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "ÄúµÄ @top ½Úµã¿ÉÄÜÓ¦¸Ã°üº¬ÔÚ @ifnottex ¶ø²»ÊÇ @ifinfo ÖУ¿" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "ÔÚµÚÒ»¸ö½Úµã֮ǰÓöµ½ @detailmenu£¬ÕýÔÚ´´½¨¡°¶¥¡±½Úµã" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, fuzzy, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "ÔÚ¡°@%2$s¡±¿éÖС°@%1$s¡±ÊÇûÓÐÒâÒåµÄ" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "δƥÅäµÄ¡°%c%s¡±" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "¡°%c%s¡±Ö®ºóÐèÒªÓÐЩʲô" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, fuzzy, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "¡°%s¡±µÄ´íÎó²ÎÊý£¬¡°%s¡±£¬Ê¹Óá°%s¡±" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "ÔÚ¡°@%2$s¡±¿éÖС°@%1$s¡±ÊÇûÓÐÒâÒåµÄ" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "ÔÚ¡°%s¡±¿éÖÐ @itemx ÊÇûÓÐÒâÒåµÄ" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "ÔÚ²åÈë¿éÖ®Íâ·¢ÏÖÁË %c%s" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s ÔÚ ISO 639 ÓïÑÔ±àÂëÖÐÊÇÎÞЧµÄ" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, fuzzy, c-format msgid "unrecognized encoding name `%s'" msgstr "²»ÄÜʶ±ðµÄ±àÂëÃû³Æ¡°%s¡±" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "±§Ç¸£¬²»Ö§³Ö±àÂë¡°%s¡±" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "ÎÞЧµÄ±àÂë×Ö·û¡°%s¡±" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s µÄ²ÎÊýӦΪ¡°i¡±»ò¡°j¡±£¬¶ø²»ÊÇ¡°%c¡±" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s ÐèÒªÒÔµ¥¸ö×Ö·û¡°i¡±»ò¡°j¡±Îª²ÎÊý" @@ -2161,27 +2161,27 @@ msgstr "@end %s ºÍ @%s ²»Æ¥Åä" msgid "Too many errors! Gave up.\n" msgstr "¹ý¶àµÄ´íÎ󣡷ůú¡£\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s£º%d£º¾¯¸æ£º" -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "´íÎó·ÅÖÃµÄ %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "ÊÔÓá°%s --help¡±ÒÔ»ñÈ¡¸ü¶àÐÅÏ¢¡£\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "Ó÷¨£º%s [Ñ¡Ïî]... TEXINFO-Îļþ...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2189,7 +2189,7 @@ msgstr "" "½« Texinfo Ô´Îļþת»»ÎªÆäËü¸÷ÖÖ¸ñʽ£¬Ä¬ÈÏת»»ÎªÊÊÓÚ\n" "ÓÉ Emacs »ò¶ÀÁ¢ GNU Info ÔÚÏßä¯ÀÀµÄ Info Îļþ¡£\n" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2213,7 +2213,7 @@ msgstr "" " -v, --verbose ½âÊͶ¼×öÁËЩʲô¡£\n" " --version ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, fuzzy, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2227,7 +2227,7 @@ msgstr "" " --html Êä³ö HTML ¶ø²»ÊÇ Info¡£\n" " --xml Êä³ö XML (TexinfoML) ¶ø²»ÊÇ Info¡£\n" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2254,7 +2254,7 @@ msgstr "" " --number-sections Êä³öÕ½ڱàºÅ¡£\n" " -o, --output=FILE Êä³öµ½Îļþ FILE (Èç¹ûÊÇ·Ö¸îµÄ HTML ÔòΪĿ¼)£¬\n" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2284,14 +2284,14 @@ msgstr "" " ¡°asis¡±£¬±£ÁôÏÖÓÐµÄ¶ÔÆë¡£\n" " --split-size=NUM ÔÚ´óС NUM µÄʱºò²ð·Ö Info Îļþ (ĬÈÏΪ %d)¡£\n" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" " read stdin if FILE is -.\n" msgstr "" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2301,7 +2301,7 @@ msgid "" "dropped.\n" msgstr "" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 #, fuzzy msgid "" "Input file options:\n" @@ -2318,7 +2318,7 @@ msgstr "" " -P DIR ½« DIR ×·¼Óµ½ @include ËÑË÷·¾¶Ö®Ç°¡£\n" " -U VAR È¡Ïû±äÁ¿ VAR µÄ¶¨Ò壬¾ÍÏó @clear¡£\n" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 #, fuzzy msgid "" "Conditional processing in input:\n" @@ -2335,6 +2335,8 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" "ÊäÈëÖеÄÌõ¼þ´¦Àí£º\n" " --ifhtml ¼´Ê¹²»ÊÇÉú³É HTML Ò²´¦Àí @ifhtml ºÍ @html¡£\n" @@ -2346,7 +2348,7 @@ msgstr "" " --no-ifplaintext ²»Òª´¦Àí @ifplaintext Îı¾¡£\n" " --no-iftex ²»Òª´¦Àí @iftex ºÍ @tex Îı¾¡£\n" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 #, fuzzy msgid "" " The defaults for the @if... conditionals depend on the output format:\n" @@ -2360,7 +2362,7 @@ msgstr "" " Èç¹ûÉú³É Info£¬Ôò --ifinfo ĬÈÏ¿ªÆô¶øÆäËüµÄĬÈϹرգ»\n" " Èç¹ûÉú³ÉÆÕͨÎı¾£¬Ôò --ifplaintext ĬÈÏ¿ªÆô¶øÆäËüĬÈϹرգ»\n" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 #, fuzzy msgid "" "Examples:\n" @@ -2386,158 +2388,158 @@ msgstr "" " makeinfo --number-sections foo.texi Êä³ö´øÓбàºÅµÄ½ÚµÄ Info\n" " makeinfo --no-split foo.texi Êä³öµ¥¸ö Info Îļþ¶ø²»ÂÛ´óС\n" -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s£º%s ²ÎÊý±ØÐëΪÊýÖµ£¬¶ø²»ÊÇ¡°%s¡±¡£\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, fuzzy, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "ÎÞ·¨´ò¿ªºêÀ©Õ¹Êä³ö¡°%s¡±" -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, fuzzy, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "ÎÞ·¨´ò¿ªºêÀ©Õ¹Êä³ö¡°%s¡±" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" "%s£º--paragraph-indent µÄ²ÎÊý±ØÐëΪÊýÖµ/¡°none¡±/¡°asis¡±£¬¶ø²»ÊÇ¡°%s¡±¡£\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" "%s£º--footnote-style µÄ²ÎÊý±ØÐëΪ¡°separate¡±»ò¡°end¡±£¬¶ø²»ÊÇ¡°%s¡±¡£\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s£ºÒÅ©Îļþ²ÎÊý¡£\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "ӦΪ¡°%s¡±" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "ÎÞ·¨´´½¨Ä¿Â¼¡°%s¡±£º%s" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "ÔÚ¡°%2$s¡±ÖÐÕÒ²»µ½¡°%1$s¡±" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "´Ó¡°%3$s¡±´´½¨ %1$s Îļþ¡°%2$s¡±¡£\n" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "ÕâÊÇ %s£¬ÓÉ makeinfo °æ±¾ %s ´Ó %s Éú³É¡£\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" msgstr "%s£ºÓÉÓÚ´íÎóɾ³ýºêÊä³öÎļþ¡°%s¡±£»Óà --force ±£ÁôºêÊä³ö¡£\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "%s£ºÓÉÓÚ´íÎóɾ³ýºêÊä³öÎļþ¡°%s¡±£»Óà --force ±£ÁôºêÊä³ö¡£\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "δ֪µÄÃüÁî¡°%s¡±" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "ʹÓû¨À¨ºÅ½«Ò»¸öÃüÁîÓÃ×÷ @%s µÄ²ÎÊý" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, fuzzy, c-format msgid "%c%s expected braces" msgstr "%c%s ÐèÒª¡°{...}¡±" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "²»Æ¥ÅäµÄ }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "ÎÞÃû×Ö£¡" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s ÒÅ©±ÕºÏ»¨À¨ºÅ" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "@image Îļþ¡°%s¡±(¶Ô HTML)²»¿É¶Á£º%s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, fuzzy, c-format msgid "No such file `%s'" msgstr "ÔÚ¡°%2$s¡±ÖÐÕÒ²»µ½¡°%1$s¡±" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "@image Îļþ¡°%s¡±(¶ÔÎı¾)²»¿É¶Á£º%s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "@image ÒÅ©ÎļþÃû²ÎÊý" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "{ûÓС°%s¡±µÄÖµ}" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s ÐèÒªÒ»¸öÃû×Ö" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "ÎļþÔÚÓöµ½Æ¥ÅäµÄ @end %s ǰ¾Í½áÊøÁË" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "¡°%.40s...¡±À©Õ¹ÆðÀ´Ì«³¤£»Î´À©Õ¹" @@ -2580,127 +2582,127 @@ msgstr "* ÁÐ #%d£ºÊä³ö = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "½Úµã¡°%s¡±ÔÚÇ°ÃæµÄ(µÚ %d ÐÐ)¶¨Òå" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "ÕýÔÚ¸ñʽ»¯½Úµã %s...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, fuzzy, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "½Úµã¡°%s¡±ÐèÒªÒ»¸ö½ÚÃüÁî (ÀýÈ磺%c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "ûÓÐΪ¡°%c%s¡±ÃüÁîÖ¸¶¨½ÚÃû³Æ" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "Anchor¡°%s¡±ºÍ½Úµã¡°%s¡±Ó³É䵽ͬһ¸öÎļþÃû" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "ºöÂԸà @anchor ÃüÁ¶ÔËüµÄÒýÓý«ÎÞ·¨¹¤×÷" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "ÖØÃüÃû anchor »òʹÓá°--no-split¡±Ñ¡Ïî" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "ÔÚ·ÖÁ¢ HTML Îļþ¡°%s¡±µÄĩβµÄÒâÍâ×Ö·û´®" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "ÏÂÒ»¸ö£º" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "ÉÏÒ»¸ö£º" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "Éϲ㣺" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "Anchor¡°%s¡±ºÍ¡°%s¡±Ó³É䵽ͬһ¸öÎļþÃû" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "ºöÂÔ @anchor ÃüÁ¶ÔËüµÄÒýÓý«²»Äܹ¤×÷" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, fuzzy, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "%sÒýÓõ½²»´æÔڵĽڵ㡰%s¡±" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "²Ëµ¥" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "½»²æÒýÓÃ" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, fuzzy, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "½Úµã¡°%s¡±µÄÏÂÒ»¸öÓòûÓÐÖ¸Ïò" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "¸Ã½Úµã (%s) º¬ÓдíÎóµÄÉÏÒ»¸ö" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "ÉÏÒ»¸ö" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "½Úµã¡°%s¡±µÄÉÏÒ»¸öÓòûÓÐÖ¸Ïò" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "¸Ã½Úµã (%s) º¬ÓдíÎóµÄÏÂÒ»¸ö" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "Éϲã" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "¾¡¹Ü½Úµã¡°%s¡±ÊÇ¡°%s¡±µÄÉϲã½Úµã£¬µ«È±ÉÙÏà¹ØµÄ²Ëµ¥Ïî" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "½Úµã¡°%s¡±Òѱ»ÒýÓÃÁË %d ´Î" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "δÒýÓõĽڵ㡰%s¡±" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, fuzzy, c-format msgid "Can't remove file `%s': %s" msgstr "ÎÞ·¨´´½¨Ä¿Â¼¡°%s¡±£º%s" @@ -2748,12 +2750,12 @@ msgstr "Ŀ¼" msgid "Short Contents" msgstr "¼ò¶ÌĿ¼" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "@image Îļþ¡°%s¡±²»¿É¶Á£º%s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/po/zh_TW.gmo b/gnu/dist/texinfo/po/zh_TW.gmo Binary files differindex 622b3bb4999..0b973198cdd 100644 --- a/gnu/dist/texinfo/po/zh_TW.gmo +++ b/gnu/dist/texinfo/po/zh_TW.gmo diff --git a/gnu/dist/texinfo/po/zh_TW.po b/gnu/dist/texinfo/po/zh_TW.po index ea92d3b2ac5..404a08953a3 100644 --- a/gnu/dist/texinfo/po/zh_TW.po +++ b/gnu/dist/texinfo/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: texinfo 4.1\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-04-09 14:31-0700\n" +"POT-Creation-Date: 2004-12-21 16:20-0800\n" "PO-Revision-Date: 2002-03-08 04:56+0800\n" "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -123,15 +123,15 @@ msgstr "¤@Ó§¹¦¨¥y:\n" msgid "%d completions:\n" msgstr "%d Ó§¹¦¨¥y:\n" -#: info/echo-area.c:1084 +#: info/echo-area.c:1085 msgid "Insert completion" msgstr "´¡¤J§¹¦¨¥y" -#: info/echo-area.c:1219 +#: info/echo-area.c:1220 msgid "Building completions..." msgstr "«Ø¥ß§¹¦¨¥y¤¤..." -#: info/echo-area.c:1339 +#: info/echo-area.c:1340 msgid "Scroll the completions window" msgstr "±²°Ê§¹¦¨¥y¤À¹jµøµ¡" @@ -227,7 +227,7 @@ msgstr "" msgid "Try --help for more information.\n" msgstr "¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T.\n" -#: info/info.c:295 makeinfo/makeinfo.c:739 util/install-info.c:1266 +#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 #: util/texindex.c:343 #, fuzzy, c-format msgid "" @@ -322,7 +322,7 @@ msgstr "" "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n" "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (^¤å) ±H¨ì help-texinfo@gnu.org.\n" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:462 +#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 #: util/install-info.c:466 util/texindex.c:292 #, fuzzy msgid "" @@ -1094,7 +1094,7 @@ msgstr "²¾¦Ü¥»¦æµ²§À" msgid "Move to the start of the line" msgstr "²¾¦Ü¥»¦æ¶}ÀY" -#: info/session.c:860 makeinfo/node.c:1380 +#: info/session.c:860 makeinfo/node.c:1424 msgid "Next" msgstr "¤U¤@Ó" @@ -1667,172 +1667,172 @@ msgstr "-%s%s-Info: (%s)%s, ¦@ %d ¦æ --%s--" msgid " Subfile: %s" msgstr " ¤lÀÉ®×: %s" -#: lib/getopt.c:570 lib/getopt.c:589 +#: lib/getopt.c:551 lib/getopt.c:570 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ¿ï¶µ `%s' ¤£©ú\n" -#: lib/getopt.c:622 lib/getopt.c:626 +#: lib/getopt.c:603 lib/getopt.c:607 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ¿ï¶µ `--%s' ¤£¥i§t¦³¤Þ¼Æ\n" -#: lib/getopt.c:635 lib/getopt.c:640 +#: lib/getopt.c:616 lib/getopt.c:621 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ¿ï¶µ `%c%s' ¤£¥i§t¦³¤Þ¼Æ\n" -#: lib/getopt.c:686 lib/getopt.c:708 lib/getopt.c:1039 lib/getopt.c:1061 +#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ¿ï¶µ `%s' ¥²¶·§t¦³¤Þ¼Æ\n" -#: lib/getopt.c:746 lib/getopt.c:749 +#: lib/getopt.c:727 lib/getopt.c:730 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ¥¼ª¾ªº¿ï¶µ `--%s'\n" -#: lib/getopt.c:757 lib/getopt.c:760 +#: lib/getopt.c:738 lib/getopt.c:741 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n" -#: lib/getopt.c:815 lib/getopt.c:818 +#: lib/getopt.c:796 lib/getopt.c:799 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ¤£¦Xªkªº¿ï¶µ -- %c\n" -#: lib/getopt.c:824 lib/getopt.c:827 +#: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: µL®Äªº¿ï¶µ -- %c\n" -#: lib/getopt.c:882 lib/getopt.c:901 lib/getopt.c:1114 lib/getopt.c:1135 +#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ¿ï¶µ¥²¶·§t¦³¤Þ¼Æ -- %c\n" -#: lib/getopt.c:954 lib/getopt.c:973 +#: lib/getopt.c:935 lib/getopt.c:954 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: ¿ï¶µ `-W %s' ¤£©ú½T\n" -#: lib/getopt.c:997 lib/getopt.c:1018 +#: lib/getopt.c:978 lib/getopt.c:999 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ¿ï¶µ `-W %s' ¤£¥i§t¦³¤Þ¼Æ\n" -#: makeinfo/cmds.c:516 makeinfo/cmds.c:538 +#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 #, fuzzy, c-format msgid "arguments to @%s ignored" msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "January" msgstr "¤@¤ë" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "February" msgstr "¤G¤ë" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "March" msgstr "¤T¤ë" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "April" msgstr "¥|¤ë" -#: makeinfo/cmds.c:581 +#: makeinfo/cmds.c:585 msgid "May" msgstr "¤¤ë" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "June" msgstr "¤»¤ë" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "July" msgstr "¤C¤ë" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "August" msgstr "¤K¤ë" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "September" msgstr "¤E¤ë" -#: makeinfo/cmds.c:582 +#: makeinfo/cmds.c:586 msgid "October" msgstr "¤Q¤ë" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "November" msgstr "¤Q¤@¤ë" -#: makeinfo/cmds.c:583 +#: makeinfo/cmds.c:587 msgid "December" msgstr "¤Q¤G¤ë" -#: makeinfo/cmds.c:904 +#: makeinfo/cmds.c:936 #, c-format msgid "unlikely character %c in @var" msgstr "" -#: makeinfo/cmds.c:947 +#: makeinfo/cmds.c:979 msgid "@sc argument all uppercase, thus no effect" msgstr "@sc ªº¤Þ¼Æ¥þ¬O¤j¼g, ©Ò¥H¨S¦³§@¥Î" -#: makeinfo/cmds.c:1002 +#: makeinfo/cmds.c:1034 #, c-format msgid "`{' expected, but saw `%c'" msgstr "" -#: makeinfo/cmds.c:1042 +#: makeinfo/cmds.c:1074 msgid "end of file inside verb block" msgstr "" -#: makeinfo/cmds.c:1050 +#: makeinfo/cmds.c:1082 #, c-format msgid "`}' expected, but saw `%c'" msgstr "" -#: makeinfo/cmds.c:1078 +#: makeinfo/cmds.c:1112 msgid "" -"@strong{Note:} produces a spurious cross-reference in Info; reword to avoid " -"that" +"@strong{Note...} produces a spurious cross-reference in Info; reword to " +"avoid that" msgstr "" -#: makeinfo/cmds.c:1238 +#: makeinfo/cmds.c:1305 #, c-format msgid "%c%s is obsolete" msgstr "%c%s ¤w¼o¤î¤£¥Î" -#: makeinfo/cmds.c:1347 +#: makeinfo/cmds.c:1414 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp ¥²¶·¦³¤@Ó¥¿¾ã¼Æªº¤Þ¼Æ, ¦Ó¤£¬O `%s'" -#: makeinfo/cmds.c:1696 makeinfo/cmds.c:1752 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 #, c-format msgid "Bad argument to %c%s" msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ" -#: makeinfo/cmds.c:1706 makeinfo/makeinfo.c:4078 +#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 msgid "asis" msgstr "" -#: makeinfo/cmds.c:1708 makeinfo/cmds.c:1738 makeinfo/makeinfo.c:4080 +#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 msgid "none" msgstr "" -#: makeinfo/cmds.c:1722 +#: makeinfo/cmds.c:1789 #, fuzzy, c-format msgid "Bad argument to @%s" msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ" -#: makeinfo/cmds.c:1736 +#: makeinfo/cmds.c:1803 msgid "insert" msgstr "" @@ -1869,12 +1869,12 @@ msgid "Method" msgstr "" #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2183 +#: makeinfo/defun.c:644 makeinfo/xml.c:2229 msgid "of" msgstr "" #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2188 +#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 msgid "on" msgstr "" @@ -1883,22 +1883,22 @@ msgstr "" msgid "Must be in `@%s' environment to use `@%s'" msgstr "" -#: makeinfo/files.c:430 +#: makeinfo/files.c:435 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/files.c:633 +#: makeinfo/files.c:638 #, c-format msgid "`%s' omitted before output filename" msgstr "" -#: makeinfo/files.c:641 +#: makeinfo/files.c:646 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "" -#: makeinfo/files.c:689 +#: makeinfo/files.c:694 msgid "Output buffer not empty." msgstr "" @@ -1939,11 +1939,11 @@ msgstr "" msgid "Untitled" msgstr "" -#: makeinfo/html.c:418 +#: makeinfo/html.c:422 msgid "[unexpected] no html tag to pop" msgstr "" -#: makeinfo/html.c:722 +#: makeinfo/html.c:752 #, fuzzy, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n" @@ -1953,45 +1953,45 @@ msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n" msgid "Unknown index `%s'" msgstr "¥¼ª¾ªº¯Á¤Þ `%s'" -#: makeinfo/index.c:227 +#: makeinfo/index.c:234 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "" -#: makeinfo/index.c:405 +#: makeinfo/index.c:412 #, c-format msgid "Index `%s' already exists" msgstr "¯Á¤Þ `%s' ¤w¦s¦b" -#: makeinfo/index.c:448 +#: makeinfo/index.c:455 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "@synindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s' »P/©Î `%s'" -#: makeinfo/index.c:654 +#: makeinfo/index.c:661 msgid "(line )" msgstr "" -#: makeinfo/index.c:662 +#: makeinfo/index.c:669 #, c-format msgid "(line %*d)" msgstr "" -#: makeinfo/index.c:743 +#: makeinfo/index.c:750 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "@printindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s'" -#: makeinfo/index.c:812 +#: makeinfo/index.c:819 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "¯Á¤Þ `%s' ªº¶µ¥Ø¤£¦b¥ô¦óªº¸`ÂI¤º" -#: makeinfo/index.c:815 makeinfo/index.c:856 +#: makeinfo/index.c:822 makeinfo/index.c:858 msgid "(outside of any node)" msgstr "(¤£¦b¥ô¦óªº¸`ÂI¤º)" -#: makeinfo/index.c:917 makeinfo/index.c:923 +#: makeinfo/index.c:919 makeinfo/index.c:925 msgid "See " msgstr "" @@ -2027,104 +2027,104 @@ msgstr "" msgid "`@end' expected `%s', but saw `%s'" msgstr "" -#: makeinfo/insertion.c:1332 +#: makeinfo/insertion.c:1337 #, c-format msgid "No matching `%cend %s'" msgstr "No matching `%cend %s'" -#: makeinfo/insertion.c:1580 +#: makeinfo/insertion.c:1592 #, c-format msgid "%s requires letter or digit" msgstr "%s ¥²¶·n¦³¦r¤¸©Î¬O¼Æ¦r" -#: makeinfo/insertion.c:1675 +#: makeinfo/insertion.c:1687 msgid "end of file inside verbatim block" msgstr "" -#: makeinfo/insertion.c:1901 +#: makeinfo/insertion.c:1913 #, fuzzy, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q" -#: makeinfo/insertion.c:1937 +#: makeinfo/insertion.c:1949 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu ¦b²Ä¤@Ó @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI" -#: makeinfo/insertion.c:1938 +#: makeinfo/insertion.c:1950 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "¤]³\±zÀ³¸Ó§â @top ¸`ÂI¥]§t¦b @ifnottex, ¦Ó¤£¬O @ifinfo?" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1962 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "¦b²Ä¤@Ó¸`ÂI¤§«e¥X²{ @detailmenu, ±N«Ø¥ß `Top' ¸`ÂI" -#: makeinfo/insertion.c:2006 +#: makeinfo/insertion.c:2018 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "" -#: makeinfo/insertion.c:2020 +#: makeinfo/insertion.c:2032 #, fuzzy, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q" -#: makeinfo/insertion.c:2051 +#: makeinfo/insertion.c:2063 #, c-format msgid "Unmatched `%c%s'" msgstr "¥¼°t¹ïªº `%c%s'" -#: makeinfo/insertion.c:2056 +#: makeinfo/insertion.c:2068 #, c-format msgid "`%c%s' needs something after it" msgstr "¦b `%c%s' ¤§«á¥²¶·n¦³ªF¦è" -#: makeinfo/insertion.c:2062 +#: makeinfo/insertion.c:2074 #, fuzzy, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ" -#: makeinfo/insertion.c:2159 +#: makeinfo/insertion.c:2171 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q" -#: makeinfo/insertion.c:2168 +#: makeinfo/insertion.c:2180 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "`%s' °Ï¶ô¤§¤º, @itemx ¨ÃµL·N¸q" -#: makeinfo/insertion.c:2344 +#: makeinfo/insertion.c:2356 #, c-format msgid "%c%s found outside of an insertion block" msgstr "" -#: makeinfo/lang.c:459 +#: makeinfo/lang.c:580 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s ¤£¬O¤@Ó¦Xªkªº ISO 639 »y¨¥½X" -#: makeinfo/lang.c:534 +#: makeinfo/lang.c:655 #, fuzzy, c-format msgid "unrecognized encoding name `%s'" msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n" -#: makeinfo/lang.c:542 +#: makeinfo/lang.c:663 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "" -#: makeinfo/lang.c:594 +#: makeinfo/lang.c:715 #, c-format msgid "invalid encoded character `%s'" msgstr "" -#: makeinfo/lang.c:884 +#: makeinfo/lang.c:1009 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s ´Á±æ¨Ï¥Î `i' ©Î `j' §@¬°¤Þ¼Æ, ¦Ó¤£¬O `%c'" -#: makeinfo/lang.c:888 +#: makeinfo/lang.c:1013 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s ´Á±æ¨Ï¥Î¤@Ó¦r¥À `i' ©Î `j' §@¬°¤Þ¼Æ" @@ -2168,33 +2168,33 @@ msgstr "@end %s »P @%s ¤£²Å¦X" msgid "Too many errors! Gave up.\n" msgstr "¿ù»~¹L¦h! ©ñ±ó.\n" -#: makeinfo/makeinfo.c:301 +#: makeinfo/makeinfo.c:302 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: ĵ§i: " -#: makeinfo/makeinfo.c:320 makeinfo/makeinfo.c:2216 +#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 #, c-format msgid "Misplaced %c" msgstr "»~¸mªº %c" -#: makeinfo/makeinfo.c:339 +#: makeinfo/makeinfo.c:340 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "¸Õ¸Õ `%s --help' ¥H¨ú±o§ó¦hªº¸ê°T.\n" -#: makeinfo/makeinfo.c:342 +#: makeinfo/makeinfo.c:343 #, fuzzy, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "¥Îªk: %s [OPTION]... FILE...\n" -#: makeinfo/makeinfo.c:345 +#: makeinfo/makeinfo.c:346 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" msgstr "" -#: makeinfo/makeinfo.c:349 +#: makeinfo/makeinfo.c:350 #, c-format msgid "" "General options:\n" @@ -2209,7 +2209,7 @@ msgid "" " --version display version information and exit.\n" msgstr "" -#: makeinfo/makeinfo.c:363 +#: makeinfo/makeinfo.c:364 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" @@ -2219,7 +2219,7 @@ msgid "" " --plaintext output plain text rather than Info.\n" msgstr "" -#: makeinfo/makeinfo.c:371 +#: makeinfo/makeinfo.c:372 msgid "" "General output options:\n" " -E, --macro-expand FILE output macro-expanded source to FILE.\n" @@ -2235,7 +2235,7 @@ msgid "" " -o, --output=FILE output to FILE (directory if split HTML),\n" msgstr "" -#: makeinfo/makeinfo.c:385 +#: makeinfo/makeinfo.c:386 #, c-format msgid "" "Options for Info and plain text:\n" @@ -2254,14 +2254,14 @@ msgid "" " --split-size=NUM split Info files at size NUM (default %d).\n" msgstr "" -#: makeinfo/makeinfo.c:402 +#: makeinfo/makeinfo.c:403 msgid "" "Options for HTML:\n" " --css-include=FILE include FILE in HTML <style> output;\n" " read stdin if FILE is -.\n" msgstr "" -#: makeinfo/makeinfo.c:408 +#: makeinfo/makeinfo.c:409 #, c-format msgid "" "Options for XML and Docbook:\n" @@ -2271,7 +2271,7 @@ msgid "" "dropped.\n" msgstr "" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "Input file options:\n" " --commands-in-node-names allow @ commands in node names.\n" @@ -2281,7 +2281,7 @@ msgid "" " -U VAR undefine the variable VAR, as with @clear.\n" msgstr "" -#: makeinfo/makeinfo.c:424 +#: makeinfo/makeinfo.c:425 msgid "" "Conditional processing in input:\n" " --ifdocbook process @ifdocbook and @docbook even if\n" @@ -2297,9 +2297,11 @@ msgid "" " --no-ifplaintext do not process @ifplaintext text.\n" " --no-iftex do not process @iftex and @tex text.\n" " --no-ifxml do not process @ifxml and @xml text.\n" +"\n" +" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n" msgstr "" -#: makeinfo/makeinfo.c:441 +#: makeinfo/makeinfo.c:444 msgid "" " The defaults for the @if... conditionals depend on the output format:\n" " if generating HTML, --ifhtml is on and the others are off;\n" @@ -2308,7 +2310,7 @@ msgid "" " if generating XML, --ifxml is on and the others are off.\n" msgstr "" -#: makeinfo/makeinfo.c:449 +#: makeinfo/makeinfo.c:452 #, fuzzy msgid "" "Examples:\n" @@ -2338,156 +2340,156 @@ msgstr "" "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n" "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (^¤å) ±H¨ì help-texinfo@gnu.org." -#: makeinfo/makeinfo.c:585 +#: makeinfo/makeinfo.c:603 #, c-format msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:665 -#: makeinfo/makeinfo.c:695 makeinfo/makeinfo.c:716 +#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692 +#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼ÆÈ, ¦Ó¤£¬O `%s'.\n" -#: makeinfo/makeinfo.c:633 +#: makeinfo/makeinfo.c:660 #, fuzzy, c-format msgid "%s: could not open macro expansion output `%s'" msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'." -#: makeinfo/makeinfo.c:638 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: ignoring second macro expansion output `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:680 +#: makeinfo/makeinfo.c:707 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼ÆÈ/`none'/`asis', ¦Ó¤£¬O `%s'.\n" -#: makeinfo/makeinfo.c:705 +#: makeinfo/makeinfo.c:732 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n" -#: makeinfo/makeinfo.c:779 +#: makeinfo/makeinfo.c:806 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: ¿òº|Àɮפ޼Æ.\n" -#: makeinfo/makeinfo.c:968 makeinfo/makeinfo.c:3937 +#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991 #, c-format msgid "Multiline command %c%s used improperly" msgstr "" -#: makeinfo/makeinfo.c:972 +#: makeinfo/makeinfo.c:1000 #, c-format msgid "Expected `%s'" msgstr "Expected `%s'" -#: makeinfo/makeinfo.c:1454 +#: makeinfo/makeinfo.c:1479 #, c-format msgid "Can't create directory `%s': %s" msgstr "" -#: makeinfo/makeinfo.c:1500 +#: makeinfo/makeinfo.c:1525 #, c-format msgid "No `%s' found in `%s'" msgstr "`%s' ¥¼¥X²{¦b `%s' ¤º" -#: makeinfo/makeinfo.c:1580 +#: makeinfo/makeinfo.c:1605 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" -#: makeinfo/makeinfo.c:1613 +#: makeinfo/makeinfo.c:1638 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:1648 +#: makeinfo/makeinfo.c:1673 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "³o¬O %s, ¥Ñ makeinfo ª©¥» %s ¦Û %s ²£¥Íªº.\n" -#: makeinfo/makeinfo.c:1671 +#: makeinfo/makeinfo.c:1709 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" msgstr "%s: ¦]¬°¿ù»~, ²¾°£¥¨¶°¿é¥XÀÉ `%s'; Yn«O¦s¥¦, ½Ð¨Ï¥Î --force ¿ï¶µ.\n" -#: makeinfo/makeinfo.c:1735 +#: makeinfo/makeinfo.c:1773 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "%s: ¦]¬°¿ù»~, ²¾°£¿é¥XÀÉ `%s'; Yn«O¦s¥¦, ½Ð¨Ï¥Î --force ¿ï¶µ.\n" -#: makeinfo/makeinfo.c:1996 +#: makeinfo/makeinfo.c:2034 #, c-format msgid "Unknown command `%s'" msgstr "¥¼ª¾ªº©R¥O `%s'" -#: makeinfo/makeinfo.c:2018 +#: makeinfo/makeinfo.c:2056 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ" -#: makeinfo/makeinfo.c:2270 +#: makeinfo/makeinfo.c:2314 #, fuzzy, c-format msgid "%c%s expected braces" msgstr "%c%s ¹wpn¦³ `{...}'" -#: makeinfo/makeinfo.c:2283 +#: makeinfo/makeinfo.c:2327 msgid "Unmatched }" msgstr "¥¼°t¹ïªº }" -#: makeinfo/makeinfo.c:2331 +#: makeinfo/makeinfo.c:2375 msgid "NO_NAME!" msgstr "NO_NAME!" -#: makeinfo/makeinfo.c:2352 +#: makeinfo/makeinfo.c:2396 #, c-format msgid "%c%s missing close brace" msgstr "%c%s ¿òº|¥k¤j¬A¸¹" -#: makeinfo/makeinfo.c:3262 +#: makeinfo/makeinfo.c:3309 #, fuzzy, c-format msgid "@image file `%s' (for HTML) not readable: %s" msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s" -#: makeinfo/makeinfo.c:3268 +#: makeinfo/makeinfo.c:3315 #, fuzzy, c-format msgid "No such file `%s'" msgstr "`%s' ¥¼¥X²{¦b `%s' ¤º" -#: makeinfo/makeinfo.c:3400 +#: makeinfo/makeinfo.c:3447 #, fuzzy, c-format msgid "@image file `%s' (for text) unreadable: %s" msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s" -#: makeinfo/makeinfo.c:3409 +#: makeinfo/makeinfo.c:3456 msgid "@image missing filename argument" msgstr "@image ¨S¦³ÀɦW¤Þ¼Æ" -#: makeinfo/makeinfo.c:3621 +#: makeinfo/makeinfo.c:3675 #, c-format msgid "undefined flag: %s" msgstr "" -#: makeinfo/makeinfo.c:3622 +#: makeinfo/makeinfo.c:3676 #, c-format msgid "{No value for `%s'}" msgstr "" -#: makeinfo/makeinfo.c:3674 +#: makeinfo/makeinfo.c:3728 #, c-format msgid "%c%s requires a name" msgstr "%c%s ¥²¶·n¦³¦WºÙ" -#: makeinfo/makeinfo.c:3780 +#: makeinfo/makeinfo.c:3834 #, c-format msgid "Reached eof before matching @end %s" msgstr "¦b°t¹ïªº @end %s ¤§«e, ¥ý¨ì¹FÀÉ®×µ²§À" -#: makeinfo/makeinfo.c:4018 +#: makeinfo/makeinfo.c:4082 #, c-format msgid "`%.40s...' is too long for expansion; not expanded" msgstr "" @@ -2530,127 +2532,127 @@ msgstr "* Äæ¦ì #%d: ¿é¥X = %s\n" msgid "Node `%s' previously defined at line %d" msgstr "¸`ÂI `%s' ¤w¦b²Ä %d ¦æ©w¸q¹L¤F" -#: makeinfo/node.c:601 +#: makeinfo/node.c:648 #, c-format msgid "Formatting node %s...\n" msgstr "½s±Æ¸`ÂI %s ªº®æ¦¡¤¤...\n" -#: makeinfo/node.c:669 +#: makeinfo/node.c:716 #, fuzzy, c-format msgid "Node `%s' requires a sectioning command (e.g., %c%s)" msgstr "¸`ÂI `%s' ¥²¶·¨Ï¥Î¤À¬q©R¥O (sectioning command) (¨Ò¦p: %c%s)" -#: makeinfo/node.c:832 +#: makeinfo/node.c:879 #, c-format msgid "No node name specified for `%c%s' command" msgstr "`%c%s' ©R¥O¤¤¥¼«ü©w¸`ÂI¦WºÙ" -#: makeinfo/node.c:873 makeinfo/node.c:1107 +#: makeinfo/node.c:920 makeinfo/node.c:1151 #, c-format msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:876 +#: makeinfo/node.c:923 msgid "This @anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:878 makeinfo/node.c:1110 +#: makeinfo/node.c:925 makeinfo/node.c:1154 msgid "Rename this anchor or use the `--no-split' option" msgstr "" -#: makeinfo/node.c:908 +#: makeinfo/node.c:955 #, c-format msgid "Unexpected string at end of split-HTML file `%s'" msgstr "" -#: makeinfo/node.c:947 +#: makeinfo/node.c:991 msgid "Next:" msgstr "¤U¤@Ó:" -#: makeinfo/node.c:963 +#: makeinfo/node.c:1007 msgid "Previous:" msgstr "¤W¤@Ó:" -#: makeinfo/node.c:977 +#: makeinfo/node.c:1021 msgid "Up:" msgstr "¤W¤@¼h:" -#: makeinfo/node.c:1104 +#: makeinfo/node.c:1148 #, c-format msgid "Anchors `%s' and `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:1109 +#: makeinfo/node.c:1153 msgid "@anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:1303 +#: makeinfo/node.c:1347 #, fuzzy, c-format msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)" msgstr "%s °Ñ·Ó¨ì¤£¦s¦bªº¸`ÂI: `%s'" -#: makeinfo/node.c:1319 +#: makeinfo/node.c:1363 msgid "Menu" msgstr "¥Ø¿ý" -#: makeinfo/node.c:1321 +#: makeinfo/node.c:1365 msgid "Cross" msgstr "" -#: makeinfo/node.c:1403 +#: makeinfo/node.c:1447 #, c-format msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1406 +#: makeinfo/node.c:1450 #, c-format msgid "This node (%s) has the bad Prev" msgstr "¥»¸`ÂI (%s) ªº «e¤@Ó (Prev) ¸`ÂI¦³°ÝÃD" -#: makeinfo/node.c:1418 +#: makeinfo/node.c:1462 msgid "Prev" msgstr "«e¤@Ó" -#: makeinfo/node.c:1461 +#: makeinfo/node.c:1505 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "" -#: makeinfo/node.c:1465 +#: makeinfo/node.c:1509 #, c-format msgid "This node (%s) has the bad Next" msgstr "¥»¸`ÂI (%s) ªº ¤U¤@Ó (Next) ¸`ÂI¦³°ÝÃD" -#: makeinfo/node.c:1477 +#: makeinfo/node.c:1521 #, c-format msgid "`%s' has no Up field (perhaps incorrect sectioning?)" msgstr "" -#: makeinfo/node.c:1480 +#: makeinfo/node.c:1524 msgid "Up" msgstr "¤W¤@¼h" -#: makeinfo/node.c:1546 +#: makeinfo/node.c:1590 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" -#: makeinfo/node.c:1575 +#: makeinfo/node.c:1619 #, c-format msgid "node `%s' has been referenced %d times" msgstr "¸`ÂI `%s' ¤w³Q°Ñ·Ó %d ¦¸" -#: makeinfo/node.c:1589 +#: makeinfo/node.c:1633 #, c-format msgid "unreferenced node `%s'" msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'" -#: makeinfo/node.c:1679 +#: makeinfo/node.c:1723 #, c-format msgid "Removing %s\n" msgstr "" -#: makeinfo/node.c:1683 +#: makeinfo/node.c:1727 #, fuzzy, c-format msgid "Can't remove file `%s': %s" msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'." @@ -2698,12 +2700,12 @@ msgstr "" msgid "Short Contents" msgstr "" -#: makeinfo/xml.c:1593 +#: makeinfo/xml.c:1605 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s" -#: makeinfo/xml.c:2051 +#: makeinfo/xml.c:2097 msgid "" "@headitem as the last item of @multitable produces invalid Docbook documents" msgstr "" diff --git a/gnu/dist/texinfo/util/Makefile.am b/gnu/dist/texinfo/util/Makefile.am index afd4aedde8a..22a5f09d980 100644 --- a/gnu/dist/texinfo/util/Makefile.am +++ b/gnu/dist/texinfo/util/Makefile.am @@ -1,4 +1,4 @@ -# Id: Makefile.am,v 1.6 2004/04/09 21:32:06 karl Exp +# Id: Makefile.am,v 1.14 2004/08/26 11:43:18 karl Exp # Makefile.am for texinfo/util. # Run automake in .. to produce Makefile.in from this. # @@ -11,12 +11,12 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. bin_PROGRAMS = ginstall-info texindex -bin_SCRIPTS = texi2dvi +bin_SCRIPTS = texi2dvi texi2pdf # Use `ginstall-info' in the definition of PROGRAMS and in dependencies # because automake generates an install-info target in every Makefile (a # bug, IMHO, but this is easier than patching Automake.) -ginstall_info_SOURCES = install-info.c +ginstall_info_SOURCES = install-info.c # Transform `ginstall-info' to `install-info' before applying any # user-specified name transformations. @@ -32,13 +32,14 @@ pkgdata_DATA = texinfo.cat # we don't actually use version.texi in the rule, but it's one way of # noticing when the version changes. texinfo.cat: texinfo-cat.in $(top_srcdir)/doc/version.texi - sed 's/__VERSION__/@VERSION@/g' $< >$@ + sed 's/__VERSION__/@VERSION@/g' $(srcdir)/texinfo-cat.in >$@ -# Most of these are for fun. The only one that's really supported is texi2dvi. -# +# Most of these are for fun. The only official/installed ones are the +# texi2* scripts. +# EXTRA_DIST = README deref.c dir-example fix-info-dir fixfonts \ fixref.gawk gdoc gen-dir-node gendocs.sh gendocs_template infosrch \ install-info-html outline.gawk \ - prepinfo.awk tex3patch texi-docstring-magic.el texi2dvi txitextest \ + prepinfo.awk tex3patch texi-docstring-magic.el texi2dvi texi2pdf txitextest \ $(dist_pkgdata_DATA) texinfo-cat.in CLEANFILES = $(pkgdata_DATA) diff --git a/gnu/dist/texinfo/util/README b/gnu/dist/texinfo/util/README index 0da06a8c524..309a494b898 100644 --- a/gnu/dist/texinfo/util/README +++ b/gnu/dist/texinfo/util/README @@ -1,4 +1,4 @@ -Id: README,v 1.1.1.1 2003/12/06 01:35:42 karl Exp +Id: README,v 1.5 2004/04/11 17:56:47 karl Exp texinfo/util/README Copyright (C) 2002 Free Software Foundation, Inc. diff --git a/gnu/dist/texinfo/util/dir-example b/gnu/dist/texinfo/util/dir-example index 5698deef0b6..2d95c64a4c1 100644 --- a/gnu/dist/texinfo/util/dir-example +++ b/gnu/dist/texinfo/util/dir-example @@ -10,7 +10,7 @@ rms suggested that we follow the categories of the Free Software If you have dir entries for Texinfo manuals you'd like to be added here, please send them to karl@gnu.org. -Id: dir-example,v 1.12 2004/04/08 22:54:19 karl Exp +Id: dir-example,v 1.51 2004/12/18 02:11:43 karl Exp File: dir, Node: Top, This is the top of the INFO tree. @@ -27,7 +27,7 @@ Not all of the topics shown below may be available on this system. * Menu: Basics -* Bash: (bash). Bourne-Again SHell. +* Bash: (bash). The GNU Bourne-Again SHell. * BC: (bc). Arbitrary precision calculator language. * Common options: (coreutils)Common options. Common options. * Coreutils: (coreutils). Core GNU (file, text, shell) utilities. @@ -39,7 +39,7 @@ Basics * Time: (time). Measuring program resource usage. Text creation and manipulation -* Diff: (diff). Comparing and merging programs. +* Diffutils: (diff). Comparing and merging files. * Ed: (ed). Line editor. * Gawk: (gawk). A text scanning and processing language. * grep: (grep). Print lines matching a pattern. @@ -49,6 +49,7 @@ Text creation and manipulation Texinfo documentation system * Info: (info). Documentation browsing system. +* Texi2HTML: (texi2html). Texinfo to HTML Converter. * Texinfo: (texinfo). The GNU documentation format. * info standalone: (info-stnd). Standalone Info reader. * infokey: (info-stnd)Invoking infokey. Compile Info customizations. @@ -88,7 +89,7 @@ Software development * As: (as). Assembler. * Autoconf: (autoconf). Create source code configuration scripts. * Binutils: (binutils). ar/copy/objdump/nm/size/strip/ranlib. -* automake: (automake). Making Makefile.in's. +* automake: (automake). Making Makefile.in's. * bison: (bison). GNU parser generator (Yacc replacement). * Cpp: (cpp). The GNU C preprocessor. * Cpplib: (cppinternals). Cpplib internals. @@ -100,8 +101,10 @@ Software development * g77: (g77). GNU Fortran 77 compiler. * Gasp: (gasp). GNU Assembler preprocessor. * gcc: (gcc). The GNU Compiler Collection. +* gccinstall: (gccinstall). Installing the GNU Compiler Collection. * gccint: (gccint). Internals of the GNU Compiler Collection. * Gnats: (gnats). Cygnus bug tracking system. +* Gnulib: (gnulib). Source files to share among distributions. * Gperf: (gperf). Perfect hash function generator. * Gprof: (gprof). Profiler. * Guile Reference: (guile). The Guile reference manual. @@ -159,6 +162,7 @@ Emacs Typesetting * Font utilities: (fontu). Programs for font manipulation. * Groff: (groff). The GNU troff document formatting system. +* GV: (gv). The GNU PostScript and PDF viewer. GNU Gettext Utilities * ISO3166: (gettext)Country Codes. ISO 3166 country codes. @@ -209,7 +213,7 @@ C++ libraries GNU organization * Maintain: (maintain). GNU maintainer guidelines. -* Standards: (standards). GNU coding standards. +* Standards: (standards). GNU coding standards. * Tasks: (tasks). GNU task list. GNU music project @@ -227,6 +231,7 @@ GNU music project TeX * Afm2tfm: (dvips)Invoking afm2tfm. Making Type 1 fonts available to TeX. * Dvips: (dvips). DVI-to-PostScript translator. +* DVI-to-PNG: (dvipng). DVI to Portable Network Graphics (PNG). * Eplain: (eplain). Expanding on plain TeX. * Kpathsearch: (kpathsea). File lookup along search paths. * LaTeX: (latex). LaTeX. @@ -285,7 +290,7 @@ Individual utilities * chown: (coreutils)chown invocation. Change file owners/groups. * chroot: (coreutils)chroot invocation. Specify the root directory. * cksum: (coreutils)cksum invocation. Print POSIX CRC checksum. -* cmp: (diff)Invoking cmp. Character-by-character diff. +* cmp: (diff)Invoking cmp. Compare 2 files byte by byte. * comm: (coreutils)comm invocation. Compare sorted files by line. * comsatd: (mailutils)comsatd. Comsat daemon. * config.status: (autoconf)config.status Invocation. Recreating configurations. @@ -296,13 +301,15 @@ Individual utilities * date: (coreutils)date invocation. Print/set system date and time. * dd: (coreutils)dd invocation. Copy and convert a file. * df: (coreutils)df invocation. Report filesystem disk usage. -* diff3: (diff)Invoking diff3. Three-way diff. +* diff: (diff)Invoking diff. Compare 2 files line by line. +* diff3: (diff)Invoking diff3. Compare 3 files line by line. * dir: (coreutils)dir invocation. List directories briefly. * dircolors: (coreutils)dircolors invocation. Color setup for ls. * dirname: (coreutils)dirname invocation. Strip non-directory suffix. * dmp: (web2c)Dmp invocation. Troff->MPX (MetaPost pictures). * du: (coreutils)du invocation. Report on disk usage. * dvicopy: (web2c)DVIcopy invocation. Virtual font expansion +* dvipng: (dvipng)Invoking dvipng. A DVI-to-PNG translator. * dvitomp: (web2c)DVItoMP invocation. DVI to MPX (MetaPost pictures). * dvitype: (web2c)DVItype invocation. DVI to human-readable text. * echo: (coreutils)echo invocation. Print a line of text. @@ -385,7 +392,7 @@ Individual utilities * objdump: (binutils)objdump. Display info from object files. * od: (coreutils)od invocation. Dump files in octal, etc. * paste: (coreutils)paste invocation. Merge lines of files. -* patch: (diff)Invoking patch. Automatically applying diffs. +* patch: (diff)Invoking patch. Apply a patch to a file. * patgen: (web2c)Patgen invocation. Creating hyphenation patterns. * pathchk: (coreutils)pathchk invocation. Check file name portability. * pid: (id-utils)pid invocation. Looking up filenames. @@ -409,7 +416,7 @@ Individual utilities * readmsg: (mailutils)readmsg. Extract messages from a folder. * rm: (coreutils)rm invocation. Remove files. * rmdir: (coreutils)rmdir invocation. Remove empty directories. -* sdiff: (diff)Invoking sdiff. Interactively merge files. +* sdiff: (diff)Invoking sdiff. Merge 2 files side-by-side. * send-pr: (gnats)Invoking send-pr. Submitting bugs. * seq: (coreutils)seq invocation. Print numeric sequences * shar: (sharutils)shar invocation. Create shell archive. diff --git a/gnu/dist/texinfo/util/gen-dir-node b/gnu/dist/texinfo/util/gen-dir-node index 270b9057766..88e0b2d19ac 100755 --- a/gnu/dist/texinfo/util/gen-dir-node +++ b/gnu/dist/texinfo/util/gen-dir-node @@ -1,5 +1,5 @@ #!/bin/sh -# Id: gen-dir-node,v 1.1.1.1 2003/12/06 01:35:48 karl Exp +# Id: gen-dir-node,v 1.3 2004/04/11 17:56:47 karl Exp # Generate the top-level Info node, given a directory of Info files # and (optionally) a skeleton file. The output will be suitable for a # top-level dir file. The skeleton file contains info topic names in the @@ -51,7 +51,7 @@ echo "This version was generated on `date`" echo "by `whoami`@`hostname` for `(cd ${INFODIR}; pwd)`" cat << moobler -\Id: gen-dir-node,v 1.1.1.1 2003/12/06 01:35:48 karl Exp +\Id: gen-dir-node,v 1.3 2004/04/11 17:56:47 karl Exp This is the file .../info/dir, which contains the topmost node of the Info hierarchy. The first time you invoke Info you start off looking at that node, which is (dir)Top. diff --git a/gnu/dist/texinfo/util/gendocs.sh b/gnu/dist/texinfo/util/gendocs.sh index eae144e7eec..aa89fa4e6f0 100644 --- a/gnu/dist/texinfo/util/gendocs.sh +++ b/gnu/dist/texinfo/util/gendocs.sh @@ -1,7 +1,7 @@ #!/bin/sh # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -# Id: gendocs.sh,v 1.4 2004/02/28 00:11:16 karl Exp +# Id: gendocs.sh,v 1.13 2004/09/01 11:40:20 karl Exp # # Copyright (C) 2003, 2004 Free Software Foundation, Inc. # @@ -39,7 +39,7 @@ templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendoc : ${GENDOCS_TEMPLATE_DIR="."} unset CDPATH -rcs_revision='Revision: 1.4' +rcs_revision='Revision: 1.13' rcs_version=`set - $rcs_revision; echo $2` program=`echo $0 | sed -e 's!.*/!!'` version="gendocs.sh $rcs_version @@ -146,16 +146,18 @@ fi echo Generating output formats for $srcfile -echo Generating info files... -${MAKEINFO} -o $PACKAGE.info $srcfile +cmd="${MAKEINFO} -o $PACKAGE.info $srcfile" +echo "Generating info files... ($cmd)" +$cmd mkdir -p $outdir/ -tar czf $outdir/$PACKAGE-info.tar.gz $PACKAGE.info* -info_tgz_size="`calcsize $outdir/$PACKAGE-info.tar.gz`" +tar czf $outdir/$PACKAGE.info.tar.gz $PACKAGE.info* +info_tgz_size="`calcsize $outdir/$PACKAGE.info.tar.gz`" # do not mv the info files, there's no point in having them available # separately on the web. -echo Generating dvi ... -${TEXI2DVI} $srcfile +cmd="${TEXI2DVI} $srcfile" +echo "Generating dvi ... ($cmd)" +$cmd # now, before we compress dvi: echo Generating postscript... @@ -169,84 +171,87 @@ gzip -f -9 $PACKAGE.dvi dvi_gz_size="`calcsize $PACKAGE.dvi.gz`" mv $PACKAGE.dvi.gz $outdir/ -echo Generating pdf ... -${TEXI2DVI} --pdf $srcfile +cmd="${TEXI2DVI} --pdf $srcfile" +echo "Generating pdf ... ($cmd)" +$cmd pdf_size="`calcsize $PACKAGE.pdf`" mv $PACKAGE.pdf $outdir/ -echo Generating ASCII... -${MAKEINFO} -o $PACKAGE.txt --no-split --no-headers $srcfile +cmd="${MAKEINFO} -o $PACKAGE.txt --no-split --no-headers $srcfile" +echo "Generating ASCII... ($cmd)" +$cmd ascii_size="`calcsize $PACKAGE.txt`" gzip -f -9 -c $PACKAGE.txt >$outdir/$PACKAGE.txt.gz ascii_gz_size="`calcsize $outdir/$PACKAGE.txt.gz`" mv $PACKAGE.txt $outdir/ -echo Generating monolithic html... +cmd="${MAKEINFO} --no-split --html -o $PACKAGE.html $html $srcfile" +echo "Generating monolithic html... ($cmd)" rm -rf $PACKAGE.html # in case a directory is left over -${MAKEINFO} --no-split --html $html $srcfile +$cmd html_mono_size="`calcsize $PACKAGE.html`" gzip -f -9 -c $PACKAGE.html >$outdir/$PACKAGE.html.gz html_mono_gz_size="`calcsize $outdir/$PACKAGE.html.gz`" mv $PACKAGE.html $outdir/ -echo Generating html by node... -${MAKEINFO} --html $html $srcfile -if test -d $PACKAGE; then - split_html_dir=$PACKAGE -elif test -d $PACKAGE.html; then - split_html_dir=$PACKAGE.html -else - echo "$0: can't find split html dir for $srcfile." >&2 -fi +cmd="${MAKEINFO} --html -o $PACKAGE.html $html $srcfile" +echo "Generating html by node... ($cmd)" +$cmd +split_html_dir=$PACKAGE.html ( cd ${split_html_dir} || exit 1 - tar -czf ../$outdir/${PACKAGE}_html_node.tar.gz -- *.html + tar -czf ../$outdir/${PACKAGE}.html_node.tar.gz -- *.html ) -html_node_tgz_size="`calcsize $outdir/${PACKAGE}_html_node.tar.gz`" +html_node_tgz_size="`calcsize $outdir/${PACKAGE}.html_node.tar.gz`" rm -f $outdir/html_node/*.html mkdir -p $outdir/html_node/ mv ${split_html_dir}/*.html $outdir/html_node/ rmdir ${split_html_dir} echo Making .tar.gz for sources... -srcfiles=`ls *.texinfo *.texi *.txi 2>/dev/null` -tar czfh $outdir/$PACKAGE.texi.tar.gz $srcfiles +srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null` +tar cvzfh $outdir/$PACKAGE.texi.tar.gz $srcfiles texi_tgz_size="`calcsize $outdir/$PACKAGE.texi.tar.gz`" if test -n "$docbook"; then - echo Generating docbook XML... - ${MAKEINFO} -o - --docbook $srcfile > ${srcdir}/$PACKAGE-db.xml + cmd="${MAKEINFO} -o - --docbook $srcfile > ${srcdir}/$PACKAGE-db.xml" + echo "Generating docbook XML... $(cmd)" + eval $cmd docbook_xml_size="`calcsize $PACKAGE-db.xml`" gzip -f -9 -c $PACKAGE-db.xml >$outdir/$PACKAGE-db.xml.gz docbook_xml_gz_size="`calcsize $outdir/$PACKAGE-db.xml.gz`" mv $PACKAGE-db.xml $outdir/ - echo Generating docbook HTML... + cmd="${DOCBOOK2HTML} -o $split_html_db_dir ${outdir}/$PACKAGE-db.xml" + echo "Generating docbook HTML... ($cmd)" + $cmd split_html_db_dir=html_node_db - ${DOCBOOK2HTML} -o $split_html_db_dir ${outdir}/$PACKAGE-db.xml ( cd ${split_html_db_dir} || exit 1 - tar -czf ../$outdir/${PACKAGE}_html_node_db.tar.gz -- *.html + tar -czf ../$outdir/${PACKAGE}.html_node_db.tar.gz -- *.html ) - html_node_db_tgz_size="`calcsize $outdir/${PACKAGE}_html_node_db.tar.gz`" + html_node_db_tgz_size="`calcsize $outdir/${PACKAGE}.html_node_db.tar.gz`" rm -f $outdir/html_node_db/*.html mkdir -p $outdir/html_node_db mv ${split_html_db_dir}/*.html $outdir/html_node_db/ rmdir ${split_html_db_dir} - echo Generating docbook ASCII... - ${DOCBOOK2TXT} ${outdir}/$PACKAGE-db.xml + cmd="${DOCBOOK2TXT} ${outdir}/$PACKAGE-db.xml" + echo "Generating docbook ASCII... ($cmd)" + $cmd docbook_ascii_size="`calcsize $PACKAGE-db.txt`" mv $PACKAGE-db.txt $outdir/ - echo Generating docbook PS... - ${DOCBOOK2PS} ${outdir}/$PACKAGE-db.xml + cmd="${DOCBOOK2PS} ${outdir}/$PACKAGE-db.xml" + echo "Generating docbook PS... $(cmd)" + $cmd gzip -f -9 -c $PACKAGE-db.ps >$outdir/$PACKAGE-db.ps.gz docbook_ps_gz_size="`calcsize $outdir/$PACKAGE-db.ps.gz`" mv $PACKAGE-db.ps $outdir/ - echo Generating docbook PDF... - ${DOCBOOK2PDF} ${outdir}/$PACKAGE-db.xml + cmd="${DOCBOOK2PDF} ${outdir}/$PACKAGE-db.xml" + echo "Generating docbook PDF... ($cmd)" + $cmd docbook_pdf_size="`calcsize $PACKAGE-db.pdf`" mv $PACKAGE-db.pdf $outdir/ fi @@ -254,27 +259,27 @@ fi echo Writing index file... curdate="`date '+%B %d, %Y'`" sed \ - -e "s/%%TITLE%%/$MANUAL_TITLE/g" \ - -e "s/%%DATE%%/$curdate/g" \ - -e "s/%%PACKAGE%%/$PACKAGE/g" \ - -e "s/%%HTML_MONO_SIZE%%/$html_mono_size/g" \ - -e "s/%%HTML_MONO_GZ_SIZE%%/$html_mono_gz_size/g" \ - -e "s/%%HTML_NODE_TGZ_SIZE%%/$html_node_tgz_size/g" \ - -e "s/%%INFO_TGZ_SIZE%%/$info_tgz_size/g" \ - -e "s/%%DVI_GZ_SIZE%%/$dvi_gz_size/g" \ - -e "s/%%PDF_SIZE%%/$pdf_size/g" \ - -e "s/%%PS_GZ_SIZE%%/$ps_gz_size/g" \ - -e "s/%%ASCII_SIZE%%/$ascii_size/g" \ - -e "s/%%ASCII_GZ_SIZE%%/$ascii_gz_size/g" \ - -e "s/%%TEXI_TGZ_SIZE%%/$texi_tgz_size/g" \ - -e "s/%%DOCBOOK_HTML_NODE_TGZ_SIZE%%/$html_node_db_tgz_size/g" \ - -e "s/%%DOCBOOK_ASCII_SIZE%%/$docbook_ascii_size/g" \ - -e "s/%%DOCBOOK_PS_GZ_SIZE%%/$docbook_ps_gz_size/g" \ - -e "s/%%DOCBOOK_PDF_SIZE%%/$docbook_pdf_size/g" \ - -e "s/%%DOCBOOK_XML_SIZE%%/$docbook_xml_size/g" \ - -e "s/%%DOCBOOK_XML_GZ_SIZE%%/$docbook_xml_gz_size/g" \ + -e "s!%%TITLE%%!$MANUAL_TITLE!g" \ + -e "s!%%DATE%%!$curdate!g" \ + -e "s!%%PACKAGE%%!$PACKAGE!g" \ + -e "s!%%HTML_MONO_SIZE%%!$html_mono_size!g" \ + -e "s!%%HTML_MONO_GZ_SIZE%%!$html_mono_gz_size!g" \ + -e "s!%%HTML_NODE_TGZ_SIZE%%!$html_node_tgz_size!g" \ + -e "s!%%INFO_TGZ_SIZE%%!$info_tgz_size!g" \ + -e "s!%%DVI_GZ_SIZE%%!$dvi_gz_size!g" \ + -e "s!%%PDF_SIZE%%!$pdf_size!g" \ + -e "s!%%PS_GZ_SIZE%%!$ps_gz_size!g" \ + -e "s!%%ASCII_SIZE%%!$ascii_size!g" \ + -e "s!%%ASCII_GZ_SIZE%%!$ascii_gz_size!g" \ + -e "s!%%TEXI_TGZ_SIZE%%!$texi_tgz_size!g" \ + -e "s!%%DOCBOOK_HTML_NODE_TGZ_SIZE%%!$html_node_db_tgz_size!g" \ + -e "s!%%DOCBOOK_ASCII_SIZE%%!$docbook_ascii_size!g" \ + -e "s!%%DOCBOOK_PS_GZ_SIZE%%!$docbook_ps_gz_size!g" \ + -e "s!%%DOCBOOK_PDF_SIZE%%!$docbook_pdf_size!g" \ + -e "s!%%DOCBOOK_XML_SIZE%%!$docbook_xml_size!g" \ + -e "s!%%DOCBOOK_XML_GZ_SIZE%%!$docbook_xml_gz_size!g" \ -e "s,%%SCRIPTURL%%,$scripturl,g" \ - -e "s/%%SCRIPTNAME%%/$prog/g" \ + -e "s!%%SCRIPTNAME%%!$prog!g" \ $GENDOCS_TEMPLATE_DIR/gendocs_template >$outdir/index.html echo "Done! See $outdir/ subdirectory for new files." diff --git a/gnu/dist/texinfo/util/gendocs_template b/gnu/dist/texinfo/util/gendocs_template index c38bb4893e0..ccfc2df866b 100644 --- a/gnu/dist/texinfo/util/gendocs_template +++ b/gnu/dist/texinfo/util/gendocs_template @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<!-- Id: gendocs_template,v 1.3 2004/02/28 00:06:45 karl Exp --> +<!-- Id: gendocs_template,v 1.6 2004/09/23 13:16:19 karl Exp --> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> @@ -33,7 +33,7 @@ </p> <hr /> -<p>This manual (for %%PACKAGE%%) is available in the following formats:</p> +<p>This manual (%%PACKAGE%%) is available in the following formats:</p> <ul> <li><a href="%%PACKAGE%%.html">HTML @@ -43,10 +43,10 @@ <li><a href="%%PACKAGE%%.html.gz">HTML compressed (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</a> - entirely on one web page.</li> - <li><a href="%%PACKAGE%%_html_node.tar.gz">HTML compressed + <li><a href="%%PACKAGE%%.html_node.tar.gz">HTML compressed (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file)</a> - with one web page per node.</li> - <li><a href="%%PACKAGE%%-info.tar.gz">Info document + <li><a href="%%PACKAGE%%.info.tar.gz">Info document (%%INFO_TGZ_SIZE%%K characters gzipped tar file)</a>.</li> <li><a href="%%PACKAGE%%.txt">ASCII text (%%ASCII_SIZE%%K characters)</a>.</li> @@ -62,9 +62,8 @@ (%%TEXI_TGZ_SIZE%%K characters gzipped tar file)</a></li> </ul> -<p>(This page generated by the <a -href="%%SCRIPTURL%%">%%SCRIPTNAME%%</a> script.) -</p> +<p>(This page generated by the <a href="%%SCRIPTURL%%">%%SCRIPTNAME%% +script</a>.)</p> <div class="copyright"> <p> @@ -92,7 +91,7 @@ permitted in any medium, provided this notice is preserved. <p> Updated: <!-- timestamp start --> -$Date: 2004/07/12 23:26:46 $ $Author: wiz $ +$Date: 2008/09/02 07:50:57 $ $Author: christos $ <!-- timestamp end --> </p> </div> diff --git a/gnu/dist/texinfo/util/infosrch b/gnu/dist/texinfo/util/infosrch index fad37faa2bd..472df6c72b0 100644 --- a/gnu/dist/texinfo/util/infosrch +++ b/gnu/dist/texinfo/util/infosrch @@ -1,5 +1,5 @@ #!/usr/local/bin/perl -w -# Id: infosrch,v 1.1.1.1 2003/12/06 01:35:52 karl Exp +# Id: infosrch,v 1.2 2004/04/11 17:56:47 karl Exp # infosrch does a regex search on an info manual. # By Harry Putnam <reader@newsguy.com>. diff --git a/gnu/dist/texinfo/util/install-info-html b/gnu/dist/texinfo/util/install-info-html index 7fb9ef96272..c4973aa7113 100644 --- a/gnu/dist/texinfo/util/install-info-html +++ b/gnu/dist/texinfo/util/install-info-html @@ -1,5 +1,5 @@ #!@BASH@ -# Id: install-info-html,v 1.1.1.1 2003/12/06 01:35:48 karl Exp +# Id: install-info-html,v 1.3 2004/04/11 17:56:47 karl Exp name=install-info-html version=1.0 diff --git a/gnu/dist/texinfo/util/texi-docstring-magic.el b/gnu/dist/texinfo/util/texi-docstring-magic.el index a552742587c..1b4a676eb53 100644 --- a/gnu/dist/texinfo/util/texi-docstring-magic.el +++ b/gnu/dist/texinfo/util/texi-docstring-magic.el @@ -5,7 +5,7 @@ ;; Copyright (C) 1998 David Aspinall ;; Maintainer: David Aspinall <da@dcs.ed.ac.uk> ;; -;; Id: texi-docstring-magic.el,v 1.1.1.1 2003/12/06 01:35:50 karl Exp +;; Id: texi-docstring-magic.el,v 1.2 2004/04/11 17:56:47 karl Exp ;; ;; This package is distributed under the terms of the ;; GNU General Public License, Version 2. diff --git a/gnu/dist/texinfo/util/texi2pdf b/gnu/dist/texinfo/util/texi2pdf new file mode 100644 index 00000000000..a0f97c50ba7 --- /dev/null +++ b/gnu/dist/texinfo/util/texi2pdf @@ -0,0 +1,19 @@ +#!/bin/sh +# Id: texi2pdf,v 1.1 2004/07/11 01:02:35 karl Exp +# Written by Thomas Esser. Public domain. +# Execute texi2dvi --pdf. + +test -f /bin/sh5 && test -z "$RUNNING_SH5" \ + && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \ + && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; } +unset RUNNING_SH5 + +test -f /bin/bsh && test -z "$RUNNING_BSH" \ + && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \ + && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; } +unset RUNNING_BSH + +# hack around a bug in zsh: +test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' + +texi2dvi --pdf ${1+"$@"} diff --git a/gnu/dist/texinfo/util/texinfo.dtd b/gnu/dist/texinfo/util/texinfo.dtd index 11df381ac81..119d0f5ee28 100644 --- a/gnu/dist/texinfo/util/texinfo.dtd +++ b/gnu/dist/texinfo/util/texinfo.dtd @@ -1,4 +1,4 @@ -<!-- Id: texinfo.dtd,v 1.6 2004/03/01 15:48:51 dirt Exp +<!-- Id: texinfo.dtd,v 1.4 2004/12/19 15:08:55 karl Exp Document Type Definition for Texinfo. Author: Philippe Martin (feloy@free.fr) @@ -6,7 +6,7 @@ Karl Eichwalder (keichwa@gmx.net) Alper Ersoy (dirt@gtk.org) - Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -17,7 +17,8 @@ <!-- ENTITIES --> <!-- Meta-information --> -<!ENTITY % metainformation "setfilename | settitle | dircategory"> +<!ENTITY % metainformation "setfilename | settitle | dircategory + | documentdescription"> <!ENTITY % variables "setvalue | clearvalue"> <!-- Document language --> @@ -38,7 +39,7 @@ | smalllisp | cartouche | copying | format | smallformat | display | smalldisplay | itemize | enumerate | sp | center | group - | float | table | multitable | definition | verbatim"> + | table | multitable | definition"> <!-- API definitions --> <!-- *************** --> @@ -60,7 +61,7 @@ <!ENTITY % section.level3 "subsection | unnumberedsubsec | appendixsubsec"> -<!ENTITY % section.level4 "subsubsection | unnumberedsubsubsec +<!ENTITY % section.level4 "subsubsection | unnumberedsubsubsec | appendixsubsubsec"> <!ENTITY % section.all "%section.level1; | %section.level2; | %section.level3; @@ -71,39 +72,40 @@ | %section.level2; | %section.level3; | %section.level4; - | titlepage | image - | %toc; | %lang; | %variables; + | verbatim | titlepage | %toc; + | %lang; | %variables; | %headings; - | printindex | listoffloats)*"> + | printindex)*"> <!ENTITY % section.level2.content "(%block; | %section.level3; | %section.level4; - | titlepage | image - | %toc; | %lang; | %variables; + | verbatim | titlepage | %toc; + | %lang; | %variables; | %headings;)*"> <!ENTITY % section.level3.content "(%block; | %section.level4; - | titlepage | image - | %toc; | %lang; | %variables; + | verbatim | titlepage | %toc; + | %lang; | %variables; | %headings;)*"> <!ENTITY % section.level4.content "(%block; - | titlepage | image - | %toc; | %lang; | %variables; + | verbatim | titlepage | %toc; + | %lang; | %variables; | %headings;)*"> <!-- Inline --> <!-- ****** --> <!ENTITY % Inline.emphasize "strong | emph"> -<!ENTITY % Inline.smallcaps "sc"> -<!ENTITY % Inline.fonts "i | b | tt | r | titlefont"> -<!ENTITY % Inline.markup "code | command | env | file | option | samp | dfn | cite | key | kbd | var | acronym | url | dmn"> -<!ENTITY % Inline.math "math"> -<!ENTITY % Inline.reference "xref | inforef | indexterm | email | uref | anchor"> +<!ENTITY % Inline.fonts "b | i | r | sansserif | slanted | titlefont | tt"> <!ENTITY % Inline.footnote "footnote"> +<!ENTITY % Inline.markup "code | command | env | file | option | samp + | dfn | cite | key | kbd | var | acronym | url"> +<!ENTITY % Inline.math "math"> +<!ENTITY % Inline.reference "xref | inforef | indexterm | email | uref"> +<!ENTITY % Inline.smallcaps "sc"> <!ENTITY % Inline.phrase "%Inline.emphasize; | %Inline.smallcaps; | %Inline.fonts; @@ -123,7 +125,7 @@ <!-- meta-information --> <!ELEMENT setfilename (#PCDATA)> -<!ELEMENT settitle (#PCDATA | %Inline.phrase;)*> +<!ELEMENT settitle (#PCDATA | %Inline.phrase; | footnote)*> <!ELEMENT dircategory (#PCDATA)> <!ELEMENT setvalue (#PCDATA | %Inline.phrase;)*> @@ -150,7 +152,7 @@ <!-- NODES --> <!-- ***** --> <!ELEMENT node (nodename, nodenext?, nodeprev?, nodeup?, - (%section.all; | %block; | image | %toc; | %lang;)*) > + (%section.all; | %block; | %toc; | %lang; | image)*) > <!ELEMENT nodename (#PCDATA)> <!ELEMENT nodenext (#PCDATA)> @@ -178,12 +180,12 @@ <!ELEMENT appendixsubsubsec (title?, (%section.level4.content;))> <!-- Headings and titles --> -<!ELEMENT majorheading (#PCDATA | %Inline.phrase;)*> -<!ELEMENT chapheading (#PCDATA | %Inline.phrase;)*> -<!ELEMENT heading (#PCDATA | %Inline.phrase;)*> -<!ELEMENT subheading (#PCDATA | %Inline.phrase;)*> -<!ELEMENT subsubheading (#PCDATA | %Inline.phrase;)*> -<!ELEMENT title (#PCDATA | %Inline.phrase;)*> +<!ELEMENT majorheading (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT chapheading (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT heading (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT subheading (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT subsubheading (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT title (#PCDATA | %Inline.phrase; | footnote)*> <!-- Negative Indentation in Blocks --> <!ELEMENT exdent (#PCDATA | %Inline.phrase;)*> @@ -191,7 +193,8 @@ <!-- BLOCK Elements --> <!-- ************** --> -<!ELEMENT quotation (%block; | %Inline.phrase; | exdent )*> +<!ELEMENT quotation (%block; | %Inline.phrase; | exdent)*> +<!ELEMENT documentdescription (#PCDATA | %block; | %Inline.phrase;)*> <!ELEMENT example (#PCDATA | %block; | %Inline.phrase; | exdent)*> <!ELEMENT smallexample (#PCDATA | %block; | %Inline.phrase; | exdent)*> <!ELEMENT lisp (#PCDATA | %block; | %Inline.phrase; | exdent)*> @@ -226,7 +229,7 @@ <!ELEMENT verbatim (#PCDATA)> <!ATTLIST verbatim xml:space (preserve) #FIXED 'preserve'> -<!ELEMENT para (#PCDATA | %Inline.phrase;)*> +<!ELEMENT para (#PCDATA | %Inline.phrase; | footnote | %lang;)*> <!ATTLIST para role CDATA #IMPLIED> @@ -235,7 +238,7 @@ <!ELEMENT menuentry (menunode?, menutitle?, menucomment?)> <!ELEMENT menunode (#PCDATA)> <!ELEMENT menutitle (#PCDATA)> -<!ELEMENT menucomment (#PCDATA | %Inline.phrase;)*> +<!ELEMENT menucomment (#PCDATA | para)*> <!-- Floating displays --> <!ELEMENT float (floattype, floatpos, (%block;)*, caption?)> @@ -276,17 +279,17 @@ <!ELEMENT definitionterm (%definition.cmds; | indexterm)+> <!ELEMENT definitionitem (%block;)*> -<!ELEMENT defcategory (#PCDATA | %Inline.phrase;)*> -<!ELEMENT deffunction (#PCDATA | %Inline.phrase;)*> -<!ELEMENT defvariable (#PCDATA | %Inline.phrase;)*> -<!ELEMENT defparam (#PCDATA | %Inline.phrase;)*> -<!ELEMENT defdelimiter (#PCDATA | %Inline.phrase;)*> -<!ELEMENT deftype (#PCDATA | %Inline.phrase;)*> -<!ELEMENT defparamtype (#PCDATA | %Inline.phrase;)*> -<!ELEMENT defdatatype (#PCDATA | %Inline.phrase;)*> -<!ELEMENT defclass (#PCDATA | %Inline.phrase;)*> -<!ELEMENT defclassvar (#PCDATA | %Inline.phrase;)*> -<!ELEMENT defoperation (#PCDATA | %Inline.phrase;)*> +<!ELEMENT defcategory (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT deffunction (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT defvariable (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT defparam (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT defdelimiter (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT deftype (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT defparamtype (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT defdatatype (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT defclass (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT defclassvar (#PCDATA | %Inline.phrase; | footnote)*> +<!ELEMENT defoperation (#PCDATA | %Inline.phrase; | footnote)*> <!-- INLINE Elements --> <!-- *************** --> @@ -319,12 +322,15 @@ <!ELEMENT kbd (#PCDATA | %Inline.phrase;)*> <!ELEMENT var (#PCDATA | %Inline.phrase;)*> <!ELEMENT url (#PCDATA | %Inline.phrase;)*> -<!ELEMENT dmn (#PCDATA | %Inline.phrase;)*> <!ELEMENT acronym (acronymword, acronymdesc?)> <!ELEMENT acronymword (#PCDATA | %Inline.phrase;)*> <!ELEMENT acronymdesc (#PCDATA | %Inline.phrase;)*> +<!ELEMENT abbrev (abbrevword, abbrevdesc?)> +<!ELEMENT abbrevword (#PCDATA | %Inline.phrase;)*> +<!ELEMENT abbrevdesc (#PCDATA | %Inline.phrase;)*> + <!-- math --> <!ELEMENT math (#PCDATA | %Inline.phrase;)*> @@ -362,108 +368,111 @@ <!ELEMENT footnote (para)> - -<!ENTITY tex "TeX"> -<!ENTITY latex "LaTeX"> -<!ENTITY ellipsis ""> -<!ENTITY lt ""> -<!ENTITY gt ""> -<!ENTITY bullet ""> -<!ENTITY copyright ""> -<!ENTITY registered ""> -<!ENTITY minus ""> -<!ENTITY linebreak ""> -<!ENTITY space ""> -<!ENTITY dots ""> -<!ENTITY enddots ""> -<!ENTITY amp ""> -<!ENTITY ldquo ""> -<!ENTITY rdquo ""> -<!ENTITY mdash ""> -<!ENTITY ndash ""> -<!ENTITY period ""> -<!ENTITY eosperiod ""> -<!ENTITY quest ""> -<!ENTITY eosquest ""> -<!ENTITY excl ""> -<!ENTITY eosexcl ""> - -<!ENTITY auml ""> -<!ENTITY ouml ""> -<!ENTITY uuml ""> -<!ENTITY Auml ""> -<!ENTITY Ouml ""> -<!ENTITY Uuml ""> -<!ENTITY Euml ""> -<!ENTITY euml ""> -<!ENTITY Iuml ""> -<!ENTITY iuml ""> -<!ENTITY yuml ""> -<!ENTITY uml ""> - -<!ENTITY Aacute ""> -<!ENTITY Eacute ""> -<!ENTITY Iacute ""> -<!ENTITY Oacute ""> -<!ENTITY Uacute ""> -<!ENTITY Yacute ""> -<!ENTITY aacute ""> -<!ENTITY eacute ""> -<!ENTITY iacute ""> -<!ENTITY oacute ""> -<!ENTITY uacute ""> -<!ENTITY yacute ""> - -<!ENTITY ccedil ""> -<!ENTITY Ccedil ""> - -<!ENTITY Acirc ""> -<!ENTITY Ecirc ""> -<!ENTITY Icirc ""> -<!ENTITY Ocirc ""> -<!ENTITY Ucirc ""> -<!ENTITY acirc ""> -<!ENTITY ecirc ""> -<!ENTITY icirc ""> -<!ENTITY ocirc ""> -<!ENTITY ucirc ""> - -<!ENTITY Agrave ""> -<!ENTITY Egrave ""> -<!ENTITY Igrave ""> -<!ENTITY Ograve ""> -<!ENTITY Ugrave ""> -<!ENTITY agrave ""> -<!ENTITY egrave ""> -<!ENTITY igrave ""> -<!ENTITY ograve ""> -<!ENTITY ugrave ""> - -<!ENTITY Atilde ""> -<!ENTITY Ntilde ""> -<!ENTITY Otilde ""> -<!ENTITY atilde ""> -<!ENTITY ntilde ""> -<!ENTITY otilde ""> - -<!ENTITY oslash ""> -<!ENTITY Oslash ""> - -<!ENTITY ordm ""> -<!ENTITY ordf ""> - -<!ENTITY iexcl ""> -<!ENTITY pound ""> -<!ENTITY iquest ""> -<!ENTITY AElig ""> -<!ENTITY aelig ""> -<!ENTITY OElig ""> -<!ENTITY oelig ""> -<!ENTITY Aring ""> -<!ENTITY aring ""> -<!ENTITY szlig ""> - -<!ENTITY macr ""> +<!ELEMENT neos EMPTY> + +<!ENTITY tex "TeX"> <!-- Should become an element. --> +<!ENTITY latex "LaTeX"> <!-- Should become an element. --> +<!ENTITY ellipsis "…"> +<!ENTITY lt "<"> +<!ENTITY gt ">"> +<!ENTITY bullet "•"> +<!ENTITY copyright "©"> +<!ENTITY registered "®"> +<!ENTITY euro "€"> +<!ENTITY pounds "£"> +<!ENTITY minus "−"> +<!ENTITY linebreak "
"> <!-- Should become an element. --> +<!ENTITY space " "> <!-- Should become an element. --> +<!ENTITY dots "…<neos/>"> +<!ENTITY enddots "…"> +<!ENTITY amp "&"> +<!ENTITY ldquo "“"> +<!ENTITY rdquo "”"> +<!ENTITY mdash "—"> +<!ENTITY ndash "–"> +<!ENTITY period ".<neos/>"> +<!ENTITY eosperiod "."> +<!ENTITY quest "?<neos/>"> +<!ENTITY eosquest "?"> +<!ENTITY excl "!<neos/>"> +<!ENTITY eosexcl "!"> + +<!ENTITY auml "ä"> +<!ENTITY ouml "ö"> +<!ENTITY uuml "ü"> +<!ENTITY Auml "Ä"> +<!ENTITY Ouml "Ö"> +<!ENTITY Uuml "Ü"> +<!ENTITY Euml "Ë"> +<!ENTITY euml "ë"> +<!ENTITY Iuml "Ï"> +<!ENTITY iuml "ï"> +<!ENTITY yuml "ÿ"> +<!ENTITY uml "¨"> + +<!ENTITY Aacute "Á"> +<!ENTITY Eacute "É"> +<!ENTITY Iacute "Í"> +<!ENTITY Oacute "Ó"> +<!ENTITY Uacute "Ú"> +<!ENTITY Yacute "Ý"> +<!ENTITY aacute "á"> +<!ENTITY eacute "é"> +<!ENTITY iacute "í"> +<!ENTITY oacute "ó"> +<!ENTITY uacute "ú"> +<!ENTITY yacute "ý"> + +<!ENTITY ccedil "ç"> +<!ENTITY Ccedil "Ç"> + +<!ENTITY Acirc "Â"> +<!ENTITY Ecirc "Ê"> +<!ENTITY Icirc "Ã"> +<!ENTITY Ocirc "Ô"> +<!ENTITY Ucirc "Û"> +<!ENTITY acirc "â"> +<!ENTITY ecirc "ê"> +<!ENTITY icirc "î"> +<!ENTITY ocirc "ô"> +<!ENTITY ucirc "û"> + +<!ENTITY Agrave "À"> +<!ENTITY Egrave "È"> +<!ENTITY Igrave "Ì"> +<!ENTITY Ograve "Ò"> +<!ENTITY Ugrave "Ù"> +<!ENTITY agrave "à"> +<!ENTITY egrave "è"> +<!ENTITY igrave "ì"> +<!ENTITY ograve "ò"> +<!ENTITY ugrave "ù"> + +<!ENTITY Atilde "Ã"> +<!ENTITY Ntilde "Ñ"> +<!ENTITY Otilde "Õ"> +<!ENTITY atilde "ã"> +<!ENTITY ntilde "ñ"> +<!ENTITY otilde "õ"> + +<!ENTITY oslash "ø"> +<!ENTITY Oslash "Ø"> + +<!ENTITY ordm "º"> +<!ENTITY ordf "ª"> + +<!ENTITY iexcl "¡"> +<!ENTITY pound "£"> +<!ENTITY iquest "¿"> +<!ENTITY AElig "Æ"> +<!ENTITY aelig "æ"> +<!ENTITY OElig "Œ"> +<!ENTITY oelig "œ"> +<!ENTITY Aring "Å"> +<!ENTITY aring "å"> +<!ENTITY szlig "ß"> + +<!ENTITY macr "¯"> <!-- fixxme: not yet classified --> @@ -473,4 +482,3 @@ lines CDATA #IMPLIED> <!ELEMENT printindex (#PCDATA)> -<!-- vim: set expandtab: --> diff --git a/gnu/dist/texinfo/util/texinfo.xsl b/gnu/dist/texinfo/util/texinfo.xsl index 972bd0948e8..7b34a00a3b6 100644 --- a/gnu/dist/texinfo/util/texinfo.xsl +++ b/gnu/dist/texinfo/util/texinfo.xsl @@ -1,5 +1,5 @@ <?xml version='1.0'?> -<!-- Id: texinfo.xsl,v 1.1 2004/01/23 13:19:13 dirt Exp --> +<!-- Id: texinfo.xsl,v 1.1 2004/04/11 17:56:47 karl Exp --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> diff --git a/gnu/dist/texinfo/util/txitextest b/gnu/dist/texinfo/util/txitextest index d9f5e2e2da3..275fcf4d885 100644 --- a/gnu/dist/texinfo/util/txitextest +++ b/gnu/dist/texinfo/util/txitextest @@ -1,5 +1,5 @@ #!/bin/sh -# Id: txitextest,v 1.1.1.1 2003/12/06 01:35:52 karl Exp +# Id: txitextest,v 1.5 2004/04/11 17:56:47 karl Exp # Test texinfo.tex changes by running various manuals through with an # old version, saving the .ps result from dvips, doing the same with a # new version, and comparing. Idea from Stepan Kasal. |
