texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Rename to Texinfo::Convert::Utils definition_cate


From: Patrice Dumas
Subject: branch master updated: Rename to Texinfo::Convert::Utils definition_category_tree and update
Date: Mon, 01 Aug 2022 10:27:24 -0400

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 9b7309d4d2 Rename to Texinfo::Convert::Utils definition_category_tree 
and update
9b7309d4d2 is described below

commit 9b7309d4d220b557796679d1aff579c2c669ad66
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Aug 1 16:27:12 2022 +0200

    Rename to Texinfo::Convert::Utils definition_category_tree and update
    
    * tp/Texinfo/Convert/Utils.pm (definition_category_tree),
    tp/Texinfo/Convert/HTML.pm (_convert_def_line_type),
    tp/Texinfo/Convert/LaTeX.pm (_convert): rename
    definition_category() as definition_category_tree().
    Use code for the formatting of the class name.
    Use it in LaTeX formatting.  Do not expand the category
    tree in code context in HTML.
---
 ChangeLog                                          |  12 ++
 doc/customization_api.texi                         |   4 +-
 tp/TODO                                            |   4 -
 tp/Texinfo/Convert/HTML.pm                         |  18 ++-
 tp/Texinfo/Convert/LaTeX.pm                        |  20 +--
 tp/Texinfo/Convert/Text.pm                         |   2 +-
 tp/Texinfo/Convert/Utils.pm                        |  20 +--
 tp/t/results/languages/multiple.pl                 |   2 +-
 tp/t/results/languages/multiple_in_preamble.pl     |   2 +-
 .../languages/multiple_in_preamble_before_node.pl  |   2 +-
 .../res_parser/formatting_exotic/chapter.html      | 136 ++++++++++-----------
 .../res_parser/formatting_fr_icons/formatting.html |  32 ++---
 12 files changed, 124 insertions(+), 130 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b15a307105..391991ea5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2022-07-31  Patrice Dumas  <pertusus@free.fr>
+
+       Rename to Texinfo::Convert::Utils definition_category_tree and update
+
+       * tp/Texinfo/Convert/Utils.pm (definition_category_tree),
+       tp/Texinfo/Convert/HTML.pm (_convert_def_line_type),
+       tp/Texinfo/Convert/LaTeX.pm (_convert): rename
+       definition_category() as definition_category_tree().
+       Use code for the formatting of the class name.
+       Use it in LaTeX formatting.  Do not expand the category
+       tree in code context in HTML.
+
 2022-07-31  Patrice Dumas  <pertusus@free.fr>
 
        Format DEF_TABLE @def* lines similarly with default case
diff --git a/doc/customization_api.texi b/doc/customization_api.texi
index 1fde5cc921..c971104786 100644
--- a/doc/customization_api.texi
+++ b/doc/customization_api.texi
@@ -3540,8 +3540,8 @@ Texinfo::Convert::Utils::expand_verbatiminclude, tp_api}.
 @item @code{@@def*} @@-commands
 @xref{Texinfo::Convert::Utils $arguments = 
definition_arguments_content($element),,
 Texinfo::Convert::Utils::definition_arguments_content, tp_api}.
-@xref{Texinfo::Convert::Utils $tree = definition_category($converter@comma{} 
$def_line),,
-Texinfo::Convert::Utils::definition_category, tp_api}.
+@xref{Texinfo::Convert::Utils $tree = 
definition_category_tree($converter@comma{} $def_line),,
+Texinfo::Convert::Utils::definition_category_tree, tp_api}.
 
 @item @code{@@float}
 @xref{Texinfo::Convert::Converter ($caption@comma{} $prepended) = 
$converter->float_name_caption ($float),,
diff --git a/tp/TODO b/tp/TODO
index 7dfd0f09c8..d5ea64aa77 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -20,10 +20,6 @@ Before next release
 Bugs
 ====
 
-add @code, change name, use more (LaTeX
-definition_category ->
-Texinfo::Convert::Utils::definition_category_code_class
-
 HTML API
 ========
 
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 4f9e46dd4e..e2ed2579fe 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5983,20 +5983,16 @@ sub _convert_def_line_type($$$$)
          . $def_call
          . "$anchor$anchor_span_close</dt>\n";
   } else {
-    my $category_prepared = '';
-    if ($element->{'extra'} and $element->{'extra'}->{'def_parsed_hash'}
-        and %{$element->{'extra'}->{'def_parsed_hash'}}) {
-      my $parsed_definition_category
-         = Texinfo::Convert::Utils::definition_category($self, $element);
-      if ($parsed_definition_category) {
-        $category_prepared = $self->convert_tree({'type' => '_code',
-                   'contents' => [$parsed_definition_category]});
-      }
-    }
+    my $category_result = '';
+    my $definition_category_tree
+      = Texinfo::Convert::Utils::definition_category_tree($self, $element);
+    $category_result
+      = $self->convert_tree({'contents' => [$definition_category_tree]})
+        if (defined($definition_category_tree));
   
     return $self->html_attribute_class('tr', \@classes)
        . "$index_label><td align=\"left\">" . $def_call .
-       "</td><td align=\"right\">" . $category_prepared . "</td></tr>\n";
+       "</td><td align=\"right\">" . $category_result . "</td></tr>\n";
   }
 }
 
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 4fd1f5b030..99f2ff74cb 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3594,24 +3594,8 @@ sub _convert($$)
         $self->{'formatting_context'}->[-1]->{'code'}->[-1] -= 1;
         $result .= '}'; # \texttt
 
-        my $category;
-        if ($command eq 'defcv' or $command eq 'deftypecv') {
-          $category = $self->gdt('{category} of @code{{class}}',
-            { 'category'
-                 => $element->{'extra'}->{'def_parsed_hash'}->{'category'},
-              'class'
-                 => $element->{'extra'}->{'def_parsed_hash'}->{'class'}
-            });
-        } elsif ($command eq 'defop' or $command eq 'deftypeop') {
-          $category =  $self->gdt('{category} on @code{{class}}',
-            { 'category'
-                 => $element->{'extra'}->{'def_parsed_hash'}->{'category'},
-              'class'
-                 => $element->{'extra'}->{'def_parsed_hash'}->{'class'}
-            });
-        } else {
-          $category = $element->{'extra'}->{'def_parsed_hash'}->{'category'};
-        }
+        my $category
+          = Texinfo::Convert::Utils::definition_category_tree($self, 
$element);;
         if (defined($category)) {
           # category is converted in normal text context
           my $converted = _convert($self, $category);
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index eeb9163d50..8f184f7b27 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -574,7 +574,7 @@ sub _convert($;$)
     if ($element->{'extra'} and $element->{'extra'}->{'def_parsed_hash'}
              and %{$element->{'extra'}->{'def_parsed_hash'}}) {
       my $parsed_definition_category
-        = Texinfo::Convert::Utils::definition_category($options->{'converter'},
+        = 
Texinfo::Convert::Utils::definition_category_tree($options->{'converter'},
                                                        $element);
       my @contents = ($parsed_definition_category, {'text' => ': '});
       if ($element->{'extra'}->{'def_parsed_hash'}->{'type'}) {
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index a9b0501d98..0441320fe6 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -104,7 +104,7 @@ sub definition_arguments_content($)
 }
 
 # $SELF converter argument is optional
-sub definition_category($$)
+sub definition_category_tree($$)
 {
   my $self = shift;
   my $current = shift;
@@ -117,21 +117,27 @@ sub definition_category($$)
 
   return $arg_category
     if (!defined($arg_class));
+
+  my $arg_class_code;
+  if (! $self) {
+    $arg_class_code = {'cmdname' => 'code',
+       'args' => [{'type' => 'brace_command_arg', 'contents' => 
[$arg_class]}]};
+  }
   
   my $style = 
$Texinfo::Common::command_index{$current->{'extra'}->{'def_command'}};
   if ($style eq 'fn') {
     if ($self) {
-      return $self->gdt('{category} on {class}', { 'category' => $arg_category,
+      return $self->gdt('{category} on @code{{class}}', { 'category' => 
$arg_category,
                                           'class' => $arg_class });
     } else {
-      return {'contents' => [$arg_category, {'text' => ' on '}, $arg_class]};
+      return {'contents' => [$arg_category, {'text' => ' on '}, 
$arg_class_code]};
     }
   } elsif ($style eq 'vr') {
     if ($self) {
-      return $self->gdt('{category} of {class}', { 'category' => $arg_category,
+      return $self->gdt('{category} of @code{{class}}', { 'category' => 
$arg_category,
                                           'class' => $arg_class });
     } else {
-      return {'contents' => [$arg_category, {'text' => ' of '}, $arg_class]};
+      return {'contents' => [$arg_category, {'text' => ' of '}, 
$arg_class_code]};
     }
   }
 }
@@ -395,8 +401,8 @@ Arguments correspond to text following the category and the 
name
 on the @-command line.  If there is no argument, I<$arguments>
 will be C<undef>.
 
-=item $tree = definition_category($converter, $def_line)
-X<C<definition_category>>
+=item $tree = definition_category_tree($converter, $def_line)
+X<C<definition_category_tree>>
 
 The I<$converter> argument may be undef.  I<$def_line> is a
 C<def_line> texinfo tree container.  This function
diff --git a/tp/t/results/languages/multiple.pl 
b/tp/t/results/languages/multiple.pl
index 600b0a5eb3..d620136363 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -1412,7 +1412,7 @@ $result_converted{'html'}->{'multiple'} = '<!DOCTYPE html>
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- Variable d\'instance de copying: a b
+<!-- Variable d\'instance of copying: a b
 erreur-> -->
 <title>top</title>
 
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index b3ec7ff5c7..b5bc627d67 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -1237,7 +1237,7 @@ $result_converted{'html'}->{'multiple_in_preamble'} = 
'<!DOCTYPE html>
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- Primjer varijable od copying: a b
+<!-- Primjer varijable of copying: a b
 greška-> -->
 <title>top section</title>
 
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl 
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index fe50b9cfad..106d044219 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -1060,7 +1060,7 @@ 
$result_converted{'html'}->{'multiple_in_preamble_before_node'} = '<!DOCTYPE htm
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- Primjer varijable od copying: a b
+<!-- Primjer varijable of copying: a b
 greška-> -->
 <title>top section</title>
 
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html 
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index dc8e9ff3e8..09ee7fe0ad 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -1442,12 +1442,12 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </pre></div>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-d_002d_002deffn_005fname"><td 
align="left"><code class="code">d--effn_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-copying-d_002d_002deffn_005fname"><td 
align="left"><code class="code">d--effn_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;effn
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-de_002d_002dffn_005fname"><td 
align="left"><code class="code">de--ffn_name</code> <span class="r"><i 
class="slanted">ar&ndash;guments    more args <br> even more 
so</i></span></td><td align="right">cate--gory</td></tr>
+<tr class="deffn" id="index-copying-de_002d_002dffn_005fname"><td 
align="left"><code class="code">de--ffn_name</code> <span class="r"><i 
class="slanted">ar&ndash;guments    more args <br> even more 
so</i></span></td><td align="right">cate&ndash;gory</td></tr>
 <tr><td colspan="2"><p>def&ndash;fn
 </p></td></tr></table>
  
@@ -1489,77 +1489,77 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <table class="first-defvr" width="100%">
-<tr class="defvr" id="index-copying-d_002d_002defvr_005fname"><td 
align="left"><code class="code">d--efvr_name</code></td><td 
align="right">c--ategory</td></tr>
+<tr class="defvr" id="index-copying-d_002d_002defvr_005fname"><td 
align="left"><code class="code">d--efvr_name</code></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;efvr
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-n_002d_002dame"><td align="left"><code 
class="code">n--ame</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-copying-n_002d_002dame"><td align="left"><code 
class="code">n--ame</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;effn
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-copying-n_002d_002dame-1"><td align="left"><code 
class="code">n--ame</code></td><td align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-copying-n_002d_002dame-1"><td align="left"><code 
class="code">n--ame</code></td><td align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;effn no arg
 </p></td></tr></table>
 
 <table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory</td></tr>
+<tr class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code> <code 
class="code">a--rguments...</code></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefn
 </p></td></tr></table>
 
 <table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code></td><td align="right">c--ategory</td></tr>
+<tr class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefn no arg
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory on 
c--lass</td></tr>
+<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c&ndash;ategory on 
<code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code></td><td align="right">c--ategory on 
c--lass</td></tr>
+<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code></td><td align="right">c&ndash;ategory on 
<code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop no arg
 </p></td></tr></table>
 
 <table class="first-deftypevr" width="100%">
-<tr class="deftypevr" id="index-copying-d_002d_002deftypevr_005fname"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypevr_name</code></td><td align="right">c--ategory</td></tr>
+<tr class="deftypevr" id="index-copying-d_002d_002deftypevr_005fname"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypevr_name</code></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypevr
 </p></td></tr></table>
 
 <table class="first-defcv" width="100%">
-<tr class="defcv" id="index-copying-d_002d_002defcv_005fname"><td 
align="left"><code class="code">d--efcv_name</code></td><td 
align="right">c--ategory of c--lass</td></tr>
+<tr class="defcv" id="index-copying-d_002d_002defcv_005fname"><td 
align="left"><code class="code">d--efcv_name</code></td><td 
align="right">c&ndash;ategory of <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;efcv
 </p></td></tr></table>
 
 <table class="first-defcv" width="100%">
-<tr class="defcv" id="index-copying-d_002d_002defcv_005fname-1"><td 
align="left"><code class="code">d--efcv_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
of c--lass</td></tr>
+<tr class="defcv" id="index-copying-d_002d_002defcv_005fname-1"><td 
align="left"><code class="code">d--efcv_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c&ndash;ategory of <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;efcv with arguments
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code></td><td align="right">c--ategory of 
c--lass</td></tr>
+<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code></td><td align="right">c&ndash;ategory of 
<code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname-of-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory of 
c--lass</td></tr>
+<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname-of-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c&ndash;ategory of 
<code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv with arguments
 </p></td></tr></table>
 
 <table class="first-defop" width="100%">
-<tr class="defop" 
id="index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">d--efop_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
on c--lass</td></tr>
+<tr class="defop" 
id="index-copying-d_002d_002defop_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">d--efop_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c&ndash;ategory on <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;efop
 </p></td></tr></table>
 
 <table class="first-defop" width="100%">
-<tr class="defop" 
id="index-copying-d_002d_002defop_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">d--efop_name</code></td><td 
align="right">c--ategory on c--lass</td></tr>
+<tr class="defop" 
id="index-copying-d_002d_002defop_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">d--efop_name</code></td><td 
align="right">c&ndash;ategory on <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;efop no arg
 </p></td></tr></table>
 
 <table class="first-deftp" width="100%">
-<tr class="deftp" id="index-copying-d_002d_002deftp_005fname"><td 
align="left"><code class="code">d--eftp_name</code> <span class="r"><i 
class="slanted">a&ndash;ttributes...</i></span></td><td 
align="right">c--ategory</td></tr>
+<tr class="deftp" id="index-copying-d_002d_002deftp_005fname"><td 
align="left"><code class="code">d--eftp_name</code> <span class="r"><i 
class="slanted">a&ndash;ttributes...</i></span></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftp
 </p></td></tr></table>
 
@@ -1604,22 +1604,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></td></tr></table>
 
 <table class="first-defcv first-defivar-alias-first-defcv" width="100%">
-<tr class="defcv defivar-alias-defcv" 
id="index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">d--efivar_name</code></td><td 
align="right">Instance Variable of c--lass</td></tr>
+<tr class="defcv defivar-alias-defcv" 
id="index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">d--efivar_name</code></td><td 
align="right">Instance Variable of <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;efivar
 </p></td></tr></table>
 
 <table class="first-deftypecv first-deftypeivar-alias-first-deftypecv" 
width="100%">
-<tr class="deftypecv deftypeivar-alias-deftypecv" 
id="index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeivar_name</code></td><td align="right">Instance Variable 
of c--lass</td></tr>
+<tr class="deftypecv deftypeivar-alias-deftypecv" 
id="index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeivar_name</code></td><td align="right">Instance Variable 
of <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeivar
 </p></td></tr></table>
 
 <table class="first-defop first-defmethod-alias-first-defop" width="100%">
-<tr class="defop defmethod-alias-defop" 
id="index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">d--efmethod_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">Method on 
c--lass</td></tr>
+<tr class="defop defmethod-alias-defop" 
id="index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">d--efmethod_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">Method on 
<code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;efmethod
 </p></td></tr></table>
 
 <table class="first-deftypeop first-deftypemethod-alias-first-deftypeop" 
width="100%">
-<tr class="deftypeop deftypemethod-alias-deftypeop" 
id="index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypemethod_name</code> <code 
class="code">a--rguments...</code></td><td align="right">Method on 
c--lass</td></tr>
+<tr class="deftypeop deftypemethod-alias-deftypeop" 
id="index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypemethod_name</code> <code 
class="code">a--rguments...</code></td><td align="right">Method on <code 
class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypemethod
 </p></td></tr></table>
 
@@ -1630,27 +1630,27 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></td></tr></table>
 
 <table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code></td><td 
align="right">c--ategory2</td></tr>
+<tr class="deftypefn" id="index-copying-d_002d_002deftypefn_005fname2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code></td><td 
align="right">c&ndash;ategory2</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefn no arg2
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 on 
c--lass2</td></tr>
+<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c&ndash;ategory2 on 
<code class="code">c--lass2</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop2
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code></td><td align="right">c--ategory2 on 
c--lass2</td></tr>
+<tr class="deftypeop" 
id="index-copying-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code></td><td align="right">c&ndash;ategory2 on 
<code class="code">c--lass2</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop no arg2
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code></td><td align="right">c--ategory2 of 
c--lass2</td></tr>
+<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code></td><td align="right">c&ndash;ategory2 of 
<code class="code">c--lass2</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv2
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 of 
c--lass2</td></tr>
+<tr class="deftypecv" 
id="index-copying-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c&ndash;ategory2 of 
<code class="code">c--lass2</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv with arguments2
 </p></td></tr></table>
 
@@ -2518,12 +2518,12 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </pre></div>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-d_002d_002deffn_005fname"><td align="left"><code 
class="code">d--effn_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-d_002d_002deffn_005fname"><td align="left"><code 
class="code">d--effn_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;effn
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-de_002d_002dffn_005fname"><td align="left"><code 
class="code">de--ffn_name</code> <span class="r"><i 
class="slanted">ar&ndash;guments    more args <br> even more 
so</i></span></td><td align="right">cate--gory</td></tr>
+<tr class="deffn" id="index-de_002d_002dffn_005fname"><td align="left"><code 
class="code">de--ffn_name</code> <span class="r"><i 
class="slanted">ar&ndash;guments    more args <br> even more 
so</i></span></td><td align="right">cate&ndash;gory</td></tr>
 <tr><td colspan="2"><p>def&ndash;fn
 </p></td></tr></table>
  
@@ -2565,77 +2565,77 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 
 
 <table class="first-defvr" width="100%">
-<tr class="defvr" id="index-d_002d_002defvr_005fname"><td align="left"><code 
class="code">d--efvr_name</code></td><td align="right">c--ategory</td></tr>
+<tr class="defvr" id="index-d_002d_002defvr_005fname"><td align="left"><code 
class="code">d--efvr_name</code></td><td align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;efvr
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-n_002d_002dame"><td align="left"><code 
class="code">n--ame</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-n_002d_002dame"><td align="left"><code 
class="code">n--ame</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;effn
 </p></td></tr></table>
 
 <table class="first-deffn" width="100%">
-<tr class="deffn" id="index-n_002d_002dame-1"><td align="left"><code 
class="code">n--ame</code></td><td align="right">c--ategory</td></tr>
+<tr class="deffn" id="index-n_002d_002dame-1"><td align="left"><code 
class="code">n--ame</code></td><td align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;effn no arg
 </p></td></tr></table>
 
 <table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory</td></tr>
+<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code> <code 
class="code">a--rguments...</code></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefn
 </p></td></tr></table>
 
 <table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code></td><td align="right">c--ategory</td></tr>
+<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypefn_name</code></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefn no arg
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory on 
c--lass</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c&ndash;ategory on 
<code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code></td><td align="right">c--ategory on 
c--lass</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code></td><td align="right">c&ndash;ategory on 
<code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop no arg
 </p></td></tr></table>
 
 <table class="first-deftypevr" width="100%">
-<tr class="deftypevr" id="index-d_002d_002deftypevr_005fname"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypevr_name</code></td><td align="right">c--ategory</td></tr>
+<tr class="deftypevr" id="index-d_002d_002deftypevr_005fname"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypevr_name</code></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypevr
 </p></td></tr></table>
 
 <table class="first-defcv" width="100%">
-<tr class="defcv" id="index-d_002d_002defcv_005fname"><td align="left"><code 
class="code">d--efcv_name</code></td><td align="right">c--ategory of 
c--lass</td></tr>
+<tr class="defcv" id="index-d_002d_002defcv_005fname"><td align="left"><code 
class="code">d--efcv_name</code></td><td align="right">c&ndash;ategory of <code 
class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;efcv
 </p></td></tr></table>
 
 <table class="first-defcv" width="100%">
-<tr class="defcv" id="index-d_002d_002defcv_005fname-1"><td align="left"><code 
class="code">d--efcv_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
of c--lass</td></tr>
+<tr class="defcv" id="index-d_002d_002defcv_005fname-1"><td align="left"><code 
class="code">d--efcv_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c&ndash;ategory of <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;efcv with arguments
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code></td><td align="right">c--ategory of 
c--lass</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code></td><td align="right">c&ndash;ategory of 
<code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory of 
c--lass</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c&ndash;ategory of 
<code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv with arguments
 </p></td></tr></table>
 
 <table class="first-defop" width="100%">
-<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">d--efop_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
on c--lass</td></tr>
+<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">d--efop_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td 
align="right">c&ndash;ategory on <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;efop
 </p></td></tr></table>
 
 <table class="first-defop" width="100%">
-<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">d--efop_name</code></td><td 
align="right">c--ategory on c--lass</td></tr>
+<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">d--efop_name</code></td><td 
align="right">c&ndash;ategory on <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;efop no arg
 </p></td></tr></table>
 
 <table class="first-deftp" width="100%">
-<tr class="deftp" id="index-d_002d_002deftp_005fname"><td align="left"><code 
class="code">d--eftp_name</code> <span class="r"><i 
class="slanted">a&ndash;ttributes...</i></span></td><td 
align="right">c--ategory</td></tr>
+<tr class="deftp" id="index-d_002d_002deftp_005fname"><td align="left"><code 
class="code">d--eftp_name</code> <span class="r"><i 
class="slanted">a&ndash;ttributes...</i></span></td><td 
align="right">c&ndash;ategory</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftp
 </p></td></tr></table>
 
@@ -2680,22 +2680,22 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></td></tr></table>
 
 <table class="first-defcv first-defivar-alias-first-defcv" width="100%">
-<tr class="defcv defivar-alias-defcv" 
id="index-d_002d_002defivar_005fname-of-c_002d_002dlass"><td align="left"><code 
class="code">d--efivar_name</code></td><td align="right">Instance Variable of 
c--lass</td></tr>
+<tr class="defcv defivar-alias-defcv" 
id="index-d_002d_002defivar_005fname-of-c_002d_002dlass"><td align="left"><code 
class="code">d--efivar_name</code></td><td align="right">Instance Variable of 
<code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;efivar
 </p></td></tr></table>
 
 <table class="first-deftypecv first-deftypeivar-alias-first-deftypecv" 
width="100%">
-<tr class="deftypecv deftypeivar-alias-deftypecv" 
id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeivar_name</code></td><td align="right">Instance Variable 
of c--lass</td></tr>
+<tr class="deftypecv deftypeivar-alias-deftypecv" 
id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeivar_name</code></td><td align="right">Instance Variable 
of <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeivar
 </p></td></tr></table>
 
 <table class="first-defop first-defmethod-alias-first-defop" width="100%">
-<tr class="defop defmethod-alias-defop" 
id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">d--efmethod_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">Method on 
c--lass</td></tr>
+<tr class="defop defmethod-alias-defop" 
id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">d--efmethod_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">Method on 
<code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;efmethod
 </p></td></tr></table>
 
 <table class="first-deftypeop first-deftypemethod-alias-first-deftypeop" 
width="100%">
-<tr class="deftypeop deftypemethod-alias-deftypeop" 
id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypemethod_name</code> <code 
class="code">a--rguments...</code></td><td align="right">Method on 
c--lass</td></tr>
+<tr class="deftypeop deftypemethod-alias-deftypeop" 
id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypemethod_name</code> <code 
class="code">a--rguments...</code></td><td align="right">Method on <code 
class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypemethod
 </p></td></tr></table>
 
@@ -2706,27 +2706,27 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></td></tr></table>
 
 <table class="first-deftypefn" width="100%">
-<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code></td><td 
align="right">c--ategory2</td></tr>
+<tr class="deftypefn" id="index-d_002d_002deftypefn_005fname2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypefn_name2</code></td><td 
align="right">c&ndash;ategory2</td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypefn no arg2
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 on 
c--lass2</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c&ndash;ategory2 on 
<code class="code">c--lass2</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop2
 </p></td></tr></table>
 
 <table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code></td><td align="right">c--ategory2 on 
c--lass2</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-1"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code></td><td align="right">c&ndash;ategory2 on 
<code class="code">c--lass2</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypeop no arg2
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code></td><td align="right">c--ategory2 of 
c--lass2</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code></td><td align="right">c&ndash;ategory2 of 
<code class="code">c--lass2</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv2
 </p></td></tr></table>
 
 <table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 of 
c--lass2</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-1"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c&ndash;ategory2 of 
<code class="code">c--lass2</code></td></tr>
 <tr><td colspan="2"><p>d&ndash;eftypecv with arguments2
 </p></td></tr></table>
 
@@ -3755,13 +3755,13 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-2"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory on 
c--lass</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-2"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory on <code 
class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypeop
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-3"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code></td><td align="right">c--ategory on 
c--lass</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname-on-c_002d_002dlass-3"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeop_name</code></td><td align="right">c--ategory on <code 
class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypeop no arg
 </pre></td></tr></table>
 <pre class="example-preformatted">
@@ -3773,37 +3773,37 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted">
 
 </pre><table class="first-defcv" width="100%">
-<tr class="defcv" id="index-d_002d_002defcv_005fname-2"><td align="left"><code 
class="code">d--efcv_name</code></td><td align="right">c--ategory of 
c--lass</td></tr>
+<tr class="defcv" id="index-d_002d_002defcv_005fname-2"><td align="left"><code 
class="code">d--efcv_name</code></td><td align="right">c--ategory of <code 
class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efcv
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defcv" width="100%">
-<tr class="defcv" id="index-d_002d_002defcv_005fname-3"><td align="left"><code 
class="code">d--efcv_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
of c--lass</td></tr>
+<tr class="defcv" id="index-d_002d_002defcv_005fname-3"><td align="left"><code 
class="code">d--efcv_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
of <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efcv with arguments
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-2"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code></td><td align="right">c--ategory of 
c--lass</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-2"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code></td><td align="right">c--ategory of <code 
class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypecv
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-3"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory of 
c--lass</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname-of-c_002d_002dlass-3"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypecv_name</code> <code 
class="code">a--rguments...</code></td><td align="right">c--ategory of <code 
class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypecv with 
arguments
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defop" width="100%">
-<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass-2"><td 
align="left"><code class="code">d--efop_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
on c--lass</td></tr>
+<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass-2"><td 
align="left"><code class="code">d--efop_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">c--ategory 
on <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efop
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defop" width="100%">
-<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass-3"><td 
align="left"><code class="code">d--efop_name</code></td><td 
align="right">c--ategory on c--lass</td></tr>
+<tr class="defop" id="index-d_002d_002defop_005fname-on-c_002d_002dlass-3"><td 
align="left"><code class="code">d--efop_name</code></td><td 
align="right">c--ategory on <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efop no arg
 </pre></td></tr></table>
 <pre class="example-preformatted">
@@ -3863,25 +3863,25 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted">
 
 </pre><table class="first-defcv first-defivar-alias-first-defcv" width="100%">
-<tr class="defcv defivar-alias-defcv" 
id="index-d_002d_002defivar_005fname-of-c_002d_002dlass-1"><td 
align="left"><code class="code">d--efivar_name</code></td><td 
align="right">Instance Variable of c--lass</td></tr>
+<tr class="defcv defivar-alias-defcv" 
id="index-d_002d_002defivar_005fname-of-c_002d_002dlass-1"><td 
align="left"><code class="code">d--efivar_name</code></td><td 
align="right">Instance Variable of <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efivar
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypecv first-deftypeivar-alias-first-deftypecv" 
width="100%">
-<tr class="deftypecv deftypeivar-alias-deftypecv" 
id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeivar_name</code></td><td align="right">Instance Variable 
of c--lass</td></tr>
+<tr class="deftypecv deftypeivar-alias-deftypecv" 
id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypeivar_name</code></td><td align="right">Instance Variable 
of <code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypeivar
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-defop first-defmethod-alias-first-defop" 
width="100%">
-<tr class="defop defmethod-alias-defop" 
id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">d--efmethod_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">Method on 
c--lass</td></tr>
+<tr class="defop defmethod-alias-defop" 
id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">d--efmethod_name</code> <span class="r"><i 
class="slanted">a&ndash;rguments...</i></span></td><td align="right">Method on 
<code class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--efmethod
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypeop first-deftypemethod-alias-first-deftypeop" 
width="100%">
-<tr class="deftypeop deftypemethod-alias-deftypeop" 
id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypemethod_name</code> <code 
class="code">a--rguments...</code></td><td align="right">Method on 
c--lass</td></tr>
+<tr class="deftypeop deftypemethod-alias-deftypeop" 
id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><td 
align="left"><code class="code">t--ype</code> <code 
class="code">d--eftypemethod_name</code> <code 
class="code">a--rguments...</code></td><td align="right">Method on <code 
class="code">c--lass</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypemethod
 </pre></td></tr></table>
 <pre class="example-preformatted">
@@ -3900,25 +3900,25 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 on 
c--lass2</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-2"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 on <code 
class="code">c--lass2</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypeop2
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypeop" width="100%">
-<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code></td><td align="right">c--ategory2 on 
c--lass2</td></tr>
+<tr class="deftypeop" 
id="index-d_002d_002deftypeop_005fname2-on-c_002d_002dlass2-3"><td 
align="left"><code class="code">t--ype2</code><br> <code 
class="code">d--eftypeop_name2</code></td><td align="right">c--ategory2 on 
<code class="code">c--lass2</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypeop no arg2
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code></td><td align="right">c--ategory2 of 
c--lass2</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-2"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code></td><td align="right">c--ategory2 of 
<code class="code">c--lass2</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypecv2
 </pre></td></tr></table>
 <pre class="example-preformatted">
 
 </pre><table class="first-deftypecv" width="100%">
-<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 of 
c--lass2</td></tr>
+<tr class="deftypecv" 
id="index-d_002d_002deftypecv_005fname2-of-c_002d_002dlass2-3"><td 
align="left"><code class="code">t--ype2</code> <code 
class="code">d--eftypecv_name2</code> <code 
class="code">a--rguments2...</code></td><td align="right">c--ategory2 of <code 
class="code">c--lass2</code></td></tr>
 <tr><td colspan="2"><pre class="example-preformatted">d--eftypecv with 
arguments2
 </pre></td></tr></table>
 <pre class="example-preformatted">
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html 
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index 431c1b3c05..76f1b10883 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -467,31 +467,31 @@ d-eftypefn
 c-ategory: t-ype d-eftypefn_name
 d-eftypefn no arg
 
-c-ategory de c-lass: t-ype d-eftypeop_name a-rguments...
+c-ategory on c-lass: t-ype d-eftypeop_name a-rguments...
 d-eftypeop
 
-c-ategory de c-lass: t-ype d-eftypeop_name
+c-ategory on c-lass: t-ype d-eftypeop_name
 d-eftypeop no arg
 
 c-ategory: t-ype d-eftypevr_name
 d-eftypevr
 
-c-ategory de c-lass: d-efcv_name
+c-ategory of c-lass: d-efcv_name
 d-efcv
 
-c-ategory de c-lass: d-efcv_name a-rguments...
+c-ategory of c-lass: d-efcv_name a-rguments...
 d-efcv with arguments
 
-c-ategory de c-lass: t-ype d-eftypecv_name
+c-ategory of c-lass: t-ype d-eftypecv_name
 d-eftypecv
 
-c-ategory de c-lass: t-ype d-eftypecv_name a-rguments...
+c-ategory of c-lass: t-ype d-eftypecv_name a-rguments...
 d-eftypecv with arguments
 
-c-ategory de c-lass: d-efop_name a-rguments...
+c-ategory on c-lass: d-efop_name a-rguments...
 d-efop
 
-c-ategory de c-lass: d-efop_name
+c-ategory on c-lass: d-efop_name
 d-efop no arg
 
 c-ategory: d-eftp_name a-ttributes...
@@ -521,16 +521,16 @@ d-eftypefun
 Variable: t-ype d-eftypevar_name
 d-eftypevar
 
-Variable d'instance de c-lass: d-efivar_name
+Variable d'instance of c-lass: d-efivar_name
 d-efivar
 
-Variable d'instance de c-lass: t-ype d-eftypeivar_name
+Variable d'instance of c-lass: t-ype d-eftypeivar_name
 d-eftypeivar
 
-Me'thode de c-lass: d-efmethod_name a-rguments...
+Me'thode on c-lass: d-efmethod_name a-rguments...
 d-efmethod
 
-Me'thode de c-lass: t-ype d-eftypemethod_name a-rguments...
+Me'thode on c-lass: t-ype d-eftypemethod_name a-rguments...
 d-eftypemethod
 
 
@@ -540,16 +540,16 @@ aaa2
 c-ategory2: t-ype2 d-eftypefn_name2
 d-eftypefn no arg2
 
-c-ategory2 de c-lass2: t-ype2 d-eftypeop_name2 a-rguments2...
+c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2 a-rguments2...
 d-eftypeop2
 
-c-ategory2 de c-lass2: t-ype2 d-eftypeop_name2
+c-ategory2 on c-lass2: t-ype2 d-eftypeop_name2
 d-eftypeop no arg2
 
-c-ategory2 de c-lass2: t-ype2 d-eftypecv_name2
+c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2
 d-eftypecv2
 
-c-ategory2 de c-lass2: t-ype2 d-eftypecv_name2 a-rguments2...
+c-ategory2 of c-lass2: t-ype2 d-eftypecv_name2 a-rguments2...
 d-eftypecv with arguments2
 
 fun2: arg2



reply via email to

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