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

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/09/15 22:16:45

Modified files:
        tp/Texinfo/Convert: XML.pm 
        tp/t/results/coverage: table.pl 
        tp/t/results/xtable: empty_item_itemx.pl 
                             inter_item_commands_in_table.pl 

Log message:
        put before_item tyoe in beforefirstitem element.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/empty_item_itemx.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl?cvsroot=texinfo&r1=1.15&r2=1.16

Patches:
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- Texinfo/Convert/XML.pm      14 Sep 2011 22:59:13 -0000      1.33
+++ Texinfo/Convert/XML.pm      15 Sep 2011 22:16:44 -0000      1.34
@@ -228,6 +228,7 @@
   'multitable_head' => 'thead',
   'multitable_body' => 'tbody',
   'def_item' => 'definitionitem',
+  'before_item' => 'beforefirstitem',
 );
 
 my %context_block_commands = (

Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- t/results/coverage/table.pl 12 Sep 2011 23:39:17 -0000      1.49
+++ t/results/coverage/table.pl 15 Sep 2011 22:16:45 -0000      1.50
@@ -827,10 +827,10 @@
 </para></tableitem></tableentry></table>
 
 <vtable commandarg="samp"><!--  samp -->
-<!--  after vtable -->
+<beforefirstitem><!--  after vtable -->
 <cindex index="cp"><indexterm index="cp">index entry</indexterm></cindex>
 
-<tableentry><tableterm><item><itemformat command="samp"><indexterm 
index="vr">vtable item</indexterm>vtable item</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item><itemformat 
command="samp"><indexterm index="vr">vtable item</indexterm>vtable 
item</itemformat></item>
 <!--  after item -->
 <kindex index="ky"><indexterm index="ky">key</indexterm></kindex>
 <itemx><itemformat command="samp"><indexterm index="vr">itemx 
vtable</indexterm>itemx vtable <!--  comment in itemx line 
--></itemformat></itemx>

Index: t/results/xtable/empty_item_itemx.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/empty_item_itemx.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/xtable/empty_item_itemx.pl        11 Sep 2011 19:05:10 -0000      
1.17
+++ t/results/xtable/empty_item_itemx.pl        15 Sep 2011 22:16:45 -0000      
1.18
@@ -539,10 +539,10 @@
 
 
 $result_converted{'xml'}->{'empty_item_itemx'} = '<vtable commandarg="asis">
-
+<beforefirstitem>
 <para>VTable
 </para>
-<tableentry><tableterm><item><itemformat command="asis"><indexterm 
index="vr">first item</indexterm>first item</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item><itemformat 
command="asis"><indexterm index="vr">first item</indexterm>first 
item</itemformat></item>
 <itemx><itemformat command="asis"></itemformat></itemx>
 <itemx><itemformat command="asis"><indexterm index="vr">after an empty itemx, 
before an empty item</indexterm>after an empty itemx, before an empty 
item</itemformat></itemx>
 </tableterm></tableentry><tableentry><tableterm><item><itemformat 
command="asis"> </itemformat></item>

Index: t/results/xtable/inter_item_commands_in_table.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/xtable/inter_item_commands_in_table.pl    11 Sep 2011 19:05:10 
-0000      1.15
+++ t/results/xtable/inter_item_commands_in_table.pl    15 Sep 2011 22:16:45 
-0000      1.16
@@ -1846,8 +1846,8 @@
 
 
 $result_converted{'xml'}->{'inter_item_commands_in_table'} = '<vtable 
commandarg="code">
-<!--  comment in table -->
-<tableentry><tableterm><item><itemformat command="code"><indexterm 
index="vr">a</indexterm>a</itemformat></item>
+<beforefirstitem><!--  comment in table -->
+</beforefirstitem><tableentry><tableterm><item><itemformat 
command="code"><indexterm index="vr">a</indexterm>a</itemformat></item>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></vtable>
 
@@ -1875,16 +1875,16 @@
 </tableitem></tableentry></ftable>
 
 <table commandarg="code">
-<cindex index="cp"><indexterm index="cp">cindex in table</indexterm></cindex>
+<beforefirstitem><cindex index="cp"><indexterm index="cp">cindex in 
table</indexterm></cindex>
 <!--  comment in table -->
-<tableentry><tableterm><item><itemformat command="code">abb</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item><itemformat 
command="code">abb</itemformat></item>
 </tableterm><tableitem><para>l&textndash;ine
 </para></tableitem></tableentry></table>
 
 <table commandarg="code">
-<cindex index="cp"><indexterm index="cp">cindex in table</indexterm></cindex>
+<beforefirstitem><cindex index="cp"><indexterm index="cp">cindex in 
table</indexterm></cindex>
 <para>Texte before first item.
-</para><tableentry><tableterm><item><itemformat 
command="code">abb</itemformat></item>
+</para></beforefirstitem><tableentry><tableterm><item><itemformat 
command="code">abb</itemformat></item>
 </tableterm></tableentry></table>
 ';