[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/XML.pm t/08misc_comm...
From: |
Patrice Dumas |
Subject: |
texinfo/tp Texinfo/Convert/XML.pm t/08misc_comm... |
Date: |
Sat, 10 Sep 2011 12:27:18 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/09/10 12:27:18
Modified files:
tp/Texinfo/Convert: XML.pm
tp/t : 08misc_commands.t
tp/t/results/misc_commands: comment_space_command_on_line.pl
Log message:
Test @comment after a @end.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/08misc_commands.t?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl?cvsroot=texinfo&r1=1.13&r2=1.14
Patches:
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- Texinfo/Convert/XML.pm 10 Sep 2011 11:17:26 -0000 1.24
+++ Texinfo/Convert/XML.pm 10 Sep 2011 12:27:18 -0000 1.25
@@ -986,6 +986,8 @@
if ($root->{'cmdname'}
and exists($Texinfo::Common::block_commands{$root->{'cmdname'}})) {
#$result .= "</$root->{'cmdname'}>\n";
+ # FIXME The end of line and comment is taken into account
+ # but 'space_at_end' is ignored.
my $end_command = $root->{'extra'}->{'end_command'};
my $end_line;
if ($end_command) {
Index: t/08misc_commands.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/08misc_commands.t,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/08misc_commands.t 10 Sep 2011 11:17:27 -0000 1.23
+++ t/08misc_commands.t 10 Sep 2011 12:27:18 -0000 1.24
@@ -421,7 +421,7 @@
@float Text, label
float
address@hidden float
address@hidden float @c end
@listoffloats Text @ @c listoffloats
Index: t/results/misc_commands/comment_space_command_on_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/misc_commands/comment_space_command_on_line.pl 10 Sep 2011
11:17:27 -0000 1.13
+++ t/results/misc_commands/comment_space_command_on_line.pl 10 Sep 2011
12:27:18 -0000 1.14
@@ -503,9 +503,20 @@
},
{
'parent' => {},
- 'text' => '
-',
+ 'text' => ' ',
'type' => 'spaces_at_end'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => ' end
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'parent' => {}
}
],
'parent' => {},
@@ -734,6 +745,8 @@
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9];
$result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent'}
= $result_trees{'comment_space_command_on_line'}{'contents'}[2]{'contents'}[9];
@@ -776,7 +789,7 @@
@float Text, label
float
address@hidden float
address@hidden float @c end
@listoffloats Text @ @c listoffloats
@@ -985,7 +998,7 @@
<float name="label"
type="Text"><floattype>Text</floattype><floatname>label</floatname>
<para>float
-</para></float>
+</para></float><!-- end -->
<listoffloats type="Text--">Text <spacecmd type="spc"/></listoffloats><!--
listoffloats -->
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Convert/XML.pm t/08misc_comm...,
Patrice Dumas <=