texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp TODO Texinfo/Convert/Converter.pm Te...


From: Patrice Dumas
Subject: texinfo/tp TODO Texinfo/Convert/Converter.pm Te...
Date: Tue, 08 Nov 2011 00:05:53 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/11/08 00:05:53

Modified files:
        tp             : TODO 
        tp/Texinfo/Convert: Converter.pm DocBook.pm Text.pm 
        tp/t           : converters_tests.t 
        tp/t/results/converters_tests: accent.pl accent_with_text.pl 
                                       accentenc.pl 
                                       ref_error_formatting.pl 
                                       refs_formatting.pl 
                                       sp_in_example.pl test_sp.pl 
                                       unknown_value.pl weird_accents.pl 
                                       weird_accents_disable_encoding.pl 

Log message:
        Improve formatting of @inforef in docbook.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.221&r2=1.222
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/converters_tests.t?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accent.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accent_with_text.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accentenc.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/ref_error_formatting.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/refs_formatting.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/sp_in_example.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/test_sp.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/unknown_value.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/weird_accents.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/weird_accents_disable_encoding.pl?cvsroot=texinfo&r1=1.5&r2=1.6

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -b -r1.221 -r1.222
--- TODO        7 Nov 2011 22:59:49 -0000       1.221
+++ TODO        8 Nov 2011 00:05:50 -0000       1.222
@@ -5,13 +5,15 @@
 Before next release
 ===================
 
+Internationalize 'error-->'.  FIXME in the code.
+
 
 Bugs
 ====
 
-(A) sectioning/next_in_menu_is_below there should certainly be a warning for
+sectioning/next_in_menu_is_below there should certainly be a warning for
 the subsection that is both below and next the section, because it is 
-next in menu.  Bug or not?
+next in menu.  This is a bug, there should be a warning.
 
 
 Delayed bugs

Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- Texinfo/Convert/Converter.pm        7 Nov 2011 22:19:20 -0000       1.64
+++ Texinfo/Convert/Converter.pm        8 Nov 2011 00:05:50 -0000       1.65
@@ -742,7 +742,7 @@
                'dots'         => '&hellip;',
                'enddots'      => '...',
                'equiv'        => '&equiv;',
-# FIXME(Karl) i18n
+# FIXME i18n
                'error'        => 'error--&gt;',
                'expansion'    => '&rarr;',
                'arrow'        => '&rarr;',

Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- Texinfo/Convert/DocBook.pm  6 Nov 2011 00:55:28 -0000       1.30
+++ Texinfo/Convert/DocBook.pm  8 Nov 2011 00:05:50 -0000       1.31
@@ -717,7 +717,6 @@
       } elsif ($Texinfo::Common::ref_commands{$root->{'cmdname'}}) {
         if ($root->{'extra'} and $root->{'extra'}->{'brace_command_contents'}) 
{
           if ($root->{'cmdname'} eq 'inforef') {
-            # FIXME(Karl) how to format inforef?
             my $filename;
             if (scalar (@{$root->{'extra'}->{'brace_command_contents'}}) == 3
                 and 
defined($root->{'extra'}->{'brace_command_contents'}->[-1])) {
@@ -728,29 +727,29 @@
             }
             my $node;
             if (defined($root->{'extra'}->{'brace_command_contents'}->[0])) {
-              $self->{'document_context'}->[-1]->{'code'}++;
-              $node = $self->_convert({'contents' 
-                     => $root->{'extra'}->{'brace_command_contents'}->[0]});
-              $self->{'document_context'}->[-1]->{'code'}--;
-            }
-            my $name;
-            if (scalar (@{$root->{'extra'}->{'brace_command_contents'}}) >= 2
-                and 
defined($root->{'extra'}->{'brace_command_contents'}->[1])) {
-              $name = $self->_convert({'contents' 
-                   => $root->{'extra'}->{'brace_command_contents'}->[0]});
-            }
-            my $node_file = '';
-            if (defined($node)) {
-              $node_file .= $node;
-            }
-            if (defined($filename)) {
-              $node_file .= "($filename)";
-            }
-            if (defined($name)) {
-              return "*note $name: $node_file";
-            } else {
-              return "*note ${node_file}::";
+              $node = {'contents' 
+                        => $root->{'extra'}->{'brace_command_contents'}->[0]};
             }
+            if ($node and defined($filename)) {
+              return $self->_convert($self->gdt(
+                   "See Info file address@hidden, node address@hidden",
+                   { 'myfile' => {'type' => '_converted', 'text' => $filename},
+                     'mynode' => $node}));
+            } elsif ($node) {
+              return $self->_convert($self->gdt(
+                   "See node address@hidden",
+                   {'mynode' => $node}));
+            } elsif (defined($filename)) {
+              return $self->_convert($self->gdt(
+                   "See Info file address@hidden",
+                   { 'myfile' => {'type' => '_converted', 'text' => 
$filename}}));
+            }
+            #my $name;
+            #if (scalar (@{$root->{'extra'}->{'brace_command_contents'}}) >= 2
+            #    and 
defined($root->{'extra'}->{'brace_command_contents'}->[1])) {
+            #  $name = $self->_convert({'contents' 
+            #       => $root->{'extra'}->{'brace_command_contents'}->[0]});
+            #}
           } else {
             my $book_contents;
             if (scalar (@{$root->{'extra'}->{'brace_command_contents'}}) == 5

Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- Texinfo/Convert/Text.pm     6 Nov 2011 17:48:54 -0000       1.80
+++ Texinfo/Convert/Text.pm     8 Nov 2011 00:05:50 -0000       1.81
@@ -78,7 +78,7 @@
                'dots'         => '...',
                'enddots'      => '...',
                'equiv'        => '==',
-# FIXME(Karl) i18n?
+# FIXME i18n
                'error'        => 'error-->',
                'expansion'    => '==>',
                'arrow'        => '->',

Index: t/converters_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/converters_tests.t,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/converters_tests.t        1 Oct 2011 15:14:22 -0000       1.7
+++ t/converters_tests.t        8 Nov 2011 00:05:51 -0000       1.8
@@ -254,7 +254,7 @@
   push @{$test->[2]->{'test_formats'}}, 'plaintext';
   push @{$test->[2]->{'test_formats'}}, 'html_text';
   #push @{$test->[2]->{'test_formats'}}, 'xml';
-  #push @{$test->[2]->{'test_formats'}}, 'docbook';
+  push @{$test->[2]->{'test_formats'}}, 'docbook';
 }
 
 foreach my $test (@html_text_cases) {

Index: t/results/converters_tests/accent.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/accent.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/converters_tests/accent.pl        30 Oct 2011 00:51:17 -0000      
1.6
+++ t/results/converters_tests/accent.pl        8 Nov 2011 00:05:51 -0000       
1.7
@@ -3127,4 +3127,86 @@
 </p><hr>
 ';
 
+
+$result_converted{'docbook'}->{'accent'} = '<chapter label="" id="Top">
+<title>top</title>
+
+<para>should be e&#8216;: &#232; &#232;
+</para>
+<para>should be e&#8217;: &#233; &#233;
+</para>
+<para>should be e^: &#234; &#234;
+</para>
+<para>should be u&quot;: &#252; &#252;
+</para>
+<para>should be i&#8216;: &#236; &#236;
+</para>
+<para>should be i&#8217;: &#237; &#237;
+</para>
+<para>should be i^: &#238; &#238;
+</para>
+<para>should be u&quot;: &#252; &#252;
+</para>
+<para>should be c,: &#231; &#231;
+</para>
+<para>should be n~: &#241; &#241;
+</para>
+<para>should be e=: &#275; &#275;
+</para>
+<para>should be e&#8217;<!-- /@w -->&#8217;: e\'\' e\'\'
+</para>
+<para>should be e.: &#279; &#279;
+</para>
+<para>should be e*: e* e*
+</para>
+<para>should be ee[: ee[
+</para>
+<para>should be e(: &#277; &#277;
+</para>
+<para>should be e_: e_ e_
+</para>
+<para>should be .e: &#7865; &#7865;
+</para>
+<para>should be e&lt;: &#283; &#283;
+</para>
+<para>should be a; : &#261; &#261;
+</para>
+<para>should be e; : &#281; &#281;
+</para>
+<para>upside down: &#191; &#161;
+</para>
+<para>A-with-circle: &#229;,&#197;
+</para>
+<para>AE, OE ligatures: &#230; &#198; &#339; &#338;
+</para>
+<para>dotless i, j: i j
+</para>
+<para>Polish suppressed-L: &#322; &#321;
+</para>
+<para>O-with-slash: &#248; &#216;
+</para>
+<para>es-zet or sharp S: &#223;
+</para>
+<para>pounds sterling: &#163;
+</para>
+<!-- arg is command - @dotless{i} is special-cased for HTML -->
+<para>should be dotless i&#8216;: &#236;
+</para>
+<para>should be dotless i&#8217;: &#237;
+</para>
+<para>should be dotless i^: &#238;
+</para>
+<para>should be dotless i&quot;: &#239;
+</para>
+<!-- arg is command - @dotless{j} -->
+<para>should be dotless j&#8216;: j`
+</para>
+<para>should be dotless j&#8217;: j\'
+</para>
+<para>should be dotless j^: &#309;
+</para>
+<para>should be dotless j&quot;: j"
+</para></chapter>
+';
+
 1;

Index: t/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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/converters_tests/accent_with_text.pl      29 Sep 2011 22:12:55 
-0000      1.1
+++ t/results/converters_tests/accent_with_text.pl      8 Nov 2011 00:05:51 
-0000       1.2
@@ -229,4 +229,8 @@
 $result_converted{'html_text'}->{'accent_with_text'} = '<p>&ndash;a( &ndash;b 
&icirc; &#309; &ndash;a^
 </p>';
 
+
+$result_converted{'docbook'}->{'accent_with_text'} = '<para>&#8211;a( &#8211;b 
&#238; &#309; &#8211;a^
+</para>';
+
 1;

Index: t/results/converters_tests/accentenc.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/accentenc.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/converters_tests/accentenc.pl     30 Oct 2011 00:51:17 -0000      
1.7
+++ t/results/converters_tests/accentenc.pl     8 Nov 2011 00:05:51 -0000       
1.8
@@ -3185,4 +3185,87 @@
 </p><hr>
 ';
 
+
+$result_converted{'docbook'}->{'accentenc'} = '
+<chapter label="" id="Top">
+<title>top</title>
+
+<para>should be e&#8216;: &#232; &#232;
+</para>
+<para>should be e&#8217;: &#233; &#233;
+</para>
+<para>should be e^: &#234; &#234;
+</para>
+<para>should be u&quot;: &#252; &#252;
+</para>
+<para>should be i&#8216;: &#236; &#236;
+</para>
+<para>should be i&#8217;: &#237; &#237;
+</para>
+<para>should be i^: &#238; &#238;
+</para>
+<para>should be u&quot;: &#252; &#252;
+</para>
+<para>should be c,: &#231; &#231;
+</para>
+<para>should be n~: &#241; &#241;
+</para>
+<para>should be e=: &#275; &#275;
+</para>
+<para>should be e&#8217;<!-- /@w -->&#8217;: e\'\' e\'\'
+</para>
+<para>should be e.: &#279; &#279;
+</para>
+<para>should be e*: e* e*
+</para>
+<para>should be ee[: ee[
+</para>
+<para>should be e(: &#277; &#277;
+</para>
+<para>should be e_: e_ e_
+</para>
+<para>should be .e: &#7865; &#7865;
+</para>
+<para>should be e&lt;: &#283; &#283;
+</para>
+<para>should be a; : &#261; &#261;
+</para>
+<para>should be e; : &#281; &#281;
+</para>
+<para>upside down: &#191; &#161;
+</para>
+<para>A-with-circle: &#229;,&#197;
+</para>
+<para>AE, OE ligatures: &#230; &#198; &#339; &#338;
+</para>
+<para>dotless i, j: i j
+</para>
+<para>Polish suppressed-L: &#322; &#321;
+</para>
+<para>O-with-slash: &#248; &#216;
+</para>
+<para>es-zet or sharp S: &#223;
+</para>
+<para>pounds sterling: &#163;
+</para>
+<!-- arg is command - @dotless{i} is special-cased for HTML -->
+<para>should be dotless i&#8216;: &#236;
+</para>
+<para>should be dotless i&#8217;: &#237;
+</para>
+<para>should be dotless i^: &#238;
+</para>
+<para>should be dotless i&quot;: &#239;
+</para>
+<!-- arg is command - @dotless{j} -->
+<para>should be dotless j&#8216;: j`
+</para>
+<para>should be dotless j&#8217;: j\'
+</para>
+<para>should be dotless j^: &#309;
+</para>
+<para>should be dotless j&quot;: j"
+</para></chapter>
+';
+
 1;

Index: t/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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/ref_error_formatting.pl  1 Nov 2011 03:26:32 
-0000       1.5
+++ t/results/converters_tests/ref_error_formatting.pl  8 Nov 2011 00:05:52 
-0000       1.6
@@ -4948,4 +4948,48 @@
 <code>@inforef{node,,file name}</code> See <a href="file name.html#node">(file 
name)node</a>
 </p>';
 
+
+$result_converted{'docbook'}->{'ref_error_formatting'} = '
+<para><literal>@ref{node}</literal> <link linkend="node">node</link>
+</para>
+<para><literal>@ref{,cross ref name}</literal> <link>cross ref name</link>
+<literal>@ref{,,title}</literal> <link>title</link>
+<literal>@ref{,,,file name}</literal> 
+<literal>@ref{,,,,manual}</literal> section &#8220;&#8221; in 
<citetitle>manual</citetitle>
+<literal>@ref{node,cross ref name}</literal> <link linkend="node">cross ref 
name</link>
+<literal>@ref{node,,title}</literal> <link linkend="node">title</link>
+<literal>@ref{node,,,file name}</literal> 
+<literal>@ref{node,,,,manual}</literal> section &#8220;node&#8221; in 
<citetitle>manual</citetitle>
+<literal>@ref{node,cross ref name,title,}</literal> <link 
linkend="node">title</link>
+<literal>@ref{node,cross ref name,,file name}</literal> 
+<literal>@ref{node,cross ref name,,,manual}</literal> section &#8220;cross ref 
name&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{node,cross ref name,title,file name}</literal> 
+<literal>@ref{node,cross ref name,title,,manual}</literal> section 
&#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{node,cross ref name,title, file name, manual}</literal> section 
&#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{node,,title,file name}</literal> 
+<literal>@ref{node,,title,,manual}</literal> section &#8220;title&#8221; in 
<citetitle>manual</citetitle>
+<literal>@ref{node,,title, file name, manual}</literal> section 
&#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{node,,,file name,manual}</literal> section &#8220;node&#8221; in 
<citetitle>manual</citetitle>
+<literal>@ref{,cross ref name,title,}</literal> <link>title</link>
+<literal>@ref{,cross ref name,,file name}</literal> 
+<literal>@ref{,cross ref name,,,manual}</literal> section &#8220;cross ref 
name&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{,cross ref name,title,file name}</literal> 
+<literal>@ref{,cross ref name,title,,manual}</literal> section 
&#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{,cross ref name,title, file name, manual}</literal> section 
&#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{,,title,file name}</literal> 
+<literal>@ref{,,title,,manual}</literal> section &#8220;title&#8221; in 
<citetitle>manual</citetitle>
+<literal>@ref{,,title, file name, manual}</literal> section 
&#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{,,,file name,manual}</literal> section &#8220;&#8221; in 
<citetitle>manual</citetitle>
+</para>
+<para><literal>@inforef{,cross ref name }</literal> 
+<literal>@inforef{,,file name}</literal> See Info file <filename>file 
name</filename>
+<literal>@inforef{,cross ref name, file name}</literal> See Info file 
<filename>file name</filename>
+<literal>@inforef{}</literal> 
+</para>
+<para><literal>@inforef{node, cross ref name, file name}</literal> See Info 
file <filename>file name</filename>, node &#8216;<literal>node</literal>&#8217;
+<literal>@inforef{node}</literal> See node 
&#8216;<literal>node</literal>&#8217;
+<literal>@inforef{node, cross ref name}</literal> See node 
&#8216;<literal>node</literal>&#8217;
+<literal>@inforef{node,,file name}</literal> See Info file <filename>file 
name</filename>, node &#8216;<literal>node</literal>&#8217;
+</para>';
+
 1;

Index: t/results/converters_tests/refs_formatting.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/refs_formatting.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/refs_formatting.pl       1 Nov 2011 03:26:32 
-0000       1.5
+++ t/results/converters_tests/refs_formatting.pl       8 Nov 2011 00:05:52 
-0000       1.6
@@ -4778,4 +4778,45 @@
 </p><hr>
 ';
 
+
+$result_converted{'docbook'}->{'refs_formatting'} = '<chapter label="1" 
id="chapter">
+<title>chapter</title>
+
+<para><literal>@ref{chapter,cross ref name}</literal> <link 
linkend="chapter">cross ref name</link>
+<literal>@ref{chapter,,title}</literal> <link linkend="chapter">title</link>
+<literal>@ref{chapter,,,file name}</literal> 
+<literal>@ref{chapter,,,,manual}</literal> section &#8220;chapter&#8221; in 
<citetitle>manual</citetitle>
+<literal>@ref{chapter,cross ref name,title,}</literal> <link 
linkend="chapter">title</link>
+<literal>@ref{chapter,cross ref name,,file name}</literal> 
+<literal>@ref{chapter,cross ref name,,,manual}</literal> section &#8220;cross 
ref name&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{chapter,cross ref name,title,file name}</literal> 
+<literal>@ref{chapter,cross ref name,title,,manual}</literal> section 
&#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{chapter,cross ref name,title, file name, manual}</literal> 
section &#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{chapter,,title,file name}</literal> 
+<literal>@ref{chapter,,title,,manual}</literal> section &#8220;title&#8221; in 
<citetitle>manual</citetitle>
+<literal>@ref{chapter,,title, file name, manual}</literal> section 
&#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{chapter,,,file name,manual}</literal> section 
&#8220;chapter&#8221; in <citetitle>manual</citetitle>
+</para>
+<para><literal>@ref{(pman)anode,cross ref name}</literal> <link>cross ref 
name</link>
+<literal>@ref{(pman)anode,,title}</literal> <link>title</link>
+<literal>@ref{(pman)anode,,,file name}</literal> 
+<literal>@ref{(pman)anode,,,,manual}</literal> section 
&#8220;(pman)anode&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,cross ref name,title,}</literal> <link>title</link>
+<literal>@ref{(pman)anode,cross ref name,,file name}</literal> 
+<literal>@ref{(pman)anode,cross ref name,,,manual}</literal> section 
&#8220;cross ref name&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,cross ref name,title,file name}</literal> 
+<literal>@ref{(pman)anode,cross ref name,title,,manual}</literal> section 
&#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,cross ref name,title, file name, manual}</literal> 
section &#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,title,file name}</literal> 
+<literal>@ref{(pman)anode,,title,,manual}</literal> section 
&#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,title, file name, manual}</literal> section 
&#8220;title&#8221; in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,,file name,manual}</literal> section 
&#8220;(pman)anode&#8221; in <citetitle>manual</citetitle>
+</para>
+<para><literal>@inforef{chapter, cross ref name, file name}</literal> See Info 
file <filename>file name</filename>, node 
&#8216;<literal>chapter</literal>&#8217;
+<literal>@inforef{chapter}</literal> See node 
&#8216;<literal>chapter</literal>&#8217;
+<literal>@inforef{chapter, cross ref name}</literal> See node 
&#8216;<literal>chapter</literal>&#8217;
+<literal>@inforef{chapter,,file name}</literal> See Info file <filename>file 
name</filename>, node &#8216;<literal>chapter</literal>&#8217;
+</para></chapter>
+';
+
 1;

Index: t/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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/converters_tests/sp_in_example.pl 13 Aug 2011 18:40:24 -0000      
1.1
+++ t/results/converters_tests/sp_in_example.pl 8 Nov 2011 00:05:52 -0000       
1.2
@@ -490,4 +490,18 @@
 </pre></div>
 ';
 
+
+$result_converted{'docbook'}->{'sp_in_example'} = '<screen>Para
+other para
+Now lone @sp:
+
+
+Para after sp
+
+A
+B
+
+sp after para
+</screen>';
+
 1;

Index: t/results/converters_tests/test_sp.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/test_sp.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/converters_tests/test_sp.pl       13 Aug 2011 18:40:24 -0000      
1.1
+++ t/results/converters_tests/test_sp.pl       8 Nov 2011 00:05:52 -0000       
1.2
@@ -445,4 +445,18 @@
 </p><br>
 ';
 
+
+$result_converted{'docbook'}->{'test_sp'} = '<para>Para
+</para><para>other para
+Now lone @sp:
+</para>
+
+<para>Para after sp
+</para>
+<para>A
+</para><para>B
+</para>
+<para>sp after para
+</para>';
+
 1;

Index: t/results/converters_tests/unknown_value.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/unknown_value.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/converters_tests/unknown_value.pl 13 Aug 2011 18:40:24 -0000      
1.1
+++ t/results/converters_tests/unknown_value.pl 8 Nov 2011 00:05:52 -0000       
1.2
@@ -46,4 +46,7 @@
 
 $result_converted{'html_text'}->{'unknown_value'} = '{No value for 
&lsquo;unknown&rsquo;}';
 
+
+$result_converted{'docbook'}->{'unknown_value'} = '';
+
 1;

Index: t/results/converters_tests/weird_accents.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/weird_accents.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/weird_accents.pl 30 Oct 2011 00:51:17 -0000      
1.5
+++ t/results/converters_tests/weird_accents.pl 8 Nov 2011 00:05:53 -0000       
1.6
@@ -671,4 +671,21 @@
 </p><hr>
 ';
 
+
+$result_converted{'docbook'}->{'weird_accents'} = '
+<chapter label="" id="Top">
+<title>top</title>
+
+<para>&#297;=
+</para>
+<para>&#241;,=
+</para>
+<para>a_=
+</para>
+<para>.r`^
+</para>
+<para>r`\'=
+</para></chapter>
+';
+
 1;

Index: t/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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/weird_accents_disable_encoding.pl        30 Oct 
2011 00:51:17 -0000      1.5
+++ t/results/converters_tests/weird_accents_disable_encoding.pl        8 Nov 
2011 00:05:53 -0000       1.6
@@ -671,4 +671,21 @@
 </p><hr>
 ';
 
+
+$result_converted{'docbook'}->{'weird_accents_disable_encoding'} = '
+<chapter label="" id="Top">
+<title>top</title>
+
+<para>&#297;=
+</para>
+<para>&#241;,=
+</para>
+<para>a_=
+</para>
+<para>.r`^
+</para>
+<para>r`\'=
+</para></chapter>
+';
+
 1;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]