[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog po_document/de.us-ascii.po po...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo ChangeLog po_document/de.us-ascii.po po... |
|
Date: |
Sun, 24 Oct 2010 22:52:52 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/10/24 22:52:52
Modified files:
. : ChangeLog
po_document : de.us-ascii.po es.us-ascii.po fr.us-ascii.po
hu.po it.po ja.po nl.us-ascii.po no.us-ascii.po
pt.us-ascii.po pt_BR.us-ascii.po
texi2html/formats: info.init
tp : TODO
tp/Texinfo : Parser.pm
Log message:
* texi2html/formats/info.init (info_default_normal_text):
upper case @var even when producing utf8. Report from Karl.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1162&r2=1.1163
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/de.us-ascii.po?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/es.us-ascii.po?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/fr.us-ascii.po?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/hu.po?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/it.po?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/ja.po?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/nl.us-ascii.po?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/no.us-ascii.po?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/pt.us-ascii.po?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/pt_BR.us-ascii.po?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/info.init?cvsroot=texinfo&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.109&r2=1.110
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1162
retrieving revision 1.1163
diff -u -b -r1.1162 -r1.1163
--- ChangeLog 24 Oct 2010 17:51:43 -0000 1.1162
+++ ChangeLog 24 Oct 2010 22:52:51 -0000 1.1163
@@ -2,6 +2,8 @@
* texi2html/texi2html.pl (%index_names): remove the 'prefixes' key,
it isn't useful.
+ * texi2html/formats/info.init (info_default_normal_text):
+ upper case @var even when producing utf8. Report from Karl.
2010-10-15 Karl Berry <address@hidden>
Index: po_document/de.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/de.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/de.us-ascii.po 24 Oct 2010 17:51:44 -0000 1.21
+++ po_document/de.us-ascii.po 24 Oct 2010 22:52:52 -0000 1.22
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-10-24 18:43+0200\n"
+"POT-Creation-Date: 2010-10-24 23:56+0200\n"
"PO-Revision-Date: 2008-03-19\n"
"Last-Translator: Reinhold Kainhofer <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -603,7 +603,7 @@
msgid "The node you are looking for is at {href}."
msgstr "Der Knoten, den Sie sehen, befindet sich bei {href}"
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2806
+#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
@@ -621,7 +621,7 @@
msgid "Jump to"
msgstr "Springe zu"
-#: texi2html/formats/info.init:3127
+#: texi2html/formats/info.init:3129
msgid "(outside of any node)"
msgstr ""
Index: po_document/es.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/es.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/es.us-ascii.po 24 Oct 2010 17:51:44 -0000 1.21
+++ po_document/es.us-ascii.po 24 Oct 2010 22:52:52 -0000 1.22
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-10-24 18:43+0200\n"
+"POT-Creation-Date: 2010-10-24 23:56+0200\n"
"PO-Revision-Date: 2008-08-28\n"
"Last-Translator: Francisco Vila <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -604,7 +604,7 @@
msgid "The node you are looking for is at {href}."
msgstr "El nodo que busca se encuentra en {href}."
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2806
+#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
@@ -622,7 +622,7 @@
msgid "Jump to"
msgstr "Saltar a"
-#: texi2html/formats/info.init:3127
+#: texi2html/formats/info.init:3129
msgid "(outside of any node)"
msgstr ""
Index: po_document/fr.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/fr.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/fr.us-ascii.po 24 Oct 2010 17:51:44 -0000 1.21
+++ po_document/fr.us-ascii.po 24 Oct 2010 22:52:52 -0000 1.22
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-10-24 18:43+0200\n"
+"POT-Creation-Date: 2010-10-24 23:56+0200\n"
"PO-Revision-Date: 2008-07-20\n"
"Last-Translator: Jean-Charles Malahieude <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -602,7 +602,7 @@
msgid "The node you are looking for is at {href}."
msgstr "Le address@hidden que vous recherchez est ici@ : {href}."
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2806
+#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
@@ -620,7 +620,7 @@
msgid "Jump to"
msgstr "Aller @`a"
-#: texi2html/formats/info.init:3127
+#: texi2html/formats/info.init:3129
msgid "(outside of any node)"
msgstr ""
Index: po_document/hu.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/hu.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/hu.po 24 Oct 2010 17:51:44 -0000 1.21
+++ po_document/hu.po 24 Oct 2010 22:52:52 -0000 1.22
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-10-24 18:43+0200\n"
+"POT-Creation-Date: 2010-10-24 23:56+0200\n"
"PO-Revision-Date: 2009-12-27 22:02+0100\n"
"Last-Translator: Harmath Dénes <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -604,7 +604,7 @@
msgid "The node you are looking for is at {href}."
msgstr "A keresett csomópont itt található: {href}."
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2806
+#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
@@ -622,7 +622,7 @@
msgid "Jump to"
msgstr "Ugorj ide"
-#: texi2html/formats/info.init:3127
+#: texi2html/formats/info.init:3129
msgid "(outside of any node)"
msgstr "(bármelyik csomóponton kÃvül)"
Index: po_document/it.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/it.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/it.po 24 Oct 2010 17:51:44 -0000 1.21
+++ po_document/it.po 24 Oct 2010 22:52:52 -0000 1.22
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-10-24 18:43+0200\n"
+"POT-Creation-Date: 2010-10-24 23:56+0200\n"
"PO-Revision-Date: 2009-12-27 22:02+0100\n"
"Last-Translator: Federico Bruni <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -603,7 +603,7 @@
msgid "The node you are looking for is at {href}."
msgstr "Il nodo che stai cercando è {href}"
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2806
+#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
@@ -621,7 +621,7 @@
msgid "Jump to"
msgstr "Salta a"
-#: texi2html/formats/info.init:3127
+#: texi2html/formats/info.init:3129
msgid "(outside of any node)"
msgstr "(fuori da qualsiasi nodo)"
Index: po_document/ja.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/ja.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/ja.po 24 Oct 2010 17:51:44 -0000 1.21
+++ po_document/ja.po 24 Oct 2010 22:52:52 -0000 1.22
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-10-24 18:43+0200\n"
+"POT-Creation-Date: 2010-10-24 23:56+0200\n"
"PO-Revision-Date: 2007-02-05\n"
"Last-Translator: Unknown\n"
"Language-Team: Unknown\n"
@@ -595,7 +595,7 @@
msgid "The node you are looking for is at {href}."
msgstr ""
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2806
+#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
@@ -613,7 +613,7 @@
msgid "Jump to"
msgstr "移å"
-#: texi2html/formats/info.init:3127
+#: texi2html/formats/info.init:3129
msgid "(outside of any node)"
msgstr ""
Index: po_document/nl.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/nl.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/nl.us-ascii.po 24 Oct 2010 17:51:44 -0000 1.21
+++ po_document/nl.us-ascii.po 24 Oct 2010 22:52:52 -0000 1.22
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-10-24 18:43+0200\n"
+"POT-Creation-Date: 2010-10-24 23:56+0200\n"
"PO-Revision-Date: 2001-01-01\n"
"Last-Translator: Unknown\n"
"Language-Team: Unknown\n"
@@ -590,7 +590,7 @@
msgid "The node you are looking for is at {href}."
msgstr ""
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2806
+#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
@@ -608,7 +608,7 @@
msgid "Jump to"
msgstr ""
-#: texi2html/formats/info.init:3127
+#: texi2html/formats/info.init:3129
msgid "(outside of any node)"
msgstr ""
Index: po_document/no.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/no.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/no.us-ascii.po 24 Oct 2010 17:51:44 -0000 1.21
+++ po_document/no.us-ascii.po 24 Oct 2010 22:52:52 -0000 1.22
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-10-24 18:43+0200\n"
+"POT-Creation-Date: 2010-10-24 23:56+0200\n"
"PO-Revision-Date: 2001-01-01\n"
"Last-Translator: Unknown\n"
"Language-Team: Unknown\n"
@@ -590,7 +590,7 @@
msgid "The node you are looking for is at {href}."
msgstr ""
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2806
+#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
@@ -608,7 +608,7 @@
msgid "Jump to"
msgstr ""
-#: texi2html/formats/info.init:3127
+#: texi2html/formats/info.init:3129
msgid "(outside of any node)"
msgstr ""
Index: po_document/pt.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/pt.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/pt.us-ascii.po 24 Oct 2010 17:51:44 -0000 1.21
+++ po_document/pt.us-ascii.po 24 Oct 2010 22:52:52 -0000 1.22
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-10-24 18:43+0200\n"
+"POT-Creation-Date: 2010-10-24 23:56+0200\n"
"PO-Revision-Date: 2006-01-09\n"
"Last-Translator: Jorge Barros de Abreu <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -604,7 +604,7 @@
msgid "The node you are looking for is at {href}."
msgstr "O nodo que address@hidden est@'a olhando est@'a em {href}."
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2806
+#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
@@ -622,7 +622,7 @@
msgid "Jump to"
msgstr "Pular para"
-#: texi2html/formats/info.init:3127
+#: texi2html/formats/info.init:3129
msgid "(outside of any node)"
msgstr ""
Index: po_document/pt_BR.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/pt_BR.us-ascii.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po_document/pt_BR.us-ascii.po 24 Oct 2010 17:51:44 -0000 1.21
+++ po_document/pt_BR.us-ascii.po 24 Oct 2010 22:52:52 -0000 1.22
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-10-24 18:43+0200\n"
+"POT-Creation-Date: 2010-10-24 23:56+0200\n"
"PO-Revision-Date: 2006-01-09\n"
"Last-Translator: Jorge Barros de Abreu <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -604,7 +604,7 @@
msgid "The node you are looking for is at {href}."
msgstr "O nodo que address@hidden est@'a olhando est@'a em {href}."
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2806
+#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
@@ -622,7 +622,7 @@
msgid "Jump to"
msgstr "Pular para"
-#: texi2html/formats/info.init:3127
+#: texi2html/formats/info.init:3129
msgid "(outside of any node)"
msgstr ""
Index: texi2html/formats/info.init
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/formats/info.init,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- texi2html/formats/info.init 25 Sep 2010 14:34:32 -0000 1.59
+++ texi2html/formats/info.init 24 Oct 2010 22:52:52 -0000 1.60
@@ -2409,6 +2409,9 @@
my $style_stack = shift;
my $state = shift;
+ # This is always done here since it is not done in t2h_utf8_normal_text
+ $text = uc($text) if (in_cmd($style_stack, 'var'));
+
# ENCODING_NAME should be defined, but maybe
# not when parsing commands in first or second pass, and removing texi
# like what is done for @setfilename.
@@ -2420,7 +2423,6 @@
{
#print STDERR "info_default_normal_text $text $in_preformatted $in_code
\n";
$text = uc($text) if (in_cmd($style_stack, 'sc'));
- $text = uc($text) if (in_cmd($style_stack, 'var'));
if (! $in_code and !$in_preformatted)
{
$text =~ s/---/\x{1F}/g;
Index: tp/TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- tp/TODO 24 Oct 2010 20:13:36 -0000 1.41
+++ tp/TODO 24 Oct 2010 22:52:52 -0000 1.42
@@ -4,6 +4,10 @@
should be closed and give an error message.
This is certainly only an issue for @footnote and similar not a general issue.
+There is no forward looking code anymore, so maybe a lex/yacc parser
+could be used for the main loop. More simply, a binary tokenizer, at
+least, could make for a notable speedup.
+
Following should be an error:
@example
@heading A heading
Index: tp/Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- tp/Texinfo/Parser.pm 24 Oct 2010 20:28:43 -0000 1.109
+++ tp/Texinfo/Parser.pm 24 Oct 2010 22:52:52 -0000 1.110
@@ -68,22 +68,67 @@
return &{$parser->{'gettext'}}(@_);
}
+# these are the default values for the parser state that may be
+# initialized to values given by the user.
my %default_configuration = (
'test' => 0,
'debug' => 0,
'gettext' => sub {return $_[0];},
- 'context' => '_root',
- 'aliases' => {},
- 'indices' => [],
- 'values' => {},
- 'macros' => {},
'expanded_formats' => [],
'include_directories' => [ '.' ],
+ # this is the initial context. It is put at the bottom of the
+ # 'context_stack'
+ 'context' => '_root',
+ # these are the user-added indices. May be an array reference on names
+ # or an hash reference in the same format than %index_names below
+ 'indices' => [],
+ # the following are dynamically modified during the document parsing.
+ 'aliases' => {}, # key is a command name value is the alias
+ 'values' => {}, # the key is the name, the value the @set name
+ # argument
+ 'macros' => {}, # the key is the user-defined macro name. The
+ # value is the reference on a macro element
+ # as obtained by parsing the @macro
'clickstyle' => 'arrow',
- 'sections_level' => 0,
- 'merged_indices' => {}
+ 'sections_level' => 0, # modified by raise/lowersections
+ 'merged_indices' => {}, # the key is merged in the value
);
+# the other possible keys for the parser state are:
+#
+# expanded_formats_hash each key comes from expanded_formats value is 1
+# index_names a structure holding the link between index
+# names and prefixes
+# see the initial value as %index_names below.
+# context_stack stack of the contexts, more recent on top.
+# 'line' is added when on a line or
+# block @-command line,
+# 'def' is added instead if on a definition line.
+# 'preformatted' is added in block commands
+# where there is no paragraphs and spaces are kept
+# (format, example, display...)
+# 'menu' is added in menu commands
+# 'math', 'footnote', 'caption', 'shortcaption' are
+# also added when in those commands
+# conditionals_stack a stack of conditional commands that are expanded.
+# definfoenclose an hash, key is the command name, value is an array
+# reference with 2 values, beginning and ending.
+# encoding Current encoding set by @documentencoding
+# input a stack, with last at bottom. Holds the opened files
+# or text. Pending macro expansion or text expansion
+# is also in that structure
+# misc_commands the same than %misc_commands below, but with index
+# entry commands dynamically added
+# no_paragraph_commands the same than %default_no_paragraph_commands
+# below, with index
+# entry commands dynamically added
+# simple_text_commands the same than %simple_text_commands below, but
+# with index entry commands dynamically added
+# errors_warnings a structure with the errors and warnings.
+# error_nrs number of errors.
+
+
+
my %no_brace_commands; # commands never taking braces
foreach my $no_brace_command ('*',' ',"\t","\n",'-', '|', '/',':','!',
@@ -94,6 +139,26 @@
# commands taking a line as argument or no argument.
# sectioning commands and def* commands are added below.
# index commands are added dynamically.
+#
+# The values signification is:
+# special: no value and macro expansion, all the line is used, and
+# analysed during parsing (_parse_special_misc_command)
+# lineraw: no value and macro expansion, the line is kept as-is, not
+# analysed
+# skipline: no argument, everything else on the line is skipped
+# skipspace: no argument, following spaces are skipped.
+# noarg: no argument
+# text: the line is parsed as texinfo, and the argument is converted
+# to simple text
+# line: the line is parsed as texinfo
+# a number: the line is parsed as texinfo and the result should be plain
+# text maybe followed by a comment; the result is analysed
+# during parsing (_parse_line_command_args).
+# The number is an indication of the number of arguments of
+# the command.
+#
+# Beware that @item and @itemx may be like 'line' or 'skipspace' depending
+# on the context.
my %misc_commands = (
'node' => 'line', # special arg
'bye' => 'skipline', # no arg
@@ -147,14 +212,14 @@
# interacts with setchapternewpage
'setchapternewpage' => 1, # off on odd
- # FIXME for the following the @this* commands are not defined. Also
- # @value and maybe macro invocations may also be delayed.
+ # only relevant in TeX, and special
'everyheading' => 'lineraw', # @*heading @*footing use @|
'everyfooting' => 'lineraw', # + @thispage @thissectionname
'evenheading' => 'lineraw', # @thissectionnum @thissection
'evenfooting' => 'lineraw', # @thischaptername @thischapternum
'oddheading' => 'lineraw', # @thischapter @thistitle @thisfile
'oddfooting' => 'lineraw',
+
'smallbook' => 'skipline', # no arg
'syncodeindex' => 2, # args are index identifiers
'synindex' => 2,
@@ -203,7 +268,7 @@
'allow-recursion' => 'skipline',
);
-# command with braces. value is the max number of arguments.
+# command with braces. Value is the max number of arguments.
my %brace_commands;
# accent commands. They may be called with and without braces.
@@ -260,10 +325,6 @@
$no_paragraph_contexts{$no_paragraph_context} = 1;
};
-my %menu_commands;
-foreach my $menu_command ('menu', 'detailmenu', 'direntry') {
- $menu_commands{$menu_command} = 1;
-};
# commands delimiting blocks, with an @end.
@@ -277,6 +338,7 @@
# commands that forces closing an opened paragraph.
my %close_paragraph_commands;
+# the type of index, f: function, v: variable, t: type
my %index_type_def = (
'f' => ['deffn', 'deftypefn', 'deftypeop', 'defop'],
'v' => ['defvr', 'deftypevr', 'defcv', 'deftypecv' ],
@@ -291,7 +353,9 @@
}
my %def_map = (
- # basic commands
+ # basic commands.
+ # 'arg' and 'argtype' are for everything appearing after the other
+ # arguments.
'deffn', [ 'category', 'name', 'arg' ],
'defvr', [ 'category', 'name' ],
'deftypefn', [ 'category', 'type', 'name', 'argtype' ],
@@ -350,8 +414,14 @@
$block_commands{'multitable'} = 'multitable';
$block_item_commands{'multitable'} = 1;
+# block commands in which menu entry and menu comments appear
+my %menu_commands;
+foreach my $menu_command ('menu', 'detailmenu', 'direntry') {
+ $menu_commands{$menu_command} = 1;
+ $block_commands{$menu_command} = 0;
+};
+
foreach my $block_command(
- 'menu', 'detailmenu', 'direntry',
'cartouche', 'group', 'raggedright', 'flushleft', 'flushright',
'titlepage', 'copying', 'documentdescription') {
$block_commands{$block_command} = 0;
@@ -366,7 +436,7 @@
}
my @out_formats = ('html', 'tex', 'xml', 'docbook');
-# macro is special
+# macro/rmacro are special
foreach my $raw_command (@out_formats, 'verbatim',
'ignore', 'macro', 'rmacro') {
$block_commands{$raw_command} = 'raw';
@@ -411,8 +481,9 @@
'quote-arg' => N__('arguments are quoted by default'),
);
-my %forbidden_index_name = ();
-
+# key is index name, keys of the reference value are the prefixes.
+# value associated with the prefix is 0 if the prefix is not a code-like
+# prefix, 1 if it is a code-like prefix (set by defcodeindex/syncodeindex).
my %index_names = (
'cp' => {'cp' => 0,'c' => 0},
'fn' => {'fn' => 1, 'f' => 1},
@@ -422,6 +493,9 @@
'tp' => {'tp' => 1, 't' => 1}
);
+# index names that cannot be set by the user.
+my %forbidden_index_name = ();
+
foreach my $name(keys(%index_names)) {
foreach my $prefix (keys %{$index_names{$name}}) {
$forbidden_index_name{$prefix} = 1;
@@ -435,7 +509,7 @@
# commands that should only appear at the root level and contain up to
-# the next root command
+# the next root command. @node and sectioning commands.
my %root_commands;
foreach my $sectioning_command (
- texinfo ChangeLog po_document/de.us-ascii.po po...,
Patrice Dumas <=