[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5414] * Texinfo/Convert/DocBook.pm: do not use lineannotation for
|
From: |
Patrice Dumas |
|
Subject: |
[5414] * Texinfo/Convert/DocBook.pm: do not use lineannotation for |
|
Date: |
Sat, 15 Feb 2014 13:17:09 +0000 |
Revision: 5414
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5414
Author: pertusus
Date: 2014-02-15 13:17:06 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
* Texinfo/Convert/DocBook.pm: do not use lineannotation for
@r, the semantics are not the same. Report from Aharon Robbins.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Convert/DocBook.pm
trunk/tp/t/results/converters_tests/at_commands_in_refs.pl
trunk/tp/t/results/converters_tests/normal_font_in_monospace.pl
trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2014-02-15 11:38:25 UTC (rev 5413)
+++ trunk/ChangeLog 2014-02-15 13:17:06 UTC (rev 5414)
@@ -1,3 +1,7 @@
+2014-02-15 Patrice Dumas <address@hidden>
+ * Texinfo/Convert/DocBook.pm: do not use lineannotation for
+ @r, the semantics are not the same. Report from Aharon Robbins.
+
2014-02-09 Karl Berry <address@hidden>
* doc/texinfo.tex (\cartouche): do not do \nonarrowing at all;
Modified: trunk/tp/Texinfo/Convert/DocBook.pm
===================================================================
--- trunk/tp/Texinfo/Convert/DocBook.pm 2014-02-15 11:38:25 UTC (rev 5413)
+++ trunk/tp/Texinfo/Convert/DocBook.pm 2014-02-15 13:17:06 UTC (rev 5414)
@@ -138,7 +138,7 @@
'kbd' => 'userinput',
'key' => 'keycap',
'option' => 'option',
- 'r' => 'lineannotation',
+ 'r' => '',
'samp' => 'literal',
'strong' => 'emphasis role="bold"',
't' => 'literal',
Modified: trunk/tp/t/results/converters_tests/at_commands_in_refs.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_refs.pl 2014-02-15
11:38:25 UTC (rev 5413)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs.pl 2014-02-15
13:17:06 UTC (rev 5414)
@@ -22934,7 +22934,7 @@
</chapter>
<chapter label="21" id="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i">
-<title><citetitle>cite asis</citetitle> in @w <emphasis
role="bold">b</emphasis><!-- /@w --> <lineannotation>in r</lineannotation> sc
<emphasis role="bold">str</emphasis> <literal>t</literal>
<replaceable>var</replaceable> <firstterm>dfn</firstterm>
<emphasis>i</emphasis></title>
+<title><citetitle>cite asis</citetitle> in @w <emphasis
role="bold">b</emphasis><!-- /@w --> in r sc <emphasis
role="bold">str</emphasis> <literal>t</literal> <replaceable>var</replaceable>
<firstterm>dfn</firstterm> <emphasis>i</emphasis></title>
</chapter>
<chapter label="22" id="env-code-option-samp-command-file-C_002dx-ESC">
@@ -22980,7 +22980,7 @@
<link linkend="someone_0040somewher-no_005fexplain_0040there"><ulink
url="mailto:address@hidden";>the someone</ulink>
<email>address@hidden</email></link>
<link
linkend="f_002d_002dile1-f_002d_002dile"><inlinemediaobject><imageobject><imagedata
fileref="f--ile1.jpg"
format="JPG"></imagedata></imageobject></inlinemediaobject>
<inlinemediaobject><imageobject><imagedata fileref="f--ile.png"
format="PNG"></imagedata></imageobject><textobject><literallayout>Image
description""\\.</literallayout></textobject></inlinemediaobject></link>
<link linkend="-_0040-_007b_007d-_002e-"><literal> @ {} . </literal></link>
-<link linkend="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><citetitle>cite
asis</citetitle> in @w <emphasis role="bold">b</emphasis><!-- /@w -->
<lineannotation>in r</lineannotation> sc <emphasis role="bold">str</emphasis>
<literal>t</literal> <replaceable>var</replaceable> <firstterm>dfn</firstterm>
<emphasis>i</emphasis></link>
+<link linkend="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><citetitle>cite
asis</citetitle> in @w <emphasis role="bold">b</emphasis><!-- /@w --> in r sc
<emphasis role="bold">str</emphasis> <literal>t</literal>
<replaceable>var</replaceable> <firstterm>dfn</firstterm>
<emphasis>i</emphasis></link>
<link
linkend="env-code-option-samp-command-file-C_002dx-ESC"><envar>env</envar>
<literal>code</literal> <option>option</option>
‘<literal>samp</literal>’ <command>command</command>
<filename>file</filename> <userinput>C-x <keycap>ESC</keycap></userinput></link>
<link linkend="8_002e27in">8.27in</link>
<link linkend="sansserif-slanted">sansserif slanted</link>
Modified: trunk/tp/t/results/converters_tests/normal_font_in_monospace.pl
===================================================================
--- trunk/tp/t/results/converters_tests/normal_font_in_monospace.pl
2014-02-15 11:38:25 UTC (rev 5413)
+++ trunk/tp/t/results/converters_tests/normal_font_in_monospace.pl
2014-02-15 13:17:06 UTC (rev 5414)
@@ -282,9 +282,9 @@
</para>';
-$result_converted{'docbook'}->{'normal_font_in_monospace'} = '<screen>in
example <lineannotation>in r—now <literal>in
co---de</literal></lineannotation>
+$result_converted{'docbook'}->{'normal_font_in_monospace'} = '<screen>in
example in r—now <literal>in co---de</literal>
</screen>
-<para><command>in command---c <lineannotation>in r—r <filename>in
file---</filename></lineannotation></command>.
+<para><command>in command---c in r—r <filename>in
file---</filename></command>.
</para>';
1;
Modified: trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
2014-02-15 11:38:25 UTC (rev 5413)
+++ trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
2014-02-15 13:17:06 UTC (rev 5414)
@@ -158,7 +158,7 @@
<literal>@key{--a}</literal> <keycap>--a</keycap>
<literal>@math{--a {\frac{1}{2}} @minus{}}</literal>
<inlineequation><mathphrase>--a {\frac{1}{2}}
−</mathphrase></inlineequation>
<literal>@option{--a}</literal> <option>--a</option>
-<literal>@r{--a}</literal> <lineannotation>–a</lineannotation>
+<literal>@r{--a}</literal> –a
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
<literal>@sc{--a}</literal> –a
<literal>@strong{--a}</literal> <emphasis role="bold">–a</emphasis>
@@ -655,7 +655,7 @@
<literal>@key{--a}</literal> <keycap>--a</keycap>
<literal>@math{--a {\frac{1}{2}} @minus{}}</literal>
<inlineequation><mathphrase>--a {\frac{1}{2}}
−</mathphrase></inlineequation>
<literal>@option{--a}</literal> <option>--a</option>
-<literal>@r{--a}</literal> <lineannotation>–a</lineannotation>
+<literal>@r{--a}</literal> –a
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
<literal>@sc{--a}</literal> –a
<literal>@strong{--a}</literal> <emphasis role="bold">–a</emphasis>
@@ -1153,7 +1153,7 @@
<literal>@key{--a}</literal> <keycap>--a</keycap>
<literal>@math{--a {\frac{1}{2}} @minus{}}</literal>
<inlineequation><mathphrase>--a {\frac{1}{2}}
−</mathphrase></inlineequation>
<literal>@option{--a}</literal> <option>--a</option>
-<literal>@r{--a}</literal> <lineannotation>–a</lineannotation>
+<literal>@r{--a}</literal> –a
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
<literal>@sc{--a}</literal> –a
<literal>@strong{--a}</literal> <emphasis role="bold">–a</emphasis>
@@ -1652,7 +1652,7 @@
<literal>@key{--a}</literal> <keycap>--a</keycap>
<literal>@math{--a {\frac{1}{2}} @minus{}}</literal>
<inlineequation><mathphrase>--a {\frac{1}{2}}
−</mathphrase></inlineequation>
<literal>@option{--a}</literal> <option>--a</option>
-<literal>@r{--a}</literal> <lineannotation>–a</lineannotation>
+<literal>@r{--a}</literal> –a
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
<literal>@sc{--a}</literal> –a
<literal>@strong{--a}</literal> <emphasis role="bold">–a</emphasis>
@@ -2150,7 +2150,7 @@
<literal>@key{--a}</literal> <keycap>--a</keycap>
<literal>@math{--a {\frac{1}{2}} @minus{}}</literal>
<inlineequation><mathphrase>--a {\frac{1}{2}}
−</mathphrase></inlineequation>
<literal>@option{--a}</literal> <option>--a</option>
-<literal>@r{--a}</literal> <lineannotation>–a</lineannotation>
+<literal>@r{--a}</literal> –a
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
<literal>@sc{--a}</literal> –a
<literal>@strong{--a}</literal> <emphasis role="bold">–a</emphasis>
@@ -2643,7 +2643,7 @@
<literal>@key{--a}</literal> <keycap>--a</keycap>
<literal>@math{--a {\frac{1}{2}} @minus{}}</literal>
<inlineequation><mathphrase>--a {\frac{1}{2}}
−</mathphrase></inlineequation>
<literal>@option{--a}</literal> <option>--a</option>
-<literal>@r{--a}</literal> <lineannotation>–a</lineannotation>
+<literal>@r{--a}</literal> –a
<literal>@samp{--a}</literal> ‘<literal>--a</literal>’
<literal>@sc{--a}</literal> --a
<literal>@strong{--a}</literal> <emphasis role="bold">--a</emphasis>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5414] * Texinfo/Convert/DocBook.pm: do not use lineannotation for,
Patrice Dumas <=