texinfo/tp TODO Texinfo/Convert/XML.pm t/test_u...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/09/13 23:09:48

Modified files:
        tp             : TODO 
        tp/Texinfo/Convert: XML.pm 
        tp/t           : test_utils.pl 
        tp/t/results/coverage: commands.pl item_container.pl 
        tp/t/results/xml_tests: comments_on_block_command_lines.pl 
                                image_inline_or_not.pl 

Log message:
        Fixes in XML.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.167&r2=1.168
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_utils.pl?cvsroot=texinfo&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl?cvsroot=texinfo&r1=1.7&r2=1.8

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -b -r1.167 -r1.168
--- TODO        12 Sep 2011 23:39:14 -0000      1.167
+++ TODO        13 Sep 2011 23:09:47 -0000      1.168
@@ -1,3 +1,7 @@
+export XML_CATALOG_FILES=~/src/texinfo/tp/catalog.xml
+perl -w t/02coverage.t -o
+xmllint --nonet --noout --valid commands.xml
+
 @appendix should stop @part. Right now it do not do that.
 Cf sectioning_part_appendix.
 

Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- Texinfo/Convert/XML.pm      11 Sep 2011 19:05:09 -0000      1.31
+++ Texinfo/Convert/XML.pm      13 Sep 2011 23:09:47 -0000      1.32
@@ -426,7 +426,7 @@
           and $root->{'parent'}->{'cmdname'}
           and ($root->{'parent'}->{'cmdname'} eq 'itemize'
                or $root->{'parent'}->{'cmdname'} eq 'enumerate')) {
-        $result .= "<item>";
+        $result .= "<listitem>";
         if ($root->{'parent'}->{'cmdname'} eq 'itemize'
             and $root->{'parent'}->{'extra'} 
             and $root->{'parent'}->{'extra'}->{'block_command_line_contents'}
@@ -436,7 +436,7 @@
         => $root->{'parent'}->{'extra'}->{'block_command_line_contents'}->[0]})
             ."</prepend>";
         }
-        unshift @close_elements, 'item';
+        unshift @close_elements, 'listitem';
       } elsif (($root->{'cmdname'} eq 'item' or $root->{'cmdname'} eq 'itemx')
                and $root->{'parent'}->{'type'} 
                and $root->{'parent'}->{'type'} eq 'table_term') {
@@ -706,7 +706,7 @@
         }
       }
       if (defined($command)) {
-        $result = "<$command${attribute}>$result<$command>";
+        $result = "<$command${attribute}>$result</$command>";
       }
       if ($Texinfo::Common::context_brace_commands{$root->{'cmdname'}}) {
         pop @{$self->{'document_context'}};

Index: t/test_utils.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_utils.pl,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- t/test_utils.pl     12 Sep 2011 23:39:14 -0000      1.98
+++ t/test_utils.pl     13 Sep 2011 23:09:48 -0000      1.99
@@ -67,6 +67,10 @@
   <!ENTITY latex "LaTeX">
 ]>
 '. "<book lang=\"en\">\n", "</book>\n"],
+  'xml' => ['<?xml version="1.0"?>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V4.12//EN" 
"http://www.gnu.org/software/texinfo/dtd/4.12/texinfo.dtd";>
+<texinfo xml:lang="en">
+', "</texinfo>\n"],
 );
 
 our $arg_generate;

Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- t/results/coverage/commands.pl      12 Sep 2011 23:39:15 -0000      1.47
+++ t/results/coverage/commands.pl      13 Sep 2011 23:09:48 -0000      1.48
@@ -569,7 +569,7 @@
 
 $result_converted{'xml'}->{'commands'} = '<para>&arobase; &tex; <spacecmd 
type="nl"/><accent type="uml">e</accent> <accent 
type="circ"><dotless>i</dotless></accent> <accent type="tilde">a</accent> 
<accent type="ring">a</accent>
 <clicksequence>File <click command="arrow"/> Open</clicksequence>&eosperiod;
-<email><emailaddress>a</emailaddress><emailname>b</emailname><email> 
<code>code --- -- \'\' ``</code>
+<email><emailaddress>a</emailaddress><emailname>b</emailname></email> 
<code>code --- -- \'\' ``</code>
 &textmdash; &textndash; &textrdquo; &textldquo;. <sc>small caps</sc>.
 </para>
 <cindex index="cp"><indexterm index="cp">index entry &textldquo;in 
text&textrdquo; &latex;</indexterm></cindex>

Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- t/results/coverage/item_container.pl        12 Sep 2011 23:39:16 -0000      
1.43
+++ t/results/coverage/item_container.pl        13 Sep 2011 23:09:48 -0000      
1.44
@@ -494,17 +494,17 @@
 
 $result_converted{'xml'}->{'item_container'} = '
 <itemize><itemprepend>+</itemprepend>
-<item><prepend>+</prepend><para>i&textndash;tem +
-</para></item></itemize>
+<listitem><prepend>+</prepend><para>i&textndash;tem +
+</para></listitem></itemize>
 
 <itemize commandarg="bullet"><itemprepend>&bullet;</itemprepend>
-<item><prepend>&bullet;</prepend>
+<listitem><prepend>&bullet;</prepend>
 <para>b&textndash;ullet
-</para></item></itemize>
+</para></listitem></itemize>
 
 <itemize commandarg="bullet">
-<item><prepend>&bullet;</prepend><para>no itemize argument
-</para></item></itemize>
+<listitem><prepend>&bullet;</prepend><para>no itemize argument
+</para></listitem></itemize>
 ';
 
 

Index: t/results/xml_tests/comments_on_block_command_lines.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/xml_tests/comments_on_block_command_lines.pl      11 Sep 2011 
19:05:10 -0000      1.6
+++ t/results/xml_tests/comments_on_block_command_lines.pl      13 Sep 2011 
23:09:48 -0000      1.7
@@ -2457,24 +2457,24 @@
 
 
 $result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize 
commandarg="bullet"><!--  comm -->
-<item><prepend>&bullet;</prepend><para>itemize it
-</para></item></itemize>
+<listitem><prepend>&bullet;</prepend><para>itemize it
+</para></listitem></itemize>
 
 <itemize><itemprepend>x </itemprepend><!--  comm -->
-<item><prepend>x</prepend><para>itemize xit
-</para></item></itemize>
+<listitem><prepend>x</prepend><para>itemize xit
+</para></listitem></itemize>
 
 <itemize commandarg="bullet"><itemprepend>&bullet; </itemprepend><!--  comm -->
-<item><prepend>&bullet;</prepend><para>itemize bulletit
-</para></item></itemize>
+<listitem><prepend>&bullet;</prepend><para>itemize bulletit
+</para></listitem></itemize>
 
 <enumerate first="1"><!--  comm -->
-<item><para>en
-</para></item></enumerate>
+<listitem><para>en
+</para></listitem></enumerate>
 
 <enumerate first="a"><enumeratefirst>a </enumeratefirst><!--  comm -->
-<item><para>aen
-</para></item></enumerate>
+<listitem><para>aen
+</para></listitem></enumerate>
 
 <table commandarg="asis"><!--  table -->
 <tableentry><tableterm><item><itemformat command="asis">it</itemformat></item>

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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/xml_tests/image_inline_or_not.pl  11 Sep 2011 19:05:10 -0000      
1.7
+++ t/results/xml_tests/image_inline_or_not.pl  13 Sep 2011 23:09:48 -0000      
1.8
@@ -2221,57 +2221,57 @@
 
 
 
-$result_converted{'xml'}->{'image_inline_or_not'} = 
'<image><imagefile>A</imagefile><image>
+$result_converted{'xml'}->{'image_inline_or_not'} = 
'<image><imagefile>A</imagefile></image>
 
-<para>Para <image where="inline"><imagefile>hh</imagefile><image>.
+<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>
+<image><imagefile>B</imagefile></image>
 
-<para>Para <image where="inline"><imagefile>jj</imagefile><image>.
+<para>Para <image where="inline"><imagefile>jj</imagefile></image>.
 </para>
 <example>
 <pre xml:space="preserve">
-<image where="inline"><imagefile>in_example</imagefile><image>
+<image where="inline"><imagefile>in_example</imagefile></image>
 
 T
-<image where="inline"><imagefile>in example after text</imagefile><image>
+<image where="inline"><imagefile>in example after text</imagefile></image>
 </pre></example>
 
-<quotation><quotationtype><image 
where="inline"><imagefile>in_quotation_arg</imagefile><image></quotationtype>
-<image><imagefile>in_quotation_content</imagefile><image>
+<quotation><quotationtype><image 
where="inline"><imagefile>in_quotation_arg</imagefile></image></quotationtype>
+<image><imagefile>in_quotation_content</imagefile></image>
 </quotation>
 
 <table commandarg="asis">
-<tableentry><tableterm><item><itemformat command="asis"><image 
where="inline"><imagefile>in_table_item</imagefile><image></itemformat></item>
+<tableentry><tableterm><item><itemformat command="asis"><image 
where="inline"><imagefile>in_table_item</imagefile></image></itemformat></item>
 </tableterm><tableitem>
-<image><imagefile>in_table_def</imagefile><image>
+<image><imagefile>in_table_def</imagefile></image>
 
-<para>AA <image where="inline"><imagefile>in_table_def_para</imagefile><image>
+<para>AA <image where="inline"><imagefile>in_table_def_para</imagefile></image>
 </para>
-<image><imagefile>in_table_def_after</imagefile><image>
+<image><imagefile>in_table_def_after</imagefile></image>
 </tableitem></tableentry></table>
 
 <menu>
-<menuentry><menunode><image 
where="inline"><imagefile>node_image</imagefile><image></menunode><menudescription><pre
 xml:space="preserve"><image 
where="inline"><imagefile>image_in_description</imagefile><image>
-</pre></menudescription></menuentry><menuentry><menutitle><image 
where="inline"><imagefile>in_menu_entry_name</imagefile><image></menutitle><menunode>(somewhere)<image
 
where="inline"><imagefile>extnode</imagefile><image></menunode><menudescription><pre
 xml:space="preserve">
+<menuentry><menunode><image 
where="inline"><imagefile>node_image</imagefile></image></menunode><menudescription><pre
 xml:space="preserve"><image 
where="inline"><imagefile>image_in_description</imagefile></image>
+</pre></menudescription></menuentry><menuentry><menutitle><image 
where="inline"><imagefile>in_menu_entry_name</imagefile></image></menutitle><menunode>(somewhere)<image
 
where="inline"><imagefile>extnode</imagefile></image></menunode><menudescription><pre
 xml:space="preserve">
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
-<image where="inline"><imagefile>in_menu_comment</imagefile><image>
+<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>
-<chapter><sectiontitle><image 
where="inline"><imagefile>in_chapter_arg</imagefile><image></sectiontitle>
+<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>
 
 
-<para>T<footnote><image 
where="inline"><imagefile>in_footnote</imagefile><image>
+<para>T<footnote><image 
where="inline"><imagefile>in_footnote</imagefile></image>
 </footnote>
 </para>
 <float name="g" type="F"><floattype>F</floattype><floatname>g</floatname>
 
-<image><imagefile>in_float</imagefile><image>
+<image><imagefile>in_float</imagefile></image>
 
-<caption><image><imagefile>in_caption</imagefile><image><para> PAra <image 
where="inline"><imagefile>in_caption_para</imagefile><image></para></caption>
+<caption><image><imagefile>in_caption</imagefile></image><para> PAra <image 
where="inline"><imagefile>in_caption_para</imagefile></image></para></caption>
 </float>
 </chapter>
 ';