texinfo/tp/Texinfo/Convert TexinfoXML.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        13/01/26 14:09:34

Modified files:
        tp/Texinfo/Convert: TexinfoXML.pm 

Log message:
        Check command associated to element to decide to handle element as node 
or 
        section.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/TexinfoXML.pm?cvsroot=texinfo&r1=1.3&r2=1.4

Patches:
Index: TexinfoXML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/TexinfoXML.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- TexinfoXML.pm       23 Jan 2013 18:54:51 -0000      1.3
+++ TexinfoXML.pm       26 Jan 2013 14:09:32 -0000      1.4
@@ -1547,7 +1547,9 @@
   # is done, and the command is not associated to an element, or when
   # the element is closed.
   } elsif ((($root->{'type'} and $root->{'type'} eq 'element'
-             and $root->{'extra'} and $root->{'extra'}->{'element_command'})
+             and $root->{'extra'} and $root->{'extra'}->{'element_command'}
+             and !($root->{'extra'}->{'element_command'}->{'cmdname'}
+                   and $root->{'extra'}->{'element_command'}->{'cmdname'} eq 
'node'))
             or ($root->{'cmdname'} 
                 and $Texinfo::Common::root_commands{$root->{'cmdname'}}
                 and $root->{'cmdname'} ne 'node'
@@ -1580,7 +1582,9 @@
       delete $self->{'pending_bye'};
     }
   } elsif ((($root->{'type'} and $root->{'type'} eq 'element'
-             and $root->{'extra'} and $root->{'extra'}->{'element_command'})
+             and $root->{'extra'} and $root->{'extra'}->{'element_command'}
+             and $root->{'extra'}->{'element_command'}->{'cmdname'}
+             and $root->{'extra'}->{'element_command'}->{'cmdname'} eq 'node')
             or ($root->{'cmdname'} 
                 and $root->{'cmdname'} eq 'node'
                 and !($root->{'parent'} and $root->{'parent'}->{'type'}