diff -u -r --new-file texinfo-4.0/makeinfo/Makefile.am texinfo-4.0-db/makeinfo/Makefile.am --- texinfo-4.0/makeinfo/Makefile.am Sun Apr 25 16:30:33 1999 +++ texinfo-4.0-db/makeinfo/Makefile.am Thu Sep 28 15:51:14 2000 @@ -9,9 +9,9 @@ LDADD = ../lib/libtxi.a @INTLLIBS@ makeinfo_SOURCES = \ - cmds.c cmds.h defun.c defun.h files.c files.h footnote.c footnote.h \ - html.c html.h index.c index.h insertion.c insertion.h lang.c lang.h \ - macro.c macro.h makeinfo.c makeinfo.h multi.c node.c node.h \ + cmds.c cmds.h defun.c defun.h docbook.c docbook.h files.c files.h \ + footnote.c footnote.h html.c html.h index.c index.h insertion.c insertion.h \ + lang.c lang.h macro.c macro.h makeinfo.c makeinfo.h multi.c node.c node.h \ sectioning.c sectioning.h toc.c toc.h EXTRA_DIST = README diff -u -r --new-file texinfo-4.0/makeinfo/Makefile.in texinfo-4.0-db/makeinfo/Makefile.in --- texinfo-4.0/makeinfo/Makefile.in Tue Sep 28 15:40:51 1999 +++ texinfo-4.0-db/makeinfo/Makefile.in Thu Sep 28 15:55:43 2000 @@ -90,7 +90,7 @@ INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\" LDADD = ../lib/libtxi.a @INTLLIBS@ -makeinfo_SOURCES = cmds.c cmds.h defun.c defun.h files.c files.h footnote.c footnote.h html.c html.h index.c index.h insertion.c insertion.h lang.c lang.h macro.c macro.h makeinfo.c makeinfo.h multi.c node.c node.h sectioning.c sectioning.h toc.c toc.h +makeinfo_SOURCES = cmds.c cmds.h defun.c defun.h docbook.c docbook.h files.c files.h footnote.c footnote.h html.c html.h index.c index.h insertion.c insertion.h lang.c lang.h macro.c macro.h makeinfo.c makeinfo.h multi.c node.c node.h sectioning.c sectioning.h toc.c toc.h EXTRA_DIST = README @@ -106,8 +106,9 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -makeinfo_OBJECTS = cmds.o defun.o files.o footnote.o html.o index.o \ -insertion.o lang.o macro.o makeinfo.o multi.o node.o sectioning.o toc.o +makeinfo_OBJECTS = cmds.o defun.o docbook.o files.o footnote.o html.o \ +index.o insertion.o lang.o macro.o makeinfo.o multi.o node.o \ +sectioning.o toc.o makeinfo_LDADD = $(LDADD) makeinfo_DEPENDENCIES = ../lib/libtxi.a makeinfo_LDFLAGS = @@ -120,7 +121,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(makeinfo_SOURCES) OBJECTS = $(makeinfo_OBJECTS) @@ -281,7 +282,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -298,38 +299,6 @@ || exit 1; \ fi; \ done -cmds.o: cmds.c ../lib/system.h ../config.h ../lib/getopt.h cmds.h \ - defun.h insertion.h files.h footnote.h lang.h macro.h \ - makeinfo.h node.h sectioning.h toc.h -defun.o: defun.c ../lib/system.h ../config.h ../lib/getopt.h defun.h \ - insertion.h makeinfo.h -files.o: files.c ../lib/system.h ../config.h ../lib/getopt.h files.h \ - macro.h makeinfo.h -footnote.o: footnote.c ../lib/system.h ../config.h ../lib/getopt.h \ - footnote.h macro.h makeinfo.h -html.o: html.c ../lib/system.h ../config.h ../lib/getopt.h cmds.h html.h \ - lang.h makeinfo.h sectioning.h -index.o: index.c ../lib/system.h ../config.h ../lib/getopt.h index.h \ - makeinfo.h cmds.h lang.h macro.h toc.h -insertion.o: insertion.c ../lib/system.h ../config.h ../lib/getopt.h \ - cmds.h defun.h insertion.h macro.h makeinfo.h -lang.o: lang.c ../lib/system.h ../config.h ../lib/getopt.h cmds.h lang.h \ - makeinfo.h -macro.o: macro.c ../lib/system.h ../config.h ../lib/getopt.h cmds.h \ - macro.h makeinfo.h insertion.h -makeinfo.o: makeinfo.c ../lib/system.h ../config.h ../lib/getopt.h \ - makeinfo.h cmds.h files.h footnote.h html.h index.h insertion.h \ - macro.h node.h toc.h -multi.o: multi.c ../lib/system.h ../config.h ../lib/getopt.h insertion.h \ - makeinfo.h -node.o: node.c ../lib/system.h ../config.h ../lib/getopt.h cmds.h \ - files.h footnote.h macro.h makeinfo.h node.h sectioning.h \ - insertion.h -sectioning.o: sectioning.c ../lib/system.h ../config.h ../lib/getopt.h \ - cmds.h macro.h makeinfo.h node.h toc.h sectioning.h -toc.o: toc.c ../lib/system.h ../config.h ../lib/getopt.h makeinfo.h \ - cmds.h files.h macro.h node.h lang.h sectioning.h toc.h - info-am: info: info-recursive dvi-am: diff -u -r --new-file texinfo-4.0/makeinfo/cmds.c texinfo-4.0-db/makeinfo/cmds.c --- texinfo-4.0/makeinfo/cmds.c Sun Sep 19 12:39:35 1999 +++ texinfo-4.0-db/makeinfo/cmds.c Thu Sep 28 15:51:14 2000 @@ -20,6 +20,7 @@ #include "system.h" #include "cmds.h" #include "defun.h" +#include "docbook.h" #include "files.h" #include "footnote.h" #include "insertion.h" @@ -485,11 +486,15 @@ if (html) insert_html_tag (arg, "code"); + else if (docbook) + docbook_insert_tag (arg, DB_CODE); else if (!printing_index) add_char ('`'); } else if (html) insert_html_tag (arg, "code"); + else if (docbook) + docbook_insert_tag (arg, DB_CODE); else { if (!printing_index) @@ -509,6 +514,8 @@ in_fixed_width_font++; insert_html_tag (arg, "kbd"); } + else if (docbook) + docbook_insert_tag (arg, DB_KBD); else { /* People use @kbd in an example to get the "user input" font. We don't want quotes in that case. */ @@ -527,6 +534,8 @@ else add_word (">"); } + else if (docbook) + docbook_insert_tag (arg, DB_URL); else if (arg == START) add_word ("<"); @@ -540,6 +549,8 @@ { if (html) add_word (arg == START ? "<" : ">"); + else if (docbook) + docbook_insert_tag (arg, DB_KEY); else add_char (arg == START ? '<' : '>'); } @@ -562,6 +573,8 @@ if (html) insert_html_tag (arg, "var"); + else if (docbook) + docbook_insert_tag (arg, DB_VAR); else if (arg == END) { while (start_pos < end_pos) @@ -615,6 +628,8 @@ { if (html) insert_html_tag (arg, "dfn"); + else if (docbook) + docbook_insert_tag (arg, DB_DFN); else if (arg == START) add_char ('"'); else @@ -627,6 +642,8 @@ { if (html) insert_html_tag (arg, "em"); + else if (docbook) + docbook_insert_tag (arg, DB_EMPH); else add_char ('_'); } @@ -637,6 +654,8 @@ { if (html) insert_html_tag (arg, "strong"); + else if (docbook) + docbook_insert_tag (arg, DB_STRONG); else add_char ('*'); } @@ -647,6 +666,8 @@ { if (html) insert_html_tag (arg, "cite"); + else if (docbook) + docbook_insert_tag (arg, DB_CITE); else { if (arg == START) @@ -670,6 +691,8 @@ { if (html) insert_html_tag (arg, "i"); + else if (docbook) + docbook_insert_tag (arg, DB_I); else not_fixed_width (arg); } @@ -680,6 +703,8 @@ { if (html) insert_html_tag (arg, "b"); + else if (docbook) + docbook_insert_tag (arg, DB_B); else not_fixed_width (arg); } @@ -840,7 +865,7 @@ { char *line; - if (html) + if (html || docbook) cm_ignore_line (); else { diff -u -r --new-file texinfo-4.0/makeinfo/docbook.c texinfo-4.0-db/makeinfo/docbook.c --- texinfo-4.0/makeinfo/docbook.c Wed Dec 31 19:00:00 1969 +++ texinfo-4.0-db/makeinfo/docbook.c Thu Sep 28 16:11:59 2000 @@ -0,0 +1,424 @@ +#include + +#include "system.h" +#include "cmds.h" +#include "docbook.h" +#include "insertion.h" +#include "lang.h" +#include "makeinfo.h" +#include "macro.h" +#include "sectioning.h" + +int docbook_version_inserted = 0; +int docbook_first_chapter_found = 0; +int docbook_must_insert_node_anchor = 0; +int docbook_begin_book_p = 0; + +static int section_level = -1; +static int in_docbook_paragraph = 0; +static int in_list = 0; + +static int in_table = 0; +static int in_term = 0; +static int in_entry = 0; +static int in_varlistitem = 0; + +static int in_example = 0; + +void +docbook_begin_section (level, cmd) + int level; + char *cmd; +{ + int i, old_no_indent; + char *temp, *tem; + close_paragraph (); + docbook_first_chapter_found = 1; + filling_enabled = indented_fill = 0; + old_no_indent = no_indent; + no_indent = 1; + + if (!docbook_begin_book_p) + docbook_begin_book (); + + if (macro_expansion_output_stream && !executing_string) + append_to_expansion_output (input_text_offset + 1); + + get_rest_of_line (0, &temp); + + if (in_docbook_paragraph) + { + insert_string ("\n"); + adjust_braces_following (0, 8); + } + in_docbook_paragraph = 0; + + if (level > section_level + 1) + level = section_level + 1; + + for (i = section_level; i >= level ; i--) + { + if (i == 0) + add_word ("\n"); + else + add_word_args ("\n", i); + } + + section_level = level; + + if (level == 0) + add_word (""); + add_word (""); + + if (macro_expansion_output_stream && !executing_string) + { + char *temp1 = xmalloc (2 + strlen (temp)); + sprintf (temp1, "%s", temp); + remember_itext (input_text, input_text_offset); + me_execute_string (temp1); + free (temp1); + } + else + execute_string ("%s", temp); + + free (temp); + + add_word (""); + + close_paragraph (); + filling_enabled = 1; + no_indent = old_no_indent; +} + +void +docbook_begin_paragraph () +{ + if (!docbook_first_chapter_found) + return; + + if (in_example) + return; + + if (in_table && !in_term) + { + if (!in_varlistitem) + insert_string (""); + else + insert_string ("\n"); + in_varlistitem = 1; + + return; + } + if (in_list) + return; + if (in_docbook_paragraph) + { + insert_string ("\n"); + adjust_braces_following (0, 8); + } + + if (docbook_must_insert_node_anchor) + { + char *tem; + insert_string (""); + docbook_must_insert_node_anchor = 0; + } + else + { + insert_string (""); + adjust_braces_following (0, 6); + } + in_docbook_paragraph = 1; +} + +void +docbook_begin_book () +{ + if (!docbook_begin_book_p) + docbook_begin_book_p = 1; + else + return; + + add_word_args ("\n\ +\n%s\n", title); +} + +void +docbook_end_book () +{ + int i; + if (in_docbook_paragraph) + { + insert_string ("\n"); + } + + for (i = section_level; i >= 0 ; i--) + { + if (i == 0) + add_word ("\n"); + else + add_word_args ("\n", i); + } + + add_word ("\n"); +} + +void +docbook_insert_tag (start_or_end, tag) + int start_or_end; + char *tag; +{ + if (!paragraph_is_open && start_or_end == START) + docbook_begin_paragraph (); + + add_char ('<'); + if (start_or_end != START) + add_char ('/'); + add_word (tag); + add_char ('>'); +} + +void +docbook_xref1 (node_name) + char *node_name; +{ + char *tem; + add_word (""); +} + +void +docbook_xref2 (node_name, ref_name) + char *node_name; + char *ref_name; +{ + char *tem; + add_word (""); +} + +int +docbook_quote (character) + int character; +{ + switch (language_code) + { + case fr: + if (character == '`') + { + add_word ("« "); + return ';'; + } + else + { + add_word (" "); + return '»'; + } + break; + + default: + return '"'; + } +} + +#define IS_BLANK(c) (c == ' ' || c == '\t' || c == '\n') + +int +docbook_is_punctuation (character, next) + int character; + int next; +{ + return ( (character == ';' + || character == ':' + || character == '?' + || character == '!') + && IS_BLANK (next)); +} + +void +docbook_punctuation (character) + int character; +{ + switch (language_code) + { + case fr: + while (output_paragraph[output_paragraph_offset-1] == ' ') + output_paragraph_offset--; + add_word (" "); + break; + default: + } +} + +static int in_item = 0; + +void +docbook_begin_itemize () +{ + if (!in_docbook_paragraph) + { + insert_string (""); + in_docbook_paragraph = 1; + } + insert_string ("\n"); + in_item = 0; + in_list = 1; +} + +void +docbook_end_itemize () +{ + if (in_item) + { + insert_string (""); + in_item = 0; + } + insert_string ("\n\n"); + in_list = 0; +} + +void +docbook_begin_enumerate () +{ + if (!in_docbook_paragraph) + { + insert_string (""); + in_docbook_paragraph = 1; + } + insert_string ("\n"); + in_item = 0; + in_list = 1; +} + +void +docbook_end_enumerate () +{ + if (in_item) + { + insert_string (""); + in_item = 0; + } + insert_string ("\n\n"); + in_list = 0; +} + +void +docbook_begin_table () +{ + if (in_docbook_paragraph) + insert_string (""); + insert_string (""); + in_docbook_paragraph = 1; + + insert_string ("\n"); + in_table ++; + in_varlistitem = 0; + in_entry = 0; +} + +void +docbook_end_table () +{ + insert_string ("\n\n\n\n"); + if (in_table == 1) + insert_string (""); + in_table --; + in_list = 0; + in_docbook_paragraph = 0; +} + +void +docbook_add_item () +{ + if (in_item) + insert_string (""); + insert_string ("\n"); + in_item = 1; +} + +void +docbook_add_table_item () +{ + if (in_varlistitem) + { + insert_string ("\n"); + in_entry = 0; + in_varlistitem = 0; + } + if (!in_entry) + { + insert_string ("\n"); + in_entry = 1; + } + insert_string (""); + in_list = 1; + in_term = 1; +} + +void +docbook_close_table_item () +{ + insert_string (""); + in_list = 1; + in_term = 0; +} + +void +docbook_add_anchor (anchor) + char *anchor; +{ + add_word (""); +} + +void +docbook_footnote (note) + char *note; +{ + add_word_args (" %s ", note); +} + +void +docbook_begin_index () +{ + add_word ("\n"); +} + +void +docbook_begin_example () +{ + in_example = 1; + add_word ("\n\n"); +} + +void +docbook_end_example () +{ + in_example = 0; + add_word ("\n\n\n"); +} diff -u -r --new-file texinfo-4.0/makeinfo/docbook.h texinfo-4.0-db/makeinfo/docbook.h --- texinfo-4.0/makeinfo/docbook.h Wed Dec 31 19:00:00 1969 +++ texinfo-4.0-db/makeinfo/docbook.h Thu Sep 28 15:51:14 2000 @@ -0,0 +1,56 @@ +#ifndef DOCBOOK_H +#define DOCBOOK_H + +#define DB_CODE "Command" +#define DB_KBD "UserInput" +#define DB_KEY "KeyCap" +#define DB_DFN "FirstTerm" +#define DB_EMPH "Emphasis" +#define DB_STRONG "WordAsWord" +#define DB_CITE "Citation" +#define DB_TT "WordAsWord" +#define DB_URL "WordAsWord" +#define DB_VAR "Parameter" +#define DB_I "WordAsWord" +#define DB_B "WordAsWord" + +extern int docbook_version_inserted; +extern int docbook_begin_book_p; +extern int docbook_first_chapter_found; +extern int docbook_must_insert_node_anchor; + +void docbook_begin_section (); +void docbook_begin_paragraph (); +void docbook_begin_book (); +void docbook_end_book (); + +void docbook_insert_tag (); + +void docbook_xref1 (); +void docbook_xref2 (); + +int docbook_quote (); + +int docbook_is_punctuation (); +void docbook_punctuation (); + +void docbook_begin_itemize (); +void docbook_end_itemize (); +void docbook_begin_enumerate (); +void docbook_end_enumerate (); + +void docbook_begin_table (); +void docbook_end_table (); +void docbook_add_item (); +void docbook_add_table_item (); +void docbook_close_table_item (); +void docbook_add_anchor (); + +void docbook_footnote (); + +void docbook_begin_index (); + +void docbook_begin_example (); +void docbook_end_example (); + +#endif /* DOCBOOK_H */ diff -u -r --new-file texinfo-4.0/makeinfo/footnote.c texinfo-4.0-db/makeinfo/footnote.c --- texinfo-4.0/makeinfo/footnote.c Mon Sep 20 08:20:52 1999 +++ texinfo-4.0-db/makeinfo/footnote.c Thu Sep 28 15:51:14 2000 @@ -18,6 +18,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "system.h" +#include "docbook.h" #include "footnote.h" #include "macro.h" #include "makeinfo.h" @@ -221,6 +222,8 @@ if (html) add_word_args ("%s", current_footnote_number, marker); + else if (docbook) + docbook_footnote (note); else /* Your method should at least insert MARKER. */ switch (footnote_style) @@ -267,6 +270,9 @@ FN *footnote = pending_notes; if (!pending_notes) + return; + + if (docbook) return; if (html) diff -u -r --new-file texinfo-4.0/makeinfo/html.c texinfo-4.0-db/makeinfo/html.c --- texinfo-4.0/makeinfo/html.c Sat Sep 18 15:27:41 1999 +++ texinfo-4.0-db/makeinfo/html.c Thu Sep 28 15:51:14 2000 @@ -19,6 +19,7 @@ #include "system.h" #include "cmds.h" +#include "docbook.h" #include "html.h" #include "lang.h" #include "makeinfo.h" @@ -153,14 +154,16 @@ add_escaped_anchor_name (name) char *name; { + if (docbook && !isalpha(*name)) + add_word ("A"); for (; *name; name++) { - if (*name == '&') + if (*name == '&' && html) add_word ("&"); else if (! 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 ("%%%x", (unsigned char) *name); + add_word_args (html ? "%%%x" : "%x", (unsigned char) *name); else add_char (*name); } diff -u -r --new-file texinfo-4.0/makeinfo/index.c texinfo-4.0-db/makeinfo/index.c --- texinfo-4.0/makeinfo/index.c Sun Jul 18 14:50:06 1999 +++ texinfo-4.0-db/makeinfo/index.c Thu Sep 28 15:51:14 2000 @@ -18,6 +18,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "system.h" +#include "docbook.h" #include "index.h" #include "lang.h" #include "macro.h" @@ -654,6 +655,8 @@ close_paragraph (); if (html) add_word ("
    "); + else if (docbook) + docbook_begin_index (); else if (!no_headers) add_word ("* Menu:\n\n"); @@ -746,7 +749,15 @@ expanded any commands in index->entry, including any implicit @code. Thus, can't call execute_string, since @@ has turned into @. */ - if (!no_headers) + if (docbook) + { + add_word ("\n"); + insert_string (index->entry); + add_word ("\n"); + docbook_xref1 (index_node); + add_word ("\n\n"); + } + else if (!no_headers) { sprintf (line, "* %-37s ", index->entry); line[2 + strlen (index->entry)] = ':'; @@ -820,4 +831,6 @@ if (html) add_word ("
"); + else if (docbook) + add_word (""); } diff -u -r --new-file texinfo-4.0/makeinfo/insertion.c texinfo-4.0-db/makeinfo/insertion.c --- texinfo-4.0/makeinfo/insertion.c Mon Jul 19 17:37:36 1999 +++ texinfo-4.0-db/makeinfo/insertion.c Thu Sep 28 23:39:13 2000 @@ -20,6 +20,7 @@ #include "system.h" #include "cmds.h" #include "defun.h" +#include "docbook.h" #include "insertion.h" #include "macro.h" #include "makeinfo.h" @@ -60,7 +61,7 @@ int in_paragraph = 0; static const char dl_tag[] = "
\n"; - + void init_insertion_stack () { @@ -330,7 +331,7 @@ add_word_args ("
    \n", type, start); } - + /* Conditionally parse based on the current command name. */ void command_name_condition () @@ -374,7 +375,7 @@ { had_menu_commentary = 1; } - else if (!no_headers) + else if (!no_headers && !docbook) add_word ("* Menu:\n"); in_menu++; @@ -414,6 +415,8 @@ /* @quotation does filling (@display doesn't). */ if (html) add_word ("
    \n"); + else if (docbook) + docbook_begin_example (); else { close_single_paragraph (); @@ -447,6 +450,9 @@ if (type != format && type != smallformat) current_indent += default_indentation_increment; + if (docbook){ + docbook_begin_example (); + } break; case multitable: @@ -490,8 +496,15 @@ in_paragraph = 0; } else - add_word (dl_tag); + add_word (dl_tag); } + else if (docbook) + { + if (type == itemize) + docbook_begin_itemize (); + else + docbook_begin_table (); + } break; case enumerate: @@ -508,6 +521,8 @@ if (html) enum_html (); + else if (docbook) + docbook_begin_enumerate (); if (isdigit (*enumeration_arg)) start_enumerating (atoi (enumeration_arg), ENUM_DIGITS); @@ -677,6 +692,8 @@ current_indent -= default_indentation_increment; if (html) add_word ("
\n"); + else if (docbook) + docbook_end_enumerate (); break; case flushleft: @@ -702,6 +719,9 @@ if (html) add_word (type == quotation ? "\n" : "\n"); + if (docbook) + docbook_end_example (); + /* The ending of one of these insertions always marks the start of a new paragraph. */ close_insertion_paragraph (); @@ -713,12 +733,16 @@ current_indent -= default_indentation_increment; if (html) add_word ("
\n"); + else if (docbook) + docbook_end_table (); break; case itemize: current_indent -= default_indentation_increment; if (html) add_word ("\n"); + else if (docbook) + docbook_end_itemize (); close_insertion_paragraph (); break; @@ -801,7 +825,7 @@ } line_number = real_line_number; } - + /* Insertion (environment) commands. */ void @@ -869,7 +893,7 @@ void cm_direntry () { - if (no_headers || html) + if (no_headers || html || docbook) command_name_condition (); else begin_insertion (direntry); @@ -947,7 +971,7 @@ { begin_insertion (group); } - + void cm_ifinfo () { @@ -1022,7 +1046,7 @@ else command_name_condition (); } - + /* Begin an insertion where the lines are not filled or indented. */ void cm_flushleft () @@ -1090,7 +1114,7 @@ end_insertion (type); free (temp); } - + /* @itemx, @item. */ static int itemx_flag = 0; @@ -1195,6 +1219,8 @@ } add_word ("
  • "); } + else if (docbook) + docbook_add_item (); else { start_paragraph (); @@ -1289,6 +1315,22 @@ last_html_output_position = output_position; add_word ("
    "); } + else if (docbook) + { + docbook_add_table_item (); + if (item_func && *item_func) + execute_string ("%s{%s}", item_func, rest_of_line); + else + execute_string ("%s", rest_of_line); + + if (current_insertion_type () == ftable) + execute_string ("%cfindex %s\n", COMMAND_PREFIX, rest_of_line); + + if (current_insertion_type () == vtable) + execute_string ("%cvindex %s\n", COMMAND_PREFIX, rest_of_line); + docbook_close_table_item (); + close_single_paragraph (); + } else { /* We need this to determine if we have two @item's in a row diff -u -r --new-file texinfo-4.0/makeinfo/lang.c texinfo-4.0-db/makeinfo/lang.c --- texinfo-4.0/makeinfo/lang.c Tue Jul 13 17:16:29 1999 +++ texinfo-4.0-db/makeinfo/lang.c Thu Sep 28 15:51:14 2000 @@ -264,7 +264,7 @@ int html_solo_standalone; char *html_solo; { - if (html) + if (html || docbook) { static int valid_html_accent; diff -u -r --new-file texinfo-4.0/makeinfo/makeinfo.c texinfo-4.0-db/makeinfo/makeinfo.c --- texinfo-4.0/makeinfo/makeinfo.c Sun Sep 19 11:24:44 1999 +++ texinfo-4.0-db/makeinfo/makeinfo.c Thu Sep 28 23:39:33 2000 @@ -26,6 +26,7 @@ #define COMPILING_MAKEINFO #include "makeinfo.h" #include "cmds.h" +#include "docbook.h" #include "files.h" #include "footnote.h" #include "html.h" @@ -84,7 +85,7 @@ line between paragraphs. Paragraphs are defined by 2 or more consecutive newlines in the input file (i.e., one or more blank lines). */ #define DEFAULT_PARAGRAPH_SPACING 1 - + /* Global variables. */ /* The output file name. */ @@ -219,7 +220,7 @@ void add_word_args (); void execute_string (); #endif /* no prototypes */ - + /* Error handling. */ /* Number of errors encountered. */ @@ -341,7 +342,7 @@ { line_error (_("Misplaced %c"), '}'); } - + /* Main. */ /* Display the version info of this invocation of Makeinfo. */ @@ -432,6 +433,7 @@ struct option long_options[] = { { "commands-in-node-names", 0, &expensive_validation, 1 }, + { "docbook", 0, 0, 'd' }, { "error-limit", 1, 0, 'e' }, { "fill-column", 1, 0, 'f' }, { "footnote-style", 1, 0, 's' }, @@ -487,7 +489,7 @@ textdomain (PACKAGE); /* Parse argument flags from the input line. */ - while ((c = getopt_long (argc, argv, "D:e:E:f:hI:o:p:P:r:s:U:vV:w", + while ((c = getopt_long (argc, argv, "dD:e:E:f:hI:o:p:P:r:s:U:vV:w", long_options, &ind)) != EOF) { if (c == 0 && long_options[ind].flag == 0) @@ -495,6 +497,14 @@ switch (c) { + case 'd': + docbook = 1; + process_html = 0; + process_info = 0; + splitting = 0; /* too complicated for now */ + set_paragraph_indent ("none"); + break; + case 'D': case 'U': /* User specified variable to set or clear. */ @@ -683,7 +693,7 @@ return errors_printed ? 2 : 0; } - + /* Hacking tokens and strings. */ /* Return the next token as a string pointer. We cons the string. */ @@ -1039,7 +1049,7 @@ input_text_offset = i; *string = temp; } - + /* Converting a file. */ /* Convert the file named by NAME. The output is saved on the file @@ -1260,7 +1270,7 @@ if (!command_output_filename) { get_until ("\n", &output_filename); /* read rest of line */ - if (html) + if (html || docbook) { /* Change any extension to .html. */ char *html_name, *directory_part, *basename_part, *temp; @@ -1278,7 +1288,7 @@ + strlen (basename_part) + 6); strcpy (html_name, directory_part); strcat (html_name, basename_part); - strcat (html_name, ".html"); + strcat (html_name, html ? ".html" : ".sgml"); /* Replace name from @setfilename with the html name. */ free (output_filename); @@ -1325,9 +1335,11 @@ if (verbose_mode) printf (_("Making %s file `%s' from `%s'.\n"), - no_headers ? "text" : (html ? "HTML" : "info"), + no_headers ? "text" : + html ? "HTML" : + docbook ? "DocBook" : "info", output_filename, input_filename); - + if (output_stream == NULL) { fs_error (real_output_filename); @@ -1354,9 +1366,16 @@ } /* html fixxme: should output this as trailer on first page. */ + if (docbook) + add_word ("\n"); + docbook_version_inserted = 1; + } close_paragraph (); reader_loop (); @@ -1387,7 +1406,7 @@ if (tag_table) { tag_table = (TAG_ENTRY *) reverse_list (tag_table); - if (!no_headers && !html) + if (!no_headers && !html && !docbook) write_tag_table (); } @@ -1398,6 +1417,13 @@ close_paragraph (); } + if (docbook) + { + start_paragraph (); + docbook_end_book (); + close_paragraph (); + } + if (output_stream != stdout) fclose (output_stream); @@ -1470,7 +1496,7 @@ current_indent = 0; meta_char_pos = 0; } - + /* This is called from `reader_loop' when we are at the * beginning a menu line. */ @@ -1553,7 +1579,7 @@ if (tem) free (tem); } - + /* Find the command corresponding to STRING. If the command is found, return a pointer to the data structure. Otherwise return -1. */ static COMMAND * @@ -1576,7 +1602,7 @@ /* We never heard of this command. */ return (COMMAND *) -1; } - + /* input_text_offset is right at the command prefix character. Read the next token to determine what to do. Return zero if there's no known command or macro after the prefix character. */ @@ -1697,6 +1723,9 @@ break; character = curchar (); + if (!only_macro_expansion && !in_fixed_width_font && docbook + && docbook_is_punctuation (character, input_text[input_text_offset + 1])) + docbook_punctuation (character); /* If only_macro_expansion, only handle macros and leave everything else intact. */ @@ -1705,7 +1734,10 @@ && input_text[input_text_offset + 1] == character) { input_text_offset++; - character = '"'; /* html fixxme */ + if (docbook) + character = docbook_quote (character); + else + character = '"'; /* html fixxme */ } /* Convert --- to --. */ @@ -1764,7 +1796,7 @@ this always, even if SGML rules don't require it since that's easier and safer for non-conforming browsers. */ case '&': - if (html && escape_html) + if ((html || docbook) && escape_html) add_word ("&"); else add_char (character); @@ -1772,7 +1804,7 @@ break; case '<': - if (html && escape_html) + if ((html || docbook) && escape_html) add_word ("<"); else add_char (character); @@ -1780,7 +1812,7 @@ break; case '>': - if (html && escape_html) + if ((html || docbook) && escape_html) add_word (">"); else add_char (character); @@ -1823,7 +1855,7 @@ if (macro_expansion_output_stream && !only_macro_expansion) maybe_write_itext (input_text, input_text_offset); } - + void init_brace_stack () { @@ -1984,7 +2016,7 @@ } return len; } - + void #if defined (VA_FPRINTF) && __STDC__ add_word_args (char *format, ...) @@ -2028,7 +2060,7 @@ in a menu, then simply return. But if we're only expanding macros, then we're being called from glean_node_from_menu to try to remember a menu reference, and we need that so we can do defaulting. */ - if (no_headers && !only_macro_expansion && (in_menu || in_detailmenu)) + if ((docbook || no_headers) && !only_macro_expansion && (in_menu || in_detailmenu)) return; /* If we are adding a character now, then we don't have to @@ -2063,7 +2095,6 @@ if (!filling_enabled && ! (html && (in_menu || in_detailmenu))) { insert ('\n'); - if (force_flush_right) { close_paragraph (); @@ -2130,12 +2161,17 @@ /* This horrible kludge of checking for a < prevents

    from being inserted when we already have html markup starting a paragraph, as with

      and

      and the like. */ - if (html && escape_html && character != '<' + if ((html || docbook) && escape_html && character != '<' && (!in_fixed_width_font || in_menu || in_detailmenu)) { - insert_string ("

      "); + if (html) + { + insert_string ("

      "); + adjust_braces_following (0, 3); /* adjust for

      */ + } + else + docbook_begin_paragraph (); in_paragraph = 1; - adjust_braces_following (0, 3); /* adjust for

      */ } } @@ -2269,7 +2305,9 @@ omissions, and we'll still output the html `just in time'. */ if (!executing_string && html && !html_output_head_p) html_output_head (); - + if (!executing_string && docbook && !docbook_begin_book_p && docbook_version_inserted) + docbook_begin_book (); + output_paragraph[output_paragraph_offset++] = character; if (output_paragraph_offset == paragraph_buffer_len) { @@ -2456,7 +2494,6 @@ close_paragraph () { int i; - /* The insertion paragraph is no longer closed. */ insertion_paragraph_closed = 0; @@ -2484,11 +2521,11 @@ output_paragraph_offset = ++tindex; /* Break the line if that is appropriate. */ - if (paragraph_spacing >= 0) + if (paragraph_spacing >= 0 && !docbook) insert ('\n'); /* Add as many blank lines as is specified in `paragraph_spacing'. */ - if (!force_flush_right) + if (!force_flush_right && !docbook) { for (i = 0; i < (paragraph_spacing - line_already_broken); i++) { @@ -2639,7 +2676,7 @@ } return -1; } - + /* Cross references. */ /* Return next comma-delimited argument, but do not cross a close-brace @@ -2701,7 +2738,7 @@ char *arg5 = get_xref_token (0); char *tem; - if (html) + if (html || docbook) { if (!ref_flag) add_word_args ("%s", px_ref_flag ? _("see ") : _("See ")); @@ -2772,6 +2809,8 @@ execute_string ("%s", *arg2 ? arg2 : arg3); add_word (""); } + else if (docbook) + docbook_xref2 (arg1, arg3); else { execute_string ("%s:", *arg2 ? arg2 : arg3); @@ -2794,6 +2833,13 @@ execute_string ("%s", *arg2 ? arg2 : arg1); add_word (""); } + else if (docbook) + { + if (*arg2) + docbook_xref2 (arg1, arg2); + else + docbook_xref1 (arg1); + } else { if (*arg2) @@ -2915,9 +2961,9 @@ char *desc = get_xref_token (0); char *replacement = get_xref_token (0); - if (html) + if (html || docbook) { /* never need to show the url */ - add_word (""); execute_string ("%s", *replacement ? replacement : (*desc ? desc : url)); - add_word (""); + add_word (html ? "" : ""); } else if (*replacement) /* do not show the url */ execute_string ("%s", replacement); @@ -2964,16 +3010,16 @@ char *addr = get_xref_token (1); /* expands all macros in email */ char *name = get_xref_token (0); - if (html) + if (html || docbook) { - add_word (""); execute_string ("%s", *name ? name : addr); - add_word (""); + add_word (html ? "" : ""); } else { @@ -3072,7 +3118,7 @@ if (name_arg) free (name_arg); } - + /* Conditionals. */ /* A structure which contains `defined' variables. */ @@ -3440,7 +3486,7 @@ } } } - + /* Execution of random text not in file. */ typedef struct { @@ -3663,7 +3709,7 @@ return ret; } - + /* Set the paragraph indentation variable to the value specified in STRING. Values can be: `asis': Don't change existing indentation. diff -u -r --new-file texinfo-4.0/makeinfo/makeinfo.h texinfo-4.0-db/makeinfo/makeinfo.h --- texinfo-4.0/makeinfo/makeinfo.h Sat Sep 18 14:09:22 1999 +++ texinfo-4.0-db/makeinfo/makeinfo.h Thu Sep 28 15:51:14 2000 @@ -113,6 +113,9 @@ /* Nonzero if we are currently processing a multitable command */ DECLARE (int, multitable_active, 0); +/* Nonzero means that we're generating DocBook. */ +DECLARE (int, docbook, 0); + /* Nonzero means that we're generating HTML. */ DECLARE (int, html, 0); @@ -220,7 +223,7 @@ #define digit_value(c) ((c) - '0') #endif -#define HTML_SAFE "$-_.+!*'()" +#define HTML_SAFE (html ? "$-_.+!*'()" : "$_.+!*'()") #define URL_SAFE_CHAR(ch) (isalnum (ch) || strchr (HTML_SAFE, ch)) #define COMMAND_PREFIX '@' diff -u -r --new-file texinfo-4.0/makeinfo/multi.c texinfo-4.0-db/makeinfo/multi.c --- texinfo-4.0/makeinfo/multi.c Tue Aug 17 17:06:56 1999 +++ texinfo-4.0-db/makeinfo/multi.c Thu Sep 28 15:51:14 2000 @@ -81,7 +81,7 @@ out_char (ch) int ch; { - if (html) + if (html || docbook) add_char (ch); else { @@ -103,7 +103,7 @@ { int i, j, s; - if (html) + if (html || docbook) { add_word ("

      "); return; @@ -163,6 +163,16 @@ current paragraph, so this is ok. */ if (html) add_word ("

      "); + else if (docbook) + { + int i; + docbook_begin_paragraph (); + add_word ("
      \n"); + add_word_args ("", ncolumns); + for (i=1; i<=ncolumns; i++) + add_word_args ("\n", envs[i].fill_column); + add_word ("\n"); + } if (hsep) draw_horizontal_separator (); @@ -390,6 +400,15 @@ first_row = 0; return; } + else if (docbook) + { + if (!first_row) + add_word ("\n"); + add_word (""); + first_row = 0; + return; + } + first_row = 0; if (current_env_no > 0) { @@ -505,6 +524,8 @@ if (html) add_word ("
      "); + else if (docbook) + add_word (" "); else nselect_next_environment (); @@ -516,7 +537,7 @@ void end_multitable () { - if (!html) + if (!html && !docbook) output_multitable_row (); /* Multitables cannot be nested. Otherwise, we'd have to save the @@ -529,6 +550,8 @@ if (html) add_word ("
      \n"); + else if (docbook) + add_word ("\n"); #if 0 printf (_("** Multicolumn output from last row:\n")); diff -u -r --new-file texinfo-4.0/makeinfo/node.c texinfo-4.0-db/makeinfo/node.c --- texinfo-4.0/makeinfo/node.c Mon Sep 20 08:31:21 1999 +++ texinfo-4.0-db/makeinfo/node.c Thu Sep 28 15:51:14 2000 @@ -19,6 +19,7 @@ #include "system.h" #include "cmds.h" +#include "docbook.h" #include "files.h" #include "footnote.h" #include "macro.h" @@ -461,6 +462,9 @@ int new_node_pos, defaulting, this_section; int no_warn = 0; + if (docbook) + docbook_must_insert_node_anchor = 1; + if (strcmp (command, "nwnode") == 0) no_warn = TAG_FLAG_NO_WARN; @@ -517,7 +521,7 @@ remember_itext (input_text, input_text_offset); no_indent = 1; - if (!no_headers && !html) + if (!no_headers && !html && !docbook) { add_word_args ("\037\nFile: %s, Node: ", pretty_output_filename); @@ -813,7 +817,7 @@ } } - else if (!no_headers) + else if (!no_headers && !docbook) { if (macro_expansion_output_stream) me_inhibit_expansion++; @@ -883,6 +887,8 @@ add_anchor_name (anchor, 0); add_word ("\">"); } + else if (docbook) + docbook_add_anchor (anchor); /* Save it in the tag table. */ remember_node (anchor, NULL, NULL, NULL, output_position + output_column, diff -u -r --new-file texinfo-4.0/makeinfo/sectioning.c texinfo-4.0-db/makeinfo/sectioning.c --- texinfo-4.0/makeinfo/sectioning.c Tue Aug 17 17:06:50 1999 +++ texinfo-4.0-db/makeinfo/sectioning.c Thu Sep 28 15:51:14 2000 @@ -21,6 +21,7 @@ #include "system.h" #include "cmds.h" +#include "docbook.h" #include "macro.h" #include "makeinfo.h" #include "node.h" @@ -231,6 +232,8 @@ if (html) sectioning_html (level, cmd); + else if (docbook) + docbook_begin_section (level,cmd); else { character = scoring_characters[level]; diff -u -r --new-file texinfo-4.0/po/texinfo.pot texinfo-4.0-db/po/texinfo.pot --- texinfo-4.0/po/texinfo.pot Sat Sep 25 12:11:12 1999 +++ texinfo-4.0-db/po/texinfo.pot Thu Sep 28 23:39:42 2000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-09-25 12:11-0400\n" +"POT-Creation-Date: 2000-09-28 23:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -231,7 +231,7 @@ msgid "Try --help for more information.\n" msgstr "" -#: info/info.c:267 makeinfo/makeinfo.c:616 util/install-info.c:1221 +#: info/info.c:267 makeinfo/makeinfo.c:626 util/install-info.c:1221 #: util/texindex.c:336 #, c-format msgid "" @@ -716,7 +716,7 @@ msgid "Move to the start of the line" msgstr "" -#: info/session.c:884 makeinfo/node.c:1092 +#: info/session.c:884 makeinfo/node.c:1098 msgid "Next" msgstr "" @@ -1378,83 +1378,83 @@ msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:448 msgid "January" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:448 msgid "February" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:448 msgid "March" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:448 msgid "April" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:448 msgid "May" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:449 msgid "June" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:449 msgid "July" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:449 msgid "August" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:449 msgid "September" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:449 msgid "October" msgstr "" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:450 msgid "November" msgstr "" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:450 msgid "December" msgstr "" -#: makeinfo/cmds.c:571 +#: makeinfo/cmds.c:584 #, c-format msgid "unlikely character %c in @var" msgstr "" -#: makeinfo/cmds.c:605 +#: makeinfo/cmds.c:618 msgid "@sc argument all uppercase, thus no effect" msgstr "" -#: makeinfo/cmds.c:754 +#: makeinfo/cmds.c:779 #, c-format msgid "%c%s is obsolete" msgstr "" -#: makeinfo/cmds.c:814 +#: makeinfo/cmds.c:839 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "" -#: makeinfo/cmds.c:1092 makeinfo/cmds.c:1118 makeinfo/footnote.c:80 +#: makeinfo/cmds.c:1117 makeinfo/cmds.c:1143 makeinfo/footnote.c:81 #, c-format msgid "Bad argument to %c%s" msgstr "" -#: makeinfo/cmds.c:1102 makeinfo/makeinfo.c:3678 +#: makeinfo/cmds.c:1127 makeinfo/makeinfo.c:3724 msgid "asis" msgstr "" -#: makeinfo/cmds.c:1104 makeinfo/makeinfo.c:3680 +#: makeinfo/cmds.c:1129 makeinfo/makeinfo.c:3726 msgid "none" msgstr "" @@ -1510,131 +1510,131 @@ msgid "%s: getwd: %s, %s\n" msgstr "" -#: makeinfo/footnote.c:149 +#: makeinfo/footnote.c:150 #, c-format msgid "`%c%s' needs an argument `{...}', not just `%s'" msgstr "" -#: makeinfo/footnote.c:164 +#: makeinfo/footnote.c:165 #, c-format msgid "No closing brace for footnote `%s'" msgstr "" -#: makeinfo/footnote.c:197 +#: makeinfo/footnote.c:198 msgid "Footnote defined without parent node" msgstr "" -#: makeinfo/footnote.c:278 +#: makeinfo/footnote.c:284 msgid "Footnotes" msgstr "" #. The should not have markup. -#: makeinfo/html.c:40 +#: makeinfo/html.c:41 msgid "Untitled" msgstr "" -#: makeinfo/index.c:212 +#: makeinfo/index.c:213 #, c-format msgid "Unknown index `%s'" msgstr "" -#: makeinfo/index.c:382 +#: makeinfo/index.c:383 #, c-format msgid "Index `%s' already exists" msgstr "" -#: makeinfo/index.c:425 +#: makeinfo/index.c:426 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "" -#: makeinfo/index.c:642 +#: makeinfo/index.c:643 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "" -#: makeinfo/index.c:680 +#: makeinfo/index.c:683 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "" -#: makeinfo/index.c:683 makeinfo/index.c:722 +#: makeinfo/index.c:686 makeinfo/index.c:725 msgid "(outside of any node)" msgstr "" -#: makeinfo/insertion.c:192 +#: makeinfo/insertion.c:193 msgid "Broken-Type in insertion_type_pname" msgstr "" -#: makeinfo/insertion.c:265 +#: makeinfo/insertion.c:266 msgid "Enumeration stack overflow" msgstr "" -#: makeinfo/insertion.c:297 +#: makeinfo/insertion.c:298 #, c-format msgid "lettering overflow, restarting at %c" msgstr "" -#: makeinfo/insertion.c:481 +#: makeinfo/insertion.c:487 #, c-format msgid "%s requires an argument: the formatter for %citem" msgstr "" -#: makeinfo/insertion.c:623 +#: makeinfo/insertion.c:638 #, c-format msgid "address@hidden' expected `%s', but saw `%s'" msgstr "" -#: makeinfo/insertion.c:797 +#: makeinfo/insertion.c:821 #, c-format msgid "No matching `%cend %s'" msgstr "" -#: makeinfo/insertion.c:902 +#: makeinfo/insertion.c:926 #, c-format msgid "%s requires letter or digit" msgstr "" -#: makeinfo/insertion.c:1046 +#: makeinfo/insertion.c:1070 msgid "@menu seen before first @node, creating `Top' node" msgstr "" -#: makeinfo/insertion.c:1047 +#: makeinfo/insertion.c:1071 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" #. Problems anyway, @detailmenu should always be inside @menu. -#: makeinfo/insertion.c:1059 +#: makeinfo/insertion.c:1083 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "" -#: makeinfo/insertion.c:1074 +#: makeinfo/insertion.c:1098 #, c-format msgid "Unmatched `%c%s'" msgstr "" -#: makeinfo/insertion.c:1081 +#: makeinfo/insertion.c:1105 #, c-format msgid "`%c%s' needs something after it" msgstr "" -#: makeinfo/insertion.c:1087 +#: makeinfo/insertion.c:1111 #, c-format msgid "Bad argument to `%s', `%s', using `%s'" msgstr "" -#: makeinfo/insertion.c:1175 +#: makeinfo/insertion.c:1199 #, c-format msgid "@%s not meaningful inside address@hidden' block" msgstr "" -#: makeinfo/insertion.c:1184 +#: makeinfo/insertion.c:1208 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "" -#: makeinfo/insertion.c:1357 +#: makeinfo/insertion.c:1399 #, c-format msgid "%c%s found outside of an insertion block" msgstr "" @@ -1690,26 +1690,26 @@ msgid "mismatched @end %s with @%s" msgstr "" -#: makeinfo/makeinfo.c:308 +#: makeinfo/makeinfo.c:309 #, c-format msgid "%s:%d: warning: " msgstr "" -#: makeinfo/makeinfo.c:331 +#: makeinfo/makeinfo.c:332 msgid "Too many errors! Gave up.\n" msgstr "" -#: makeinfo/makeinfo.c:342 makeinfo/makeinfo.c:1802 +#: makeinfo/makeinfo.c:343 makeinfo/makeinfo.c:1834 #, c-format msgid "Misplaced %c" msgstr "" -#: makeinfo/makeinfo.c:362 +#: makeinfo/makeinfo.c:363 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: makeinfo/makeinfo.c:365 +#: makeinfo/makeinfo.c:366 #, c-format msgid "" "Usage: %s [OPTION]... TEXINFO-FILE...\n" @@ -1740,7 +1740,7 @@ " implies --no-split.\n" msgstr "" -#: makeinfo/makeinfo.c:391 +#: makeinfo/makeinfo.c:392 #, c-format msgid "" " --no-headers suppress Info node separators and Node: lines " @@ -1768,7 +1768,7 @@ " --version display version information and exit.\n" msgstr "" -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:416 msgid "" "\n" "The defaults for the @if... conditionals depend on the output format:\n" @@ -1786,298 +1786,298 @@ "general questions and discussion to address@hidden" msgstr "" -#: makeinfo/makeinfo.c:508 makeinfo/makeinfo.c:531 makeinfo/makeinfo.c:592 +#: makeinfo/makeinfo.c:518 makeinfo/makeinfo.c:541 makeinfo/makeinfo.c:602 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:521 +#: makeinfo/makeinfo.c:531 #, c-format msgid "Couldn't open macro expansion output `%s'" msgstr "" -#: makeinfo/makeinfo.c:524 +#: makeinfo/makeinfo.c:534 msgid "Cannot specify more than one macro expansion output" msgstr "" -#: makeinfo/makeinfo.c:561 +#: makeinfo/makeinfo.c:571 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:602 +#: makeinfo/makeinfo.c:612 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:647 +#: makeinfo/makeinfo.c:657 #, c-format msgid "%s: missing file argument.\n" msgstr "" -#: makeinfo/makeinfo.c:810 +#: makeinfo/makeinfo.c:820 #, c-format msgid "Expected `%s'" msgstr "" -#: makeinfo/makeinfo.c:1229 +#: makeinfo/makeinfo.c:1239 #, c-format msgid "No `%s' found in `%s'" msgstr "" -#: makeinfo/makeinfo.c:1306 +#: makeinfo/makeinfo.c:1316 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" -#: makeinfo/makeinfo.c:1327 +#: makeinfo/makeinfo.c:1337 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:1358 +#: makeinfo/makeinfo.c:1372 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "" -#: makeinfo/makeinfo.c:1377 +#: makeinfo/makeinfo.c:1396 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" msgstr "" #. If there were errors, and no --force, remove the output. -#: makeinfo/makeinfo.c:1420 +#: makeinfo/makeinfo.c:1446 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" -#: makeinfo/makeinfo.c:1635 +#: makeinfo/makeinfo.c:1661 #, c-format msgid "Unknown command `%s'" msgstr "" -#: makeinfo/makeinfo.c:1657 +#: makeinfo/makeinfo.c:1683 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "" -#: makeinfo/makeinfo.c:1838 +#: makeinfo/makeinfo.c:1870 #, c-format msgid "%c%s expected `{...}'" msgstr "" -#: makeinfo/makeinfo.c:1868 +#: makeinfo/makeinfo.c:1900 msgid "Unmatched }" msgstr "" -#: makeinfo/makeinfo.c:1918 +#: makeinfo/makeinfo.c:1950 msgid "NO_NAME!" msgstr "" -#: makeinfo/makeinfo.c:1940 +#: makeinfo/makeinfo.c:1972 #, c-format msgid "%c%s missing close brace" msgstr "" -#: makeinfo/makeinfo.c:2707 makeinfo/makeinfo.c:2884 +#: makeinfo/makeinfo.c:2744 makeinfo/makeinfo.c:2930 msgid "see " msgstr "" -#: makeinfo/makeinfo.c:2707 +#: makeinfo/makeinfo.c:2744 msgid "See " msgstr "" -#: makeinfo/makeinfo.c:2836 +#: makeinfo/makeinfo.c:2882 #, c-format msgid "`.' or `,' must follow cross reference, not %c" msgstr "" -#: makeinfo/makeinfo.c:3026 +#: makeinfo/makeinfo.c:3072 #, c-format msgid "No .png or .jpg for `%s'" msgstr "" -#: makeinfo/makeinfo.c:3063 +#: makeinfo/makeinfo.c:3109 #, c-format msgid "@image file `%s' unreadable: %s" msgstr "" -#: makeinfo/makeinfo.c:3070 +#: makeinfo/makeinfo.c:3116 msgid "@image missing filename argument" msgstr "" -#: makeinfo/makeinfo.c:3259 +#: makeinfo/makeinfo.c:3305 #, c-format msgid "{No value for `%s'}" msgstr "" -#: makeinfo/makeinfo.c:3313 +#: makeinfo/makeinfo.c:3359 #, c-format msgid "%c%s requires a name" msgstr "" -#: makeinfo/makeinfo.c:3421 +#: makeinfo/makeinfo.c:3467 #, c-format msgid "Reached eof before matching @end %s" msgstr "" -#: makeinfo/multi.c:208 +#: makeinfo/multi.c:218 msgid "Missing } in @multitable template" msgstr "" -#: makeinfo/multi.c:284 +#: makeinfo/multi.c:294 #, c-format msgid "ignoring stray text `%s' after @multitable" msgstr "" -#: makeinfo/multi.c:357 +#: makeinfo/multi.c:367 #, c-format msgid "Too many columns in multitable item (max %d)" msgstr "" -#: makeinfo/multi.c:401 +#: makeinfo/multi.c:420 #, c-format msgid "Cannot select column #%d in multitable" msgstr "" -#: makeinfo/multi.c:504 +#: makeinfo/multi.c:523 msgid "ignoring @tab outside of multitable" msgstr "" -#: makeinfo/multi.c:534 +#: makeinfo/multi.c:557 msgid "** Multicolumn output from last row:\n" msgstr "" -#: makeinfo/multi.c:537 +#: makeinfo/multi.c:560 #, c-format msgid "* column #%d: output = %s\n" msgstr "" -#: makeinfo/node.c:250 +#: makeinfo/node.c:251 #, c-format msgid "Node `%s' previously defined at line %d" msgstr "" -#: makeinfo/node.c:514 +#: makeinfo/node.c:518 #, c-format msgid "Formatting node %s...\n" msgstr "" -#: makeinfo/node.c:559 +#: makeinfo/node.c:563 #, c-format msgid "Node `%s' requires a sectioning command (e.g. %c%s)" msgstr "" -#: makeinfo/node.c:719 +#: makeinfo/node.c:723 #, c-format msgid "No node name specified for `%c%s' command" msgstr "" -#: makeinfo/node.c:774 +#: makeinfo/node.c:778 msgid "Node:" msgstr "" -#: makeinfo/node.c:783 makeinfo/sectioning.c:528 +#: makeinfo/node.c:787 makeinfo/sectioning.c:531 msgid "Next:" msgstr "" -#: makeinfo/node.c:793 +#: makeinfo/node.c:797 msgid "Previous:" msgstr "" -#: makeinfo/node.c:803 +#: makeinfo/node.c:807 msgid "Up:" msgstr "" -#: makeinfo/node.c:1012 +#: makeinfo/node.c:1018 #, c-format msgid "%s reference to nonexistent node `%s'" msgstr "" -#: makeinfo/node.c:1029 +#: makeinfo/node.c:1035 msgid "Menu" msgstr "" -#: makeinfo/node.c:1031 +#: makeinfo/node.c:1037 msgid "Cross" msgstr "" -#: makeinfo/node.c:1115 +#: makeinfo/node.c:1121 #, c-format msgid "Next field of node `%s' not pointed to" msgstr "" -#: makeinfo/node.c:1119 +#: makeinfo/node.c:1125 #, c-format msgid "This node (%s) has the bad Prev" msgstr "" -#: makeinfo/node.c:1133 +#: makeinfo/node.c:1139 msgid "Prev" msgstr "" -#: makeinfo/node.c:1176 +#: makeinfo/node.c:1182 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "" -#: makeinfo/node.c:1180 +#: makeinfo/node.c:1186 #, c-format msgid "This node (%s) has the bad Next" msgstr "" -#: makeinfo/node.c:1194 +#: makeinfo/node.c:1200 #, c-format msgid "`%s' has no Up field" msgstr "" -#: makeinfo/node.c:1197 +#: makeinfo/node.c:1203 msgid "Up" msgstr "" -#: makeinfo/node.c:1265 +#: makeinfo/node.c:1271 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" -#: makeinfo/node.c:1296 +#: makeinfo/node.c:1302 #, c-format msgid "node `%s' has been referenced %d times" msgstr "" -#: makeinfo/node.c:1310 +#: makeinfo/node.c:1316 #, c-format msgid "unreferenced node `%s'" msgstr "" -#: makeinfo/sectioning.c:116 +#: makeinfo/sectioning.c:117 #, c-format msgid "Appendix %c " msgstr "" #. should never happen, but a poor guy, named Murphy ... -#: makeinfo/sectioning.c:328 makeinfo/sectioning.c:410 +#: makeinfo/sectioning.c:331 makeinfo/sectioning.c:413 #, c-format msgid "Internal error (search_sectioning) \"%s\"!" msgstr "" -#: makeinfo/sectioning.c:468 +#: makeinfo/sectioning.c:471 #, c-format msgid "%c%s is obsolete; use %c%s instead" msgstr "" -#: makeinfo/sectioning.c:484 +#: makeinfo/sectioning.c:487 #, c-format msgid "Node with %ctop as a section already exists" msgstr "" -#: makeinfo/sectioning.c:496 +#: makeinfo/sectioning.c:499 #, c-format msgid "Here is the %ctop node" msgstr "" -#: makeinfo/sectioning.c:515 +#: makeinfo/sectioning.c:518 #, c-format msgid "%ctop used before %cnode, defaulting to %s" msgstr ""