texinfo-commits
[Top][All Lists]
Advanced

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

[7534] texi2any.pl call do_index_keys


From: gavinsmith0123
Subject: [7534] texi2any.pl call do_index_keys
Date: Sat, 26 Nov 2016 15:35:28 +0000 (UTC)

Revision: 7534
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7534
Author:   gavin
Date:     2016-11-26 15:35:28 +0000 (Sat, 26 Nov 2016)
Log Message:
-----------
texi2any.pl call do_index_keys

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Structuring.pm
    trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
    trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
    trunk/tp/texi2any.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-11-22 18:58:34 UTC (rev 7533)
+++ trunk/ChangeLog     2016-11-26 15:35:28 UTC (rev 7534)
@@ -1,3 +1,11 @@
+2016-11-26  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Structuring.pm (_do_index_keys, do_index_keys): 
+       Rename, and remove second argument.
+       * tp/texi2any.pl: Call 'do_index_keys' so that the data set in 
+       this function, for example the 'in_code' value on index entries, 
+       will be set in case 'do_index_keys' is not called again.
+
 2016-11-22  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/ModulePath.pm.in: Correct a condition.

Modified: trunk/tp/Texinfo/Structuring.pm
===================================================================
--- trunk/tp/Texinfo/Structuring.pm     2016-11-22 18:58:34 UTC (rev 7533)
+++ trunk/tp/Texinfo/Structuring.pm     2016-11-26 15:35:28 UTC (rev 7534)
@@ -1401,10 +1401,11 @@
   return $res;
 }
 
-sub _do_index_keys($$$)
+# Go through all the index entries and set 'key', the sort key, on
+# each one.
+sub do_index_keys($$)
 {
   my $self = shift;
-  my $index_entries = shift;
   my $index_names = shift;
 
   my $options = {'sort_string' => 1};
@@ -1414,8 +1415,8 @@
   }
   my %convert_text_options = Texinfo::Common::_convert_text_options($self);
   $options = {%$options, %convert_text_options};
-  foreach my $index_name (keys(%$index_entries)) {
-    foreach my $entry (@{$index_entries->{$index_name}}) {
+  foreach my $index_name (keys(%$index_names)) {
+    foreach my $entry (@{$index_names->{$index_name}->{'index_entries'}}) {
       $entry->{'in_code'} = 
$index_names->{$entry->{'index_name'}}->{'in_code'};
       $options->{'code'} = $entry->{'in_code'};
       $entry->{'key'} = Texinfo::Convert::Text::convert(
@@ -1439,7 +1440,7 @@
   my $index_entries = shift;
   my $index_names = shift;
   my $sorted_index_entries;
-  _do_index_keys($self, $index_entries, $index_names);
+  do_index_keys($self, $index_names);
   foreach my $index_name (keys(%$index_entries)) {
     @{$sorted_index_entries->{$index_name}} = 
         sort _sort_index_entries 
@@ -1454,7 +1455,7 @@
   my $index_entries = shift;
   my $index_names = shift;
   my $indices_sorted_by_letters;
-  _do_index_keys($self, $index_entries, $index_names);
+  do_index_keys($self, $index_names);
   foreach my $index_name (keys(%$index_entries)) {
     my $index_letter_hash;
     foreach my $index_entry (@{$index_entries->{$index_name}}) {

Modified: trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml  
2016-11-22 18:58:34 UTC (rev 7533)
+++ trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml  
2016-11-26 15:35:28 UTC (rev 7534)
@@ -35,8 +35,8 @@
 </para>
 <indexterm role="cp"><primary>&#8211;option</primary></indexterm>
 <indexterm role="cp"><primary>&#8220;</primary></indexterm>
-<indexterm role="fn"><primary>&#8220;</primary></indexterm>
-<indexterm role="fn"><primary>&#8211;foption</primary></indexterm>
+<indexterm role="fn"><primary>``</primary></indexterm>
+<indexterm role="fn"><primary>--foption</primary></indexterm>
 
 <para>@&quot;u &#252; 
 @&quot;{U} &#220; 
@@ -296,10 +296,10 @@
 </abstract>
 <screen>s&#8211;mallformat
 </screen>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;effn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<function>d--effn_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--effn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<function>d--effn_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;effn
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>de&#8211;ffn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> 
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>    
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
+<synopsis><indexterm 
role="fn"><primary>de--ffn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> 
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>    
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
 </replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable> 
<replaceable>so</replaceable></synopsis>
 <blockquote><para>def&#8211;fn
 </para></blockquote> 
@@ -338,58 +338,58 @@
 <blockquote><!-- comment -->
 <para>text in def item for second def item
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efvr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<varname>d--efvr_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efvr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<varname>d--efvr_name</varname></synopsis>
 <blockquote><para>d&#8211;efvr
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;eftypefn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefn_name</function> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--eftypefn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefn_name</function> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypefn
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;eftypeop_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypeop_name</methodname> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm role="fn"><primary>d--eftypeop_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypeop_name</methodname> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypeop
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;eftypevr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <varname>d--eftypevr_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--eftypevr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <varname>d--eftypevr_name</varname></synopsis>
 <blockquote><para>d&#8211;eftypevr
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efcv_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efcv_name</property></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efcv_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efcv_name</property></synopsis>
 <blockquote><para>d&#8211;efcv
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;efop_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efop_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efop_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efop_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efop
 </para></blockquote>
-<synopsis><indexterm 
role="tp"><primary>d&#8211;eftp_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
+<synopsis><indexterm 
role="tp"><primary>d--eftp_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
 <blockquote><para>d&#8211;eftp
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<function>d--efun_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<function>d--efun_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efun
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efmac_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Macro</emphasis>:</phrase> 
<function>d--efmac_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efmac_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Macro</emphasis>:</phrase> 
<function>d--efmac_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efmac
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efspec_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>d--efspec_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efspec_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>d--efspec_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efspec
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efvar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<varname>d--efvar_name</varname> <replaceable>argvar</replaceable> 
<replaceable>argvar1</replaceable></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efvar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<varname>d--efvar_name</varname> <replaceable>argvar</replaceable> 
<replaceable>argvar1</replaceable></synopsis>
 <blockquote><para>d&#8211;efvar
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efopt_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">User Option</emphasis>:</phrase> 
<varname>d--efopt_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efopt_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">User Option</emphasis>:</phrase> 
<varname>d--efopt_name</varname></synopsis>
 <blockquote><para>d&#8211;efopt
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;eftypefun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefun_name</function> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--eftypefun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefun_name</function> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypefun
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;eftypevar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> 
<varname>d--eftypevar_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--eftypevar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> 
<varname>d--eftypevar_name</varname></synopsis>
 <blockquote><para>d&#8211;eftypevar
 </para></blockquote>
-<synopsis><indexterm role="vr"><primary>d&#8211;efivar_name of 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efivar_name</property></synopsis>
+<synopsis><indexterm role="vr"><primary>d--efivar_name of 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efivar_name</property></synopsis>
 <blockquote><para>d&#8211;efivar
 </para></blockquote>
-<synopsis><indexterm role="vr"><primary>d&#8211;eftypeivar_name of 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> 
<property>d--eftypeivar_name</property></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypeivar_name of 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> 
<property>d--eftypeivar_name</property></synopsis>
 <blockquote><para>d&#8211;eftypeivar
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;efmethod_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efmethod_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efmethod_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efmethod_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efmethod
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;eftypemethod_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm role="fn"><primary>d--eftypemethod_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypemethod
 </para></blockquote>
 <para><literal>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file 
n---ame@@, ma---nual@@}</literal> See section &#8220;t&#8212;itle@&#8221; in 
<citetitle>ma&#8212;nual@</citetitle>.
@@ -535,8 +535,8 @@
 </para>
 <indexterm role="cp"><primary>&#8211;option</primary></indexterm>
 <indexterm role="cp"><primary>&#8220;</primary></indexterm>
-<indexterm role="fn"><primary>&#8220;</primary></indexterm>
-<indexterm role="fn"><primary>&#8211;foption</primary></indexterm>
+<indexterm role="fn"><primary>``</primary></indexterm>
+<indexterm role="fn"><primary>--foption</primary></indexterm>
 
 <para>@&quot;u &#252; 
 @&quot;{U} &#220; 
@@ -796,10 +796,10 @@
 </abstract>
 <screen>s&#8211;mallformat
 </screen>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;effn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<function>d--effn_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--effn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<function>d--effn_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;effn
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>de&#8211;ffn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> 
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>    
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
+<synopsis><indexterm 
role="fn"><primary>de--ffn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> 
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>    
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
 </replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable> 
<replaceable>so</replaceable></synopsis>
 <blockquote><para>def&#8211;fn
 </para></blockquote> 
@@ -838,58 +838,58 @@
 <blockquote><!-- comment -->
 <para>text in def item for second def item
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efvr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<varname>d--efvr_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efvr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<varname>d--efvr_name</varname></synopsis>
 <blockquote><para>d&#8211;efvr
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;eftypefn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefn_name</function> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--eftypefn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefn_name</function> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypefn
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;eftypeop_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypeop_name</methodname> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm role="fn"><primary>d--eftypeop_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypeop_name</methodname> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypeop
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;eftypevr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <varname>d--eftypevr_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--eftypevr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <varname>d--eftypevr_name</varname></synopsis>
 <blockquote><para>d&#8211;eftypevr
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efcv_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efcv_name</property></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efcv_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efcv_name</property></synopsis>
 <blockquote><para>d&#8211;efcv
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;efop_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efop_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efop_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efop_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efop
 </para></blockquote>
-<synopsis><indexterm 
role="tp"><primary>d&#8211;eftp_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
+<synopsis><indexterm 
role="tp"><primary>d--eftp_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
 <blockquote><para>d&#8211;eftp
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<function>d--efun_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<function>d--efun_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efun
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efmac_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Macro</emphasis>:</phrase> 
<function>d--efmac_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efmac_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Macro</emphasis>:</phrase> 
<function>d--efmac_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efmac
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efspec_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>d--efspec_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efspec_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>d--efspec_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efspec
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efvar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<varname>d--efvar_name</varname> <replaceable>argvar</replaceable> 
<replaceable>argvar1</replaceable></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efvar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<varname>d--efvar_name</varname> <replaceable>argvar</replaceable> 
<replaceable>argvar1</replaceable></synopsis>
 <blockquote><para>d&#8211;efvar
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efopt_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">User Option</emphasis>:</phrase> 
<varname>d--efopt_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efopt_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">User Option</emphasis>:</phrase> 
<varname>d--efopt_name</varname></synopsis>
 <blockquote><para>d&#8211;efopt
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;eftypefun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefun_name</function> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--eftypefun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefun_name</function> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypefun
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;eftypevar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> 
<varname>d--eftypevar_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--eftypevar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> 
<varname>d--eftypevar_name</varname></synopsis>
 <blockquote><para>d&#8211;eftypevar
 </para></blockquote>
-<synopsis><indexterm role="vr"><primary>d&#8211;efivar_name of 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efivar_name</property></synopsis>
+<synopsis><indexterm role="vr"><primary>d--efivar_name of 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efivar_name</property></synopsis>
 <blockquote><para>d&#8211;efivar
 </para></blockquote>
-<synopsis><indexterm role="vr"><primary>d&#8211;eftypeivar_name of 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> 
<property>d--eftypeivar_name</property></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypeivar_name of 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> 
<property>d--eftypeivar_name</property></synopsis>
 <blockquote><para>d&#8211;eftypeivar
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;efmethod_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efmethod_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efmethod_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efmethod_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efmethod
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;eftypemethod_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm role="fn"><primary>d--eftypemethod_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypemethod
 </para></blockquote>
 <para><literal>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file 
n---ame@@, ma---nual@@}</literal> See section &#8220;t&#8212;itle@&#8221; in 
<citetitle>ma&#8212;nual@</citetitle>.
@@ -1036,8 +1036,8 @@
 </para>
 <indexterm role="cp"><primary>&#8211;option</primary></indexterm>
 <indexterm role="cp"><primary>&#8220;</primary></indexterm>
-<indexterm role="fn"><primary>&#8220;</primary></indexterm>
-<indexterm role="fn"><primary>&#8211;foption</primary></indexterm>
+<indexterm role="fn"><primary>``</primary></indexterm>
+<indexterm role="fn"><primary>--foption</primary></indexterm>
 
 <para>@&quot;u &#252; 
 @&quot;{U} &#220; 
@@ -1297,10 +1297,10 @@
 </abstract>
 <screen>s&#8211;mallformat
 </screen>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;effn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<function>d--effn_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--effn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<function>d--effn_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;effn
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>de&#8211;ffn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> 
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>    
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
+<synopsis><indexterm 
role="fn"><primary>de--ffn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> 
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>    
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
 </replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable> 
<replaceable>so</replaceable></synopsis>
 <blockquote><para>def&#8211;fn
 </para></blockquote> 
@@ -1339,58 +1339,58 @@
 <blockquote><!-- comment -->
 <para>text in def item for second def item
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efvr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<varname>d--efvr_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efvr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<varname>d--efvr_name</varname></synopsis>
 <blockquote><para>d&#8211;efvr
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;eftypefn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefn_name</function> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--eftypefn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefn_name</function> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypefn
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;eftypeop_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypeop_name</methodname> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm role="fn"><primary>d--eftypeop_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypeop_name</methodname> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypeop
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;eftypevr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <varname>d--eftypevr_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--eftypevr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <varname>d--eftypevr_name</varname></synopsis>
 <blockquote><para>d&#8211;eftypevr
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efcv_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efcv_name</property></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efcv_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efcv_name</property></synopsis>
 <blockquote><para>d&#8211;efcv
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;efop_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efop_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efop_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efop_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efop
 </para></blockquote>
-<synopsis><indexterm 
role="tp"><primary>d&#8211;eftp_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
+<synopsis><indexterm 
role="tp"><primary>d--eftp_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
 <blockquote><para>d&#8211;eftp
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<function>d--efun_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<function>d--efun_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efun
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efmac_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Macro</emphasis>:</phrase> 
<function>d--efmac_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efmac_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Macro</emphasis>:</phrase> 
<function>d--efmac_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efmac
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efspec_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>d--efspec_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efspec_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>d--efspec_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efspec
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efvar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<varname>d--efvar_name</varname> <replaceable>argvar</replaceable> 
<replaceable>argvar1</replaceable></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efvar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<varname>d--efvar_name</varname> <replaceable>argvar</replaceable> 
<replaceable>argvar1</replaceable></synopsis>
 <blockquote><para>d&#8211;efvar
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efopt_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">User Option</emphasis>:</phrase> 
<varname>d--efopt_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efopt_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">User Option</emphasis>:</phrase> 
<varname>d--efopt_name</varname></synopsis>
 <blockquote><para>d&#8211;efopt
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;eftypefun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefun_name</function> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--eftypefun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefun_name</function> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypefun
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;eftypevar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> 
<varname>d--eftypevar_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--eftypevar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> 
<varname>d--eftypevar_name</varname></synopsis>
 <blockquote><para>d&#8211;eftypevar
 </para></blockquote>
-<synopsis><indexterm role="vr"><primary>d&#8211;efivar_name of 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efivar_name</property></synopsis>
+<synopsis><indexterm role="vr"><primary>d--efivar_name of 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efivar_name</property></synopsis>
 <blockquote><para>d&#8211;efivar
 </para></blockquote>
-<synopsis><indexterm role="vr"><primary>d&#8211;eftypeivar_name of 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> 
<property>d--eftypeivar_name</property></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypeivar_name of 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> 
<property>d--eftypeivar_name</property></synopsis>
 <blockquote><para>d&#8211;eftypeivar
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;efmethod_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efmethod_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efmethod_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efmethod_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efmethod
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;eftypemethod_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm role="fn"><primary>d--eftypemethod_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypemethod
 </para></blockquote>
 <para><literal>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file 
n---ame@@, ma---nual@@}</literal> See section &#8220;t&#8212;itle@&#8221; in 
<citetitle>ma&#8212;nual@</citetitle>.
@@ -1538,8 +1538,8 @@
 </para>
 <indexterm role="cp"><primary>&#8211;option</primary></indexterm>
 <indexterm role="cp"><primary>&#8220;</primary></indexterm>
-<indexterm role="fn"><primary>&#8220;</primary></indexterm>
-<indexterm role="fn"><primary>&#8211;foption</primary></indexterm>
+<indexterm role="fn"><primary>``</primary></indexterm>
+<indexterm role="fn"><primary>--foption</primary></indexterm>
 
 <para>@&quot;u &#252; 
 @&quot;{U} &#220; 
@@ -1799,10 +1799,10 @@
 </abstract>
 <screen>s&#8211;mallformat
 </screen>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;effn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<function>d--effn_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--effn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<function>d--effn_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;effn
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>de&#8211;ffn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> 
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>    
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
+<synopsis><indexterm 
role="fn"><primary>de--ffn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> 
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>    
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
 </replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable> 
<replaceable>so</replaceable></synopsis>
 <blockquote><para>def&#8211;fn
 </para></blockquote> 
@@ -1841,58 +1841,58 @@
 <blockquote><!-- comment -->
 <para>text in def item for second def item
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efvr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<varname>d--efvr_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efvr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<varname>d--efvr_name</varname></synopsis>
 <blockquote><para>d&#8211;efvr
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;eftypefn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefn_name</function> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--eftypefn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefn_name</function> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypefn
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;eftypeop_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypeop_name</methodname> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm role="fn"><primary>d--eftypeop_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypeop_name</methodname> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypeop
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;eftypevr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <varname>d--eftypevr_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--eftypevr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <varname>d--eftypevr_name</varname></synopsis>
 <blockquote><para>d&#8211;eftypevr
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efcv_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efcv_name</property></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efcv_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efcv_name</property></synopsis>
 <blockquote><para>d&#8211;efcv
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;efop_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efop_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efop_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efop_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efop
 </para></blockquote>
-<synopsis><indexterm 
role="tp"><primary>d&#8211;eftp_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
+<synopsis><indexterm 
role="tp"><primary>d--eftp_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
 <blockquote><para>d&#8211;eftp
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<function>d--efun_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<function>d--efun_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efun
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efmac_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Macro</emphasis>:</phrase> 
<function>d--efmac_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efmac_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Macro</emphasis>:</phrase> 
<function>d--efmac_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efmac
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efspec_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>d--efspec_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efspec_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>d--efspec_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efspec
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efvar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<varname>d--efvar_name</varname> <replaceable>argvar</replaceable> 
<replaceable>argvar1</replaceable></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efvar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<varname>d--efvar_name</varname> <replaceable>argvar</replaceable> 
<replaceable>argvar1</replaceable></synopsis>
 <blockquote><para>d&#8211;efvar
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efopt_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">User Option</emphasis>:</phrase> 
<varname>d--efopt_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efopt_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">User Option</emphasis>:</phrase> 
<varname>d--efopt_name</varname></synopsis>
 <blockquote><para>d&#8211;efopt
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;eftypefun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefun_name</function> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--eftypefun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefun_name</function> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypefun
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;eftypevar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> 
<varname>d--eftypevar_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--eftypevar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> 
<varname>d--eftypevar_name</varname></synopsis>
 <blockquote><para>d&#8211;eftypevar
 </para></blockquote>
-<synopsis><indexterm role="vr"><primary>d&#8211;efivar_name of 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efivar_name</property></synopsis>
+<synopsis><indexterm role="vr"><primary>d--efivar_name of 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efivar_name</property></synopsis>
 <blockquote><para>d&#8211;efivar
 </para></blockquote>
-<synopsis><indexterm role="vr"><primary>d&#8211;eftypeivar_name of 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> 
<property>d--eftypeivar_name</property></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypeivar_name of 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> 
<property>d--eftypeivar_name</property></synopsis>
 <blockquote><para>d&#8211;eftypeivar
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;efmethod_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efmethod_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efmethod_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efmethod_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efmethod
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;eftypemethod_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm role="fn"><primary>d--eftypemethod_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypemethod
 </para></blockquote>
 <para><literal>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file 
n---ame@@, ma---nual@@}</literal> See section &#8220;t&#8212;itle@&#8221; in 
<citetitle>ma&#8212;nual@</citetitle>.
@@ -2039,8 +2039,8 @@
 </para>
 <indexterm role="cp"><primary>&#8211;option</primary></indexterm>
 <indexterm role="cp"><primary>&#8220;</primary></indexterm>
-<indexterm role="fn"><primary>&#8220;</primary></indexterm>
-<indexterm role="fn"><primary>&#8211;foption</primary></indexterm>
+<indexterm role="fn"><primary>``</primary></indexterm>
+<indexterm role="fn"><primary>--foption</primary></indexterm>
 
 <para>@&quot;u &#252; 
 @&quot;{U} &#220; 
@@ -2300,10 +2300,10 @@
 </abstract>
 <screen>s&#8211;mallformat
 </screen>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;effn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<function>d--effn_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--effn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<function>d--effn_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;effn
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>de&#8211;ffn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> 
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>    
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
+<synopsis><indexterm 
role="fn"><primary>de--ffn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> 
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>    
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
 </replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable> 
<replaceable>so</replaceable></synopsis>
 <blockquote><para>def&#8211;fn
 </para></blockquote> 
@@ -2342,58 +2342,58 @@
 <blockquote><!-- comment -->
 <para>text in def item for second def item
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efvr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<varname>d--efvr_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efvr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<varname>d--efvr_name</varname></synopsis>
 <blockquote><para>d&#8211;efvr
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;eftypefn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefn_name</function> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--eftypefn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefn_name</function> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypefn
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;eftypeop_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypeop_name</methodname> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm role="fn"><primary>d--eftypeop_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypeop_name</methodname> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypeop
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;eftypevr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <varname>d--eftypevr_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--eftypevr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <varname>d--eftypevr_name</varname></synopsis>
 <blockquote><para>d&#8211;eftypevr
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efcv_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efcv_name</property></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efcv_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efcv_name</property></synopsis>
 <blockquote><para>d&#8211;efcv
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;efop_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efop_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efop_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efop_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efop
 </para></blockquote>
-<synopsis><indexterm 
role="tp"><primary>d&#8211;eftp_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
+<synopsis><indexterm 
role="tp"><primary>d--eftp_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
 <blockquote><para>d&#8211;eftp
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<function>d--efun_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<function>d--efun_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efun
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efmac_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Macro</emphasis>:</phrase> 
<function>d--efmac_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efmac_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Macro</emphasis>:</phrase> 
<function>d--efmac_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efmac
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;efspec_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>d--efspec_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--efspec_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>d--efspec_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efspec
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efvar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<varname>d--efvar_name</varname> <replaceable>argvar</replaceable> 
<replaceable>argvar1</replaceable></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efvar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<varname>d--efvar_name</varname> <replaceable>argvar</replaceable> 
<replaceable>argvar1</replaceable></synopsis>
 <blockquote><para>d&#8211;efvar
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;efopt_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">User Option</emphasis>:</phrase> 
<varname>d--efopt_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--efopt_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">User Option</emphasis>:</phrase> 
<varname>d--efopt_name</varname></synopsis>
 <blockquote><para>d&#8211;efopt
 </para></blockquote>
-<synopsis><indexterm 
role="fn"><primary>d&#8211;eftypefun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefun_name</function> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm 
role="fn"><primary>d--eftypefun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefun_name</function> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypefun
 </para></blockquote>
-<synopsis><indexterm 
role="vr"><primary>d&#8211;eftypevar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> 
<varname>d--eftypevar_name</varname></synopsis>
+<synopsis><indexterm 
role="vr"><primary>d--eftypevar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> 
<varname>d--eftypevar_name</varname></synopsis>
 <blockquote><para>d&#8211;eftypevar
 </para></blockquote>
-<synopsis><indexterm role="vr"><primary>d&#8211;efivar_name of 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efivar_name</property></synopsis>
+<synopsis><indexterm role="vr"><primary>d--efivar_name of 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efivar_name</property></synopsis>
 <blockquote><para>d&#8211;efivar
 </para></blockquote>
-<synopsis><indexterm role="vr"><primary>d&#8211;eftypeivar_name of 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> 
<property>d--eftypeivar_name</property></synopsis>
+<synopsis><indexterm role="vr"><primary>d--eftypeivar_name of 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> 
<property>d--eftypeivar_name</property></synopsis>
 <blockquote><para>d&#8211;eftypeivar
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;efmethod_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efmethod_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>d--efmethod_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efmethod_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><para>d&#8211;efmethod
 </para></blockquote>
-<synopsis><indexterm role="fn"><primary>d&#8211;eftypemethod_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname> 
<type>a--rguments...</type></synopsis>
+<synopsis><indexterm role="fn"><primary>d--eftypemethod_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname> 
<type>a--rguments...</type></synopsis>
 <blockquote><para>d&#8211;eftypemethod
 </para></blockquote>
 <para><literal>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file 
n---ame@@, ma---nual@@}</literal> See section &#8220;t&#8212;itle@&#8221; in 
<citetitle>ma&#8212;nual@</citetitle>.
@@ -2537,7 +2537,7 @@
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 
-<indexterm role="cp"><primary>&#8211;option</primary></indexterm><indexterm 
role="cp"><primary>&#8220;</primary></indexterm><indexterm 
role="fn"><primary>&#8220;</primary></indexterm><indexterm 
role="fn"><primary>&#8211;foption</primary></indexterm>
+<indexterm role="cp"><primary>&#8211;option</primary></indexterm><indexterm 
role="cp"><primary>&#8220;</primary></indexterm><indexterm 
role="fn"><primary>``</primary></indexterm><indexterm 
role="fn"><primary>--foption</primary></indexterm>
 @&quot;u &#252; 
 @&quot;{U} &#220; 
 @~n &#241;
@@ -2794,10 +2794,10 @@
 </abstract><screen>
 </screen><screen>s--mallformat
 </screen><screen>
-</screen><synopsis><indexterm 
role="fn"><primary>d&#8211;effn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<function>d--effn_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm 
role="fn"><primary>d--effn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<function>d--effn_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><screen>d--effn
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="fn"><primary>de&#8211;ffn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> 
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>    
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
+</screen><synopsis><indexterm 
role="fn"><primary>de--ffn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">cate--gory</emphasis>:</phrase> 
<function>de--ffn_name</function> <replaceable>ar--guments</replaceable>    
<replaceable>more</replaceable> <replaceable>args</replaceable> <replaceable>
 </replaceable> <replaceable>even</replaceable> <replaceable>more</replaceable> 
<replaceable>so</replaceable></synopsis>
 <blockquote><screen>def--fn
 </screen></blockquote><screen> 
@@ -2835,58 +2835,58 @@
 <blockquote><screen><!-- comment -->
 text in def item for second def item
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="vr"><primary>d&#8211;efvr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<varname>d--efvr_name</varname></synopsis>
+</screen><synopsis><indexterm 
role="vr"><primary>d--efvr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<varname>d--efvr_name</varname></synopsis>
 <blockquote><screen>d--efvr
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="fn"><primary>d&#8211;eftypefn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefn_name</function> 
<type>a--rguments...</type></synopsis>
+</screen><synopsis><indexterm 
role="fn"><primary>d--eftypefn_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefn_name</function> 
<type>a--rguments...</type></synopsis>
 <blockquote><screen>d--eftypefn
 </screen></blockquote><screen>
-</screen><synopsis><indexterm role="fn"><primary>d&#8211;eftypeop_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypeop_name</methodname> 
<type>a--rguments...</type></synopsis>
+</screen><synopsis><indexterm role="fn"><primary>d--eftypeop_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypeop_name</methodname> 
<type>a--rguments...</type></synopsis>
 <blockquote><screen>d--eftypeop
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="vr"><primary>d&#8211;eftypevr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <varname>d--eftypevr_name</varname></synopsis>
+</screen><synopsis><indexterm 
role="vr"><primary>d--eftypevr_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <varname>d--eftypevr_name</varname></synopsis>
 <blockquote><screen>d--eftypevr
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="vr"><primary>d&#8211;efcv_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efcv_name</property></synopsis>
+</screen><synopsis><indexterm 
role="vr"><primary>d--efcv_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efcv_name</property></synopsis>
 <blockquote><screen>d--efcv
 </screen></blockquote><screen>
-</screen><synopsis><indexterm role="fn"><primary>d&#8211;efop_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efop_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm role="fn"><primary>d--efop_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">c--ategory</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efop_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><screen>d--efop
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="tp"><primary>d&#8211;eftp_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
+</screen><synopsis><indexterm 
role="tp"><primary>d--eftp_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">c--ategory</emphasis>:</phrase> 
<structname>d--eftp_name</structname> <type>a--ttributes...</type></synopsis>
 <blockquote><screen>d--eftp
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="fn"><primary>d&#8211;efun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<function>d--efun_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm 
role="fn"><primary>d--efun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<function>d--efun_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><screen>d--efun
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="fn"><primary>d&#8211;efmac_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Macro</emphasis>:</phrase> 
<function>d--efmac_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm 
role="fn"><primary>d--efmac_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Macro</emphasis>:</phrase> 
<function>d--efmac_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><screen>d--efmac
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="fn"><primary>d&#8211;efspec_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>d--efspec_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm 
role="fn"><primary>d--efspec_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Special Form</emphasis>:</phrase> 
<function>d--efspec_name</function> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><screen>d--efspec
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="vr"><primary>d&#8211;efvar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<varname>d--efvar_name</varname> <replaceable>argvar</replaceable> 
<replaceable>argvar1</replaceable></synopsis>
+</screen><synopsis><indexterm 
role="vr"><primary>d--efvar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<varname>d--efvar_name</varname> <replaceable>argvar</replaceable> 
<replaceable>argvar1</replaceable></synopsis>
 <blockquote><screen>d--efvar
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="vr"><primary>d&#8211;efopt_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">User Option</emphasis>:</phrase> 
<varname>d--efopt_name</varname></synopsis>
+</screen><synopsis><indexterm 
role="vr"><primary>d--efopt_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">User Option</emphasis>:</phrase> 
<varname>d--efopt_name</varname></synopsis>
 <blockquote><screen>d--efopt
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="fn"><primary>d&#8211;eftypefun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefun_name</function> 
<type>a--rguments...</type></synopsis>
+</screen><synopsis><indexterm 
role="fn"><primary>d--eftypefun_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> <function>d--eftypefun_name</function> 
<type>a--rguments...</type></synopsis>
 <blockquote><screen>d--eftypefun
 </screen></blockquote><screen>
-</screen><synopsis><indexterm 
role="vr"><primary>d&#8211;eftypevar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> 
<varname>d--eftypevar_name</varname></synopsis>
+</screen><synopsis><indexterm 
role="vr"><primary>d--eftypevar_name</primary></indexterm><phrase 
role="category"><emphasis role="bold">Variable</emphasis>:</phrase> 
<returnvalue>t--ype</returnvalue> 
<varname>d--eftypevar_name</varname></synopsis>
 <blockquote><screen>d--eftypevar
 </screen></blockquote><screen>
-</screen><synopsis><indexterm role="vr"><primary>d&#8211;efivar_name of 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efivar_name</property></synopsis>
+</screen><synopsis><indexterm role="vr"><primary>d--efivar_name of 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<property>d--efivar_name</property></synopsis>
 <blockquote><screen>d--efivar
 </screen></blockquote><screen>
-</screen><synopsis><indexterm role="vr"><primary>d&#8211;eftypeivar_name of 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> 
<property>d--eftypeivar_name</property></synopsis>
+</screen><synopsis><indexterm role="vr"><primary>d--eftypeivar_name of 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Instance Variable</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> 
<property>d--eftypeivar_name</property></synopsis>
 <blockquote><screen>d--eftypeivar
 </screen></blockquote><screen>
-</screen><synopsis><indexterm role="fn"><primary>d&#8211;efmethod_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efmethod_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
+</screen><synopsis><indexterm role="fn"><primary>d--efmethod_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<methodname>d--efmethod_name</methodname> 
<replaceable>a--rguments...</replaceable></synopsis>
 <blockquote><screen>d--efmethod
 </screen></blockquote><screen>
-</screen><synopsis><indexterm role="fn"><primary>d&#8211;eftypemethod_name on 
c&#8211;lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname> 
<type>a--rguments...</type></synopsis>
+</screen><synopsis><indexterm role="fn"><primary>d--eftypemethod_name on 
c--lass</primary></indexterm><phrase role="category"><emphasis 
role="bold">Method</emphasis>:</phrase> 
<ooclass><classname>c--lass</classname></ooclass> 
<returnvalue>t--ype</returnvalue> <methodname>d--eftypemethod_name</methodname> 
<type>a--rguments...</type></synopsis>
 <blockquote><screen>d--eftypemethod
 </screen></blockquote><screen>
 <literal>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@, 
ma---nual@@}</literal> See section ``t---itle@'' in 
<citetitle>ma---nual@</citetitle>.
@@ -3011,8 +3011,8 @@
 <indexterm role="cp"><primary>.</primary></indexterm>
 <indexterm role="cp"><primary>?</primary></indexterm>
 <indexterm role="cp"><primary>a</primary></indexterm>
-<indexterm role="fn"><primary>t&#8211;ruc</primary></indexterm>
-<indexterm role="fn"><primary>T&#8211;ruc</primary></indexterm>
+<indexterm role="fn"><primary>t--ruc</primary></indexterm>
+<indexterm role="fn"><primary>T--ruc</primary></indexterm>
 <indexterm role="fn"><primary>.</primary></indexterm>
 <indexterm role="fn"><primary>?</primary></indexterm>
 <indexterm role="fn"><primary>a</primary></indexterm>

Modified: trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml      
2016-11-22 18:58:34 UTC (rev 7533)
+++ trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml      
2016-11-26 15:35:28 UTC (rev 7534)
@@ -778,8 +778,8 @@
 </para>
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="1">&textndash;option</indexterm></cindex>
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="2">&textldquo;</indexterm></cindex>
-<findex index="fn" spaces=" "><indexterm index="fn" 
number="1">&textldquo;</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm index="fn" 
number="2">&textndash;foption</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn" 
number="1">``</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn" 
number="2">--foption</indexterm></findex>
 
 <para>&arobase;&quot;u <accent type="uml" bracketed="off">u</accent> 
 &arobase;&quot;&lbrace;U&rbrace; <accent type="uml">U</accent> 
@@ -1099,11 +1099,11 @@
 <pre xml:space="preserve">s&textndash;mallformat
 </pre></smallformat>
 
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="3">d&textndash;effn_name</indexterm><defcategory>c--ategory</defcategory>
 <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="3">d--effn_name</indexterm><defcategory>c--ategory</defcategory> 
<deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;effn
 </para></definitionitem></deffn>
 
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="4">de&textndash;ffn_name</indexterm><defcategory>cate--gory</defcategory>
 <deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="4">de--ffn_name</indexterm><defcategory>cate--gory</defcategory> 
<deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
 <definitionitem><para>def&textndash;fn
 </para></definitionitem></deffn>
  
@@ -1146,75 +1146,75 @@
 <para>text in def item for second def item
 </para></definitionitem></deffn>
 
-<defvr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="1">d&textndash;efvr_name</indexterm><defcategory>c--ategory</defcategory>
 <defvariable>d--efvr_name</defvariable></definitionterm>
+<defvr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="1">d--efvr_name</indexterm><defcategory>c--ategory</defcategory> 
<defvariable>d--efvr_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;efvr
 </para></definitionitem></defvr>
 
-<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="23">d&textndash;eftypefn_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="23">d--eftypefn_name</indexterm><defcategory>c--ategory</defcategory> 
<deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypefn
 </para></definitionitem></deftypefn>
 
-<deftypeop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="24">d&textndash;eftypeop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypeop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="24">d--eftypeop_name on 
c--lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypeop
 </para></definitionitem></deftypeop>
 
-<deftypevr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="2">d&textndash;eftypevr_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
+<deftypevr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="2">d--eftypevr_name</indexterm><defcategory>c--ategory</defcategory> 
<deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;eftypevr
 </para></definitionitem></deftypevr>
 
-<defcv spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="3">d&textndash;efcv_name</indexterm><defcategory>c--ategory</defcategory>
 <defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
+<defcv spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="3">d--efcv_name</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;efcv
 </para></definitionitem></defcv>
 
-<defop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="25">d&textndash;efop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+<defop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="25">d--efop_name on 
c--lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efop
 </para></definitionitem></defop>
 
-<deftp spaces=" " endspaces=" "><definitionterm><indexterm index="tp" 
number="1">d&textndash;eftp_name</indexterm><defcategory>c--ategory</defcategory>
 <defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
+<deftp spaces=" " endspaces=" "><definitionterm><indexterm index="tp" 
number="1">d--eftp_name</indexterm><defcategory>c--ategory</defcategory> 
<defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftp
 </para></definitionitem></deftp>
 
-<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="26">d&textndash;efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="26">d--efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efun
 </para></definitionitem></defun>
 
-<defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="27">d&textndash;efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="27">d--efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efmac
 </para></definitionitem></defmac>
 
-<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="28">d&textndash;efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="28">d--efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efspec
 </para></definitionitem></defspec>
 
-<defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="4">d&textndash;efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
+<defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="4">d--efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
 <definitionitem><para>d&textndash;efvar
 </para></definitionitem></defvar>
 
-<defopt spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="5">d&textndash;efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
+<defopt spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="5">d--efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;efopt
 </para></definitionitem></defopt>
 
-<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="29">d&textndash;eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="29">d--eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypefun
 </para></definitionitem></deftypefun>
 
-<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="6">d&textndash;eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
+<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="6">d--eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;eftypevar
 </para></definitionitem></deftypevar>
 
-<defivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="7">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
+<defivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="7">d--efivar_name of c--lass</indexterm><defcategory automatic="on" 
bracketed="on">Instance Variable</defcategory> <defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;efivar
 </para></definitionitem></defivar>
 
-<deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="8">d&textndash;eftypeivar_name of 
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance 
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
+<deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="8">d--eftypeivar_name of c--lass</indexterm><defcategory automatic="on" 
bracketed="on">Instance Variable</defcategory> <defclass>c--lass</defclass> 
<deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;eftypeivar
 </para></definitionitem></deftypeivar>
 
-<defmethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="30">d&textndash;efmethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+<defmethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="30">d--efmethod_name on c--lass</indexterm><defcategory 
automatic="on">Method</defcategory> <defclass>c--lass</defclass> 
<defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efmethod
 </para></definitionitem></defmethod>
 
-<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="31">d&textndash;eftypemethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="31">d--eftypemethod_name on c--lass</indexterm><defcategory 
automatic="on">Method</defcategory> <defclass>c--lass</defclass> 
<deftype>t--ype</deftype> <defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypemethod
 </para></definitionitem></deftypemethod>
 
@@ -1378,8 +1378,8 @@
 </para>
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="7">&textndash;option</indexterm></cindex>
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="8">&textldquo;</indexterm></cindex>
-<findex index="fn" spaces=" "><indexterm index="fn" 
number="34">&textldquo;</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm index="fn" 
number="35">&textndash;foption</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn" 
number="34">``</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn" 
number="35">--foption</indexterm></findex>
 
 <para>&arobase;&quot;u <accent type="uml" bracketed="off">u</accent> 
 &arobase;&quot;&lbrace;U&rbrace; <accent type="uml">U</accent> 
@@ -1699,11 +1699,11 @@
 <pre xml:space="preserve">s&textndash;mallformat
 </pre></smallformat>
 
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="36">d&textndash;effn_name</indexterm><defcategory>c--ategory</defcategory>
 <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="36">d--effn_name</indexterm><defcategory>c--ategory</defcategory> 
<deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;effn
 </para></definitionitem></deffn>
 
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="37">de&textndash;ffn_name</indexterm><defcategory>cate--gory</defcategory>
 <deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="37">de--ffn_name</indexterm><defcategory>cate--gory</defcategory> 
<deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
 <definitionitem><para>def&textndash;fn
 </para></definitionitem></deffn>
  
@@ -1746,75 +1746,75 @@
 <para>text in def item for second def item
 </para></definitionitem></deffn>
 
-<defvr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="11">d&textndash;efvr_name</indexterm><defcategory>c--ategory</defcategory>
 <defvariable>d--efvr_name</defvariable></definitionterm>
+<defvr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="11">d--efvr_name</indexterm><defcategory>c--ategory</defcategory> 
<defvariable>d--efvr_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;efvr
 </para></definitionitem></defvr>
 
-<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="56">d&textndash;eftypefn_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="56">d--eftypefn_name</indexterm><defcategory>c--ategory</defcategory> 
<deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypefn
 </para></definitionitem></deftypefn>
 
-<deftypeop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="57">d&textndash;eftypeop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypeop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="57">d--eftypeop_name on 
c--lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypeop
 </para></definitionitem></deftypeop>
 
-<deftypevr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="12">d&textndash;eftypevr_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
+<deftypevr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="12">d--eftypevr_name</indexterm><defcategory>c--ategory</defcategory> 
<deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;eftypevr
 </para></definitionitem></deftypevr>
 
-<defcv spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="13">d&textndash;efcv_name</indexterm><defcategory>c--ategory</defcategory>
 <defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
+<defcv spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="13">d--efcv_name</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;efcv
 </para></definitionitem></defcv>
 
-<defop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="58">d&textndash;efop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+<defop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="58">d--efop_name on 
c--lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efop
 </para></definitionitem></defop>
 
-<deftp spaces=" " endspaces=" "><definitionterm><indexterm index="tp" 
number="2">d&textndash;eftp_name</indexterm><defcategory>c--ategory</defcategory>
 <defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
+<deftp spaces=" " endspaces=" "><definitionterm><indexterm index="tp" 
number="2">d--eftp_name</indexterm><defcategory>c--ategory</defcategory> 
<defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftp
 </para></definitionitem></deftp>
 
-<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="59">d&textndash;efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="59">d--efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efun
 </para></definitionitem></defun>
 
-<defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="60">d&textndash;efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="60">d--efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efmac
 </para></definitionitem></defmac>
 
-<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="61">d&textndash;efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="61">d--efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efspec
 </para></definitionitem></defspec>
 
-<defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="14">d&textndash;efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
+<defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="14">d--efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
 <definitionitem><para>d&textndash;efvar
 </para></definitionitem></defvar>
 
-<defopt spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="15">d&textndash;efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
+<defopt spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="15">d--efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;efopt
 </para></definitionitem></defopt>
 
-<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="62">d&textndash;eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="62">d--eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypefun
 </para></definitionitem></deftypefun>
 
-<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="16">d&textndash;eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
+<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="16">d--eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;eftypevar
 </para></definitionitem></deftypevar>
 
-<defivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="17">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
+<defivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="17">d--efivar_name of c--lass</indexterm><defcategory automatic="on" 
bracketed="on">Instance Variable</defcategory> <defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;efivar
 </para></definitionitem></defivar>
 
-<deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="18">d&textndash;eftypeivar_name of 
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance 
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
+<deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="18">d--eftypeivar_name of c--lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;eftypeivar
 </para></definitionitem></deftypeivar>
 
-<defmethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="63">d&textndash;efmethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+<defmethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="63">d--efmethod_name on c--lass</indexterm><defcategory 
automatic="on">Method</defcategory> <defclass>c--lass</defclass> 
<defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efmethod
 </para></definitionitem></defmethod>
 
-<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="64">d&textndash;eftypemethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="64">d--eftypemethod_name on c--lass</indexterm><defcategory 
automatic="on">Method</defcategory> <defclass>c--lass</defclass> 
<deftype>t--ype</deftype> <defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypemethod
 </para></definitionitem></deftypemethod>
 
@@ -1978,8 +1978,8 @@
 </para>
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="13">&textndash;option</indexterm></cindex>
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="14">&textldquo;</indexterm></cindex>
-<findex index="fn" spaces=" "><indexterm index="fn" 
number="67">&textldquo;</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm index="fn" 
number="68">&textndash;foption</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn" 
number="67">``</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn" 
number="68">--foption</indexterm></findex>
 
 <para>&arobase;&quot;u <accent type="uml" bracketed="off">u</accent> 
 &arobase;&quot;&lbrace;U&rbrace; <accent type="uml">U</accent> 
@@ -2299,11 +2299,11 @@
 <pre xml:space="preserve">s&textndash;mallformat
 </pre></smallformat>
 
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="69">d&textndash;effn_name</indexterm><defcategory>c--ategory</defcategory>
 <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="69">d--effn_name</indexterm><defcategory>c--ategory</defcategory> 
<deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;effn
 </para></definitionitem></deffn>
 
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="70">de&textndash;ffn_name</indexterm><defcategory>cate--gory</defcategory>
 <deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="70">de--ffn_name</indexterm><defcategory>cate--gory</defcategory> 
<deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
 <definitionitem><para>def&textndash;fn
 </para></definitionitem></deffn>
  
@@ -2346,75 +2346,75 @@
 <para>text in def item for second def item
 </para></definitionitem></deffn>
 
-<defvr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="21">d&textndash;efvr_name</indexterm><defcategory>c--ategory</defcategory>
 <defvariable>d--efvr_name</defvariable></definitionterm>
+<defvr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="21">d--efvr_name</indexterm><defcategory>c--ategory</defcategory> 
<defvariable>d--efvr_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;efvr
 </para></definitionitem></defvr>
 
-<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="89">d&textndash;eftypefn_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="89">d--eftypefn_name</indexterm><defcategory>c--ategory</defcategory> 
<deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypefn
 </para></definitionitem></deftypefn>
 
-<deftypeop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="90">d&textndash;eftypeop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypeop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="90">d--eftypeop_name on 
c--lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypeop
 </para></definitionitem></deftypeop>
 
-<deftypevr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="22">d&textndash;eftypevr_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
+<deftypevr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="22">d--eftypevr_name</indexterm><defcategory>c--ategory</defcategory> 
<deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;eftypevr
 </para></definitionitem></deftypevr>
 
-<defcv spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="23">d&textndash;efcv_name</indexterm><defcategory>c--ategory</defcategory>
 <defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
+<defcv spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="23">d--efcv_name</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;efcv
 </para></definitionitem></defcv>
 
-<defop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="91">d&textndash;efop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+<defop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="91">d--efop_name on 
c--lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efop
 </para></definitionitem></defop>
 
-<deftp spaces=" " endspaces=" "><definitionterm><indexterm index="tp" 
number="3">d&textndash;eftp_name</indexterm><defcategory>c--ategory</defcategory>
 <defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
+<deftp spaces=" " endspaces=" "><definitionterm><indexterm index="tp" 
number="3">d--eftp_name</indexterm><defcategory>c--ategory</defcategory> 
<defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftp
 </para></definitionitem></deftp>
 
-<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="92">d&textndash;efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="92">d--efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efun
 </para></definitionitem></defun>
 
-<defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="93">d&textndash;efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="93">d--efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efmac
 </para></definitionitem></defmac>
 
-<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="94">d&textndash;efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+<defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="94">d--efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efspec
 </para></definitionitem></defspec>
 
-<defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="24">d&textndash;efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
+<defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="24">d--efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
 <definitionitem><para>d&textndash;efvar
 </para></definitionitem></defvar>
 
-<defopt spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="25">d&textndash;efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
+<defopt spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="25">d--efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;efopt
 </para></definitionitem></defopt>
 
-<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="95">d&textndash;eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="95">d--eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypefun
 </para></definitionitem></deftypefun>
 
-<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="26">d&textndash;eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
+<deftypevar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="26">d--eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
 <definitionitem><para>d&textndash;eftypevar
 </para></definitionitem></deftypevar>
 
-<defivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="27">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
+<defivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="27">d--efivar_name of c--lass</indexterm><defcategory automatic="on" 
bracketed="on">Instance Variable</defcategory> <defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;efivar
 </para></definitionitem></defivar>
 
-<deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="28">d&textndash;eftypeivar_name of 
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance 
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
+<deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="28">d--eftypeivar_name of c--lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
 <definitionitem><para>d&textndash;eftypeivar
 </para></definitionitem></deftypeivar>
 
-<defmethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="96">d&textndash;efmethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+<defmethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="96">d--efmethod_name on c--lass</indexterm><defcategory 
automatic="on">Method</defcategory> <defclass>c--lass</defclass> 
<defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><para>d&textndash;efmethod
 </para></definitionitem></defmethod>
 
-<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="97">d&textndash;eftypemethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="97">d--eftypemethod_name on c--lass</indexterm><defcategory 
automatic="on">Method</defcategory> <defclass>c--lass</defclass> 
<deftype>t--ype</deftype> <defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><para>d&textndash;eftypemethod
 </para></definitionitem></deftypemethod>
 
@@ -2572,8 +2572,8 @@
 
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="19">&textndash;option</indexterm></cindex>
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="20">&textldquo;</indexterm></cindex>
-<findex index="fn" spaces=" "><indexterm index="fn" 
number="100">&textldquo;</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm index="fn" 
number="101">&textndash;foption</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn" 
number="100">``</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn" 
number="101">--foption</indexterm></findex>
 
 &arobase;&quot;u <accent type="uml" bracketed="off">u</accent> 
 &arobase;&quot;&lbrace;U&rbrace; <accent type="uml">U</accent> 
@@ -2893,11 +2893,11 @@
 <pre xml:space="preserve">s--mallformat
 </pre></smallformat>
 <pre xml:space="preserve">
-</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="102">d&textndash;effn_name</indexterm><defcategory>c--ategory</defcategory>
 <deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="102">d--effn_name</indexterm><defcategory>c--ategory</defcategory> 
<deffunction>d--effn_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--effn
 </pre></definitionitem></deffn>
 <pre xml:space="preserve">
-</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="103">de&textndash;ffn_name</indexterm><defcategory>cate--gory</defcategory>
 <deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
+</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="103">de--ffn_name</indexterm><defcategory>cate--gory</defcategory> 
<deffunction>de--ffn_name</deffunction> <defparam>ar--guments</defparam>    
<defparam>more</defparam> <defparam>args</defparam> 
<defparam>&linebreak;</defparam> <defparam>even</defparam> 
<defparam>more</defparam> <defparam>so</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">def--fn
 </pre></definitionitem></deffn>
 <pre xml:space="preserve"> 
@@ -2940,75 +2940,75 @@
 text in def item for second def item
 </pre></definitionitem></deffn>
 <pre xml:space="preserve">
-</pre><defvr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="31">d&textndash;efvr_name</indexterm><defcategory>c--ategory</defcategory>
 <defvariable>d--efvr_name</defvariable></definitionterm>
+</pre><defvr spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="31">d--efvr_name</indexterm><defcategory>c--ategory</defcategory> 
<defvariable>d--efvr_name</defvariable></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efvr
 </pre></definitionitem></defvr>
 <pre xml:space="preserve">
-</pre><deftypefn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn" 
number="122">d&textndash;eftypefn_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+</pre><deftypefn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn" 
number="122">d--eftypefn_name</indexterm><defcategory>c--ategory</defcategory> 
<deftype>t--ype</deftype> <deffunction>d--eftypefn_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypefn
 </pre></definitionitem></deftypefn>
 <pre xml:space="preserve">
-</pre><deftypeop spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn" number="123">d&textndash;eftypeop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+</pre><deftypeop spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn" number="123">d--eftypeop_name on 
c--lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypeop_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypeop
 </pre></definitionitem></deftypeop>
 <pre xml:space="preserve">
-</pre><deftypevr spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr" 
number="32">d&textndash;eftypevr_name</indexterm><defcategory>c--ategory</defcategory>
 <deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
+</pre><deftypevr spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr" 
number="32">d--eftypevr_name</indexterm><defcategory>c--ategory</defcategory> 
<deftype>t--ype</deftype> 
<defvariable>d--eftypevr_name</defvariable></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypevr
 </pre></definitionitem></deftypevr>
 <pre xml:space="preserve">
-</pre><defcv spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="33">d&textndash;efcv_name</indexterm><defcategory>c--ategory</defcategory>
 <defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
+</pre><defcv spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="33">d--efcv_name</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efcv_name</defclassvar></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efcv
 </pre></definitionitem></defcv>
 <pre xml:space="preserve">
-</pre><defop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="124">d&textndash;efop_name on 
c&textndash;lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defop spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="124">d--efop_name on 
c--lass</indexterm><defcategory>c--ategory</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efop_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efop
 </pre></definitionitem></defop>
 <pre xml:space="preserve">
-</pre><deftp spaces=" " endspaces=" "><definitionterm><indexterm index="tp" 
number="4">d&textndash;eftp_name</indexterm><defcategory>c--ategory</defcategory>
 <defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
+</pre><deftp spaces=" " endspaces=" "><definitionterm><indexterm index="tp" 
number="4">d--eftp_name</indexterm><defcategory>c--ategory</defcategory> 
<defdatatype>d--eftp_name</defdatatype> 
<defparamtype>a--ttributes...</defparamtype></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftp
 </pre></definitionitem></deftp>
 <pre xml:space="preserve">
-</pre><defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="125">d&textndash;efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="125">d--efun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deffunction>d--efun_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efun
 </pre></definitionitem></defun>
 <pre xml:space="preserve">
-</pre><defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="126">d&textndash;efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defmac spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="126">d--efmac_name</indexterm><defcategory 
automatic="on">Macro</defcategory> <deffunction>d--efmac_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efmac
 </pre></definitionitem></defmac>
 <pre xml:space="preserve">
-</pre><defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="127">d&textndash;efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defspec spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="127">d--efspec_name</indexterm><defcategory automatic="on" 
bracketed="on">Special Form</defcategory> 
<deffunction>d--efspec_name</deffunction> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efspec
 </pre></definitionitem></defspec>
 <pre xml:space="preserve">
-</pre><defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="34">d&textndash;efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
+</pre><defvar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="34">d--efvar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <defvariable>d--efvar_name</defvariable> 
<defparam>argvar</defparam> <defparam>argvar1</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efvar
 </pre></definitionitem></defvar>
 <pre xml:space="preserve">
-</pre><defopt spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="35">d&textndash;efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
+</pre><defopt spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="35">d--efopt_name</indexterm><defcategory automatic="on" 
bracketed="on">User Option</defcategory> 
<defvariable>d--efopt_name</defvariable></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efopt
 </pre></definitionitem></defopt>
 <pre xml:space="preserve">
-</pre><deftypefun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn" number="128">d&textndash;eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+</pre><deftypefun spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn" number="128">d--eftypefun_name</indexterm><defcategory 
automatic="on">Function</defcategory> <deftype>t--ype</deftype> 
<deffunction>d--eftypefun_name</deffunction> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypefun
 </pre></definitionitem></deftypefun>
 <pre xml:space="preserve">
-</pre><deftypevar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr" number="36">d&textndash;eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
+</pre><deftypevar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr" number="36">d--eftypevar_name</indexterm><defcategory 
automatic="on">Variable</defcategory> <deftype>t--ype</deftype> 
<defvariable>d--eftypevar_name</defvariable></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypevar
 </pre></definitionitem></deftypevar>
 <pre xml:space="preserve">
-</pre><defivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="37">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
+</pre><defivar spaces=" " endspaces=" "><definitionterm><indexterm index="vr" 
number="37">d--efivar_name of c--lass</indexterm><defcategory automatic="on" 
bracketed="on">Instance Variable</defcategory> <defclass>c--lass</defclass> 
<defclassvar>d--efivar_name</defclassvar></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efivar
 </pre></definitionitem></defivar>
 <pre xml:space="preserve">
-</pre><deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr" number="38">d&textndash;eftypeivar_name of 
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance 
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
+</pre><deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm 
index="vr" number="38">d--eftypeivar_name of c--lass</indexterm><defcategory 
automatic="on" bracketed="on">Instance Variable</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypeivar
 </pre></definitionitem></deftypeivar>
 <pre xml:space="preserve">
-</pre><defmethod spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn" number="129">d&textndash;efmethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defmethod spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn" number="129">d--efmethod_name on c--lass</indexterm><defcategory 
automatic="on">Method</defcategory> <defclass>c--lass</defclass> 
<defoperation>d--efmethod_name</defoperation> 
<defparam>a--rguments...</defparam></definitionterm>
 <definitionitem><pre xml:space="preserve">d--efmethod
 </pre></definitionitem></defmethod>
 <pre xml:space="preserve">
-</pre><deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn" number="130">d&textndash;eftypemethod_name on 
c&textndash;lass</indexterm><defcategory automatic="on">Method</defcategory> 
<defclass>c--lass</defclass> <deftype>t--ype</deftype> 
<defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
+</pre><deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn" number="130">d--eftypemethod_name on c--lass</indexterm><defcategory 
automatic="on">Method</defcategory> <defclass>c--lass</defclass> 
<deftype>t--ype</deftype> <defoperation>d--eftypemethod_name</defoperation> 
<defparamtype>a--rguments...</defparamtype></definitionterm>
 <definitionitem><pre xml:space="preserve">d--eftypemethod
 </pre></definitionitem></deftypemethod>
 <pre xml:space="preserve">
@@ -3152,8 +3152,8 @@
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="27">.</indexterm></cindex>
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="28">?</indexterm></cindex>
 <cindex index="cp" spaces=" "><indexterm index="cp" 
number="29">a</indexterm></cindex>
-<findex index="fn" spaces=" "><indexterm index="fn" 
number="133">t&textndash;ruc</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm index="fn" 
number="134">T&textndash;ruc</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn" 
number="133">t--ruc</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn" 
number="134">T--ruc</indexterm></findex>
 <findex index="fn" spaces=" "><indexterm index="fn" 
number="135">.</indexterm></findex>
 <findex index="fn" spaces=" "><indexterm index="fn" 
number="136">?</indexterm></findex>
 <findex index="fn" spaces=" "><indexterm index="fn" 
number="137">a</indexterm></findex>

Modified: trunk/tp/texi2any.pl
===================================================================
--- trunk/tp/texi2any.pl        2016-11-22 18:58:34 UTC (rev 7533)
+++ trunk/tp/texi2any.pl        2016-11-26 15:35:28 UTC (rev 7534)
@@ -1326,6 +1326,8 @@
   if ($formats_table{$format}->{'floats'}) {
     Texinfo::Structuring::number_floats($floats);
   }
+  Texinfo::Structuring::do_index_keys ($parser,
+                                       $parser->indices_information());
   $error_count = handle_errors($parser, $error_count, address@hidden);
 
   if ($format eq 'structure') {




reply via email to

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