texinfo/tp Texinfo/Convert/XML.pm t/results/sec...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/09/17 21:34:26

Modified files:
        tp/Texinfo/Convert: XML.pm 
        tp/t/results/sectioning: part_node_chapter_after_top.pl 
                                 section_before_top.pl 
                                 two_nodes_between_chapters.pl 

Log message:
        Keep the end of line at end of a node with more than one argument.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_top.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl?cvsroot=texinfo&r1=1.2&r2=1.3

Patches:
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- Texinfo/Convert/XML.pm      17 Sep 2011 20:42:10 -0000      1.36
+++ Texinfo/Convert/XML.pm      17 Sep 2011 21:34:25 -0000      1.37
@@ -569,7 +569,7 @@
           my $end_line;
           if ($root->{'args'}->[0]) {
             $end_line 
-              = 
$self->_end_line_or_comment($root->{'args'}->[0]->{'contents'});
+              = 
$self->_end_line_or_comment($root->{'args'}->[-1]->{'contents'});
           } else {
             $end_line = "\n";
           }

Index: t/results/sectioning/part_node_chapter_after_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/sectioning/part_node_chapter_after_top.pl 17 Sep 2011 20:28:19 
-0000      1.22
+++ t/results/sectioning/part_node_chapter_after_top.pl 17 Sep 2011 21:34:25 
-0000      1.23
@@ -1139,7 +1139,8 @@
 
 <part><sectiontitle>part</sectiontitle>
 
-<node name="a-node-after-part"><nodename>a node after 
part</nodename><nodenext>chapter</nodenext><nodeprev>Top</nodeprev><nodeup>Top</nodeup></node><para>After
 a node after part
+<node name="a-node-after-part"><nodename>a node after 
part</nodename><nodenext>chapter</nodenext><nodeprev>Top</nodeprev><nodeup>Top</nodeup></node>
+<para>After a node after part
 </para>
 </top>
 <node name="chapter"><nodename>chapter</nodename><nodeprev automatic="on">a 
node after part</nodeprev><nodeup automatic="on">Top</nodeup></node>

Index: t/results/sectioning/section_before_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/section_before_top.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/sectioning/section_before_top.pl  10 Sep 2011 13:12:38 -0000      
1.18
+++ t/results/sectioning/section_before_top.pl  17 Sep 2011 21:34:26 -0000      
1.19
@@ -670,7 +670,8 @@
 ';
 
 
-$result_converted{'xml'}->{'section_before_top'} = '<node 
name="section-node"><nodename>section node</nodename><nodeprev 
automatic="on">Top</nodeprev><nodeup>Top</nodeup></node><section><sectiontitle>section
 </sectiontitle>
+$result_converted{'xml'}->{'section_before_top'} = '<node 
name="section-node"><nodename>section node</nodename><nodeprev 
automatic="on">Top</nodeprev><nodeup>Top</nodeup></node>
+<section><sectiontitle>section </sectiontitle>
 
 </section>
 <node name="Top"><nodename>Top</nodename><nodenext automatic="on">section 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>

Index: t/results/sectioning/two_nodes_between_chapters.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/sectioning/two_nodes_between_chapters.pl  17 Sep 2011 20:28:19 
-0000      1.2
+++ t/results/sectioning/two_nodes_between_chapters.pl  17 Sep 2011 21:34:26 
-0000      1.3
@@ -1342,7 +1342,8 @@
 </pre></menudescription></menuentry></menu>
 
 </top>
-<node name="chapter-1"><nodename>chapter 
1</nodename><nodenext>Top</nodenext><nodeprev>node between 
chapters</nodeprev><nodeup>Top</nodeup></node><chapter><sectiontitle>chapter 
c1</sectiontitle>
+<node name="chapter-1"><nodename>chapter 
1</nodename><nodenext>Top</nodenext><nodeprev>node between 
chapters</nodeprev><nodeup>Top</nodeup></node>
+<chapter><sectiontitle>chapter c1</sectiontitle>
 
 <node name="node-between-chapters"><nodename>node between 
chapters</nodename><nodenext automatic="on">chapter 2</nodenext><nodeprev 
automatic="on">chapter 1</nodeprev><nodeup automatic="on">Top</nodeup></node>