texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp Texinfo/Convert/HTML.pm t/results/co...


From: Patrice Dumas
Subject: texinfo/tp Texinfo/Convert/HTML.pm t/results/co...
Date: Wed, 08 Aug 2012 19:12:03 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/08/08 19:12:03

Modified files:
        tp/Texinfo/Convert: HTML.pm 
        tp/t/results/converters_tests: at_commands_in_refs.pl 
        tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html: 
                                                                           
8_002e27in.html 
                                                                           
cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html 
                                                                           
env-code-option-samp-command-file-C_002dx-ESC.html 
                                                                           
http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html 
                                                                           
index.html 
        tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html: 
                                                                         
8_002e27in.html 
                                                                         
cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html 
                                                                         
env-code-option-samp-command-file-C_002dx-ESC.html 
                                                                         
http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html 
                                                                         
index.html 
        tp/t/results/coverage_braces: nested.pl 
        tp/tests/coverage/res_parser/formatting: formatting.html 
        tp/tests/coverage/res_parser/formatting_fr: formatting.html 
        tp/tests/coverage/res_parser/formatting_utf8_enable_encoding: 
                                                                      
formatting_utf8.html 
        tp/tests/layout/res_parser/formatting_chm: formatting.html 
        tp/tests/layout/res_parser/formatting_exotic: index.html 
        tp/tests/layout/res_parser/formatting_fr_icons: formatting.html 
        tp/tests/layout/res_parser/formatting_html: formatting.html 
        tp/tests/layout/res_parser/formatting_html32: formatting.html 
        tp/tests/layout/res_parser/formatting_html_nodes: index.html 
        tp/tests/layout/res_parser/formatting_nodes: index.html 
        tp/tests/layout/res_parser/formatting_regions: 
                                                       formatting_regions.html 
        tp/tests/layout/res_parser/formatting_singular: index.htm 
        tp/tests/layout/res_parser/formatting_weird_quotes: 
                                                            formatting.html 

Log message:
        Format @key more like TeX does.
        Do not output a <span> if there is no class/no css.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.247&r2=1.248
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/nested.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting/formatting.html?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting_fr/formatting.html?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/index.htm?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html?cvsroot=texinfo&r1=1.9&r2=1.10

Patches:
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -b -r1.247 -r1.248
--- Texinfo/Convert/HTML.pm     5 Aug 2012 14:34:13 -0000       1.247
+++ Texinfo/Convert/HTML.pm     8 Aug 2012 19:11:59 -0000       1.248
@@ -1382,8 +1382,13 @@
     if (defined($attribute_hash->{$cmdname}->{'attribute'})) {
       my ($style, $class, $attribute_text)
         = _parse_attribute ($attribute_hash->{$cmdname}->{'attribute'});
-      $text = $self->_attribute_class($style, $class) . "$attribute_text>" 
+      my $open = $self->_attribute_class($style, $class);
+      if ($open ne '') {
+        $text = $open . "$attribute_text>" 
               . $text . "</$style>";
+      } elsif ($attribute_text ne '') {
+        $text = "<$style $attribute_text>". $text . "</$style>";
+      }
     }
     if (defined($attribute_hash->{$cmdname}->{'quote'})) {
       $text = $self->get_conf('OPEN_QUOTE_SYMBOL') . $text
@@ -1726,12 +1731,21 @@
     #print STDERR Texinfo::Parser::_print_current($command);
     return '';
   }
-  return $self->protect_text('<') .$text .$self->protect_text('>');
-  #if (!$self->in_code()) {
-  #  return '<tt>'.$text .'</tt>';
-  #} else {
-  #  return $text;
-  #}
+  if ($self->in_string()) {
+    return $text;
+  }
+  #return $self->protect_text('<') .$text .$self->protect_text('>');
+  my $class = $cmdname;
+  if (!$self->in_code()) {
+    return $self->_attribute_class('tt', $class).'>'.$text .'</tt>';;
+  } else {
+    my $open = $self->_attribute_class('span', $class);
+    if ($open ne '') {
+      return $open.'>'.$text.'</span>';
+    } else {
+      return $text;
+    }
+  }
 }
 
 $default_commands_conversion{'key'} = \&_convert_key_command;
@@ -7147,8 +7161,13 @@
   my $element = shift;
   my $class = shift;
 
-  return "<$element" if (!defined($class) or $class eq '' 
-                         or $self->get_conf('NO_CSS'));
+  if (!defined($class) or $class eq '' or $self->get_conf('NO_CSS')) {
+    if ($element eq 'span') {
+      return '';
+    } else {
+      return "<$element";
+    }
+  }
 
   my $style = '';
 
@@ -7174,12 +7193,15 @@
     my $class = 'nolinebreak';
     $class = 'nocodebreak' if ($self->in_code() 
                            and $self->get_conf('allowcodebreaks') eq 'false');
-    my $open = $self->_attribute_class('span', $class).'>';
+    my $open = $self->_attribute_class('span', $class);
+    if ($open ne '') {
+      $open .= '>';
     # protect spaces in the html leading attribute in case we are in 'w'
     $open =~ s/ /\x{1F}/g if ($in_w);
     # special span to avoid breaking at _-
     $text =~ s/(\S*[_-]\S*)/${open}$1<\/span>/g;
   }
+  }
   if ($in_w) {
     $text .= '&nbsp;' if (chomp($text));
     # protect spaces within text

Index: t/results/converters_tests/at_commands_in_refs.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/converters_tests/at_commands_in_refs.pl   31 Jul 2012 21:54:35 
-0000      1.11
+++ t/results/converters_tests/at_commands_in_refs.pl   8 Aug 2012 19:11:59 
-0000       1.12
@@ -21874,7 +21874,7 @@
 </td></tr>
 <tr><td align="left" valign="top">&bull; <a 
href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite asis</cite> 
in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in r</span> 
<small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> <em>dfn</em> 
<i>i</i></a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a 
href="#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code> 
<code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> <samp>file</samp> <kbd>C-x 
&lt;ESC&gt;</kbd></a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a 
href="#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code> 
<code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> <samp>file</samp> <kbd>C-x <span 
class="key">ESC</span></kbd></a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
 </td></tr>
 <tr><td align="left" valign="top">&bull; <a 
href="#g_t8_002e27in">8.27in</a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
 </td></tr>
@@ -22070,7 +22070,7 @@
 <a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"></a>
 <div class="header">
 <p>
-Next: <a href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n" 
rel="next"><code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
&lt;ESC&gt;</kbd></a>, Previous: <a href="#-_0040-_007b_007d-_002e-" 
accesskey="p" rel="previous"><tt> @ {} . </tt></a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="n" 
rel="next"><code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></a>, Previous: <a 
href="#-_0040-_007b_007d-_002e-" accesskey="p" rel="previous"><tt> @ {} . 
</tt></a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1"></a>
 <h2 class="chapter">21 <cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w 
--> <span class="roman">in r</span> <small>SC</small> <strong>str</strong> 
<tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></h2>
@@ -22082,13 +22082,13 @@
 Next: <a href="#g_t8_002e27in" accesskey="n" rel="next">8.27in</a>, Previous: 
<a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i" accesskey="p" 
rel="previous"><cite>cite asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> 
<span class="roman">in r</span> <small>SC</small> <strong>str</strong> 
<tt>t</tt> <var>var</var> <em>dfn</em> <i>i</i></a>, Up: <a href="#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <a name="env-code-option-samp-command-file-C_002dx-ESC-1"></a>
-<h2 class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
&lt;ESC&gt;</kbd></h2>
+<h2 class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></h2>
 
 <hr>
 <a name="g_t8_002e27in"></a>
 <div class="header">
 <p>
-Next: <a href="#sansserif-slanted" accesskey="n" rel="next"><span 
class="sansserif">sansserif</span> <i>slanted</i></a>, Previous: <a 
href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="p" 
rel="previous"><code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
&lt;ESC&gt;</kbd></a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; 
</p>
+Next: <a href="#sansserif-slanted" accesskey="n" rel="next"><span 
class="sansserif">sansserif</span> <i>slanted</i></a>, Previous: <a 
href="#env-code-option-samp-command-file-C_002dx-ESC" accesskey="p" 
rel="previous"><code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></a>, Up: <a href="#Top" accesskey="u" 
rel="up">Top</a> &nbsp; </p>
 </div>
 <a name="g_t8_002e27in-1"></a>
 <h2 class="chapter">23 8.27in</h2>
@@ -22144,7 +22144,7 @@
 <a href="#f_002d_002dile1-f_002d_002dile"><img src="f--ile1.jpg" 
alt="f--ile1">  <img src="f--ile.png" alt="alt"></a>
 <a href="#-_0040-_007b_007d-_002e-"><tt> @ {} . </tt></a>
 <a href="#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite 
asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in 
r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> 
<em>dfn</em> <i>i</i></a>
-<a href="#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code> 
<code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> <samp>file</samp> <kbd>C-x &lt;ESC&gt;</kbd></a>
+<a href="#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code> 
<code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> <samp>file</samp> <kbd>C-x <span 
class="key">ESC</span></kbd></a>
 <a href="#g_t8_002e27in">8.27in</a>
 <a href="#sansserif-slanted"><span class="sansserif">sansserif</span> 
<i>slanted</i></a>
 <a href="#indicateurl">&lsquo;<code>indicateurl</code>&rsquo;</a>

Index: 
t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 
t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html  
    31 Jul 2012 21:54:35 -0000      1.3
+++ 
t/results/converters_tests/at_commands_in_refs_latin1/res_html/8_002e27in.html  
    8 Aug 2012 19:11:59 -0000       1.4
@@ -13,7 +13,7 @@
 <link href="index.html#Top" rel="start" title="Top">
 <link href="index.html#Top" rel="up" title="Top">
 <link href="sansserif-slanted.html#sansserif-slanted" rel="next" 
title="sansserif slanted">
-<link 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 rel="previous" title="env code option samp command file C-x &lt;ESC&gt;">
+<link 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 rel="previous" title="env code option samp command file C-x ESC">
 <style type="text/css">
 <!--
 a.summary-letter {text-decoration: none}
@@ -47,7 +47,7 @@
 <a name="g_t8_002e27in"></a>
 <div class="header">
 <p>
-Next: <a href="sansserif-slanted.html#sansserif-slanted" accesskey="n" 
rel="next"><span class="sansserif">sansserif</span> <i>slanted</i></a>, 
Previous: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 accesskey="p" rel="previous"><code>env</code> <code>code</code> 
<samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
<samp>file</samp> <kbd>C-x &lt;ESC&gt;</kbd></a>, Up: <a href="index.html#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="sansserif-slanted.html#sansserif-slanted" accesskey="n" 
rel="next"><span class="sansserif">sansserif</span> <i>slanted</i></a>, 
Previous: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 accesskey="p" rel="previous"><code>env</code> <code>code</code> 
<samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
<samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>, Up: <a 
href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <a name="g_t8_002e27in-1"></a>

Index: 
t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- 
t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
   31 Jul 2012 21:54:35 -0000      1.5
+++ 
t/results/converters_tests/at_commands_in_refs_latin1/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
   8 Aug 2012 19:11:59 -0000       1.6
@@ -12,7 +12,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
 <link href="index.html#Top" rel="start" title="Top">
 <link href="index.html#Top" rel="up" title="Top">
-<link 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 rel="next" title="env code option samp command file C-x &lt;ESC&gt;">
+<link 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 rel="next" title="env code option samp command file C-x ESC">
 <link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" 
rel="previous" title=" @ {} . ">
 <style type="text/css">
 <!--
@@ -47,7 +47,7 @@
 <a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"></a>
 <div class="header">
 <p>
-Next: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 accesskey="n" rel="next"><code>env</code> <code>code</code> 
<samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
<samp>file</samp> <kbd>C-x &lt;ESC&gt;</kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" accesskey="p" 
rel="previous"><tt> @ {} . </tt></a>, Up: <a href="index.html#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 accesskey="n" rel="next"><code>env</code> <code>code</code> 
<samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
<samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" accesskey="p" 
rel="previous"><tt> @ {} . </tt></a>, Up: <a href="index.html#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1"></a>

Index: 
t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 
t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
   31 Jul 2012 21:54:35 -0000      1.3
+++ 
t/results/converters_tests/at_commands_in_refs_latin1/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
   8 Aug 2012 19:11:59 -0000       1.4
@@ -2,10 +2,10 @@
 <html>
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
-<title>Top: env code option samp command file C-x &lt;ESC&gt;</title>
+<title>Top: env code option samp command file C-x ESC</title>
 
-<meta name="description" content="Top: env code option samp command file C-x 
&lt;ESC&gt;">
-<meta name="keywords" content="Top: env code option samp command file C-x 
&lt;ESC&gt;">
+<meta name="description" content="Top: env code option samp command file C-x 
ESC">
+<meta name="keywords" content="Top: env code option samp command file C-x ESC">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="Generator" content="tp">
@@ -51,7 +51,7 @@
 </div>
 <hr>
 <a name="env-code-option-samp-command-file-C_002dx-ESC-1"></a>
-<h2 class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
&lt;ESC&gt;</kbd></h2>
+<h2 class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></h2>
 
 
 

Index: 
t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- 
t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
  31 Jul 2012 21:54:35 -0000      1.7
+++ 
t/results/converters_tests/at_commands_in_refs_latin1/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
  8 Aug 2012 19:12:00 -0000       1.8
@@ -76,7 +76,7 @@
 <a 
href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile"><img 
src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" alt="alt"></a>
 <a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-"><tt> @ {} . 
</tt></a>
 <a 
href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite
 asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in 
r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> 
<em>dfn</em> <i>i</i></a>
-<a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code>
 <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> <samp>file</samp> <kbd>C-x &lt;ESC&gt;</kbd></a>
+<a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code>
 <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> <samp>file</samp> <kbd>C-x <span 
class="key">ESC</span></kbd></a>
 <a href="8_002e27in.html#g_t8_002e27in">8.27in</a>
 <a href="sansserif-slanted.html#sansserif-slanted"><span 
class="sansserif">sansserif</span> <i>slanted</i></a>
 <a 
href="indicateurl.html#indicateurl">&lsquo;<code>indicateurl</code>&rsquo;</a>

Index: t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html   
31 Jul 2012 21:54:35 -0000      1.5
+++ t/results/converters_tests/at_commands_in_refs_latin1/res_html/index.html   
8 Aug 2012 19:12:00 -0000       1.6
@@ -96,7 +96,7 @@
 </td></tr>
 <tr><td align="left" valign="top">&bull; <a 
href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite
 asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in 
r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> 
<em>dfn</em> <i>i</i></a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code>
 <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> <samp>file</samp> <kbd>C-x 
&lt;ESC&gt;</kbd></a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code>
 <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> <samp>file</samp> <kbd>C-x <span 
class="key">ESC</span></kbd></a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
 </td></tr>
 <tr><td align="left" valign="top">&bull; <a 
href="8_002e27in.html#g_t8_002e27in">8.27in</a>:</td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">
 </td></tr>

Index: 
t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 
t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html    
    31 Jul 2012 21:54:36 -0000      1.3
+++ 
t/results/converters_tests/at_commands_in_refs_utf8/res_html/8_002e27in.html    
    8 Aug 2012 19:12:00 -0000       1.4
@@ -13,7 +13,7 @@
 <link href="index.html#Top" rel="start" title="Top">
 <link href="index.html#Top" rel="up" title="Top">
 <link href="sansserif-slanted.html#sansserif-slanted" rel="next" 
title="sansserif slanted">
-<link 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 rel="previous" title="env code option samp command file C-x &lt;ESC&gt;">
+<link 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 rel="previous" title="env code option samp command file C-x ESC">
 <style type="text/css">
 <!--
 a.summary-letter {text-decoration: none}
@@ -47,7 +47,7 @@
 <a name="g_t8_002e27in"></a>
 <div class="header">
 <p>
-Next: <a href="sansserif-slanted.html#sansserif-slanted" accesskey="n" 
rel="next"><span class="sansserif">sansserif</span> <i>slanted</i></a>, 
Previous: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 accesskey="p" rel="previous"><code>env</code> <code>code</code> 
<samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
<samp>file</samp> <kbd>C-x &lt;ESC&gt;</kbd></a>, Up: <a href="index.html#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a href="sansserif-slanted.html#sansserif-slanted" accesskey="n" 
rel="next"><span class="sansserif">sansserif</span> <i>slanted</i></a>, 
Previous: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 accesskey="p" rel="previous"><code>env</code> <code>code</code> 
<samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
<samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>, Up: <a 
href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <a name="g_t8_002e27in-1"></a>

Index: 
t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- 
t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
     31 Jul 2012 21:54:36 -0000      1.5
+++ 
t/results/converters_tests/at_commands_in_refs_utf8/res_html/cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html
     8 Aug 2012 19:12:00 -0000       1.6
@@ -12,7 +12,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link href="index.html#Top" rel="start" title="Top">
 <link href="index.html#Top" rel="up" title="Top">
-<link 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 rel="next" title="env code option samp command file C-x &lt;ESC&gt;">
+<link 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 rel="next" title="env code option samp command file C-x ESC">
 <link href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" 
rel="previous" title=" @ {} . ">
 <style type="text/css">
 <!--
@@ -47,7 +47,7 @@
 <a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"></a>
 <div class="header">
 <p>
-Next: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 accesskey="n" rel="next"><code>env</code> <code>code</code> 
<samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
<samp>file</samp> <kbd>C-x &lt;ESC&gt;</kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" accesskey="p" 
rel="previous"><tt> @ {} . </tt></a>, Up: <a href="index.html#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
+Next: <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"
 accesskey="n" rel="next"><code>env</code> <code>code</code> 
<samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; <code>command</code> 
<samp>file</samp> <kbd>C-x <span class="key">ESC</span></kbd></a>, Previous: <a 
href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-" accesskey="p" 
rel="previous"><tt> @ {} . </tt></a>, Up: <a href="index.html#Top" 
accesskey="u" rel="up">Top</a> &nbsp; </p>
 </div>
 <hr>
 <a name="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i-1"></a>

Index: 
t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 
t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
     31 Jul 2012 21:54:36 -0000      1.3
+++ 
t/results/converters_tests/at_commands_in_refs_utf8/res_html/env-code-option-samp-command-file-C_002dx-ESC.html
     8 Aug 2012 19:12:00 -0000       1.4
@@ -2,10 +2,10 @@
 <html>
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
-<title>Top: env code option samp command file C-x &lt;ESC&gt;</title>
+<title>Top: env code option samp command file C-x ESC</title>
 
-<meta name="description" content="Top: env code option samp command file C-x 
&lt;ESC&gt;">
-<meta name="keywords" content="Top: env code option samp command file C-x 
&lt;ESC&gt;">
+<meta name="description" content="Top: env code option samp command file C-x 
ESC">
+<meta name="keywords" content="Top: env code option samp command file C-x ESC">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
 <meta name="Generator" content="tp">
@@ -51,7 +51,7 @@
 </div>
 <hr>
 <a name="env-code-option-samp-command-file-C_002dx-ESC-1"></a>
-<h2 class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
&lt;ESC&gt;</kbd></h2>
+<h2 class="chapter">22 <code>env</code> <code>code</code> <samp>option</samp> 
&lsquo;<samp>samp</samp>&rsquo; <code>command</code> <samp>file</samp> <kbd>C-x 
<span class="key">ESC</span></kbd></h2>
 
 
 

Index: 
t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- 
t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
    31 Jul 2012 21:54:36 -0000      1.7
+++ 
t/results/converters_tests/at_commands_in_refs_utf8/res_html/http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls.html
    8 Aug 2012 19:12:00 -0000       1.8
@@ -76,7 +76,7 @@
 <a 
href="f_002d_002dile1-f_002d_002dile.html#f_002d_002dile1-f_002d_002dile"><img 
src="f--ile1.jpg" alt="f--ile1">  <img src="f--ile.png" alt="alt"></a>
 <a href="-_0040-_007b_007d-_002e-.html#-_0040-_007b_007d-_002e-"><tt> @ {} . 
</tt></a>
 <a 
href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite
 asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in 
r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> 
<em>dfn</em> <i>i</i></a>
-<a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code>
 <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> <samp>file</samp> <kbd>C-x &lt;ESC&gt;</kbd></a>
+<a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code>
 <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> <samp>file</samp> <kbd>C-x <span 
class="key">ESC</span></kbd></a>
 <a href="8_002e27in.html#g_t8_002e27in">8.27in</a>
 <a href="sansserif-slanted.html#sansserif-slanted"><span 
class="sansserif">sansserif</span> <i>slanted</i></a>
 <a 
href="indicateurl.html#indicateurl">&lsquo;<code>indicateurl</code>&rsquo;</a>

Index: t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html     
31 Jul 2012 21:54:36 -0000      1.5
+++ t/results/converters_tests/at_commands_in_refs_utf8/res_html/index.html     
8 Aug 2012 19:12:00 -0000       1.6
@@ -96,7 +96,7 @@
 </td></tr>
 <tr><td align="left" valign="top">&bull; <a 
href="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i.html#cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><cite>cite
 asis</cite> in&nbsp;@w&nbsp;<b>b</b><!-- /@w --> <span class="roman">in 
r</span> <small>SC</small> <strong>str</strong> <tt>t</tt> <var>var</var> 
<em>dfn</em> <i>i</i></a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
 </td></tr>
-<tr><td align="left" valign="top">&bull; <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code>
 <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> <samp>file</samp> <kbd>C-x 
&lt;ESC&gt;</kbd></a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top">&bull; <a 
href="env-code-option-samp-command-file-C_002dx-ESC.html#env-code-option-samp-command-file-C_002dx-ESC"><code>env</code>
 <code>code</code> <samp>option</samp> &lsquo;<samp>samp</samp>&rsquo; 
<code>command</code> <samp>file</samp> <kbd>C-x <span 
class="key">ESC</span></kbd></a>:</td><td>&nbsp;&nbsp;</td><td align="left" 
valign="top">
 </td></tr>
 <tr><td align="left" valign="top">&bull; <a 
href="8_002e27in.html#g_t8_002e27in">8.27in</a>:</td><td>&nbsp;&nbsp;</td><td 
align="left" valign="top">
 </td></tr>

Index: t/results/coverage_braces/nested.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/nested.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/coverage_braces/nested.pl 24 Jan 2012 22:16:59 -0000      1.21
+++ t/results/coverage_braces/nested.pl 8 Aug 2012 19:12:00 -0000       1.22
@@ -88,6 +88,6 @@
 ';
 
 
-$result_converted{'html_text'}->{'nested'} = '<p>type the characters <kbd>l o 
g o u t &lt;RET&gt;</kbd>.</p>';
+$result_converted{'html_text'}->{'nested'} = '<p>type the characters <kbd>l o 
g o u t <span class="key">RET</span></kbd>.</p>';
 
 1;

Index: tests/coverage/res_parser/formatting/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/coverage/res_parser/formatting/formatting.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tests/coverage/res_parser/formatting/formatting.html        4 Aug 2012 
23:07:19 -0000       1.9
+++ tests/coverage/res_parser/formatting/formatting.html        8 Aug 2012 
19:12:00 -0000       1.10
@@ -775,7 +775,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1499,7 +1499,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2248,7 +2248,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2972,7 +2972,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -3700,7 +3700,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <span class="key">--a</span>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>

Index: tests/coverage/res_parser/formatting_fr/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/coverage/res_parser/formatting_fr/formatting.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tests/coverage/res_parser/formatting_fr/formatting.html     4 Aug 2012 
23:07:19 -0000       1.9
+++ tests/coverage/res_parser/formatting_fr/formatting.html     8 Aug 2012 
19:12:00 -0000       1.10
@@ -775,7 +775,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1499,7 +1499,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2248,7 +2248,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2972,7 +2972,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -3700,7 +3700,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <span class="key">--a</span>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>

Index: 
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- 
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html  
    4 Aug 2012 23:07:19 -0000       1.9
+++ 
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html  
    8 Aug 2012 19:12:00 -0000       1.10
@@ -775,7 +775,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} −</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1499,7 +1499,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} −</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2250,7 +2250,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} −</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2974,7 +2974,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} −</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -3702,7 +3702,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <span class="key">--a</span>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} −</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>

Index: tests/layout/res_parser/formatting_chm/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tests/layout/res_parser/formatting_chm/formatting.html      4 Aug 2012 
23:07:20 -0000       1.9
+++ tests/layout/res_parser/formatting_chm/formatting.html      8 Aug 2012 
19:12:00 -0000       1.10
@@ -775,7 +775,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1499,7 +1499,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2232,7 +2232,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2956,7 +2956,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -3684,7 +3684,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <span class="key">--a</span>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>

Index: tests/layout/res_parser/formatting_exotic/index.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tests/layout/res_parser/formatting_exotic/index.html        4 Aug 2012 
23:07:20 -0000       1.10
+++ tests/layout/res_parser/formatting_exotic/index.html        8 Aug 2012 
19:12:01 -0000       1.11
@@ -788,7 +788,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1512,7 +1512,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2240,7 +2240,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <span class="key">--a</span>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>

Index: tests/layout/res_parser/formatting_fr_icons/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tests/layout/res_parser/formatting_fr_icons/formatting.html 4 Aug 2012 
23:07:20 -0000       1.9
+++ tests/layout/res_parser/formatting_fr_icons/formatting.html 8 Aug 2012 
19:12:01 -0000       1.10
@@ -775,7 +775,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1499,7 +1499,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2248,7 +2248,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2972,7 +2972,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -3700,7 +3700,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <span class="key">--a</span>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>

Index: tests/layout/res_parser/formatting_html/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tests/layout/res_parser/formatting_html/formatting.html     4 Aug 2012 
23:07:20 -0000       1.9
+++ tests/layout/res_parser/formatting_html/formatting.html     8 Aug 2012 
19:12:02 -0000       1.10
@@ -775,7 +775,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1499,7 +1499,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2248,7 +2248,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2972,7 +2972,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -3700,7 +3700,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <span class="key">--a</span>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>

Index: tests/layout/res_parser/formatting_html32/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tests/layout/res_parser/formatting_html32/formatting.html   4 Aug 2012 
23:07:20 -0000       1.9
+++ tests/layout/res_parser/formatting_html32/formatting.html   8 Aug 2012 
19:12:02 -0000       1.10
@@ -750,7 +750,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>-a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt>--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> -a
@@ -1466,7 +1466,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>-a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt>--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> -a
@@ -2207,7 +2207,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>-a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt>--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> -a
@@ -2923,7 +2923,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>-a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt>--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> -a
@@ -3642,7 +3642,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>-a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> --a
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> -a

Index: tests/layout/res_parser/formatting_html_nodes/index.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tests/layout/res_parser/formatting_html_nodes/index.html    4 Aug 2012 
23:07:21 -0000       1.10
+++ tests/layout/res_parser/formatting_html_nodes/index.html    8 Aug 2012 
19:12:02 -0000       1.11
@@ -775,7 +775,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1499,7 +1499,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2249,7 +2249,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2973,7 +2973,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -3701,7 +3701,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <span class="key">--a</span>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>

Index: tests/layout/res_parser/formatting_nodes/index.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tests/layout/res_parser/formatting_nodes/index.html 4 Aug 2012 23:07:21 
-0000       1.10
+++ tests/layout/res_parser/formatting_nodes/index.html 8 Aug 2012 19:12:02 
-0000       1.11
@@ -775,7 +775,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1499,7 +1499,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2249,7 +2249,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2973,7 +2973,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -3701,7 +3701,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <span class="key">--a</span>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>

Index: tests/layout/res_parser/formatting_regions/formatting_regions.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tests/layout/res_parser/formatting_regions/formatting_regions.html  4 Aug 
2012 23:07:21 -0000       1.9
+++ tests/layout/res_parser/formatting_regions/formatting_regions.html  8 Aug 
2012 19:12:02 -0000       1.10
@@ -766,7 +766,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1480,7 +1480,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2231,7 +2231,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2949,7 +2949,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <span class="key">--a</span>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -3666,7 +3666,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>

Index: tests/layout/res_parser/formatting_singular/index.htm
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/index.htm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tests/layout/res_parser/formatting_singular/index.htm       4 Aug 2012 
23:07:21 -0000       1.9
+++ tests/layout/res_parser/formatting_singular/index.htm       8 Aug 2012 
19:12:02 -0000       1.10
@@ -814,7 +814,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <!-- MATH
  $- -a {\frac{1}{2}} @minus{}$
  -->
@@ -1565,7 +1565,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <!-- MATH
  $- -a {\frac{1}{2}} @minus{}$
  -->
@@ -2320,7 +2320,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <span class="key">--a</span>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <!-- MATH
  $- -a {\frac{1}{2}} @minus{}$
  -->

Index: tests/layout/res_parser/formatting_weird_quotes/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tests/layout/res_parser/formatting_weird_quotes/formatting.html     4 Aug 
2012 23:07:21 -0000       1.9
+++ tests/layout/res_parser/formatting_weird_quotes/formatting.html     8 Aug 
2012 19:12:02 -0000       1.10
@@ -775,7 +775,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1499,7 +1499,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2248,7 +2248,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2972,7 +2972,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <tt class="key">--a</tt>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -3700,7 +3700,7 @@
 <code>@file{--a}</code> <samp>--a</samp>
 <code>@i{--a}</code> <i>&ndash;a</i>
 <code>@kbd{--a}</code> <kbd>--a</kbd>
-<code>@key{--a}</code> &lt;--a&gt;
+<code>@key{--a}</code> <span class="key">--a</span>
 <code>@math{--a {\frac{1}{2}} @minus{}}</code> <em>--a {\frac{1}{2}} -</em>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>



reply via email to

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