[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/Converter.pm Texinfo...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/Converter.pm Texinfo... |
|
Date: |
Sun, 02 Sep 2012 20:34:42 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/09/02 20:34:42
Modified files:
tp/Texinfo/Convert: Converter.pm XML.pm
tp/t : xml_tests.t
tp/t/results/xml_tests: commands_and_spaces.pl
comments_on_block_command_lines.pl
Log message:
Keep spaces at end of @(fv)?table lines.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/xml_tests.t?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl?cvsroot=texinfo&r1=1.15&r2=1.16
Patches:
Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- Texinfo/Convert/XML.pm 29 Aug 2012 07:32:07 -0000 1.77
+++ Texinfo/Convert/XML.pm 2 Sep 2012 20:34:41 -0000 1.78
@@ -1088,6 +1088,28 @@
and
$root->{'args'}->[-1]->{'contents'}->[-1]->{'args'}->[-1]->{'contents'});
}
} else {
+ if ($root->{'args'}->[-1]->{'contents'}) {
+ # get end of lines from @*table.
+ my $index = -1;
+ if ($root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'}
+ and
($root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'} eq 'c'
+ or
$root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'} eq 'comment')) {
+ $index = -2;
+ }
+ if ($root->{'args'}->[-1]->{'contents'}->[$index]
+ and $root->{'args'}->[-1]->{'contents'}->[$index]->{'type'}
+ and
$root->{'args'}->[-1]->{'contents'}->[$index]->{'type'} eq
'space_at_end_block_command'
+ and
defined($root->{'args'}->[-1]->{'contents'}->[$index]->{'text'})
+ and
$root->{'args'}->[-1]->{'contents'}->[$index]->{'text'} !~ /\S/) {
+ my $end_spaces =
$root->{'args'}->[-1]->{'contents'}->[$index]->{'text'};
+ chomp $end_spaces;
+ $end_line .= $end_spaces;
+ # This also catches block @-commands with no argument that
+ # have a bogus argument, such as text on @example line
+ #print STDERR "NOT xtable: $root->{'cmdname'}\n"
+ # if
(!$Texinfo::Common::item_line_commands{$root->{'cmdname'}});
+ }
+ }
$contents_possible_comment = $root->{'args'}->[-1]->{'contents'}
if ($root->{'args'}->[-1]->{'contents'});
}
Index: t/xml_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/xml_tests.t,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/xml_tests.t 29 Aug 2012 07:32:07 -0000 1.11
+++ t/xml_tests.t 2 Sep 2012 20:34:41 -0000 1.12
@@ -201,6 +201,10 @@
in example
@end example
address@hidden text on example line
+in bad example
address@hidden example
+
@table @strong
@item in item
@end table
Index: t/results/xml_tests/commands_and_spaces.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/xml_tests/commands_and_spaces.pl 29 Aug 2012 07:32:07 -0000
1.5
+++ t/results/xml_tests/commands_and_spaces.pl 2 Sep 2012 20:34:41 -0000
1.6
@@ -1485,6 +1485,110 @@
'type' => 'empty_spaces_after_command'
},
{
+ 'parent' => {},
+ 'text' => 'text on example line'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in bad example
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'example'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'example',
+ 'spaces_after_command' => {},
+ 'text_arg' => 'example'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 58,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'end_command' => {},
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 56,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
'cmdname' => 'strong',
'parent' => {},
'type' => 'command_as_argument'
@@ -1542,7 +1646,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 57,
+ 'line_nr' => 61,
'macro' => ''
},
'parent' => {}
@@ -1591,7 +1695,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 58,
+ 'line_nr' => 62,
'macro' => ''
},
'parent' => {}
@@ -1609,7 +1713,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 56,
+ 'line_nr' => 60,
'macro' => ''
},
'parent' => {}
@@ -1657,7 +1761,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 60,
+ 'line_nr' => 64,
'macro' => ''
},
'parent' => {}
@@ -1705,7 +1809,7 @@
],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 62,
+ 'line_nr' => 66,
'macro' => ''
},
'parent' => {},
@@ -1779,7 +1883,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 64,
+ 'line_nr' => 68,
'macro' => ''
},
'parent' => {}
@@ -2120,14 +2224,6 @@
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1];
@@ -2139,43 +2235,71 @@
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0]{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'extra'}{'command_as_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0]{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'extra'}{'end_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[37]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'args'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[2]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'extra'}{'command_as_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'extra'}{'end_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'args'}[0]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[39]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'contents'}[2]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[40]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[41]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'contents'}[2]{'line_nr'};
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'contents'}[2]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[42]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[45]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'node_content'}[0]
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'node_content'};
$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[1];
@@ -2239,6 +2363,10 @@
in example
@end example
address@hidden text on example line
+in bad example
address@hidden example
+
@table @strong
@item in item
@end table
@@ -2285,6 +2413,8 @@
in example
+in bad example
+
in item
T.
@@ -2449,6 +2579,10 @@
<pre xml:space="preserve">in example
</pre></example>
+<example spaces=" ">
+<pre xml:space="preserve">in bad example
+</pre></example>
+
<table commandarg="strong" spaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="strong">in item
</itemformat></item>
</tableterm></tableentry></table>
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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/xml_tests/comments_on_block_command_lines.pl 29 Aug 2012
07:32:07 -0000 1.15
+++ t/results/xml_tests/comments_on_block_command_lines.pl 2 Sep 2012
20:34:42 -0000 1.16
@@ -2761,7 +2761,7 @@
<listitem spaces=" "><para>aen
</para></listitem></enumerate>
-<table commandarg="asis" spaces=" "><!-- c table -->
+<table commandarg="asis" spaces=" "> <!-- c table -->
<tableentry><tableterm><item spaces=" "><itemformat
command="asis">it</itemformat></item>
</tableterm></tableentry></table>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Convert/Converter.pm Texinfo...,
Patrice Dumas <=