[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/XM...
From: |
Patrice Dumas |
Subject: |
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/XM... |
Date: |
Mon, 27 Aug 2012 00:38:48 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/08/27 00:38:48
Modified files:
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: XML.pm
tp/t : 21multitable.t
tp/t/results/converters_tests: complex_nestings.pl
table_in_display_in_example.pl
table_in_example_in_display.pl
tp/t/results/coverage: item_container.pl multitable.pl
preformatted.pl
punctuation_in_line_commands.pl table.pl
table_command_comment.pl
tp/t/results/menu: block_commands_in_menu_description.pl
formats_in_menu.pl
tp/t/results/multitable: empty_item_tab.pl
inter_item_commands_in_multitable.pl
multitable_in_example.pl
multitable_with_empty_item_tab.pl
paragraph_in_cells.pl
w_in_multitable.pl
tp/t/results/xml_tests: comments_on_block_command_lines.pl
image_inline_or_not.pl
tp/t/results/xtable: accent_on_table_line.pl
block_commands_in_table.pl
comment_and_itemx_before_item.pl
definfoenclose_on_table_line.pl
empty_item_itemx.pl
inter_item_commands_in_table.pl
inter_item_commands_in_table_in_example.pl
long_item.pl table_nested.pl
tp/tests/layout/res_parser/formatting_xml: formatting.xml
Added files:
tp/t/results/multitable: not_letters_in_prototype.pl
Log message:
Keep spaces for @item/@tab too.
Handle correctly characters not matching \w in multitable prototypes.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.391&r2=1.392
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/21multitable.t?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/complex_nestings.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/table_in_display_in_example.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/table_in_example_in_display.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table_command_comment.pl?cvsroot=texinfo&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/formats_in_menu.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/empty_item_tab.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_in_example.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_with_empty_item_tab.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/paragraph_in_cells.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/w_in_multitable.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/not_letters_in_prototype.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/accent_on_table_line.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/block_commands_in_table.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/comment_and_itemx_before_item.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/empty_item_itemx.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/long_item.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/table_nested.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml?cvsroot=texinfo&r1=1.9&r2=1.10
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -b -r1.391 -r1.392
--- Texinfo/Parser.pm 26 Aug 2012 14:15:01 -0000 1.391
+++ Texinfo/Parser.pm 27 Aug 2012 00:38:45 -0000 1.392
@@ -2780,7 +2780,11 @@
'type' => 'row_prototype' } unless ($prototype eq
'');
}
}
- foreach my $prototype_or_space (split /\b/, $content->{'text'}) {
+ # The regexp breaks between characters, with a non space followed
+ # by a space or a space followed by non space. It is like \b, but
+ # for \s \S, and not \w \W.
+ foreach my $prototype_or_space (split /(?<=\S)(?=\s)|(?=\S)(?<=\s)/,
+ $content->{'text'}) {
if ($prototype_or_space =~ /\S/) {
push @prototype_line, {'text' => $prototype_or_space,
'type' => 'row_prototype' };
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- Texinfo/Convert/XML.pm 26 Aug 2012 15:27:32 -0000 1.73
+++ Texinfo/Convert/XML.pm 27 Aug 2012 00:38:45 -0000 1.74
@@ -537,7 +537,7 @@
and $root->{'parent'}->{'cmdname'}
and ($root->{'parent'}->{'cmdname'} eq 'itemize'
or $root->{'parent'}->{'cmdname'} eq 'enumerate')) {
- $result .= "<listitem>";
+ $result .= "<listitem"._leading_spaces($root).">";
if ($root->{'parent'}->{'cmdname'} eq 'itemize'
and $root->{'parent'}->{'extra'}
and $root->{'parent'}->{'extra'}->{'block_command_line_contents'}
@@ -561,7 +561,7 @@
$attribute
=
$self->_infoenclose_attribute($table_command->{'extra'}->{'command_as_argument'});
}
- $result .= "<$root->{'cmdname'}>";
+ $result .= "<$root->{'cmdname'}"._leading_spaces($root).">";
if ($format_item_command) {
$result .= "<itemformat
command=\"$format_item_command\"${attribute}>";
}
@@ -602,7 +602,8 @@
.Texinfo::Parser::_print_current($root);
}
- $result .= "<entry command=\"$root->{'cmdname'}\">";
+ $result .= "<entry command=\"$root->{'cmdname'}\""
+ ._leading_spaces($root).">";
unshift @close_elements, 'entry';
}
} elsif ($root->{'type'} and $root->{'type'} eq 'index_entry_command') {
Index: t/21multitable.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/21multitable.t,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/21multitable.t 12 Jan 2012 00:03:43 -0000 1.10
+++ t/21multitable.t 27 Aug 2012 00:38:46 -0000 1.11
@@ -3,6 +3,11 @@
require 't/test_utils.pl';
my @test_cases = (
+['not_letters_in_prototype',
+'@multitable 1.3 5-6
address@hidden 1.3 @tab 5-6
address@hidden multitable
+'],
['paragraph_in_cells',
'@multitable {AAA} {BBB}
@item truc @tab bidule
Index: t/results/converters_tests/complex_nestings.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/complex_nestings.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/complex_nestings.pl 26 Aug 2012 14:15:11
-0000 1.5
+++ t/results/converters_tests/complex_nestings.pl 27 Aug 2012 00:38:46
-0000 1.6
@@ -1629,11 +1629,11 @@
A table within the def
</pre><table commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat
command="asis">item</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat
command="asis">item</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">text
more text
-</pre></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis">second item</itemformat></item>
+</pre></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="asis">second item</itemformat></item>
</tableterm></tableentry></table>
<pre xml:space="preserve">
explanation
Index: t/results/converters_tests/table_in_display_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/table_in_display_in_example.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/converters_tests/table_in_display_in_example.pl 24 Aug 2012
16:43:18 -0000 1.3
+++ t/results/converters_tests/table_in_display_in_example.pl 27 Aug 2012
00:38:46 -0000 1.4
@@ -396,7 +396,7 @@
$result_converted{'xml'}->{'table_in_display_in_example'} = '<example>
<display>
<table commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat
command="asis">item</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat
command="asis">item</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">Line
</pre></tableitem></tableentry></table>
</display>
Index: t/results/converters_tests/table_in_example_in_display.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/table_in_example_in_display.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/converters_tests/table_in_example_in_display.pl 24 Aug 2012
16:43:18 -0000 1.3
+++ t/results/converters_tests/table_in_example_in_display.pl 27 Aug 2012
00:38:46 -0000 1.4
@@ -396,7 +396,7 @@
$result_converted{'xml'}->{'table_in_example_in_display'} = '<display>
<example>
<table commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat
command="asis">item</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat
command="asis">item</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">Line
</pre></tableitem></tableentry></table>
</example>
Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- t/results/coverage/item_container.pl 24 Aug 2012 16:43:20 -0000
1.50
+++ t/results/coverage/item_container.pl 27 Aug 2012 00:38:46 -0000
1.51
@@ -513,7 +513,7 @@
$result_converted{'xml'}->{'item_container'} = '
<itemize spaces=" "><itemprepend>+</itemprepend>
-<listitem><prepend>+</prepend><para>i&textndash;tem +
+<listitem spaces=" "><prepend>+</prepend><para>i&textndash;tem +
</para></listitem></itemize>
<itemize commandarg="bullet" spaces=" "><itemprepend>•</itemprepend>
@@ -522,7 +522,7 @@
</para></listitem></itemize>
<itemize commandarg="bullet">
-<listitem><prepend>•</prepend><para>no itemize argument
+<listitem spaces=" "><prepend>•</prepend><para>no itemize argument
</para></listitem></itemize>
';
Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- t/results/coverage/multitable.pl 26 Aug 2012 14:15:25 -0000 1.56
+++ t/results/coverage/multitable.pl 27 Aug 2012 00:38:46 -0000 1.57
@@ -877,16 +877,16 @@
$result_converted{'xml'}->{'multitable'} = '
<multitable spaces=" "><columnfractions line=" 0.6 0.4"><columnfraction
value="0.6"></columnfraction><columnfraction
value="0.4"></columnfraction></columnfractions>
-<thead><row><entry command="headitem"><para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"><para>another tab
-</para></entry></row></thead><tbody><row><entry
command="item"><para>mu&textndash;ltitable item </para></entry><entry
command="tab"><para>multitable tab
+<thead><row><entry command="headitem" spaces=" "><para>mu&textndash;ltitable
headitem </para></entry><entry command="tab" spaces=" "><para>another tab
+</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
-</para></entry></row><row><entry command="item"><para>mu&textndash;ltitable
item 2 </para></entry><entry command="tab"><para>multitable tab 2
+</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
<cindex index="cp"><indexterm index="cp">index entry within
multitable</indexterm></cindex>
-</para></entry></row><row><entry command="item"><para>lone
mu&textndash;ltitable item
+</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">truc</columnprototype> <columnprototype
bracketed="on">bidule</columnprototype></columnprototypes>
-<tbody><row><entry command="item"><para>truc </para></entry><entry
command="tab"><para>bidule
+<tbody><row><entry command="item" spaces=" "><para>truc </para></entry><entry
command="tab" spaces=" "><para>bidule
</para></entry></row></tbody></multitable>
';
Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- t/results/coverage/preformatted.pl 24 Aug 2012 16:43:20 -0000 1.58
+++ t/results/coverage/preformatted.pl 27 Aug 2012 00:38:46 -0000 1.59
@@ -499,7 +499,7 @@
<format>
<vtable commandarg="code" spaces=" ">
-<tableentry><tableterm><item><itemformat command="code"><indexterm
index="vr">item in table in format</indexterm>item in table in
format</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="code"><indexterm
index="vr">item in table in format</indexterm>item in table in
format</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">
in table in format
</pre></tableitem></tableentry></vtable>
Index: t/results/coverage/punctuation_in_line_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- t/results/coverage/punctuation_in_line_commands.pl 26 Aug 2012 14:15:26
-0000 1.34
+++ t/results/coverage/punctuation_in_line_commands.pl 27 Aug 2012 00:38:46
-0000 1.35
@@ -1559,7 +1559,7 @@
<top spaces=" "><sectiontitle>top! After punc</sectiontitle>
<table commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis">item! After
punc</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis">item! After
punc</itemformat></item>
</tableterm></tableentry></table>
<quotation spaces=" "><quotationtype>quotation arg! After punc</quotationtype>
Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- t/results/coverage/table.pl 24 Aug 2012 16:43:20 -0000 1.60
+++ t/results/coverage/table.pl 27 Aug 2012 00:38:46 -0000 1.61
@@ -845,8 +845,8 @@
$result_converted{'xml'}->{'table'} = '
<table commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis">table
item</itemformat></item>
-<itemx><itemformat command="asis">table itemx</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis">table
item</itemformat></item>
+<itemx spaces=" "><itemformat command="asis">table itemx</itemformat></itemx>
</tableterm><tableitem>
<para>In table
</para></tableitem></tableentry></table>
@@ -855,10 +855,10 @@
<beforefirstitem><!-- c after vtable -->
<cindex index="cp"><indexterm index="cp">index entry</indexterm></cindex>
-</beforefirstitem><tableentry><tableterm><item><itemformat
command="samp"><indexterm index="vr">vtable item</indexterm>vtable
item</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="samp"><indexterm index="vr">vtable item</indexterm>vtable
item</itemformat></item>
<!-- c after item -->
<kindex index="ky"><indexterm index="ky">key</indexterm></kindex>
-<itemx><itemformat command="samp"><indexterm index="vr">itemx
vtable</indexterm>itemx vtable <!-- comment comment in itemx line
--></itemformat></itemx>
+<itemx spaces=" "><itemformat command="samp"><indexterm index="vr">itemx
vtable</indexterm>itemx vtable <!-- comment comment in itemx line
--></itemformat></itemx>
</tableterm><tableitem>
</tableitem></tableentry></vtable>
';
Index: t/results/coverage/table_command_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/table_command_comment.pl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- t/results/coverage/table_command_comment.pl 24 Aug 2012 16:43:20 -0000
1.41
+++ t/results/coverage/table_command_comment.pl 27 Aug 2012 00:38:46 -0000
1.42
@@ -204,7 +204,7 @@
$result_converted{'xml'}->{'table_command_comment'} = '<table
commandarg="code" spaces=" "><!-- c in comment -->
-<tableentry><tableterm><item><itemformat
command="code">item</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat
command="code">item</itemformat></item>
</tableterm></tableentry></table>';
Index: t/results/menu/block_commands_in_menu_description.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/menu/block_commands_in_menu_description.pl 26 Aug 2012
23:00:55 -0000 1.8
+++ t/results/menu/block_commands_in_menu_description.pl 27 Aug 2012
00:38:47 -0000 1.9
@@ -1059,12 +1059,12 @@
<menuentry leadingtext="* "><menunode
separator="::">(manual)</menunode><menudescription><pre xml:space="preserve">
</pre><itemize commandarg="bullet">
<beforefirstitem><pre xml:space="preserve">
-</pre></beforefirstitem><listitem><prepend>•</prepend><pre
xml:space="preserve">in item
+</pre></beforefirstitem><listitem spaces=" "><prepend>•</prepend><pre
xml:space="preserve">in item
</pre></listitem></itemize>
<table commandarg="asis" spaces=" ">
<beforefirstitem><pre xml:space="preserve">
-</pre></beforefirstitem><tableentry><tableterm><item><itemformat
command="asis">table item</itemformat></item>
+</pre></beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">table item</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">
Text.
Index: t/results/menu/formats_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/menu/formats_in_menu.pl 26 Aug 2012 23:00:56 -0000 1.29
+++ t/results/menu/formats_in_menu.pl 27 Aug 2012 00:38:47 -0000 1.30
@@ -1217,7 +1217,7 @@
<menu>
<menuentry leadingtext="* "><menunode separator="::
">(gcc)</menunode><menudescription><pre xml:space="preserve">text
</pre><table commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat
command="asis">item</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat
command="asis">item</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">* table line::
</pre></tableitem></tableentry></table>
</menudescription></menuentry><menucomment><pre xml:space="preserve">
Index: t/results/multitable/empty_item_tab.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/multitable/empty_item_tab.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/multitable/empty_item_tab.pl 26 Aug 2012 14:15:39 -0000
1.10
+++ t/results/multitable/empty_item_tab.pl 27 Aug 2012 00:38:47 -0000
1.11
@@ -1070,7 +1070,7 @@
<tbody><row><entry command="item">
</entry></row><row><entry command="item">
-</entry></row><row><entry command="item"><para>text
+</entry></row><row><entry command="item" spaces=" "><para>text
</para></entry></row><row><entry command="item">
</entry></row></tbody></multitable>
@@ -1078,17 +1078,17 @@
<tbody><row><entry command="item">
</entry></row><row><entry command="item">
-</entry></row><row><entry command="item"><para>only item
+</entry></row><row><entry command="item" spaces=" "><para>only item
</para>
-</entry></row><row><entry command="item"><para>item text </para></entry><entry
command="tab">
-</entry></row><row><entry command="item"><para>item new line
+</entry></row><row><entry command="item" spaces=" "><para>item text
</para></entry><entry command="tab">
+</entry></row><row><entry command="item" spaces=" "><para>item new line
</para></entry><entry command="tab">
-</entry></row><row><entry command="item"></entry><entry command="tab">
+</entry></row><row><entry command="item" spaces=" "></entry><entry
command="tab">
</entry></row><row><entry command="item">
</entry><entry command="tab">
-</entry></row><row><entry command="item"><para>not empty </para></entry><entry
command="tab"><para>tab not empty
+</entry></row><row><entry command="item" spaces=" "><para>not empty
</para></entry><entry command="tab" spaces=" "><para>tab not empty
</para></entry></row></tbody></multitable>
';
Index: t/results/multitable/inter_item_commands_in_multitable.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/multitable/inter_item_commands_in_multitable.pl 26 Aug 2012
14:15:40 -0000 1.20
+++ t/results/multitable/inter_item_commands_in_multitable.pl 27 Aug 2012
00:38:47 -0000 1.21
@@ -1312,27 +1312,27 @@
$result_converted{'xml'}->{'inter_item_commands_in_multitable'} = '<multitable
spaces=" "><columnprototypes><columnprototype
bracketed="on">truc</columnprototype></columnprototypes>
<beforefirstitem><!-- c comment before first item -->
-</beforefirstitem><tbody><row><entry command="item"><para>truc
+</beforefirstitem><tbody><row><entry command="item" spaces=" "><para>truc
</para>
<cindex index="cp"><indexterm index="cp">index entry between empty
lines</indexterm></cindex>
-</entry></row><row><entry command="item"><para>trouc
+</entry></row><row><entry command="item" spaces=" "><para>trouc
<!-- c last comment -->
</para></entry></row></tbody></multitable>
<multitable spaces=" "><columnfractions line=" 0.6 0.4"><columnfraction
value="0.6"></columnfraction><columnfraction
value="0.4"></columnfraction></columnfractions>
-<thead><row><entry command="headitem"><para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"><para>another tab
-</para></entry></row></thead><tbody><row><entry
command="item"><para>mu&textndash;ltitable item </para></entry><entry
command="tab"><para>multitable tab
+<thead><row><entry command="headitem" spaces=" "><para>mu&textndash;ltitable
headitem </para></entry><entry command="tab" spaces=" "><para>another tab
+</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
-</para></entry></row><row><entry command="item"><para>mu&textndash;ltitable
item 2 </para></entry><entry command="tab"><para>multitable tab 2
+</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
<cindex index="cp"><indexterm index="cp">index entry within
multitable</indexterm></cindex>
-</para></entry></row><row><entry command="item"><para>lone
mu&textndash;ltitable item
+</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">thing</columnprototype></columnprototypes>
<beforefirstitem><para>Title
<cindex index="cp"><indexterm index="cp">cindex</indexterm></cindex>
-</para></beforefirstitem><tbody><row><entry command="item"><para>thing
+</para></beforefirstitem><tbody><row><entry command="item" spaces="
"><para>thing
</para></entry></row></tbody></multitable>
';
Index: t/results/multitable/multitable_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_in_example.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/multitable/multitable_in_example.pl 26 Aug 2012 14:15:41
-0000 1.16
+++ t/results/multitable/multitable_in_example.pl 27 Aug 2012 00:38:47
-0000 1.17
@@ -506,12 +506,12 @@
$result_converted{'xml'}->{'multitable_in_example'} = '<example>
<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">AAA</columnprototype> <columnprototype
bracketed="on">BBB</columnprototype></columnprototypes>
-<tbody><row><entry command="item"><pre xml:space="preserve">truc
</pre></entry><entry command="tab"><pre xml:space="preserve">bidule example
-</pre></entry></row><row><entry command="item"><pre xml:space="preserve">begin
item example
+<tbody><row><entry command="item" spaces=" "><pre xml:space="preserve">truc
</pre></entry><entry command="tab" spaces=" "><pre xml:space="preserve">bidule
example
+</pre></entry></row><row><entry command="item" spaces=" "><pre
xml:space="preserve">begin item example
new paragraph in item. example
-</pre></entry><entry command="tab"><pre xml:space="preserve">begin tab example
+</pre></entry><entry command="tab" spaces=" "><pre xml:space="preserve">begin
tab example
new paragraph in tab. example
</pre></entry></row></tbody></multitable>
Index: t/results/multitable/multitable_with_empty_item_tab.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_with_empty_item_tab.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/multitable/multitable_with_empty_item_tab.pl 26 Aug 2012
14:15:44 -0000 1.4
+++ t/results/multitable/multitable_with_empty_item_tab.pl 27 Aug 2012
00:38:47 -0000 1.5
@@ -400,7 +400,7 @@
$result_converted{'xml'}->{'multitable_with_empty_item_tab'} = '<multitable
spaces=" "><columnfractions line=" 0.3 0.7"><columnfraction
value="0.3"></columnfraction><columnfraction
value="0.7"></columnfraction></columnfractions>
-<tbody><row><entry command="item"><para>1-1 </para></entry><entry
command="tab"><para>1-2 </para></entry></row><row><entry
command="item"></entry><entry command="tab"></entry></row><row><entry
command="item"><para>3-1 </para></entry><entry command="tab"><para>3-2
+<tbody><row><entry command="item" spaces=" "><para>1-1 </para></entry><entry
command="tab" spaces=" "><para>1-2 </para></entry></row><row><entry
command="item"></entry><entry command="tab"></entry></row><row><entry
command="item" spaces=" "><para>3-1 </para></entry><entry command="tab"
spaces=" "><para>3-2
</para></entry></row></tbody></multitable>
';
Index: t/results/multitable/paragraph_in_cells.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/paragraph_in_cells.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/multitable/paragraph_in_cells.pl 26 Aug 2012 14:15:45 -0000
1.15
+++ t/results/multitable/paragraph_in_cells.pl 27 Aug 2012 00:38:47 -0000
1.16
@@ -443,12 +443,12 @@
$result_converted{'xml'}->{'paragraph_in_cells'} = '<multitable spaces="
"><columnprototypes><columnprototype bracketed="on">AAA</columnprototype>
<columnprototype bracketed="on">BBB</columnprototype></columnprototypes>
-<tbody><row><entry command="item"><para>truc </para></entry><entry
command="tab"><para>bidule
-</para></entry></row><row><entry command="item"><para>begin item
+<tbody><row><entry command="item" spaces=" "><para>truc </para></entry><entry
command="tab" spaces=" "><para>bidule
+</para></entry></row><row><entry command="item" spaces=" "><para>begin item
</para>
<para>new paragraph in item.
</para>
-</entry><entry command="tab"><para>begin tab
+</entry><entry command="tab" spaces=" "><para>begin tab
</para>
<para>new paragraph in tab.
</para></entry></row></tbody></multitable>';
Index: t/results/multitable/w_in_multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/multitable/w_in_multitable.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/multitable/w_in_multitable.pl 26 Aug 2012 14:15:48 -0000
1.14
+++ t/results/multitable/w_in_multitable.pl 27 Aug 2012 00:38:47 -0000
1.15
@@ -321,9 +321,9 @@
$result_converted{'xml'}->{'w_in_multitable'} = '<multitable spaces="
"><columnprototypes><columnprototype bracketed="on">aaaaaaaaa</columnprototype>
<columnprototype bracketed="on">bbbbbbbbbbb</columnprototype></columnprototypes>
-<tbody><row><entry command="item"><para><w>aaaaaaaa
+<tbody><row><entry command="item" spaces=" "><para><w>aaaaaaaa
bbbbbbbbbb</w>
-</para></entry><entry command="tab"><para>gg
+</para></entry><entry command="tab" spaces=" "><para>gg
</para></entry></row></tbody></multitable>
';
Index: t/results/xml_tests/comments_on_block_command_lines.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/xml_tests/comments_on_block_command_lines.pl 26 Aug 2012
14:15:57 -0000 1.13
+++ t/results/xml_tests/comments_on_block_command_lines.pl 27 Aug 2012
00:38:47 -0000 1.14
@@ -2556,27 +2556,27 @@
$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize
commandarg="bullet" spaces=" "><!-- c comm -->
-<listitem><prepend>•</prepend><para>itemize it
+<listitem spaces=" "><prepend>•</prepend><para>itemize it
</para></listitem></itemize>
<itemize spaces=" "><itemprepend>x </itemprepend><!-- c comm -->
-<listitem><prepend>x</prepend><para>itemize xit
+<listitem spaces=" "><prepend>x</prepend><para>itemize xit
</para></listitem></itemize>
<itemize commandarg="bullet" spaces=" "><itemprepend>•
</itemprepend><!-- c comm -->
-<listitem><prepend>•</prepend><para>itemize bulletit
+<listitem spaces=" "><prepend>•</prepend><para>itemize bulletit
</para></listitem></itemize>
<enumerate first="1" spaces=" "><!-- c comm -->
-<listitem><para>en
+<listitem spaces=" "><para>en
</para></listitem></enumerate>
<enumerate first="a" spaces=" "><enumeratefirst>a </enumeratefirst><!-- c comm
-->
-<listitem><para>aen
+<listitem spaces=" "><para>aen
</para></listitem></enumerate>
<table commandarg="asis" spaces=" "><!-- c table -->
-<tableentry><tableterm><item><itemformat command="asis">it</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat
command="asis">it</itemformat></item>
</tableterm></tableentry></table>
<quotation spaces=" "><!-- c quot no arg -->
@@ -2596,11 +2596,11 @@
</pre></example>
<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions><!-- c comm -->
-<tbody><row><entry command="item"><para>a </para></entry><entry
command="tab"><para>b
+<tbody><row><entry command="item" spaces=" "><para>a </para></entry><entry
command="tab" spaces=" "><para>b
</para></entry></row></tbody></multitable>
<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">aaa</columnprototype> <columnprototype
bracketed="on">bbb</columnprototype> </columnprototypes><!-- c c -->
-<tbody><row><entry command="item"><para>aaa </para></entry><entry
command="tab"><para>bbb
+<tbody><row><entry command="item" spaces=" "><para>aaa </para></entry><entry
command="tab" spaces=" "><para>bbb
</para></entry></row></tbody></multitable>
<float name="g" type="f" spaces=" "><floattype>f</floattype><floatname>g
</floatname><!-- c comm -->
Index: t/results/xml_tests/image_inline_or_not.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/xml_tests/image_inline_or_not.pl 26 Aug 2012 15:27:36 -0000
1.12
+++ t/results/xml_tests/image_inline_or_not.pl 27 Aug 2012 00:38:47 -0000
1.13
@@ -2342,7 +2342,7 @@
</quotation>
<table commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><image
where="inline"><imagefile>in_table_item</imagefile></image></itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><image
where="inline"><imagefile>in_table_item</imagefile></image></itemformat></item>
</tableterm><tableitem>
<image><imagefile>in_table_def</imagefile></image>
Index: t/results/xtable/accent_on_table_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/accent_on_table_line.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/xtable/accent_on_table_line.pl 24 Aug 2012 16:43:25 -0000
1.17
+++ t/results/xtable/accent_on_table_line.pl 27 Aug 2012 00:38:47 -0000
1.18
@@ -310,8 +310,8 @@
$result_converted{'xml'}->{'accent_on_table_line'} = '<table commandarg="asis"
spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis">first
item</itemformat></item>
-</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis">no at-command <code>code</code></itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis">first
item</itemformat></item>
+</tableterm></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis">no at-command <code>code</code></itemformat></item>
</tableterm></tableentry></table>
';
Index: t/results/xtable/block_commands_in_table.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/block_commands_in_table.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/xtable/block_commands_in_table.pl 24 Aug 2012 16:43:25 -0000
1.4
+++ t/results/xtable/block_commands_in_table.pl 27 Aug 2012 00:38:47 -0000
1.5
@@ -2244,26 +2244,26 @@
<top spaces=" "><sectiontitle>Element</sectiontitle>
<table commandarg="emph" spaces=" ">
-<tableentry><tableterm><item><itemformat command="emph">first
item</itemformat></item>
-<itemx><itemformat command="emph">second itemx</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="emph">first
item</itemformat></item>
+<itemx spaces=" "><itemformat command="emph">second itemx</itemformat></itemx>
</tableterm><tableitem>
<para>Text.
</para>
-</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="emph">example</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="emph">example</itemformat></item>
</tableterm><tableitem><example>
<pre xml:space="preserve">In example
end example.
</pre></example>
-</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="emph">empty line</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="emph">empty line</itemformat></item>
</tableterm><tableitem>
<para>empty line.
-</para></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="emph">quotation</itemformat></item>
+</para></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="emph">quotation</itemformat></item>
</tableterm><tableitem><quotation>
<para>Quotation
</para></quotation>
-</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="emph">quotation after a blank line</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="emph">quotation after a blank line</itemformat></item>
</tableterm><tableitem>
<quotation>
<para>quotation after a blank line
@@ -2271,17 +2271,17 @@
</tableitem></tableentry></table>
<vtable commandarg="strong" spaces=" ">
-<tableentry><tableterm><item><itemformat command="strong"><indexterm
index="vr">item before ignored lines</indexterm>item before ignored
lines</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat
command="strong"><indexterm index="vr">item before ignored
lines</indexterm>item before ignored lines</itemformat></item>
<!-- c comment -->
<vindex index="vr"><indexterm index="vr">vindex</indexterm></vindex>
-<itemx><itemformat command="strong"><indexterm index="vr">itemx
now</indexterm>itemx now</itemformat></itemx>
+<itemx spaces=" "><itemformat command="strong"><indexterm index="vr">itemx
now</indexterm>itemx now</itemformat></itemx>
</tableterm><tableitem>
<para>Description
</para></tableitem></tableentry></vtable>
<vtable commandarg="r" spaces=" ">
-<tableentry><tableterm><item><itemformat command="r"><indexterm
index="vr">item</indexterm>item</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="r"><indexterm
index="vr">item</indexterm>item</itemformat></item>
-<itemx><itemformat command="r"><indexterm index="vr">itemx after an empty
line</indexterm>itemx after an empty line</itemformat></itemx>
+<itemx spaces=" "><itemformat command="r"><indexterm index="vr">itemx after an
empty line</indexterm>itemx after an empty line</itemformat></itemx>
</tableterm><tableitem>
<para>Description.
</para>
@@ -2289,9 +2289,9 @@
<para>Something.
</para><table commandarg="emph" spaces=" ">
-<tableentry><tableterm><item><itemformat command="emph">in
item</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="emph">in
item</itemformat></item>
</tableterm><tableitem><para>Text without blank line
-</para></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="emph">second item</itemformat></item>
+</para></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="emph">second item</itemformat></item>
</tableterm><tableitem><para>Text without blank line 2
</para></tableitem></tableentry></table>
<para>After table.
Index: t/results/xtable/comment_and_itemx_before_item.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/comment_and_itemx_before_item.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/xtable/comment_and_itemx_before_item.pl 24 Aug 2012 16:43:25
-0000 1.5
+++ t/results/xtable/comment_and_itemx_before_item.pl 27 Aug 2012 00:38:47
-0000 1.6
@@ -238,7 +238,7 @@
$result_converted{'xml'}->{'comment_and_itemx_before_item'} = '<table
commandarg="code" spaces=" ">
<beforefirstitem><!-- c comment -->
-</beforefirstitem><tableentry><tableterm><itemx><itemformat command="code">in
itemx</itemformat></itemx>
+</beforefirstitem><tableentry><tableterm><itemx spaces=" "><itemformat
command="code">in itemx</itemformat></itemx>
</tableterm></tableentry></table>
';
Index: t/results/xtable/definfoenclose_on_table_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/xtable/definfoenclose_on_table_line.pl 26 Aug 2012 14:15:58
-0000 1.17
+++ t/results/xtable/definfoenclose_on_table_line.pl 27 Aug 2012 00:38:48
-0000 1.18
@@ -371,8 +371,8 @@
$result_converted{'xml'}->{'definfoenclose_on_table_line'} = '<definfoenclose
command="phi" open=":" close=":" line=" phi,:,:"></definfoenclose>
<table commandarg="phi" begin=":" end=":" spaces=" ">
-<tableentry><tableterm><item><itemformat command="phi" begin=":"
end=":">item</itemformat></item>
-<itemx><itemformat command="phi" begin=":" end=":">item x</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="phi" begin=":"
end=":">item</itemformat></item>
+<itemx spaces=" "><itemformat command="phi" begin=":" end=":">item
x</itemformat></itemx>
</tableterm><tableitem>
<para>table content.
</para></tableitem></tableentry></table>
Index: t/results/xtable/empty_item_itemx.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/empty_item_itemx.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/xtable/empty_item_itemx.pl 24 Aug 2012 16:43:26 -0000
1.23
+++ t/results/xtable/empty_item_itemx.pl 27 Aug 2012 00:38:48 -0000
1.24
@@ -559,11 +559,11 @@
<beforefirstitem>
<para>VTable
</para>
-</beforefirstitem><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">first item</indexterm>first
item</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr">first item</indexterm>first
item</itemformat></item>
<itemx><itemformat command="asis"></itemformat></itemx>
-<itemx><itemformat command="asis"><indexterm index="vr">after an empty itemx,
before an empty item</indexterm>after an empty itemx, before an empty
item</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="vr">after an
empty itemx, before an empty item</indexterm>after an empty itemx, before an
empty item</itemformat></itemx>
</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis"> </itemformat></item>
-</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">in item before end table</indexterm>in
item before end table</itemformat></item>
+</tableterm></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr">in item before end table</indexterm>in
item before end table</itemformat></item>
</tableterm></tableentry></vtable>
';
Index: t/results/xtable/inter_item_commands_in_table.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/xtable/inter_item_commands_in_table.pl 24 Aug 2012 16:43:26
-0000 1.23
+++ t/results/xtable/inter_item_commands_in_table.pl 27 Aug 2012 00:38:48
-0000 1.24
@@ -1901,29 +1901,29 @@
$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<vtable
commandarg="code" spaces=" ">
<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item><itemformat
command="code"><indexterm index="vr">a</indexterm>a</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="code"><indexterm index="vr">a</indexterm>a</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
<vtable commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
<!-- c comment between item and itemx -->
-<itemx><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
<ftable commandarg="var" spaces=" ">
-<tableentry><tableterm><item><itemformat command="var"><indexterm
index="fn">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="var"><indexterm
index="fn">a</indexterm>a</itemformat></item>
<cindex index="cp"><indexterm index="cp">index entry between item and
itemx</indexterm></cindex>
<!-- c and a comment -->
<!-- comment and another comment -->
-<itemx><itemformat command="var"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="var"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
-</para></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="var"><indexterm index="fn">c</indexterm>c</itemformat></item>
+</para></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="var"><indexterm
index="fn">c</indexterm>c</itemformat></item>
<!-- c comment between lines -->
-<itemx><itemformat command="var"><indexterm
index="fn">d</indexterm>d</itemformat></itemx>
+<itemx spaces=" "><itemformat command="var"><indexterm
index="fn">d</indexterm>d</itemformat></itemx>
</tableterm><tableitem>
<!-- c comment at end -->
</tableitem></tableentry></ftable>
@@ -1931,14 +1931,14 @@
<table commandarg="code" spaces=" ">
<beforefirstitem><cindex index="cp"><indexterm index="cp">cindex in
table</indexterm></cindex>
<!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item><itemformat
command="code">abb</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="code">abb</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<table commandarg="code" spaces=" ">
<beforefirstitem><cindex index="cp"><indexterm index="cp">cindex in
table</indexterm></cindex>
<para>Texte before first item.
-</para></beforefirstitem><tableentry><tableterm><item><itemformat
command="code">abb</itemformat></item>
+</para></beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="code">abb</itemformat></item>
</tableterm></tableentry></table>
';
Index: t/results/xtable/inter_item_commands_in_table_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/xtable/inter_item_commands_in_table_in_example.pl 24 Aug 2012
16:43:26 -0000 1.6
+++ t/results/xtable/inter_item_commands_in_table_in_example.pl 27 Aug 2012
00:38:48 -0000 1.7
@@ -633,15 +633,15 @@
$result_converted{'xml'}->{'inter_item_commands_in_table_in_example'} =
'<example>
<table commandarg="var" spaces=" ">
-<tableentry><tableterm><item><itemformat command="var">a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat
command="var">a</itemformat></item>
<pre xml:space="preserve"><cindex index="cp"><indexterm index="cp">index entry
between item and itemx</indexterm></cindex>
<!-- c and a comment -->
<!-- comment and another comment -->
-</pre><itemx><itemformat command="var">b</itemformat></itemx>
+</pre><itemx spaces=" "><itemformat command="var">b</itemformat></itemx>
<pre xml:space="preserve">
-</pre><itemx><itemformat command="var">c</itemformat></itemx>
+</pre><itemx spaces=" "><itemformat command="var">c</itemformat></itemx>
</tableterm><tableitem><pre xml:space="preserve">l--ine
-</pre></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="var">d</itemformat></item>
+</pre></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="var">d</itemformat></item>
</tableterm></tableentry></table>
</example>
';
Index: t/results/xtable/long_item.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/long_item.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/xtable/long_item.pl 24 Aug 2012 16:43:26 -0000 1.15
+++ t/results/xtable/long_item.pl 27 Aug 2012 00:38:48 -0000 1.16
@@ -294,8 +294,8 @@
$result_converted{'xml'}->{'long_item'} = '<table commandarg="emph" spaces=" ">
-<tableentry><tableterm><item><itemformat command="emph">first item
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaa</itemformat></item>
-<itemx><itemformat command="emph">second itemx bbbbbbbbbbbbbbbbbbbbbbbbbbbbb b
b b b b b b b b b b b b</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="emph">first item
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaa</itemformat></item>
+<itemx spaces=" "><itemformat command="emph">second itemx
bbbbbbbbbbbbbbbbbbbbbbbbbbbbb b b b b b b b b b b b b b</itemformat></itemx>
</tableterm><tableitem>
<para>Text.
</para></tableitem></tableentry></table>
Index: t/results/xtable/table_nested.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/table_nested.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/xtable/table_nested.pl 24 Aug 2012 16:43:26 -0000 1.21
+++ t/results/xtable/table_nested.pl 27 Aug 2012 00:38:48 -0000 1.22
@@ -3409,23 +3409,23 @@
<para>Quotation
</para><quotation>
<vtable commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
-<itemx><itemformat command="asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
</tableterm><tableitem>
<para>Text.
</para>
-</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
</tableterm><tableitem>
<para>Text 2
</para>
-</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
</tableterm></tableentry></vtable>
<para>Something.
</para><table commandarg="emph" spaces=" ">
-<tableentry><tableterm><item><itemformat command="emph">in
item</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="emph">in
item</itemformat></item>
</tableterm><tableitem><para>Text without blank line
-</para></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="emph">second item</itemformat></item>
+</para></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="emph">second item</itemformat></item>
</tableterm><tableitem><para>Text without blank line 2
</para></tableitem></tableentry></table>
<para>After table.
@@ -3434,23 +3434,23 @@
<para>Example
</para><example>
<vtable commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
-<itemx><itemformat command="asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
</tableterm><tableitem><pre xml:space="preserve">
Text.
-</pre></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
+</pre></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="asis"><indexterm index="vr">second
item</indexterm>second item</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">
Text 2
-</pre></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
+</pre></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="asis"><indexterm
index="vr">last</indexterm>last</itemformat></item>
</tableterm></tableentry></vtable>
<pre xml:space="preserve">
Something.
</pre><table commandarg="emph" spaces=" ">
-<tableentry><tableterm><item><itemformat command="emph">in
item</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="emph">in
item</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">Text without blank line
-</pre></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="emph">second item</itemformat></item>
+</pre></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="emph">second item</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">Text without blank line 2
</pre></tableitem></tableentry></table>
<pre xml:space="preserve">After table.
@@ -3460,23 +3460,23 @@
</para><quotation>
<quotation>
<vtable commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
-<itemx><itemformat command="asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
</tableterm><tableitem>
<para>Text.
</para>
-</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
</tableterm><tableitem>
<para>Text 2
</para>
-</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
</tableterm></tableentry></vtable>
<para>Something.
</para><table commandarg="emph" spaces=" ">
-<tableentry><tableterm><item><itemformat command="emph">in
item</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="emph">in
item</itemformat></item>
</tableterm><tableitem><para>Text without blank line
-</para></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="emph">second item</itemformat></item>
+</para></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="emph">second item</itemformat></item>
</tableterm><tableitem><para>Text without blank line 2
</para></tableitem></tableentry></table>
<para>After table.
Index: tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tests/layout/res_parser/formatting_xml/formatting.xml 26 Aug 2012
15:27:36 -0000 1.9
+++ tests/layout/res_parser/formatting_xml/formatting.xml 27 Aug 2012
00:38:48 -0000 1.10
@@ -1001,51 +1001,51 @@
<itemize commandarg="bullet">
-<listitem><prepend>•</prepend><para>i&textndash;temize
+<listitem spaces=" "><prepend>•</prepend><para>i&textndash;temize
</para></listitem></itemize>
<itemize spaces=" "><itemprepend>+</itemprepend>
-<listitem><prepend>+</prepend><para>i&textndash;tem +
+<listitem spaces=" "><prepend>+</prepend><para>i&textndash;tem +
</para></listitem></itemize>
<itemize commandarg="bullet" spaces=" "><itemprepend>•</itemprepend>
-<listitem><prepend>•</prepend><para>b&textndash;ullet
+<listitem spaces=" "><prepend>•</prepend><para>b&textndash;ullet
</para></listitem></itemize>
<itemize commandarg="minus" spaces=" "><itemprepend>−</itemprepend>
-<listitem><prepend>−</prepend><para>minu&textndash;s
+<listitem spaces=" "><prepend>−</prepend><para>minu&textndash;s
</para></listitem></itemize>
<itemize commandarg="emph" spaces=" ">
-<listitem><prepend></prepend><para>e&textndash;mph item
+<listitem spaces=" "><prepend></prepend><para>e&textndash;mph item
</para></listitem></itemize>
<itemize spaces=" "><itemprepend><emph>after emph</emph></itemprepend>
<beforefirstitem><!-- c comment in itemize -->
-</beforefirstitem><listitem><prepend><emph>after
emph</emph></prepend><para>e&textndash;mph item
+</beforefirstitem><listitem spaces=" "><prepend><emph>after
emph</emph></prepend><para>e&textndash;mph item
</para></listitem></itemize>
<itemize spaces=" "><itemprepend>• a&textndash;n itemize
line</itemprepend>
<beforefirstitem><cindex index="cp"><indexterm index="cp">index entry within
itemize</indexterm></cindex>
-</beforefirstitem><listitem><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 1
-</para></listitem><listitem><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 2
+</beforefirstitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 1
+</para></listitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 2
</para></listitem></itemize>
<enumerate first="1">
-<listitem><para>e&textndash;numerate
+<listitem spaces=" "><para>e&textndash;numerate
</para></listitem></enumerate>
<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
-<thead><row><entry command="headitem"><para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"><para>another tab
-</para></entry></row></thead><tbody><row><entry
command="item"><para>mu&textndash;ltitable item </para></entry><entry
command="tab"><para>multitable tab
+<thead><row><entry command="headitem" spaces=" "><para>mu&textndash;ltitable
headitem </para></entry><entry command="tab" spaces=" "><para>another tab
+</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
-</para></entry></row><row><entry command="item"><para>mu&textndash;ltitable
item 2 </para></entry><entry command="tab"><para>multitable tab 2
+</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
<cindex index="cp"><indexterm index="cp">index entry within
multitable</indexterm></cindex>
-</para></entry></row><row><entry command="item"><para>lone
mu&textndash;ltitable item
+</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">truc</columnprototype> <columnprototype
bracketed="on">bidule</columnprototype></columnprototypes>
-<tbody><row><entry command="item"><para>truc </para></entry><entry
command="tab"><para>bidule
+<tbody><row><entry command="item" spaces=" "><para>truc </para></entry><entry
command="tab" spaces=" "><para>bidule
</para></entry></row></tbody></multitable>
<example>
@@ -1265,21 +1265,21 @@
<table commandarg="asis" spaces=" ">
<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item><itemformat
command="asis">a</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<vtable commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
<!-- c comment between item and itemx -->
-<itemx><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
<ftable commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
<cindex index="cp"><indexterm index="cp">index entry between item and
itemx</indexterm></cindex>
-<itemx><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></ftable>
@@ -1603,51 +1603,51 @@
<itemize commandarg="bullet">
-<listitem><prepend>•</prepend><para>i&textndash;temize
+<listitem spaces=" "><prepend>•</prepend><para>i&textndash;temize
</para></listitem></itemize>
<itemize spaces=" "><itemprepend>+</itemprepend>
-<listitem><prepend>+</prepend><para>i&textndash;tem +
+<listitem spaces=" "><prepend>+</prepend><para>i&textndash;tem +
</para></listitem></itemize>
<itemize commandarg="bullet" spaces=" "><itemprepend>•</itemprepend>
-<listitem><prepend>•</prepend><para>b&textndash;ullet
+<listitem spaces=" "><prepend>•</prepend><para>b&textndash;ullet
</para></listitem></itemize>
<itemize commandarg="minus" spaces=" "><itemprepend>−</itemprepend>
-<listitem><prepend>−</prepend><para>minu&textndash;s
+<listitem spaces=" "><prepend>−</prepend><para>minu&textndash;s
</para></listitem></itemize>
<itemize commandarg="emph" spaces=" ">
-<listitem><prepend></prepend><para>e&textndash;mph item
+<listitem spaces=" "><prepend></prepend><para>e&textndash;mph item
</para></listitem></itemize>
<itemize spaces=" "><itemprepend><emph>after emph</emph></itemprepend>
<beforefirstitem><!-- c comment in itemize -->
-</beforefirstitem><listitem><prepend><emph>after
emph</emph></prepend><para>e&textndash;mph item
+</beforefirstitem><listitem spaces=" "><prepend><emph>after
emph</emph></prepend><para>e&textndash;mph item
</para></listitem></itemize>
<itemize spaces=" "><itemprepend>• a&textndash;n itemize
line</itemprepend>
<beforefirstitem><cindex index="cp"><indexterm index="cp">index entry within
itemize</indexterm></cindex>
-</beforefirstitem><listitem><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 1
-</para></listitem><listitem><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 2
+</beforefirstitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 1
+</para></listitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 2
</para></listitem></itemize>
<enumerate first="1">
-<listitem><para>e&textndash;numerate
+<listitem spaces=" "><para>e&textndash;numerate
</para></listitem></enumerate>
<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
-<thead><row><entry command="headitem"><para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"><para>another tab
-</para></entry></row></thead><tbody><row><entry
command="item"><para>mu&textndash;ltitable item </para></entry><entry
command="tab"><para>multitable tab
+<thead><row><entry command="headitem" spaces=" "><para>mu&textndash;ltitable
headitem </para></entry><entry command="tab" spaces=" "><para>another tab
+</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
-</para></entry></row><row><entry command="item"><para>mu&textndash;ltitable
item 2 </para></entry><entry command="tab"><para>multitable tab 2
+</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
<cindex index="cp"><indexterm index="cp">index entry within
multitable</indexterm></cindex>
-</para></entry></row><row><entry command="item"><para>lone
mu&textndash;ltitable item
+</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">truc</columnprototype> <columnprototype
bracketed="on">bidule</columnprototype></columnprototypes>
-<tbody><row><entry command="item"><para>truc </para></entry><entry
command="tab"><para>bidule
+<tbody><row><entry command="item" spaces=" "><para>truc </para></entry><entry
command="tab" spaces=" "><para>bidule
</para></entry></row></tbody></multitable>
<example>
@@ -1867,21 +1867,21 @@
<table commandarg="asis" spaces=" ">
<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item><itemformat
command="asis">a</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<vtable commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
<!-- c comment between item and itemx -->
-<itemx><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
<ftable commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
<cindex index="cp"><indexterm index="cp">index entry between item and
itemx</indexterm></cindex>
-<itemx><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></ftable>
@@ -2205,51 +2205,51 @@
<itemize commandarg="bullet">
-<listitem><prepend>•</prepend><para>i&textndash;temize
+<listitem spaces=" "><prepend>•</prepend><para>i&textndash;temize
</para></listitem></itemize>
<itemize spaces=" "><itemprepend>+</itemprepend>
-<listitem><prepend>+</prepend><para>i&textndash;tem +
+<listitem spaces=" "><prepend>+</prepend><para>i&textndash;tem +
</para></listitem></itemize>
<itemize commandarg="bullet" spaces=" "><itemprepend>•</itemprepend>
-<listitem><prepend>•</prepend><para>b&textndash;ullet
+<listitem spaces=" "><prepend>•</prepend><para>b&textndash;ullet
</para></listitem></itemize>
<itemize commandarg="minus" spaces=" "><itemprepend>−</itemprepend>
-<listitem><prepend>−</prepend><para>minu&textndash;s
+<listitem spaces=" "><prepend>−</prepend><para>minu&textndash;s
</para></listitem></itemize>
<itemize commandarg="emph" spaces=" ">
-<listitem><prepend></prepend><para>e&textndash;mph item
+<listitem spaces=" "><prepend></prepend><para>e&textndash;mph item
</para></listitem></itemize>
<itemize spaces=" "><itemprepend><emph>after emph</emph></itemprepend>
<beforefirstitem><!-- c comment in itemize -->
-</beforefirstitem><listitem><prepend><emph>after
emph</emph></prepend><para>e&textndash;mph item
+</beforefirstitem><listitem spaces=" "><prepend><emph>after
emph</emph></prepend><para>e&textndash;mph item
</para></listitem></itemize>
<itemize spaces=" "><itemprepend>• a&textndash;n itemize
line</itemprepend>
<beforefirstitem><cindex index="cp"><indexterm index="cp">index entry within
itemize</indexterm></cindex>
-</beforefirstitem><listitem><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 1
-</para></listitem><listitem><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 2
+</beforefirstitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 1
+</para></listitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 2
</para></listitem></itemize>
<enumerate first="1">
-<listitem><para>e&textndash;numerate
+<listitem spaces=" "><para>e&textndash;numerate
</para></listitem></enumerate>
<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
-<thead><row><entry command="headitem"><para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"><para>another tab
-</para></entry></row></thead><tbody><row><entry
command="item"><para>mu&textndash;ltitable item </para></entry><entry
command="tab"><para>multitable tab
+<thead><row><entry command="headitem" spaces=" "><para>mu&textndash;ltitable
headitem </para></entry><entry command="tab" spaces=" "><para>another tab
+</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
-</para></entry></row><row><entry command="item"><para>mu&textndash;ltitable
item 2 </para></entry><entry command="tab"><para>multitable tab 2
+</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
<cindex index="cp"><indexterm index="cp">index entry within
multitable</indexterm></cindex>
-</para></entry></row><row><entry command="item"><para>lone
mu&textndash;ltitable item
+</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">truc</columnprototype> <columnprototype
bracketed="on">bidule</columnprototype></columnprototypes>
-<tbody><row><entry command="item"><para>truc </para></entry><entry
command="tab"><para>bidule
+<tbody><row><entry command="item" spaces=" "><para>truc </para></entry><entry
command="tab" spaces=" "><para>bidule
</para></entry></row></tbody></multitable>
<example>
@@ -2469,21 +2469,21 @@
<table commandarg="asis" spaces=" ">
<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item><itemformat
command="asis">a</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<vtable commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
<!-- c comment between item and itemx -->
-<itemx><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
<ftable commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
<cindex index="cp"><indexterm index="cp">index entry between item and
itemx</indexterm></cindex>
-<itemx><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></ftable>
@@ -2801,51 +2801,51 @@
<pre xml:space="preserve">
</pre><itemize commandarg="bullet">
-<listitem><prepend>•</prepend><pre xml:space="preserve">i--temize
+<listitem spaces=" "><prepend>•</prepend><pre
xml:space="preserve">i--temize
</pre></listitem></itemize>
<pre xml:space="preserve">
</pre><itemize spaces=" "><itemprepend>+</itemprepend>
-<listitem><prepend>+</prepend><pre xml:space="preserve">i--tem +
+<listitem spaces=" "><prepend>+</prepend><pre xml:space="preserve">i--tem +
</pre></listitem></itemize>
<pre xml:space="preserve">
</pre><itemize commandarg="bullet" spaces="
"><itemprepend>•</itemprepend>
-<listitem><prepend>•</prepend><pre xml:space="preserve">b--ullet
+<listitem spaces=" "><prepend>•</prepend><pre
xml:space="preserve">b--ullet
</pre></listitem></itemize>
<pre xml:space="preserve">
</pre><itemize commandarg="minus" spaces=" "><itemprepend>−</itemprepend>
-<listitem><prepend>−</prepend><pre xml:space="preserve">minu--s
+<listitem spaces=" "><prepend>−</prepend><pre
xml:space="preserve">minu--s
</pre></listitem></itemize>
<pre xml:space="preserve">
</pre><itemize commandarg="emph" spaces=" ">
-<listitem><prepend></prepend><pre xml:space="preserve">e--mph item
+<listitem spaces=" "><prepend></prepend><pre xml:space="preserve">e--mph item
</pre></listitem></itemize>
<pre xml:space="preserve">
</pre><itemize spaces=" "><itemprepend><emph>after emph</emph></itemprepend>
<beforefirstitem><pre xml:space="preserve"><!-- c comment in itemize -->
-</pre></beforefirstitem><listitem><prepend><emph>after
emph</emph></prepend><pre xml:space="preserve">e--mph item
+</pre></beforefirstitem><listitem spaces=" "><prepend><emph>after
emph</emph></prepend><pre xml:space="preserve">e--mph item
</pre></listitem></itemize>
<pre xml:space="preserve">
</pre><itemize spaces=" "><itemprepend>• a--n itemize line</itemprepend>
<beforefirstitem><pre xml:space="preserve"><cindex index="cp"><indexterm
index="cp">index entry within itemize</indexterm></cindex>
-</pre></beforefirstitem><listitem><prepend>• a--n itemize
line</prepend><pre xml:space="preserve">i--tem 1
-</pre></listitem><listitem><prepend>• a--n itemize line</prepend><pre
xml:space="preserve">i--tem 2
+</pre></beforefirstitem><listitem spaces=" "><prepend>• a--n itemize
line</prepend><pre xml:space="preserve">i--tem 1
+</pre></listitem><listitem spaces=" "><prepend>• a--n itemize
line</prepend><pre xml:space="preserve">i--tem 2
</pre></listitem></itemize>
<pre xml:space="preserve">
</pre><enumerate first="1">
-<listitem><pre xml:space="preserve">e--numerate
+<listitem spaces=" "><pre xml:space="preserve">e--numerate
</pre></listitem></enumerate>
<pre xml:space="preserve">
</pre><multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
-<thead><row><entry command="headitem"><pre xml:space="preserve">mu--ltitable
headitem </pre></entry><entry command="tab"><pre xml:space="preserve">another
tab
-</pre></entry></row></thead><tbody><row><entry command="item"><pre
xml:space="preserve">mu--ltitable item </pre></entry><entry command="tab"><pre
xml:space="preserve">multitable tab
+<thead><row><entry command="headitem" spaces=" "><pre
xml:space="preserve">mu--ltitable headitem </pre></entry><entry command="tab"
spaces=" "><pre xml:space="preserve">another tab
+</pre></entry></row></thead><tbody><row><entry command="item" spaces=" "><pre
xml:space="preserve">mu--ltitable item </pre></entry><entry command="tab"
spaces=" "><pre xml:space="preserve">multitable tab
<!-- c comment in multitable -->
-</pre></entry></row><row><entry command="item"><pre
xml:space="preserve">mu--ltitable item 2 </pre></entry><entry
command="tab"><pre xml:space="preserve">multitable tab 2
+</pre></entry></row><row><entry command="item" spaces=" "><pre
xml:space="preserve">mu--ltitable item 2 </pre></entry><entry command="tab"
spaces=" "><pre xml:space="preserve">multitable tab 2
<cindex index="cp"><indexterm index="cp">index entry within
multitable</indexterm></cindex>
-</pre></entry></row><row><entry command="item"><pre xml:space="preserve">lone
mu--ltitable item
+</pre></entry></row><row><entry command="item" spaces=" "><pre
xml:space="preserve">lone mu--ltitable item
</pre></entry></row></tbody></multitable>
<pre xml:space="preserve">
</pre><multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">truc</columnprototype> <columnprototype
bracketed="on">bidule</columnprototype></columnprototypes>
-<tbody><row><entry command="item"><pre xml:space="preserve">truc
</pre></entry><entry command="tab"><pre xml:space="preserve">bidule
+<tbody><row><entry command="item" spaces=" "><pre xml:space="preserve">truc
</pre></entry><entry command="tab" spaces=" "><pre xml:space="preserve">bidule
</pre></entry></row></tbody></multitable>
<pre xml:space="preserve">
</pre><example>
@@ -3065,21 +3065,21 @@
</pre><table commandarg="asis" spaces=" ">
<beforefirstitem><pre xml:space="preserve"><!-- c comment in table -->
-</pre></beforefirstitem><tableentry><tableterm><item><itemformat
command="asis">a</itemformat></item>
+</pre></beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">l--ine
</pre></tableitem></tableentry></table>
<pre xml:space="preserve">
</pre><vtable commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
<pre xml:space="preserve"><!-- c comment between item and itemx -->
-</pre><itemx><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
+</pre><itemx spaces=" "><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><pre xml:space="preserve">l--ine
</pre></tableitem></tableentry></vtable>
<pre xml:space="preserve">
</pre><ftable commandarg="asis" spaces=" ">
-<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
<pre xml:space="preserve"><cindex index="cp"><indexterm index="cp">index entry
between item and itemx</indexterm></cindex>
-</pre><itemx><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
+</pre><itemx spaces=" "><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><pre xml:space="preserve">l--ine
</pre></tableitem></tableentry></ftable>
<pre xml:space="preserve">
Index: t/results/multitable/not_letters_in_prototype.pl
===================================================================
RCS file: t/results/multitable/not_letters_in_prototype.pl
diff -N t/results/multitable/not_letters_in_prototype.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/multitable/not_letters_in_prototype.pl 27 Aug 2012 00:38:47
-0000 1.1
@@ -0,0 +1,261 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'not_letters_in_prototype'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '1.3 5-6
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'multitable',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'item',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '1.3 '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'cell_number' => 1,
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'cmdname' => 'tab',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '5-6
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'cell_number' => 2,
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'row_number' => 1
+ },
+ 'parent' => {},
+ 'type' => 'row'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'multitable_body'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'multitable'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'multitable',
+ 'spaces_after_command' => {},
+ 'text_arg' => 'multitable'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {},
+ 'max_columns' => 2,
+ 'prototypes' => [
+ {
+ 'text' => '1.3',
+ 'type' => 'row_prototype'
+ },
+ {
+ 'text' => '5-6',
+ 'type' => 'row_prototype'
+ }
+ ],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {
+ 'text' => '1.3',
+ 'type' => 'row_prototype'
+ },
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {
+ 'text' => '5-6',
+ 'type' => 'row_prototype'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'not_letters_in_prototype'}{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'not_letters_in_prototype'}{'contents'}[0]{'args'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'not_letters_in_prototype'}{'contents'}[0]{'args'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'not_letters_in_prototype'}{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'not_letters_in_prototype'}{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'not_letters_in_prototype'}{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'not_letters_in_prototype'}{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[1];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'parent'} =
$result_trees{'not_letters_in_prototype'};
+
+$result_texis{'not_letters_in_prototype'} = '@multitable 1.3 5-6
address@hidden 1.3 @tab 5-6
address@hidden multitable
+';
+
+
+$result_texts{'not_letters_in_prototype'} = '1.3 5-6
+';
+
+$result_errors{'not_letters_in_prototype'} = [];
+
+
+
+$result_converted{'plaintext'}->{'not_letters_in_prototype'} = '1.3 5-6
+';
+
+
+$result_converted{'html_text'}->{'not_letters_in_prototype'} = '<table>
+<tr><td>1.3</td><td>5-6</td></tr>
+</table>
+';
+
+
+$result_converted{'xml'}->{'not_letters_in_prototype'} = '<multitable spaces="
"><columnprototypes><columnprototype>1.3</columnprototype>
<columnprototype>5-6</columnprototype></columnprototypes>
+<tbody><row><entry command="item" spaces=" "><para>1.3 </para></entry><entry
command="tab" spaces=" "><para>5-6
+</para></entry></row></tbody></multitable>
+';
+
+1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Parser.pm Texinfo/Convert/XM...,
Patrice Dumas <=