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

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/09/10 12:51:26

Modified files:
        tp/Texinfo/Convert: XML.pm 
        tp/t/results/coverage: punctuation_in_line_commands.pl 
        tp/t/results/misc_commands: comment_space_command_on_line.pl 
        tp/t/results/sectioning: chapter_node_before_and_after_part.pl 
                                 double_part.pl 
                                 node_part_chapter_after_chapter.pl 
                                 node_part_chapter_after_top.pl 
                                 part_chapter_after_top.pl 
                                 part_node_chapter_after_top.pl 
                                 section_before_top.pl 
                                 section_in_unnumbered_plaintext.pl 
                                 section_node_before_part.pl 
        tp/t/results/xml_tests: image_inline_or_not.pl 

Log message:
        Don't add end of line for node elements.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_part.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_top.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_node_before_part.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl?cvsroot=texinfo&r1=1.4&r2=1.5

Patches:
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- Texinfo/Convert/XML.pm      10 Sep 2011 12:27:18 -0000      1.25
+++ Texinfo/Convert/XML.pm      10 Sep 2011 12:51:23 -0000      1.26
@@ -605,11 +605,11 @@
         return "<$command${attribute}>$arg</$command>$end_line";
       } elsif ($type eq 'line') {
         if ($root->{'cmdname'} eq 'node') {
-          $result .= "<node name=\"$root->{'extra'}->{'normalized'}\">\n";
+          $result .= "<node name=\"$root->{'extra'}->{'normalized'}\">";
           $self->{'document_context'}->[-1]->{'code'}++;
           $result .= "<nodename>".
              $self->_convert({'contents' => 
$root->{'extra'}->{'node_content'}})
-             ."</nodename>\n";
+             ."</nodename>";
           # first arg is the node name.
           my $direction_index = 1;
           foreach my $direction(@node_directions) {
@@ -631,11 +631,18 @@
                 $node_name .= _normalize_top_node($self->_convert({
                   'contents' => 
$node_direction->{'extra'}->{'node_content'}}));
               }
-              $result .= "<$element${attribute}>$node_name</$element>\n";
+              $result .= "<$element${attribute}>$node_name</$element>";
             }
             $direction_index++;
           }
-          $result .= "</node>\n";
+          my $end_line;
+          if ($root->{'args'}->[0]) {
+            $end_line 
+              = 
$self->_end_line_or_comment($root->{'args'}->[0]->{'contents'});
+          } else {
+            $end_line = "\n";
+          }
+          $result .= "</node>${end_line}";
           $self->{'document_context'}->[-1]->{'code'}--;
         } elsif ($Texinfo::Common::root_commands{$root->{'cmdname'}}) {
           my $attribute;
@@ -722,7 +729,7 @@
           }
         }
         my $end_line;
-        if ($root->{'args'}->[0] and $root->{'args'}->[0]->{'contents'}) {
+        if ($root->{'args'}->[0]) {
           $end_line = 
$self->_end_line_or_comment($root->{'args'}->[0]->{'contents'})
         } else {
           $end_line = "\n";

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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/coverage/punctuation_in_line_commands.pl  7 Sep 2011 23:17:45 
-0000       1.18
+++ t/results/coverage/punctuation_in_line_commands.pl  10 Sep 2011 12:51:23 
-0000      1.19
@@ -1501,9 +1501,7 @@
 
 
 $result_converted{'xml'}->{'punctuation_in_line_commands'} = '
-<node name="node_0021-After-punc">
-<nodename>node! After punc</nodename>
-</node>
+<node name="node_0021-After-punc"><nodename>node! After punc</nodename></node>
 <top>
 <sectiontitle>top! After punc</sectiontitle>
 

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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/misc_commands/comment_space_command_on_line.pl    10 Sep 2011 
12:27:18 -0000      1.14
+++ t/results/misc_commands/comment_space_command_on_line.pl    10 Sep 2011 
12:51:23 -0000      1.15
@@ -981,10 +981,7 @@
 
 $result_converted{'xml'}->{'comment_space_command_on_line'} = 
'<settitle>Settitle <spacecmd type="spc"/></settitle><!--  settittle -->
 
-<node name="Top">
-<nodename>Top</nodename>
-<nodeup automatic="on">(dir)</nodeup>
-</node>
+<node name="Top"><nodename>Top</nodename><nodeup 
automatic="on">(dir)</nodeup></node><!--  @node Top -->
 <top>
 <sectiontitle>top element<spacecmd type="spc"/> </sectiontitle><!--  @top -->
 

Index: t/results/sectioning/chapter_node_before_and_after_part.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/sectioning/chapter_node_before_and_after_part.pl  7 Sep 2011 
23:17:46 -0000       1.17
+++ t/results/sectioning/chapter_node_before_and_after_part.pl  10 Sep 2011 
12:51:24 -0000      1.18
@@ -785,11 +785,7 @@
 
 
 $result_converted{'xml'}->{'chapter_node_before_and_after_part'} = '
-<node name="Top">
-<nodename>Top</nodename>
-<nodenext automatic="on">after</nodenext>
-<nodeup automatic="on">(dir)</nodeup>
-</node>
+<node name="Top"><nodename>Top</nodename><nodenext 
automatic="on">after</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <chapter>
 <sectiontitle>chapter</sectiontitle>
 
@@ -801,11 +797,7 @@
 <part>
 <sectiontitle>part</sectiontitle>
 
-<node name="after">
-<nodename>after</nodename>
-<nodeprev automatic="on">Top</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="after"><nodename>after</nodename><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter>
 <sectiontitle>chapter 2</sectiontitle>
 

Index: t/results/sectioning/double_part.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/double_part.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/sectioning/double_part.pl 7 Sep 2011 23:17:46 -0000       1.12
+++ t/results/sectioning/double_part.pl 10 Sep 2011 12:51:24 -0000      1.13
@@ -988,11 +988,7 @@
 ';
 
 
-$result_converted{'xml'}->{'double_part'} = '<node name="Top">
-<nodename>Top</nodename>
-<nodenext automatic="on">node chapter</nodenext>
-<nodeup automatic="on">(dir)</nodeup>
-</node>
+$result_converted{'xml'}->{'double_part'} = '<node 
name="Top"><nodename>Top</nodename><nodenext automatic="on">node 
chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top>
 <sectiontitle>top</sectiontitle>
 
@@ -1010,11 +1006,7 @@
 <sectiontitle>part second</sectiontitle>
 <para>Text part second.
 </para>
-<node name="node-chapter">
-<nodename>node chapter</nodename>
-<nodeprev automatic="on">Top</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="node-chapter"><nodename>node chapter</nodename><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter>
 <sectiontitle>chapter after 2 parts</sectiontitle>
 

Index: t/results/sectioning/node_part_chapter_after_chapter.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/sectioning/node_part_chapter_after_chapter.pl     7 Sep 2011 
23:17:46 -0000       1.18
+++ t/results/sectioning/node_part_chapter_after_chapter.pl     10 Sep 2011 
12:51:24 -0000      1.19
@@ -1257,11 +1257,7 @@
 ';
 
 
-$result_converted{'xml'}->{'node_part_chapter_after_chapter'} = '<node 
name="Top">
-<nodename>Top</nodename>
-<nodenext automatic="on">chapter node</nodenext>
-<nodeup automatic="on">(dir)</nodeup>
-</node>
+$result_converted{'xml'}->{'node_part_chapter_after_chapter'} = '<node 
name="Top"><nodename>Top</nodename><nodenext automatic="on">chapter 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top>
 <sectiontitle>top</sectiontitle>
 
@@ -1271,22 +1267,13 @@
 </pre></menudescription></menuentry></menu>
 
 </top>
-<node name="chapter-node">
-<nodename>chapter node</nodename>
-<nodenext automatic="on">part chapter node</nodenext>
-<nodeprev automatic="on">Top</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="chapter-node"><nodename>chapter node</nodename><nodenext 
automatic="on">part chapter node</nodenext><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
 
 <chapter>
 <sectiontitle>chapter node</sectiontitle>
 
 </chapter>
-<node name="part-chapter-node">
-<nodename>part chapter node</nodename>
-<nodeprev automatic="on">chapter node</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="part-chapter-node"><nodename>part chapter node</nodename><nodeprev 
automatic="on">chapter node</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <part>
 <sectiontitle>part</sectiontitle>
 

Index: t/results/sectioning/node_part_chapter_after_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/sectioning/node_part_chapter_after_top.pl 7 Sep 2011 23:17:46 
-0000       1.11
+++ t/results/sectioning/node_part_chapter_after_top.pl 10 Sep 2011 12:51:24 
-0000      1.12
@@ -855,11 +855,7 @@
 ';
 
 
-$result_converted{'xml'}->{'node_part_chapter_after_top'} = '<node name="Top">
-<nodename>Top</nodename>
-<nodenext automatic="on">chapter node</nodenext>
-<nodeup automatic="on">(dir)</nodeup>
-</node>
+$result_converted{'xml'}->{'node_part_chapter_after_top'} = '<node 
name="Top"><nodename>Top</nodename><nodenext automatic="on">chapter 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top>
 <sectiontitle>top</sectiontitle>
 
@@ -868,11 +864,7 @@
 </pre></menudescription></menuentry></menu>
 
 </top>
-<node name="chapter-node">
-<nodename>chapter node</nodename>
-<nodeprev automatic="on">Top</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="chapter-node"><nodename>chapter node</nodename><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <part>
 <sectiontitle>part</sectiontitle>
 

Index: t/results/sectioning/part_chapter_after_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/sectioning/part_chapter_after_top.pl      7 Sep 2011 23:17:46 
-0000       1.11
+++ t/results/sectioning/part_chapter_after_top.pl      10 Sep 2011 12:51:24 
-0000      1.12
@@ -855,11 +855,7 @@
 ';
 
 
-$result_converted{'xml'}->{'part_chapter_after_top'} = '<node name="Top">
-<nodename>Top</nodename>
-<nodenext automatic="on">chapter</nodenext>
-<nodeup automatic="on">(dir)</nodeup>
-</node>
+$result_converted{'xml'}->{'part_chapter_after_top'} = '<node 
name="Top"><nodename>Top</nodename><nodenext 
automatic="on">chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top>
 <sectiontitle>top</sectiontitle>
 
@@ -871,11 +867,7 @@
 <part>
 <sectiontitle>part</sectiontitle>
 
-<node name="chapter">
-<nodename>chapter</nodename>
-<nodeprev automatic="on">Top</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="chapter"><nodename>chapter</nodename><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter>
 <sectiontitle>chapter </sectiontitle>
 </chapter>

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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/sectioning/part_node_chapter_after_top.pl 7 Sep 2011 23:17:46 
-0000       1.19
+++ t/results/sectioning/part_node_chapter_after_top.pl 10 Sep 2011 12:51:24 
-0000      1.20
@@ -1129,11 +1129,7 @@
 ';
 
 
-$result_converted{'xml'}->{'part_node_chapter_after_top'} = '<node name="Top">
-<nodename>Top</nodename>
-<nodenext automatic="on">a node after part</nodenext>
-<nodeup automatic="on">(dir)</nodeup>
-</node>
+$result_converted{'xml'}->{'part_node_chapter_after_top'} = '<node 
name="Top"><nodename>Top</nodename><nodenext automatic="on">a node after 
part</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top>
 <sectiontitle>top</sectiontitle>
 
@@ -1146,19 +1142,9 @@
 <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>
-<node name="chapter">
-<nodename>chapter</nodename>
-<nodeprev automatic="on">a node after part</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="chapter"><nodename>chapter</nodename><nodeprev automatic="on">a 
node after part</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter>
 <sectiontitle>chapter </sectiontitle>
 </chapter>

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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/sectioning/section_before_top.pl  7 Sep 2011 23:17:46 -0000       
1.16
+++ t/results/sectioning/section_before_top.pl  10 Sep 2011 12:51:25 -0000      
1.17
@@ -670,20 +670,11 @@
 ';
 
 
-$result_converted{'xml'}->{'section_before_top'} = '<node name="section-node">
-<nodename>section node</nodename>
-<nodeprev automatic="on">Top</nodeprev>
-<nodeup>Top</nodeup>
-</node>
-<section>
+$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>
+<node name="Top"><nodename>Top</nodename><nodenext automatic="on">section 
node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <unnumberedsec originalcommand="top">
 <sectiontitle>top</sectiontitle>
 

Index: t/results/sectioning/section_in_unnumbered_plaintext.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/sectioning/section_in_unnumbered_plaintext.pl     7 Sep 2011 
23:17:46 -0000       1.17
+++ t/results/sectioning/section_in_unnumbered_plaintext.pl     10 Sep 2011 
12:51:25 -0000      1.18
@@ -9465,11 +9465,7 @@
 $result_converted{'xml'}->{'section_in_unnumbered_plaintext'} = '
 <setcontentsaftertitlepage></setcontentsaftertitlepage>
 
-<node name="Top">
-<nodename>Top</nodename>
-<nodenext automatic="on">chapter</nodenext>
-<nodeup automatic="on">(dir)</nodeup>
-</node>
+<node name="Top"><nodename>Top</nodename><nodenext 
automatic="on">chapter</nodenext><nodeup automatic="on">(dir)</nodeup></node>
 <top>
 <sectiontitle>Test section in unnumbered</sectiontitle>
 
@@ -9486,12 +9482,7 @@
 </pre></menudescription></menuentry></menu>
 
 </top>
-<node name="chapter">
-<nodename>chapter</nodename>
-<nodenext automatic="on">unnumbered</nodenext>
-<nodeprev automatic="on">Top</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="chapter"><nodename>chapter</nodename><nodenext 
automatic="on">unnumbered</nodenext><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter>
 <sectiontitle>chapter</sectiontitle>
 
@@ -9499,21 +9490,13 @@
 <menuentry><menunode>section in chapter</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="section-in-chapter">
-<nodename>section in chapter</nodename>
-<nodeup automatic="on">chapter</nodeup>
-</node>
+<node name="section-in-chapter"><nodename>section in chapter</nodename><nodeup 
automatic="on">chapter</nodeup></node>
 <section>
 <sectiontitle>section in chapter</sectiontitle>
 
 </section>
 </chapter>
-<node name="unnumbered">
-<nodename>unnumbered</nodename>
-<nodenext automatic="on">chapter 2</nodenext>
-<nodeprev automatic="on">chapter</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="unnumbered"><nodename>unnumbered</nodename><nodenext 
automatic="on">chapter 2</nodenext><nodeprev 
automatic="on">chapter</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <unnumbered>
 <sectiontitle>unnumbered</sectiontitle>
 
@@ -9521,21 +9504,13 @@
 <menuentry><menunode>section in unnumbered</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="section-in-unnumbered">
-<nodename>section in unnumbered</nodename>
-<nodeup automatic="on">unnumbered</nodeup>
-</node>
+<node name="section-in-unnumbered"><nodename>section in 
unnumbered</nodename><nodeup automatic="on">unnumbered</nodeup></node>
 <section>
 <sectiontitle>section in unnumbered</sectiontitle>
 
 </section>
 </unnumbered>
-<node name="chapter-2">
-<nodename>chapter 2</nodename>
-<nodenext automatic="on">chapter 3</nodenext>
-<nodeprev automatic="on">unnumbered</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="chapter-2"><nodename>chapter 2</nodename><nodenext 
automatic="on">chapter 3</nodenext><nodeprev 
automatic="on">unnumbered</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter>
 <sectiontitle>chapter 2</sectiontitle>
 
@@ -9544,11 +9519,7 @@
 </pre></menudescription></menuentry><menuentry><menunode>unnumberedsec 
2-1</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="unnumberedsec-2">
-<nodename>unnumberedsec 2</nodename>
-<nodenext automatic="on">unnumberedsec 2-1</nodenext>
-<nodeup automatic="on">chapter 2</nodeup>
-</node>
+<node name="unnumberedsec-2"><nodename>unnumberedsec 2</nodename><nodenext 
automatic="on">unnumberedsec 2-1</nodenext><nodeup automatic="on">chapter 
2</nodeup></node>
 <unnumberedsec>
 <sectiontitle>unnumbered section 2</sectiontitle>
 
@@ -9559,50 +9530,28 @@
 </pre></menudescription></menuentry><menuentry><menunode>numbered sub2 
2</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="unnumbered-sub-2">
-<nodename>unnumbered sub 2</nodename>
-<nodenext automatic="on">numbered sub 2</nodenext>
-<nodeup automatic="on">unnumberedsec 2</nodeup>
-</node>
+<node name="unnumbered-sub-2"><nodename>unnumbered sub 2</nodename><nodenext 
automatic="on">numbered sub 2</nodenext><nodeup automatic="on">unnumberedsec 
2</nodeup></node>
 <unnumberedsubsec>
 <sectiontitle>unnumbered subsection 2</sectiontitle>
 
 </unnumberedsubsec>
-<node name="numbered-sub-2">
-<nodename>numbered sub 2</nodename>
-<nodenext automatic="on">unnumbered sub2 2</nodenext>
-<nodeprev automatic="on">unnumbered sub 2</nodeprev>
-<nodeup automatic="on">unnumberedsec 2</nodeup>
-</node>
+<node name="numbered-sub-2"><nodename>numbered sub 2</nodename><nodenext 
automatic="on">unnumbered sub2 2</nodenext><nodeprev automatic="on">unnumbered 
sub 2</nodeprev><nodeup automatic="on">unnumberedsec 2</nodeup></node>
 <subsection>
 <sectiontitle>numbered subsection 2</sectiontitle>
 
 </subsection>
-<node name="unnumbered-sub2-2">
-<nodename>unnumbered sub2 2</nodename>
-<nodenext automatic="on">numbered sub2 2</nodenext>
-<nodeprev automatic="on">numbered sub 2</nodeprev>
-<nodeup automatic="on">unnumberedsec 2</nodeup>
-</node>
+<node name="unnumbered-sub2-2"><nodename>unnumbered sub2 2</nodename><nodenext 
automatic="on">numbered sub2 2</nodenext><nodeprev automatic="on">numbered sub 
2</nodeprev><nodeup automatic="on">unnumberedsec 2</nodeup></node>
 <unnumberedsubsec>
 <sectiontitle>unnumbered subsection2 2</sectiontitle>
 
 </unnumberedsubsec>
-<node name="numbered-sub2-2">
-<nodename>numbered sub2 2</nodename>
-<nodeprev automatic="on">unnumbered sub2 2</nodeprev>
-<nodeup automatic="on">unnumberedsec 2</nodeup>
-</node>
+<node name="numbered-sub2-2"><nodename>numbered sub2 2</nodename><nodeprev 
automatic="on">unnumbered sub2 2</nodeprev><nodeup automatic="on">unnumberedsec 
2</nodeup></node>
 <subsection>
 <sectiontitle>numbered subsection2 2</sectiontitle>
 
 </subsection>
 </unnumberedsec>
-<node name="unnumberedsec-2_002d1">
-<nodename>unnumberedsec 2-1</nodename>
-<nodeprev automatic="on">unnumberedsec 2</nodeprev>
-<nodeup automatic="on">chapter 2</nodeup>
-</node>
+<node name="unnumberedsec-2_002d1"><nodename>unnumberedsec 
2-1</nodename><nodeprev automatic="on">unnumberedsec 2</nodeprev><nodeup 
automatic="on">chapter 2</nodeup></node>
 <unnumberedsec>
 <sectiontitle>unnumberedsec 2-1</sectiontitle>
 
@@ -9610,10 +9559,7 @@
 <menuentry><menunode>numbered sub 2-1</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="numbered-sub-2_002d1">
-<nodename>numbered sub 2-1</nodename>
-<nodeup automatic="on">unnumberedsec 2-1</nodeup>
-</node>
+<node name="numbered-sub-2_002d1"><nodename>numbered sub 2-1</nodename><nodeup 
automatic="on">unnumberedsec 2-1</nodeup></node>
 <subsection>
 <sectiontitle>numbered subsection 2-1</sectiontitle>
 
@@ -9621,12 +9567,7 @@
 </subsection>
 </unnumberedsec>
 </chapter>
-<node name="chapter-3">
-<nodename>chapter 3</nodename>
-<nodenext automatic="on">unnumbered 4</nodenext>
-<nodeprev automatic="on">chapter 2</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="chapter-3"><nodename>chapter 3</nodename><nodenext 
automatic="on">unnumbered 4</nodenext><nodeprev automatic="on">chapter 
2</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter>
 <sectiontitle>chapter 3</sectiontitle>
 
@@ -9638,11 +9579,7 @@
 </pre></menudescription></menuentry><menuentry><menunode>unnumberedsec 
3-4</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="unnumberedsec-3">
-<nodename>unnumberedsec 3</nodename>
-<nodenext automatic="on">section 3-1</nodenext>
-<nodeup automatic="on">chapter 3</nodeup>
-</node>
+<node name="unnumberedsec-3"><nodename>unnumberedsec 3</nodename><nodenext 
automatic="on">section 3-1</nodenext><nodeup automatic="on">chapter 
3</nodeup></node>
 <unnumberedsec>
 <sectiontitle>unnumbered section 3</sectiontitle>
 
@@ -9653,61 +9590,33 @@
 </pre></menudescription></menuentry><menuentry><menunode>numbered sub2 
3</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="unnumbered-sub-3">
-<nodename>unnumbered sub 3</nodename>
-<nodenext automatic="on">numbered sub 3</nodenext>
-<nodeup automatic="on">unnumberedsec 3</nodeup>
-</node>
+<node name="unnumbered-sub-3"><nodename>unnumbered sub 3</nodename><nodenext 
automatic="on">numbered sub 3</nodenext><nodeup automatic="on">unnumberedsec 
3</nodeup></node>
 <unnumberedsubsec>
 <sectiontitle>unnumbered subsection 3</sectiontitle>
 
 </unnumberedsubsec>
-<node name="numbered-sub-3">
-<nodename>numbered sub 3</nodename>
-<nodenext automatic="on">unnumbered sub2 3</nodenext>
-<nodeprev automatic="on">unnumbered sub 3</nodeprev>
-<nodeup automatic="on">unnumberedsec 3</nodeup>
-</node>
+<node name="numbered-sub-3"><nodename>numbered sub 3</nodename><nodenext 
automatic="on">unnumbered sub2 3</nodenext><nodeprev automatic="on">unnumbered 
sub 3</nodeprev><nodeup automatic="on">unnumberedsec 3</nodeup></node>
 <subsection>
 <sectiontitle>numbered subsection 3</sectiontitle>
 
 </subsection>
-<node name="unnumbered-sub2-3">
-<nodename>unnumbered sub2 3</nodename>
-<nodenext automatic="on">numbered sub2 3</nodenext>
-<nodeprev automatic="on">numbered sub 3</nodeprev>
-<nodeup automatic="on">unnumberedsec 3</nodeup>
-</node>
+<node name="unnumbered-sub2-3"><nodename>unnumbered sub2 3</nodename><nodenext 
automatic="on">numbered sub2 3</nodenext><nodeprev automatic="on">numbered sub 
3</nodeprev><nodeup automatic="on">unnumberedsec 3</nodeup></node>
 <unnumberedsubsec>
 <sectiontitle>unnumbered subsection2 3</sectiontitle>
 
 </unnumberedsubsec>
-<node name="numbered-sub2-3">
-<nodename>numbered sub2 3</nodename>
-<nodeprev automatic="on">unnumbered sub2 3</nodeprev>
-<nodeup automatic="on">unnumberedsec 3</nodeup>
-</node>
+<node name="numbered-sub2-3"><nodename>numbered sub2 3</nodename><nodeprev 
automatic="on">unnumbered sub2 3</nodeprev><nodeup automatic="on">unnumberedsec 
3</nodeup></node>
 <subsection>
 <sectiontitle>numbered subsection2 3</sectiontitle>
 
 </subsection>
 </unnumberedsec>
-<node name="section-3_002d1">
-<nodename>section 3-1</nodename>
-<nodenext automatic="on">unnumberedsec 3-2</nodenext>
-<nodeprev automatic="on">unnumberedsec 3</nodeprev>
-<nodeup automatic="on">chapter 3</nodeup>
-</node>
+<node name="section-3_002d1"><nodename>section 3-1</nodename><nodenext 
automatic="on">unnumberedsec 3-2</nodenext><nodeprev 
automatic="on">unnumberedsec 3</nodeprev><nodeup automatic="on">chapter 
3</nodeup></node>
 <section>
 <sectiontitle>section 3-1</sectiontitle>
 
 </section>
-<node name="unnumberedsec-3_002d2">
-<nodename>unnumberedsec 3-2</nodename>
-<nodenext automatic="on">section 3-3</nodenext>
-<nodeprev automatic="on">section 3-1</nodeprev>
-<nodeup automatic="on">chapter 3</nodeup>
-</node>
+<node name="unnumberedsec-3_002d2"><nodename>unnumberedsec 
3-2</nodename><nodenext automatic="on">section 3-3</nodenext><nodeprev 
automatic="on">section 3-1</nodeprev><nodeup automatic="on">chapter 
3</nodeup></node>
 <unnumberedsec>
 <sectiontitle>unnumberedsec 3-2</sectiontitle>
 
@@ -9715,21 +9624,13 @@
 <menuentry><menunode>numbered sub 3-2</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="numbered-sub-3_002d2">
-<nodename>numbered sub 3-2</nodename>
-<nodeup automatic="on">unnumberedsec 3-2</nodeup>
-</node>
+<node name="numbered-sub-3_002d2"><nodename>numbered sub 3-2</nodename><nodeup 
automatic="on">unnumberedsec 3-2</nodeup></node>
 <subsection>
 <sectiontitle>numbered subsection 3-2</sectiontitle>
 
 </subsection>
 </unnumberedsec>
-<node name="section-3_002d3">
-<nodename>section 3-3</nodename>
-<nodenext automatic="on">unnumberedsec 3-4</nodenext>
-<nodeprev automatic="on">unnumberedsec 3-2</nodeprev>
-<nodeup automatic="on">chapter 3</nodeup>
-</node>
+<node name="section-3_002d3"><nodename>section 3-3</nodename><nodenext 
automatic="on">unnumberedsec 3-4</nodenext><nodeprev 
automatic="on">unnumberedsec 3-2</nodeprev><nodeup automatic="on">chapter 
3</nodeup></node>
 <section>
 <sectiontitle>section 3-3</sectiontitle>
 
@@ -9737,20 +9638,13 @@
 <menuentry><menunode>subsection 3-3</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="subsection-3_002d3">
-<nodename>subsection 3-3</nodename>
-<nodeup automatic="on">section 3-3</nodeup>
-</node>
+<node name="subsection-3_002d3"><nodename>subsection 3-3</nodename><nodeup 
automatic="on">section 3-3</nodeup></node>
 <subsection>
 <sectiontitle>subsection 3-3</sectiontitle>
 
 </subsection>
 </section>
-<node name="unnumberedsec-3_002d4">
-<nodename>unnumberedsec 3-4</nodename>
-<nodeprev automatic="on">section 3-3</nodeprev>
-<nodeup automatic="on">chapter 3</nodeup>
-</node>
+<node name="unnumberedsec-3_002d4"><nodename>unnumberedsec 
3-4</nodename><nodeprev automatic="on">section 3-3</nodeprev><nodeup 
automatic="on">chapter 3</nodeup></node>
 <unnumberedsec>
 <sectiontitle>unnumberedsec 3-4</sectiontitle>
 
@@ -9758,21 +9652,14 @@
 <menuentry><menunode>numbered sub 3-4</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="numbered-sub-3_002d4">
-<nodename>numbered sub 3-4</nodename>
-<nodeup automatic="on">unnumberedsec 3-4</nodeup>
-</node>
+<node name="numbered-sub-3_002d4"><nodename>numbered sub 3-4</nodename><nodeup 
automatic="on">unnumberedsec 3-4</nodeup></node>
 <subsection>
 <sectiontitle>numbered subsection 3-4</sectiontitle>
 
 </subsection>
 </unnumberedsec>
 </chapter>
-<node name="unnumbered-4">
-<nodename>unnumbered 4</nodename>
-<nodeprev automatic="on">chapter 3</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="unnumbered-4"><nodename>unnumbered 4</nodename><nodeprev 
automatic="on">chapter 3</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <unnumbered>
 <sectiontitle>unnumbered  4</sectiontitle>
 
@@ -9780,10 +9667,7 @@
 <menuentry><menunode>unnumberedsec 4</menunode><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="unnumberedsec-4">
-<nodename>unnumberedsec 4</nodename>
-<nodeup automatic="on">unnumbered 4</nodeup>
-</node>
+<node name="unnumberedsec-4"><nodename>unnumberedsec 4</nodename><nodeup 
automatic="on">unnumbered 4</nodeup></node>
 <unnumberedsec>
 <sectiontitle>unnumbered section 4</sectiontitle>
 
@@ -9794,40 +9678,22 @@
 </pre></menudescription></menuentry><menuentry><menunode>numbered sub2 
4</menunode><menudescription><pre xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
-<node name="unnumbered-sub-4">
-<nodename>unnumbered sub 4</nodename>
-<nodenext automatic="on">numbered sub 4</nodenext>
-<nodeup automatic="on">unnumberedsec 4</nodeup>
-</node>
+<node name="unnumbered-sub-4"><nodename>unnumbered sub 4</nodename><nodenext 
automatic="on">numbered sub 4</nodenext><nodeup automatic="on">unnumberedsec 
4</nodeup></node>
 <unnumberedsubsec>
 <sectiontitle>unnumbered subsection 4</sectiontitle>
 
 </unnumberedsubsec>
-<node name="numbered-sub-4">
-<nodename>numbered sub 4</nodename>
-<nodenext automatic="on">unnumbered sub2 4</nodenext>
-<nodeprev automatic="on">unnumbered sub 4</nodeprev>
-<nodeup automatic="on">unnumberedsec 4</nodeup>
-</node>
+<node name="numbered-sub-4"><nodename>numbered sub 4</nodename><nodenext 
automatic="on">unnumbered sub2 4</nodenext><nodeprev automatic="on">unnumbered 
sub 4</nodeprev><nodeup automatic="on">unnumberedsec 4</nodeup></node>
 <subsection>
 <sectiontitle>numbered subsection 4</sectiontitle>
 
 </subsection>
-<node name="unnumbered-sub2-4">
-<nodename>unnumbered sub2 4</nodename>
-<nodenext automatic="on">numbered sub2 4</nodenext>
-<nodeprev automatic="on">numbered sub 4</nodeprev>
-<nodeup automatic="on">unnumberedsec 4</nodeup>
-</node>
+<node name="unnumbered-sub2-4"><nodename>unnumbered sub2 4</nodename><nodenext 
automatic="on">numbered sub2 4</nodenext><nodeprev automatic="on">numbered sub 
4</nodeprev><nodeup automatic="on">unnumberedsec 4</nodeup></node>
 <unnumberedsubsec>
 <sectiontitle>unnumbered subsection2 4</sectiontitle>
 
 </unnumberedsubsec>
-<node name="numbered-sub2-4">
-<nodename>numbered sub2 4</nodename>
-<nodeprev automatic="on">unnumbered sub2 4</nodeprev>
-<nodeup automatic="on">unnumberedsec 4</nodeup>
-</node>
+<node name="numbered-sub2-4"><nodename>numbered sub2 4</nodename><nodeprev 
automatic="on">unnumbered sub2 4</nodeprev><nodeup automatic="on">unnumberedsec 
4</nodeup></node>
 <subsection>
 <sectiontitle>numbered subsection2 4</sectiontitle>
 </subsection>

Index: t/results/sectioning/section_node_before_part.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/section_node_before_part.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/sectioning/section_node_before_part.pl    6 Sep 2011 20:32:41 
-0000       1.11
+++ t/results/sectioning/section_node_before_part.pl    10 Sep 2011 12:51:25 
-0000      1.12
@@ -357,10 +357,7 @@
 
 
 $result_converted{'xml'}->{'section_node_before_part'} = '
-<node name="Top">
-<nodename>Top</nodename>
-<nodeup automatic="on">(dir)</nodeup>
-</node>
+<node name="Top"><nodename>Top</nodename><nodeup 
automatic="on">(dir)</nodeup></node>
 <section>
 <sectiontitle>section </sectiontitle>
 

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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/xml_tests/image_inline_or_not.pl  7 Sep 2011 23:17:46 -0000       
1.4
+++ t/results/xml_tests/image_inline_or_not.pl  10 Sep 2011 12:51:25 -0000      
1.5
@@ -2225,11 +2225,7 @@
 
 <para>Para <image where="inline"><imagefile>hh</imagefile><image>.
 </para>
-<node name="Top">
-<nodename>Top</nodename>
-<nodenext automatic="on"><image 
where="inline"><imagefile>node_image</imagefile><image></nodenext>
-<nodeup automatic="on">(dir)</nodeup>
-</node>
+<node name="Top"><nodename>Top</nodename><nodenext automatic="on"><image 
where="inline"><imagefile>node_image</imagefile><image></nodenext><nodeup 
automatic="on">(dir)</nodeup></node>
 
 <image><imagefile>B</imagefile><image>
 
@@ -2264,12 +2260,7 @@
 <image where="inline"><imagefile>in_menu_comment</imagefile><image>
 </pre></menucomment></menu>
 
-<node name="node_005fimage">
-<nodename><image 
where="inline"><imagefile>node_image</imagefile><image></nodename>
-<nodenext automatic="on">(somewhere)<image 
where="inline"><imagefile>extnode</imagefile><image></nodenext>
-<nodeprev automatic="on">Top</nodeprev>
-<nodeup automatic="on">Top</nodeup>
-</node>
+<node name="node_005fimage"><nodename><image 
where="inline"><imagefile>node_image</imagefile><image></nodename><nodenext 
automatic="on">(somewhere)<image 
where="inline"><imagefile>extnode</imagefile><image></nodenext><nodeprev 
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter>
 <sectiontitle><image 
where="inline"><imagefile>in_chapter_arg</imagefile><image></sectiontitle>