texinfo-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp/t converters_tests.t results/convert...

From: Patrice Dumas
Subject: texinfo/tp/t converters_tests.t results/convert...
Date: Tue, 03 Jan 2012 23:43:34 +0000 
CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/01/03 23:43:33

Modified files:
        tp/t           : converters_tests.t 
        tp/t/results/converters_tests: accent.pl accent_with_text.pl 
                                       accentenc.pl 
                                       documentencoding_utf8_and_insertions.pl 
                                       no_documentencoding_and_insertions.pl 
                                       ref_error_formatting.pl 
                                       refs_formatting.pl 
                                       sp_in_example.pl 
                                       test_deftypefnnewline.pl 
                                       test_sp.pl unknown_value.pl 
                                       weird_accents.pl 
                                       weird_accents_disable_encoding.pl 

Log message:
        Add XML to tests of converters_tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/converters_tests.t?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accent.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accent_with_text.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accentenc.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/ref_error_formatting.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/refs_formatting.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/sp_in_example.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/test_sp.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/unknown_value.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/weird_accents.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/weird_accents_disable_encoding.pl?cvsroot=texinfo&r1=1.6&r2=1.7

Patches:
Index: converters_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/converters_tests.t,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- converters_tests.t  28 Dec 2011 23:40:23 -0000      1.11
+++ converters_tests.t  3 Jan 2012 23:43:31 -0000       1.12
@@ -294,7 +294,7 @@
 foreach my $test (@test_cases) {
   push @{$test->[2]->{'test_formats'}}, 'plaintext';
   push @{$test->[2]->{'test_formats'}}, 'html_text';
-  #push @{$test->[2]->{'test_formats'}}, 'xml';
+  push @{$test->[2]->{'test_formats'}}, 'xml';
   push @{$test->[2]->{'test_formats'}}, 'docbook';
 }
 

Index: results/converters_tests/accent.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/accent.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- results/converters_tests/accent.pl  8 Nov 2011 00:05:51 -0000       1.7
+++ results/converters_tests/accent.pl  3 Jan 2012 23:43:32 -0000       1.8
@@ -3128,6 +3128,88 @@
 ';
 
 
+$result_converted{'xml'}->{'accent'} = '<node 
name="Top"><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
+<top><sectiontitle>top</sectiontitle>
+
+<para>should be e`: <accent type="grave">e</accent> <accent 
type="grave">e</accent>
+</para>
+<para>should be e\': <accent type="acute">e</accent> <accent 
type="acute">e</accent>
+</para>
+<para>should be e^: <accent type="circ">e</accent> <accent 
type="circ">e</accent>
+</para>
+<para>should be u&quot;: <accent type="uml">u</accent> <accent 
type="uml">u</accent>
+</para>
+<para>should be i`: <accent type="grave">i</accent> <accent 
type="grave">i</accent>
+</para>
+<para>should be i\': <accent type="acute">i</accent> <accent 
type="acute">i</accent>
+</para>
+<para>should be i^: <accent type="circ">i</accent> <accent 
type="circ">i</accent>
+</para>
+<para>should be u&quot;: <accent type="uml">u</accent> <accent 
type="uml">u</accent>
+</para>
+<para>should be c,: <accent type="cedil">c</accent> <accent 
type="cedil">c</accent>
+</para>
+<para>should be n~: <accent type="tilde">n</accent> <accent 
type="tilde">n</accent>
+</para>
+<para>should be e=: <accent type="macr">e</accent> <accent 
type="macr">e</accent>
+</para>
+<para>should be e<w>\'</w>\': <accent type="doubleacute">e</accent> <accent 
type="doubleacute">e</accent>
+</para>
+<para>should be e.: <accent type="dotaccent">e</accent> <accent 
type="dotaccent">e</accent>
+</para>
+<para>should be e*: <accent type="ring">e</accent> <accent 
type="ring">e</accent>
+</para>
+<para>should be ee[: <accent type="tieaccent">ee</accent>
+</para>
+<para>should be e(: <accent type="breve">e</accent> <accent 
type="breve">e</accent>
+</para>
+<para>should be e_: <accent type="ubaraccent">e</accent> <accent 
type="ubaraccent">e</accent>
+</para>
+<para>should be .e: <accent type="udotaccent">e</accent> <accent 
type="udotaccent">e</accent>
+</para>
+<para>should be e&lt;: <accent type="caron">e</accent> <accent 
type="caron">e</accent>
+</para>
+<para>should be a; : <accent type="ogon">a</accent> <accent 
type="ogon">a</accent>
+</para>
+<para>should be e; : <accent type="ogon">e</accent> <accent 
type="ogon">e</accent>
+</para>
+<para>upside down: &iquest; &iexcl;
+</para>
+<para>A-with-circle: &aring;,&Aring;
+</para>
+<para>AE, OE ligatures: &aelig; &AElig; &oelig; &OElig;
+</para>
+<para>dotless i, j: <dotless>i</dotless> <dotless>j</dotless>
+</para>
+<para>Polish suppressed-L: &lslash; &Lslash;
+</para>
+<para>O-with-slash: &oslash; &Oslash;
+</para>
+<para>es-zet or sharp S: &szlig;
+</para>
+<para>pounds sterling: &pound;
+</para>
+<!-- arg is command - @dotless{i} is special-cased for HTML -->
+<para>should be dotless i`: <accent type="grave"><dotless>i</dotless></accent>
+</para>
+<para>should be dotless i\': <accent type="acute"><dotless>i</dotless></accent>
+</para>
+<para>should be dotless i^: <accent type="circ"><dotless>i</dotless></accent>
+</para>
+<para>should be dotless i&quot;: <accent 
type="uml"><dotless>i</dotless></accent>
+</para>
+<!-- arg is command - @dotless{j} -->
+<para>should be dotless j`: <accent type="grave"><dotless>j</dotless></accent>
+</para>
+<para>should be dotless j\': <accent type="acute"><dotless>j</dotless></accent>
+</para>
+<para>should be dotless j^: <accent type="circ"><dotless>j</dotless></accent>
+</para>
+<para>should be dotless j&quot;: <accent 
type="uml"><dotless>j</dotless></accent>
+</para></top>
+';
+
+
 $result_converted{'docbook'}->{'accent'} = '<chapter label="" id="Top">
 <title>top</title>
 

Index: results/converters_tests/accent_with_text.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/accent_with_text.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- results/converters_tests/accent_with_text.pl        8 Nov 2011 00:05:51 
-0000       1.2
+++ results/converters_tests/accent_with_text.pl        3 Jan 2012 23:43:32 
-0000       1.3
@@ -230,6 +230,10 @@
 </p>';
 
 
+$result_converted{'xml'}->{'accent_with_text'} = '<para><accent 
type="breve">&textndash;a</accent> <dotless>&textndash;b</dotless> <accent 
type="circ">&textndash;<dotless>i</dotless></accent> <accent 
type="circ">&textndash;<dotless>j</dotless></accent> <accent 
type="circ">&textndash;a</accent>
+</para>';
+
+
 $result_converted{'docbook'}->{'accent_with_text'} = '<para>&#8211;a( &#8211;b 
&#238; &#309; &#8211;a^
 </para>';
 

Index: results/converters_tests/accentenc.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/accentenc.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- results/converters_tests/accentenc.pl       8 Nov 2011 00:05:51 -0000       
1.8
+++ results/converters_tests/accentenc.pl       3 Jan 2012 23:43:32 -0000       
1.9
@@ -3186,6 +3186,90 @@
 ';
 
 
+$result_converted{'xml'}->{'accentenc'} = '<documentencoding 
encoding="ISO-8859-1">ISO-8859-1</documentencoding>
+
+<node name="Top"><nodename>Top</nodename><nodeup 
automatic="on">(dir)</nodeup></node>
+<top><sectiontitle>top</sectiontitle>
+
+<para>should be e`: <accent type="grave">e</accent> <accent 
type="grave">e</accent>
+</para>
+<para>should be e\': <accent type="acute">e</accent> <accent 
type="acute">e</accent>
+</para>
+<para>should be e^: <accent type="circ">e</accent> <accent 
type="circ">e</accent>
+</para>
+<para>should be u&quot;: <accent type="uml">u</accent> <accent 
type="uml">u</accent>
+</para>
+<para>should be i`: <accent type="grave">i</accent> <accent 
type="grave">i</accent>
+</para>
+<para>should be i\': <accent type="acute">i</accent> <accent 
type="acute">i</accent>
+</para>
+<para>should be i^: <accent type="circ">i</accent> <accent 
type="circ">i</accent>
+</para>
+<para>should be u&quot;: <accent type="uml">u</accent> <accent 
type="uml">u</accent>
+</para>
+<para>should be c,: <accent type="cedil">c</accent> <accent 
type="cedil">c</accent>
+</para>
+<para>should be n~: <accent type="tilde">n</accent> <accent 
type="tilde">n</accent>
+</para>
+<para>should be e=: <accent type="macr">e</accent> <accent 
type="macr">e</accent>
+</para>
+<para>should be e<w>\'</w>\': <accent type="doubleacute">e</accent> <accent 
type="doubleacute">e</accent>
+</para>
+<para>should be e.: <accent type="dotaccent">e</accent> <accent 
type="dotaccent">e</accent>
+</para>
+<para>should be e*: <accent type="ring">e</accent> <accent 
type="ring">e</accent>
+</para>
+<para>should be ee[: <accent type="tieaccent">ee</accent>
+</para>
+<para>should be e(: <accent type="breve">e</accent> <accent 
type="breve">e</accent>
+</para>
+<para>should be e_: <accent type="ubaraccent">e</accent> <accent 
type="ubaraccent">e</accent>
+</para>
+<para>should be .e: <accent type="udotaccent">e</accent> <accent 
type="udotaccent">e</accent>
+</para>
+<para>should be e&lt;: <accent type="caron">e</accent> <accent 
type="caron">e</accent>
+</para>
+<para>should be a; : <accent type="ogon">a</accent> <accent 
type="ogon">a</accent>
+</para>
+<para>should be e; : <accent type="ogon">e</accent> <accent 
type="ogon">e</accent>
+</para>
+<para>upside down: &iquest; &iexcl;
+</para>
+<para>A-with-circle: &aring;,&Aring;
+</para>
+<para>AE, OE ligatures: &aelig; &AElig; &oelig; &OElig;
+</para>
+<para>dotless i, j: <dotless>i</dotless> <dotless>j</dotless>
+</para>
+<para>Polish suppressed-L: &lslash; &Lslash;
+</para>
+<para>O-with-slash: &oslash; &Oslash;
+</para>
+<para>es-zet or sharp S: &szlig;
+</para>
+<para>pounds sterling: &pound;
+</para>
+<!-- arg is command - @dotless{i} is special-cased for HTML -->
+<para>should be dotless i`: <accent type="grave"><dotless>i</dotless></accent>
+</para>
+<para>should be dotless i\': <accent type="acute"><dotless>i</dotless></accent>
+</para>
+<para>should be dotless i^: <accent type="circ"><dotless>i</dotless></accent>
+</para>
+<para>should be dotless i&quot;: <accent 
type="uml"><dotless>i</dotless></accent>
+</para>
+<!-- arg is command - @dotless{j} -->
+<para>should be dotless j`: <accent type="grave"><dotless>j</dotless></accent>
+</para>
+<para>should be dotless j\': <accent type="acute"><dotless>j</dotless></accent>
+</para>
+<para>should be dotless j^: <accent type="circ"><dotless>j</dotless></accent>
+</para>
+<para>should be dotless j&quot;: <accent 
type="uml"><dotless>j</dotless></accent>
+</para></top>
+';
+
+
 $result_converted{'docbook'}->{'accentenc'} = '
 <chapter label="" id="Top">
 <title>top</title>

Index: results/converters_tests/documentencoding_utf8_and_insertions.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- results/converters_tests/documentencoding_utf8_and_insertions.pl    4 Dec 
2011 22:16:10 -0000       1.1
+++ results/converters_tests/documentencoding_utf8_and_insertions.pl    3 Jan 
2012 23:43:32 -0000       1.2
@@ -314,6 +314,16 @@
 ';
 
 
+$result_converted{'xml'}->{'documentencoding_utf8_and_insertions'} = 
'<documentencoding encoding="utf-8">utf-8</documentencoding>
+
+<para>&textndash; &textmdash; &textrdquo; &textldquo; <code>in code</code>. 
<accent type="tilde">e</accent>.
+</para>
+<example>
+<pre xml:space="preserve">-- --- \'\' `` <code>in code</code>. <accent 
type="tilde">e</accent>.
+</pre></example>
+';
+
+
 $result_converted{'docbook'}->{'documentencoding_utf8_and_insertions'} = '
 <para>&#8211; &#8212; &#8221; &#8220; <literal>in code</literal>. &#7869;.
 </para>

Index: results/converters_tests/no_documentencoding_and_insertions.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- results/converters_tests/no_documentencoding_and_insertions.pl      4 Dec 
2011 22:16:11 -0000       1.1
+++ results/converters_tests/no_documentencoding_and_insertions.pl      3 Jan 
2012 23:43:32 -0000       1.2
@@ -267,6 +267,15 @@
 ';
 
 
+$result_converted{'xml'}->{'no_documentencoding_and_insertions'} = '
+<para>&textndash; &textmdash; &textrdquo; &textldquo; <code>in code</code>. 
<accent type="tilde">e</accent>.
+</para>
+<example>
+<pre xml:space="preserve">-- --- \'\' `` <code>in code</code>. <accent 
type="tilde">e</accent>.
+</pre></example>
+';
+
+
 $result_converted{'docbook'}->{'no_documentencoding_and_insertions'} = '
 <para>&#8211; &#8212; &#8221; &#8220; <literal>in code</literal>. &#7869;.
 </para>

Index: results/converters_tests/ref_error_formatting.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/ref_error_formatting.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- results/converters_tests/ref_error_formatting.pl    8 Nov 2011 00:05:52 
-0000       1.6
+++ results/converters_tests/ref_error_formatting.pl    3 Jan 2012 23:43:32 
-0000       1.7
@@ -4949,6 +4949,50 @@
 </p>';
 
 
+$result_converted{'xml'}->{'ref_error_formatting'} = '
+<para><code>&arobase;ref&lbrace;node&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename></ref>
+</para>
+<para><code>&arobase;ref&lbrace;,cross ref name&rbrace;</code> 
<ref><xrefinfoname>cross ref name</xrefinfoname></ref>
+<code>&arobase;ref&lbrace;,,title&rbrace;</code> 
<ref><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;,,,file name&rbrace;</code> <ref><xrefinfofile>file 
name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;,,,,manual&rbrace;</code> 
<ref><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;node,cross ref name&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname></ref>
+<code>&arobase;ref&lbrace;node,,title&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;node,,,file name&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;node,,,,manual&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;node,cross ref name,title,&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;node,cross ref name,,file name&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;node,cross ref name,,,manual&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;node,cross ref name,title,file name&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;node,cross ref name,title,,manual&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;node,cross ref name,title, file name, 
manual&rbrace;</code> <ref><xrefnodename>node</xrefnodename><xrefinfoname>cross 
ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;node,,title,file name&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
 name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;node,,title,,manual&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;node,,title, file name, manual&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
 name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;node,,,file name,manual&rbrace;</code> 
<ref><xrefnodename>node</xrefnodename><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;,cross ref name,title,&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;,cross ref name,,file name&rbrace;</code> 
<ref><xrefinfoname>cross ref name</xrefinfoname><xrefinfofile>file 
name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;,cross ref name,,,manual&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;,cross ref name,title,file name&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;,cross ref name,title,,manual&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;,cross ref name,title, file name, 
manual&rbrace;</code> <ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;,,title,file name&rbrace;</code> 
<ref><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;,,title,,manual&rbrace;</code> 
<ref><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;,,title, file name, manual&rbrace;</code> 
<ref><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;,,,file name,manual&rbrace;</code> 
<ref><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+</para>
+<para><code>&arobase;inforef&lbrace;,cross ref name &rbrace;</code> 
<inforef><inforefrefname>cross ref name </inforefrefname></inforef>
+<code>&arobase;inforef&lbrace;,,file name&rbrace;</code> 
<inforef><inforefinfoname>file name</inforefinfoname></inforef>
+<code>&arobase;inforef&lbrace;,cross ref name, file name&rbrace;</code> 
<inforef><inforefrefname>cross ref name</inforefrefname><inforefinfoname>file 
name</inforefinfoname></inforef>
+<code>&arobase;inforef&lbrace;&rbrace;</code> <inforef></inforef>
+</para>
+<para><code>&arobase;inforef&lbrace;node, cross ref name, file 
name&rbrace;</code> 
<inforef><inforefnodename>node</inforefnodename><inforefrefname>cross ref 
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<code>&arobase;inforef&lbrace;node&rbrace;</code> 
<inforef><inforefnodename>node</inforefnodename></inforef>
+<code>&arobase;inforef&lbrace;node, cross ref name&rbrace;</code> 
<inforef><inforefnodename>node</inforefnodename><inforefrefname>cross ref 
name</inforefrefname></inforef>
+<code>&arobase;inforef&lbrace;node,,file name&rbrace;</code> 
<inforef><inforefnodename>node</inforefnodename><inforefinfoname>file 
name</inforefinfoname></inforef>
+</para>';
+
+
 $result_converted{'docbook'}->{'ref_error_formatting'} = '
 <para><literal>@ref{node}</literal> <link linkend="node">node</link>
 </para>

Index: results/converters_tests/refs_formatting.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/refs_formatting.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- results/converters_tests/refs_formatting.pl 8 Nov 2011 00:05:52 -0000       
1.6
+++ results/converters_tests/refs_formatting.pl 3 Jan 2012 23:43:33 -0000       
1.7
@@ -4779,6 +4779,47 @@
 ';
 
 
+$result_converted{'xml'}->{'refs_formatting'} = '<node 
name="chapter"><nodename>chapter</nodename></node>
+<chapter><sectiontitle>chapter</sectiontitle>
+
+<para><code>&arobase;ref&lbrace;chapter,cross ref name&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname></ref>
+<code>&arobase;ref&lbrace;chapter,,title&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;chapter,,,file name&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;chapter,,,,manual&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;chapter,cross ref name,title,&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;chapter,cross ref name,,file name&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;chapter,cross ref name,,,manual&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;chapter,cross ref name,title,file 
name&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;chapter,cross ref name,title,,manual&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;chapter,cross ref name,title, file name, 
manual&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;chapter,,title,file name&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
 name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;chapter,,title,,manual&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;chapter,,title, file name, manual&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
 name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;chapter,,,file name,manual&rbrace;</code> 
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+</para>
+<para><code>&arobase;ref&lbrace;(pman)anode,cross ref name&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname></ref>
+<code>&arobase;ref&lbrace;(pman)anode,,title&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;(pman)anode,,,file name&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;(pman)anode,,,,manual&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;(pman)anode,cross ref name,,file name&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;(pman)anode,cross ref name,,,manual&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,file 
name&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;(pman)anode,cross ref 
name,title,,manual&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title, file name, 
manual&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;(pman)anode,,title,file name&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
 name</xrefinfofile></ref>
+<code>&arobase;ref&lbrace;(pman)anode,,title,,manual&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;(pman)anode,,title, file name, manual&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
 name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref&lbrace;(pman)anode,,,file name,manual&rbrace;</code> 
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+</para>
+<para><code>&arobase;inforef&lbrace;chapter, cross ref name, file 
name&rbrace;</code> 
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref 
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<code>&arobase;inforef&lbrace;chapter&rbrace;</code> 
<inforef><inforefnodename>chapter</inforefnodename></inforef>
+<code>&arobase;inforef&lbrace;chapter, cross ref name&rbrace;</code> 
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref 
name</inforefrefname></inforef>
+<code>&arobase;inforef&lbrace;chapter,,file name&rbrace;</code> 
<inforef><inforefnodename>chapter</inforefnodename><inforefinfoname>file 
name</inforefinfoname></inforef>
+</para></chapter>
+';
+
+
 $result_converted{'docbook'}->{'refs_formatting'} = '<chapter label="1" 
id="chapter">
 <title>chapter</title>
 

Index: results/converters_tests/sp_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/sp_in_example.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- results/converters_tests/sp_in_example.pl   8 Nov 2011 00:05:52 -0000       
1.2
+++ results/converters_tests/sp_in_example.pl   3 Jan 2012 23:43:33 -0000       
1.3
@@ -491,6 +491,27 @@
 ';
 
 
+$result_converted{'xml'}->{'sp_in_example'} = '<example>
+<pre xml:space="preserve">Para
+<sp value="1"></sp>
+other para
+Now lone &arobase;sp:
+
+<sp value="1"></sp>
+
+<sp value="2"></sp>
+Para after sp
+
+A
+<sp value="2"></sp>
+B
+
+sp after para
+<sp value="1"></sp>
+</pre></example>
+';
+
+
 $result_converted{'docbook'}->{'sp_in_example'} = '<screen>Para
 other para
 Now lone @sp:

Index: results/converters_tests/test_deftypefnnewline.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- results/converters_tests/test_deftypefnnewline.pl   28 Dec 2011 23:40:23 
-0000      1.2
+++ results/converters_tests/test_deftypefnnewline.pl   3 Jan 2012 23:43:33 
-0000       1.3
@@ -1049,6 +1049,30 @@
 ';
 
 
+$result_converted{'xml'}->{'test_deftypefnnewline'} = '
+<deftypefnnewline value="on"></deftypefnnewline>
+
+<node name="Top"><nodename>Top</nodename><nodeup 
automatic="on">(dir)</nodeup></node>
+<deftypefun><definitionterm><indexterm index="fn">name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>data-type</deftype> 
<deffunction>name</deffunction> 
<defparamtype>arguments...</defparamtype></definitionterm>
+<definitionitem><para>aaa
+</para></definitionitem></deftypefun>
+
+<deffn><definitionterm><indexterm 
index="fn">arg</indexterm><defcategory>fun</defcategory> 
<deffunction>arg</deffunction></definitionterm>
+<definitionitem><para>fff
+</para></definitionitem></deffn>
+
+<deftypefnnewline value="off"></deftypefnnewline>
+
+<deftypefun><definitionterm><indexterm 
index="fn">name2</indexterm><defcategory automatic="on">Function</defcategory> 
<deftype>data-type2</deftype> <deffunction>name2</deffunction> 
<defparamtype>arguments2...</defparamtype></definitionterm>
+<definitionitem><para>aaa2
+</para></definitionitem></deftypefun>
+
+<deffn><definitionterm><indexterm 
index="fn">arg2</indexterm><defcategory>fun2</defcategory> 
<deffunction>arg2</deffunction></definitionterm>
+<definitionitem><para>fff2
+</para></definitionitem></deffn>
+';
+
+
 $result_converted{'docbook'}->{'test_deftypefnnewline'} = '
 
 <anchor id="Top"/>

Index: results/converters_tests/test_sp.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/test_sp.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- results/converters_tests/test_sp.pl 8 Nov 2011 00:05:52 -0000       1.2
+++ results/converters_tests/test_sp.pl 3 Jan 2012 23:43:33 -0000       1.3
@@ -446,6 +446,25 @@
 ';
 
 
+$result_converted{'xml'}->{'test_sp'} = '<para>Para
+</para><sp value="1"></sp>
+<para>other para
+Now lone &arobase;sp:
+</para>
+<sp value="1"></sp>
+
+<sp value="2"></sp>
+<para>Para after sp
+</para>
+<para>A
+</para><sp value="2"></sp>
+<para>B
+</para>
+<para>sp after para
+</para><sp value="1"></sp>
+';
+
+
 $result_converted{'docbook'}->{'test_sp'} = '<para>Para
 </para><para>other para
 Now lone @sp:

Index: results/converters_tests/unknown_value.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/unknown_value.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- results/converters_tests/unknown_value.pl   8 Nov 2011 00:05:52 -0000       
1.2
+++ results/converters_tests/unknown_value.pl   3 Jan 2012 23:43:33 -0000       
1.3
@@ -47,6 +47,9 @@
 $result_converted{'html_text'}->{'unknown_value'} = '{No value for 
&lsquo;unknown&rsquo;}';
 
 
+$result_converted{'xml'}->{'unknown_value'} = '';
+
+
 $result_converted{'docbook'}->{'unknown_value'} = '';
 
 1;

Index: results/converters_tests/weird_accents.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/weird_accents.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- results/converters_tests/weird_accents.pl   8 Nov 2011 00:05:53 -0000       
1.6
+++ results/converters_tests/weird_accents.pl   3 Jan 2012 23:43:33 -0000       
1.7
@@ -672,6 +672,24 @@
 ';
 
 
+$result_converted{'xml'}->{'weird_accents'} = '<documentencoding 
encoding="ISO-8859-1">ISO-8859-1</documentencoding>
+
+<node name="Top"><nodename>Top</nodename><nodeup 
automatic="on">(dir)</nodeup></node>
+<top><sectiontitle>top</sectiontitle>
+
+<para><accent type="macr"><accent 
type="tilde"><dotless>i</dotless></accent></accent>
+</para>
+<para><accent type="macr"><accent type="cedil"><accent 
type="tilde">n</accent></accent></accent>
+</para>
+<para><accent type="macr"><accent type="ubaraccent">a</accent></accent>
+</para>
+<para><accent type="circ"><accent type="udotaccent"><accent 
type="grave">r</accent></accent></accent>
+</para>
+<para><accent type="macr"><accent type="acute"><accent 
type="grave">r</accent></accent></accent>
+</para></top>
+';
+
+
 $result_converted{'docbook'}->{'weird_accents'} = '
 <chapter label="" id="Top">
 <title>top</title>

Index: results/converters_tests/weird_accents_disable_encoding.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/weird_accents_disable_encoding.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- results/converters_tests/weird_accents_disable_encoding.pl  8 Nov 2011 
00:05:53 -0000       1.6
+++ results/converters_tests/weird_accents_disable_encoding.pl  3 Jan 2012 
23:43:33 -0000       1.7
@@ -672,6 +672,24 @@
 ';
 
 
+$result_converted{'xml'}->{'weird_accents_disable_encoding'} = 
'<documentencoding encoding="ISO-8859-1">ISO-8859-1</documentencoding>
+
+<node name="Top"><nodename>Top</nodename><nodeup 
automatic="on">(dir)</nodeup></node>
+<top><sectiontitle>top</sectiontitle>
+
+<para><accent type="macr"><accent 
type="tilde"><dotless>i</dotless></accent></accent>
+</para>
+<para><accent type="macr"><accent type="cedil"><accent 
type="tilde">n</accent></accent></accent>
+</para>
+<para><accent type="macr"><accent type="ubaraccent">a</accent></accent>
+</para>
+<para><accent type="circ"><accent type="udotaccent"><accent 
type="grave">r</accent></accent></accent>
+</para>
+<para><accent type="macr"><accent type="acute"><accent 
type="grave">r</accent></accent></accent>
+</para></top>
+';
+
+
 $result_converted{'docbook'}->{'weird_accents_disable_encoding'} = '
 <chapter label="" id="Top">
 <title>top</title>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]