[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/TexinfoXML.pm t/resu...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/TexinfoXML.pm t/resu... |
|
Date: |
Fri, 18 Jan 2013 22:55:05 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 13/01/18 22:55:04
Modified files:
tp/Texinfo/Convert: TexinfoXML.pm
tp/t/results/converters_tests: complex_nestings.pl
index_entry_in_preformatted.pl
printindex_merged_indices_code_style.pl
test_deftypefnnewline.pl
things_before_setfilename.pl
things_before_setfilename_no_element.pl
tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_xml:
char_latin1_utf8_in_refs.xml
tp/t/results/coverage: block_commands.pl commands.pl def.pl
multitable.pl preformatted.pl
punctuation_in_line_commands.pl table.pl
tp/t/results/misc_commands: comment_space_command_on_line.pl
tp/t/results/multitable: inter_item_commands_in_multitable.pl
tp/t/results/preformatted: def_in_example.pl
tp/t/results/sectioning: double_node_anchor_float.pl
tp/t/results/xml_tests: commands_and_spaces.pl
comments_end_lines.pl
comments_on_block_command_lines.pl
image_inline_or_not.pl
tp/t/results/xtable: block_commands_in_table.pl
empty_item_itemx.pl
inter_item_commands_in_table.pl
inter_item_commands_in_table_in_example.pl
table_nested.pl
tp/tests/layout/res_parser/formatting_xml: formatting.xml
Log message:
Add index and float numbers in thtte XML.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/TexinfoXML.pm?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/complex_nestings.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/index_entry_in_preformatted.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_xml/char_latin1_utf8_in_refs.xml?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/block_commands.pl?cvsroot=texinfo&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/def_in_example.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl?cvsroot=texinfo&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_end_lines.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/block_commands_in_table.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/empty_item_itemx.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/table_nested.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml?cvsroot=texinfo&r1=1.18&r2=1.19
Patches:
Index: Texinfo/Convert/TexinfoXML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/TexinfoXML.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Texinfo/Convert/TexinfoXML.pm 16 Jan 2013 22:02:29 -0000 1.1
+++ Texinfo/Convert/TexinfoXML.pm 18 Jan 2013 22:54:58 -0000 1.2
@@ -464,7 +464,8 @@
my $root = shift;
if ($root->{'extra'} and $root->{'extra'}->{'index_entry'}) {
my $index_entry = $root->{'extra'}->{'index_entry'};
- my $attribute = ['index', $index_entry->{'index_name'}];
+ my $attribute = ['index', $index_entry->{'index_name'},
+ 'number', $index_entry->{'number'}];
# in case the index is not a default index, or the style of the
# entry (in code or not) is not the default for this index
if ($self->{'index_names'}) {
@@ -1244,6 +1245,9 @@
defined($root->{'extra'}->{'type'}->{'normalized'})) {
push @$attribute, ('type',
$root->{'extra'}->{'type'}->{'normalized'});
}
+ if (defined($root->{'number'})) {
+ push @$attribute, ('number', $root->{'number'});
+ }
} elsif ($root->{'cmdname'} eq 'verbatim') {
push @$attribute, ('xml:space', 'preserve');
} elsif ($root->{'cmdname'} eq 'macro'
Index: t/results/converters_tests/complex_nestings.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/complex_nestings.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/converters_tests/complex_nestings.pl 3 Sep 2012 21:58:42
-0000 1.7
+++ t/results/converters_tests/complex_nestings.pl 18 Jan 2013 22:54:59
-0000 1.8
@@ -1619,12 +1619,12 @@
<example endspaces=" ">
<pre xml:space="preserve">deffs
-</pre><defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn">my
def</indexterm><defcategory automatic="on">Function</defcategory> <deffunction
bracketed="on">my def</deffunction> <defparam>args</defparam>
<defparam><var>arg</var></defparam> <defparam>&dots;</defparam></definitionterm>
-<defunx spaces=" "><definitionterm><indexterm index="fn">other
def</indexterm><defcategory automatic="on">Function</defcategory> <deffunction
bracketed="on">other def</deffunction> <defparam>no</defparam>
<defparam>args</defparam></definitionterm></defunx>
-<definitionitem><deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">name</indexterm><defcategory bracketed="on">type</defcategory>
<deffunction bracketed="on">name</deffunction> <defparam>and</defparam>
<defparam>now</defparam> <defparam>the</defparam>
<defparam>args</defparam></definitionterm>
-<definitionitem><defvar spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">variables</indexterm><defcategory
automatic="on">Variable</defcategory> <defvariable
bracketed="on">variables</defvariable>
<defparam>variable-name</defparam></definitionterm>
+</pre><defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">my def</indexterm><defcategory automatic="on">Function</defcategory>
<deffunction bracketed="on">my def</deffunction> <defparam>args</defparam>
<defparam><var>arg</var></defparam> <defparam>&dots;</defparam></definitionterm>
+<defunx spaces=" "><definitionterm><indexterm index="fn" number="2">other
def</indexterm><defcategory automatic="on">Function</defcategory> <deffunction
bracketed="on">other def</deffunction> <defparam>no</defparam>
<defparam>args</defparam></definitionterm></defunx>
+<definitionitem><deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn" number="3">name</indexterm><defcategory
bracketed="on">type</defcategory> <deffunction
bracketed="on">name</deffunction> <defparam>and</defparam>
<defparam>now</defparam> <defparam>the</defparam>
<defparam>args</defparam></definitionterm>
+<definitionitem><defvar spaces=" " endspaces=" "><definitionterm><indexterm
index="vr" number="1">variables</indexterm><defcategory
automatic="on">Variable</defcategory> <defvariable
bracketed="on">variables</defvariable>
<defparam>variable-name</defparam></definitionterm>
<pre xml:space="preserve">
-</pre><defvarx spaces=" "><definitionterm><indexterm index="vr">variables
too</indexterm><defcategory automatic="on">Variable</defcategory> <defvariable
bracketed="on">variables too</defvariable>
<defparam>other-variable</defparam></definitionterm></defvarx>
+</pre><defvarx spaces=" "><definitionterm><indexterm index="vr"
number="2">variables too</indexterm><defcategory
automatic="on">Variable</defcategory> <defvariable bracketed="on">variables
too</defvariable> <defparam>other-variable</defparam></definitionterm></defvarx>
<definitionitem><pre xml:space="preserve">THis is the defvar
A table within the def
Index: t/results/converters_tests/index_entry_in_preformatted.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/index_entry_in_preformatted.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/converters_tests/index_entry_in_preformatted.pl 7 Dec 2012
20:05:50 -0000 1.1
+++ t/results/converters_tests/index_entry_in_preformatted.pl 18 Jan 2013
22:54:59 -0000 1.2
@@ -473,12 +473,12 @@
$result_converted{'xml'}->{'index_entry_in_preformatted'} = '<node name="Top"
spaces=" "><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
<example endspaces=" ">
-<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm
index="cp">first</indexterm></cindex>
+<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm index="cp"
number="1">first</indexterm></cindex>
text
-<cindex index="cp" spaces=" "><indexterm
index="cp">other</indexterm></cindex><!-- c comment -->
+<cindex index="cp" spaces=" "><indexterm index="cp"
number="2">other</indexterm></cindex><!-- c comment -->
text2
-<cindex index="cp" spaces=" "><indexterm index="cp">last</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp"
number="3">last</indexterm></cindex>
</pre></example>
';
Index: t/results/converters_tests/printindex_merged_indices_code_style.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/converters_tests/printindex_merged_indices_code_style.pl 15 Dec
2012 18:19:17 -0000 1.2
+++ t/results/converters_tests/printindex_merged_indices_code_style.pl 18 Jan
2013 22:54:59 -0000 1.3
@@ -1090,23 +1090,23 @@
<synindex from="vr" to="fn" line=" vr fn"></synindex>
-<cindex index="cp" spaces=" "><indexterm index="cp"
mergedindex="fn">c&textldquo;b</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="1"
mergedindex="fn">c&textldquo;b</indexterm></cindex>
-<vindex index="vr" spaces=" "><indexterm index="vr" incode="0"
mergedindex="fn">v&textldquo;j</indexterm></vindex>
+<vindex index="vr" spaces=" "><indexterm index="vr" number="1" incode="0"
mergedindex="fn">v&textldquo;j</indexterm></vindex>
-<findex index="fn" spaces=" "><indexterm index="fn">f``g</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn"
number="1">f``g</indexterm></findex>
<defcodeindex value="cdi" line=" cdi"></defcodeindex>
<synindex from="cdi" to="fn" line=" cdi fn"></synindex>
-<indexcommand command="cdiindex" index="cdi" spaces=" "><indexterm index="cdi"
incode="0" mergedindex="fn">cdi&textldquo;h</indexterm></indexcommand>
+<indexcommand command="cdiindex" index="cdi" spaces=" "><indexterm index="cdi"
number="1" incode="0"
mergedindex="fn">cdi&textldquo;h</indexterm></indexcommand>
<defindex value="ddi" line=" ddi"></defindex>
<syncodeindex from="ddi" to="cp" line=" ddi cp"></syncodeindex>
-<indexcommand command="ddiindex" index="ddi" spaces=" "><indexterm index="ddi"
incode="1" mergedindex="fn">ddi``g</indexterm></indexcommand>
+<indexcommand command="ddiindex" index="ddi" spaces=" "><indexterm index="ddi"
number="1" incode="1" mergedindex="fn">ddi``g</indexterm></indexcommand>
<printindex value="fn" line=" fn"></printindex>
';
Index: t/results/converters_tests/test_deftypefnnewline.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/converters_tests/test_deftypefnnewline.pl 3 Sep 2012 21:58:43
-0000 1.8
+++ t/results/converters_tests/test_deftypefnnewline.pl 18 Jan 2013 22:54:59
-0000 1.9
@@ -1075,21 +1075,21 @@
<deftypefnnewline value="on" line=" on"></deftypefnnewline>
<node name="Top" spaces=" "><nodename>Top</nodename><nodeup
automatic="on">(dir)</nodeup></node>
-<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">name</indexterm><defcategory automatic="on">Function</defcategory>
<deftype>data-type</deftype> <deffunction>name</deffunction>
<defparamtype>arguments...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">name</indexterm><defcategory automatic="on">Function</defcategory>
<deftype>data-type</deftype> <deffunction>name</deffunction>
<defparamtype>arguments...</defparamtype></definitionterm>
<definitionitem><para>aaa
</para></definitionitem></deftypefun>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">arg</indexterm><defcategory>fun</defcategory>
<deffunction>arg</deffunction></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="2">arg</indexterm><defcategory>fun</defcategory>
<deffunction>arg</deffunction></definitionterm>
<definitionitem><para>fff
</para></definitionitem></deffn>
<deftypefnnewline value="off" line=" off"></deftypefnnewline>
-<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">name2</indexterm><defcategory automatic="on">Function</defcategory>
<deftype>data-type2</deftype> <deffunction>name2</deffunction>
<defparamtype>arguments2...</defparamtype></definitionterm>
+<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="3">name2</indexterm><defcategory automatic="on">Function</defcategory>
<deftype>data-type2</deftype> <deffunction>name2</deffunction>
<defparamtype>arguments2...</defparamtype></definitionterm>
<definitionitem><para>aaa2
</para></definitionitem></deftypefun>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">arg2</indexterm><defcategory>fun2</defcategory>
<deffunction>arg2</deffunction></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="4">arg2</indexterm><defcategory>fun2</defcategory>
<deffunction>arg2</deffunction></definitionterm>
<definitionitem><para>fff2
</para></definitionitem></deffn>
';
Index: t/results/converters_tests/things_before_setfilename.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/converters_tests/things_before_setfilename.pl 21 Dec 2012
00:30:46 -0000 1.21
+++ t/results/converters_tests/things_before_setfilename.pl 18 Jan 2013
22:54:59 -0000 1.22
@@ -1882,14 +1882,14 @@
<ref label="An-anchor"><xrefnodename>An anchor</xrefnodename></ref>
</para></footnote>
</para>
-<float name="float-anchor" type="" spaces=" " endspaces=" "><floatname
spaces=" ">float anchor</floatname>
+<float name="float-anchor" type="" number="1" spaces=" " endspaces="
"><floatname spaces=" ">float anchor</floatname>
<para>In float
</para></float>
<para>Ref to float
<ref label="float-anchor"><xrefnodename>float anchor</xrefnodename></ref>.
</para>
-<float name="ta" type="Text" spaces=" " endspaces="
"><floattype>Text</floattype><floatname spaces=" ">ta</floatname>
+<float name="ta" type="Text" number="1" spaces=" " endspaces="
"><floattype>Text</floattype><floatname spaces=" ">ta</floatname>
<para>In float
</para>
<caption><para>ta caption</para></caption>
@@ -1901,7 +1901,7 @@
<menuentry leadingtext="* "><menunode separator=":: ">An
anchor</menunode><menudescription><pre xml:space="preserve">menu entry pointing
to the anchor.
</pre></menudescription></menuentry></menu>
-<cindex index="cp" spaces=" "><indexterm index="cp">index
entry</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index
entry</indexterm></cindex>
<printindex value="cp" line=" cp"></printindex>
Index: t/results/converters_tests/things_before_setfilename_no_element.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/converters_tests/things_before_setfilename_no_element.pl 21 Dec
2012 00:30:46 -0000 1.21
+++ t/results/converters_tests/things_before_setfilename_no_element.pl 18 Jan
2013 22:54:59 -0000 1.22
@@ -1701,14 +1701,14 @@
<ref label="An-anchor"><xrefnodename>An anchor</xrefnodename></ref>
</para></footnote>
</para>
-<float name="float-anchor" type="" spaces=" " endspaces=" "><floatname
spaces=" ">float anchor</floatname>
+<float name="float-anchor" type="" number="1" spaces=" " endspaces="
"><floatname spaces=" ">float anchor</floatname>
<para>In float
</para></float>
<para>Ref to float
<ref label="float-anchor"><xrefnodename>float anchor</xrefnodename></ref>.
</para>
-<float name="ta" type="Text" spaces=" " endspaces="
"><floattype>Text</floattype><floatname spaces=" ">ta</floatname>
+<float name="ta" type="Text" number="1" spaces=" " endspaces="
"><floattype>Text</floattype><floatname spaces=" ">ta</floatname>
<para>In float
</para>
<caption><para>ta caption</para></caption>
@@ -1720,7 +1720,7 @@
<menuentry leadingtext="* "><menunode separator=":: ">An
anchor</menunode><menudescription><pre xml:space="preserve">menu entry pointing
to the anchor.
</pre></menudescription></menuentry></menu>
-<cindex index="cp" spaces=" "><indexterm index="cp">index
entry</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index
entry</indexterm></cindex>
<printindex value="cp" line=" cp"></printindex>
Index:
t/results/converters_tests/char_latin1_latin1_in_refs/res_xml/char_latin1_utf8_in_refs.xml
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_xml/char_latin1_utf8_in_refs.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
---
t/results/converters_tests/char_latin1_latin1_in_refs/res_xml/char_latin1_utf8_in_refs.xml
21 Dec 2012 00:30:46 -0000 1.4
+++
t/results/converters_tests/char_latin1_latin1_in_refs/res_xml/char_latin1_utf8_in_refs.xml
18 Jan 2013 22:54:59 -0000 1.5
@@ -47,12 +47,12 @@
<ref
label="_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"><xrefnodename>â
ê î ô û Â Ê Î Ô Û</xrefnodename></ref>
<ref label="_00e7"><xrefnodename>ç</xrefnodename></ref>
</para>
-<cindex index="cp" spaces=" "><indexterm index="cp">ä ë ï ö ü
ÿ</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm index="cp">Ä Ë Ï Ö
Ü</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm index="cp">é</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm index="cp">è</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm index="cp">â ê î ô û Â Ê Î Ô
Û</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm index="cp">ç</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="1">ä ë ï ö ü
ÿ</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="2">Ä Ë Ï Ö
Ü</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp"
number="3">é</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp"
number="4">è</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="5">â ê î ô û Â Ê Î
Ô Û</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp"
number="6">ç</indexterm></cindex>
</chapter>
<bye></bye>
Index: t/results/coverage/block_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/block_commands.pl,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- t/results/coverage/block_commands.pl 3 Sep 2012 21:58:43 -0000
1.51
+++ t/results/coverage/block_commands.pl 18 Jan 2013 22:54:59 -0000
1.52
@@ -590,7 +590,7 @@
<para>in quotation
</para></quotation>
-<float name="b-float" type="a-float" spaces=" " endspaces=" "><floattype>a
float</floattype><floatname spaces=" ">b float</floatname>
+<float name="b-float" type="a-float" number="1" spaces=" " endspaces="
"><floattype>a float</floattype><floatname spaces=" ">b float</floatname>
<para>In float
</para>
Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- t/results/coverage/commands.pl 8 Sep 2012 21:56:22 -0000 1.58
+++ t/results/coverage/commands.pl 18 Jan 2013 22:54:59 -0000 1.59
@@ -594,7 +594,7 @@
<email><emailaddress>a</emailaddress><emailname spaces="
">b</emailname></email> <code>code --- -- \'\' ``</code>
&textmdash; &textndash; &textrdquo; &textldquo;. <sc>small caps</sc>.
</para>
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry &textldquo;in
text&textrdquo; &latex;</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index entry
&textldquo;in text&textrdquo; &latex;</indexterm></cindex>
<majorheading spaces=" ">majorheading <b>in b</b></majorheading>
';
Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- t/results/coverage/def.pl 8 Sep 2012 23:06:28 -0000 1.70
+++ t/results/coverage/def.pl 18 Jan 2013 22:55:00 -0000 1.71
@@ -2635,29 +2635,29 @@
$result_converted{'xml'}->{'def'} = '
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">d--effn_name</indexterm><defcategory
bracketed="on">c--ategory</defcategory> <deffunction>d--effn_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">d--effn_name</indexterm><defcategory
bracketed="on">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">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>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="2">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>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp>
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id
<samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">followed</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>followed</deffunction> <defparam>by</defparam>
<defparam>a</defparam> <defparam>comment</defparam></definitionterm></deffnx>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="3"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="4">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="5">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="6">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="7">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="8"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="9"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="10">machin</indexterm><defcategory bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn" number="11">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="12">machin</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="13">followed</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>followed</deffunction> <defparam>by</defparam>
<defparam>a</defparam> <defparam>comment</defparam></definitionterm></deffnx>
<!-- c comment -->
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">after</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>after</deffunction> <defparam>a</defparam>
<defparam>deff</defparam> <defparam>item</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="14">after</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>after</deffunction> <defparam>a</defparam>
<defparam>deff</defparam> <defparam>item</defparam></definitionterm></deffnx>
<!-- c comment -->
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="15">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
<definitionitem><para>Various deff lines
</para></definitionitem></deffn>
';
Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- t/results/coverage/multitable.pl 8 Sep 2012 21:56:23 -0000 1.59
+++ t/results/coverage/multitable.pl 18 Jan 2013 22:55:00 -0000 1.60
@@ -881,7 +881,7 @@
</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
multitable</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index entry
within multitable</indexterm></cindex>
</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- t/results/coverage/preformatted.pl 3 Sep 2012 21:58:44 -0000 1.60
+++ t/results/coverage/preformatted.pl 18 Jan 2013 22:55:00 -0000 1.61
@@ -499,7 +499,7 @@
<format endspaces=" ">
<vtable commandarg="code" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="code"><indexterm
index="vr">item in table in format</indexterm>item in table in
format</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="code"><indexterm
index="vr" number="1">item in table in format</indexterm>item in table in
format</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">
in table in format
</pre></tableitem></tableentry></vtable>
Index: t/results/coverage/punctuation_in_line_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- t/results/coverage/punctuation_in_line_commands.pl 8 Sep 2012 21:56:23
-0000 1.38
+++ t/results/coverage/punctuation_in_line_commands.pl 18 Jan 2013 22:55:00
-0000 1.39
@@ -1591,19 +1591,19 @@
</para><exdent spaces=" ">exdent quotation! After punc</exdent>
</quotation>
-<float name="float-label_0021-After-punc" type="float-type_0021-After-punc"
spaces=" " endspaces=" "><floattype>float type! After
punc</floattype><floatname spaces=" ">float label! After punc</floatname>
+<float name="float-label_0021-After-punc" type="float-type_0021-After-punc"
number="1" spaces=" " endspaces=" "><floattype>float type! After
punc</floattype><floatname spaces=" ">float label! After punc</floatname>
<para>In float
</para><shortcaption><para>shortcaption! After punc</para></shortcaption>
</float>
-<float name="label-with-caption" type="float-type_0021-After-punc" spaces=" "
endspaces=" "><floattype>float type! After punc</floattype><floatname spaces="
">label with caption</floatname>
+<float name="label-with-caption" type="float-type_0021-After-punc" number="2"
spaces=" " endspaces=" "><floattype>float type! After
punc</floattype><floatname spaces=" ">label with caption</floatname>
<para>In float with caption.
</para><caption><para>caption! After punc</para></caption>
</float>
<listoffloats type="float-type_0021-After-punc" spaces=" ">float type! After
punc</listoffloats>
-<cindex index="cp" spaces=" "><indexterm index="cp">index! After
punc</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index! After
punc</indexterm></cindex>
<heading spaces=" ">heading! After punc</heading>
Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- t/results/coverage/table.pl 8 Sep 2012 21:56:23 -0000 1.63
+++ t/results/coverage/table.pl 18 Jan 2013 22:55:00 -0000 1.64
@@ -853,12 +853,12 @@
<vtable commandarg="samp" spaces=" " endspaces=" "><!-- c samp -->
<beforefirstitem><!-- c after vtable -->
-<cindex index="cp" spaces=" "><indexterm index="cp">index
entry</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index
entry</indexterm></cindex>
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="samp"><indexterm index="vr">vtable item</indexterm>vtable
item</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="samp"><indexterm index="vr" number="1">vtable item</indexterm>vtable
item</itemformat></item>
<!-- c after item -->
-<kindex index="ky" spaces=" "><indexterm index="ky">key</indexterm></kindex>
-<itemx spaces=" "><itemformat command="samp"><indexterm index="vr">itemx
vtable</indexterm>itemx vtable <!-- comment comment in itemx line
--></itemformat></itemx>
+<kindex index="ky" spaces=" "><indexterm index="ky"
number="1">key</indexterm></kindex>
+<itemx spaces=" "><itemformat command="samp"><indexterm index="vr"
number="2">itemx vtable</indexterm>itemx vtable <!-- comment comment in itemx
line --></itemformat></itemx>
</tableterm><tableitem>
</tableitem></tableentry></vtable>
';
Index: t/results/misc_commands/comment_space_command_on_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/misc_commands/comment_space_command_on_line.pl 9 Sep 2012
21:59:50 -0000 1.32
+++ t/results/misc_commands/comment_space_command_on_line.pl 18 Jan 2013
22:55:00 -0000 1.33
@@ -1041,13 +1041,13 @@
<frenchspacing value="on" line=" on "></frenchspacing><!-- c comment
frenchspacing -->
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry <spacecmd
type="spc"/></indexterm></cindex><!-- c index entry -->
+<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index entry
<spacecmd type="spc"/></indexterm></cindex><!-- c index entry -->
<heading spaces=" ">Heading <spacecmd type="spc"/> </heading><!-- c heading
-->
<printindex value="cp" line=" cp "></printindex><!-- c printindex -->
-<float name="label" type="Text" spaces=" " endspaces="
"><floattype>Text</floattype><floatname spaces=" ">label</floatname>
+<float name="label" type="Text" number="1" spaces=" " endspaces="
"><floattype>Text</floattype><floatname spaces=" ">label</floatname>
<para>float
</para></float> <!-- c end -->
Index: t/results/multitable/inter_item_commands_in_multitable.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/multitable/inter_item_commands_in_multitable.pl 8 Sep 2012
21:56:24 -0000 1.23
+++ t/results/multitable/inter_item_commands_in_multitable.pl 18 Jan 2013
22:55:00 -0000 1.24
@@ -1314,7 +1314,7 @@
</beforefirstitem><tbody><row><entry command="item" spaces=" "><para>truc
</para>
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry between empty
lines</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index entry
between empty lines</indexterm></cindex>
</entry></row><row><entry command="item" spaces=" "><para>trouc
<!-- c last comment -->
@@ -1325,13 +1325,13 @@
</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
multitable</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="2">index entry
within multitable</indexterm></cindex>
</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype
bracketed="on">thing</columnprototype></columnprototypes>
<beforefirstitem><para>Title
-<cindex index="cp" spaces=" "><indexterm index="cp">cindex</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp"
number="3">cindex</indexterm></cindex>
</para></beforefirstitem><tbody><row><entry command="item" spaces="
"><para>thing
</para></entry></row></tbody></multitable>
Index: t/results/preformatted/def_in_example.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/preformatted/def_in_example.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/preformatted/def_in_example.pl 3 Sep 2012 21:58:47 -0000
1.25
+++ t/results/preformatted/def_in_example.pl 18 Jan 2013 22:55:01 -0000
1.26
@@ -317,7 +317,7 @@
$result_converted{'xml'}->{'def_in_example'} = '<example endspaces=" ">
-<defun spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">name</indexterm><defcategory automatic="on">Function</defcategory>
<deffunction>name</deffunction> <defparam>arg</defparam></definitionterm>
+<defun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">name</indexterm><defcategory automatic="on">Function</defcategory>
<deffunction>name</deffunction> <defparam>arg</defparam></definitionterm>
<definitionitem><pre xml:space="preserve">in defun
</pre></definitionitem></defun>
</example>
Index: t/results/sectioning/double_node_anchor_float.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- t/results/sectioning/double_node_anchor_float.pl 9 Nov 2012 22:30:38
-0000 1.43
+++ t/results/sectioning/double_node_anchor_float.pl 18 Jan 2013 22:55:01
-0000 1.44
@@ -1174,7 +1174,7 @@
<float type="Text" spaces=" " endspaces="
"><floattype>Text</floattype><floatname spaces=" ">anchor1</floatname>
</float>
-<float name="float1" type="Text" spaces=" " endspaces="
"><floattype>Text</floattype><floatname spaces=" ">float1</floatname>
+<float name="float1" type="Text" number="1" spaces=" " endspaces="
"><floattype>Text</floattype><floatname spaces=" ">float1</floatname>
</float>
<node name="" spaces=" "><nodename></nodename></node>
Index: t/results/xml_tests/commands_and_spaces.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/xml_tests/commands_and_spaces.pl 9 Sep 2012 11:10:21 -0000
1.9
+++ t/results/xml_tests/commands_and_spaces.pl 18 Jan 2013 22:55:02 -0000
1.10
@@ -2887,7 +2887,7 @@
<para>Q
</para></quotation>
-<float name="b" type="ff" spaces=" " endspaces=" "><floattype>ff
</floattype><floatname spaces=" ">b </floatname>
+<float name="b" type="ff" number="1" spaces=" " endspaces=" "><floattype>ff
</floattype><floatname spaces=" ">b </floatname>
<para>f
</para><caption spaces=" "><para>In caption </para></caption><para>j.
</para><shortcaption><para>Short</para></shortcaption><para> g.
@@ -2921,7 +2921,7 @@
</para>
<para><indicateurl spaces=" ">http://ggg </indicateurl>
</para>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn">machin
</indexterm><defcategory bracketed="on" spaces=" ">truc </defcategory>
<deffunction bracketed="on" spaces=" ">machin </deffunction> <defparam
bracketed="on" spaces=" ">bidule </defparam> <defparam bracketed="on" spaces="
">chose </defparam> <defparam bracketed="on" spaces=" ">arg
</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">machin </indexterm><defcategory bracketed="on" spaces=" ">truc
</defcategory> <deffunction bracketed="on" spaces=" ">machin </deffunction>
<defparam bracketed="on" spaces=" ">bidule </defparam> <defparam
bracketed="on" spaces=" ">chose </defparam> <defparam bracketed="on" spaces="
">arg </defparam></definitionterm>
<definitionitem><para>T
</para></definitionitem></deffn>
Index: t/results/xml_tests/comments_end_lines.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/comments_end_lines.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/xml_tests/comments_end_lines.pl 3 Sep 2012 21:58:49 -0000
1.1
+++ t/results/xml_tests/comments_end_lines.pl 18 Jan 2013 22:55:02 -0000
1.2
@@ -1535,7 +1535,7 @@
<tbody><row><entry command="item" spaces=" "><para>a </para></entry><entry
command="tab" spaces=" "><para>b
</para></entry></row></tbody></multitable> <!-- c comm -->
-<float name="g" type="f" spaces=" " endspaces="
"><floattype>f</floattype><floatname>g</floatname>
+<float name="g" type="f" number="1" spaces=" " endspaces="
"><floattype>f</floattype><floatname>g</floatname>
<para>In f
</para></float> <!-- c comm -->
Index: t/results/xml_tests/comments_on_block_command_lines.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/xml_tests/comments_on_block_command_lines.pl 15 Jan 2013
01:25:52 -0000 1.18
+++ t/results/xml_tests/comments_on_block_command_lines.pl 18 Jan 2013
22:55:02 -0000 1.19
@@ -2789,7 +2789,7 @@
<tbody><row><entry command="item" spaces=" "><para>aaa </para></entry><entry
command="tab" spaces=" "><para>bbb
</para></entry></row></tbody></multitable>
-<float name="g" type="f" spaces=" " endspaces="
"><floattype>f</floattype><floatname>g </floatname><!-- c comm -->
+<float name="g" type="f" number="1" spaces=" " endspaces="
"><floattype>f</floattype><floatname>g </floatname><!-- c comm -->
<para>In f
</para></float>
Index: t/results/xml_tests/image_inline_or_not.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/xml_tests/image_inline_or_not.pl 3 Sep 2012 21:58:50 -0000
1.16
+++ t/results/xml_tests/image_inline_or_not.pl 18 Jan 2013 22:55:02 -0000
1.17
@@ -2472,7 +2472,7 @@
<para>T<footnote spaces="\\n"><image
where="inline"><imagefile>in_footnote</imagefile></image>
</footnote>
</para>
-<float name="g" type="F" spaces=" " endspaces="
"><floattype>F</floattype><floatname>g</floatname>
+<float name="g" type="F" number="1.1" spaces=" " endspaces="
"><floattype>F</floattype><floatname>g</floatname>
<image><imagefile>in_float</imagefile></image>
Index: t/results/xtable/block_commands_in_table.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/block_commands_in_table.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/xtable/block_commands_in_table.pl 8 Sep 2012 21:56:25 -0000
1.7
+++ t/results/xtable/block_commands_in_table.pl 18 Jan 2013 22:55:02 -0000
1.8
@@ -2271,17 +2271,17 @@
</tableitem></tableentry></table>
<vtable commandarg="strong" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat
command="strong"><indexterm index="vr">item before ignored
lines</indexterm>item before ignored lines</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat
command="strong"><indexterm index="vr" number="1">item before ignored
lines</indexterm>item before ignored lines</itemformat></item>
<!-- c comment -->
-<vindex index="vr" spaces=" "><indexterm index="vr">vindex</indexterm></vindex>
-<itemx spaces=" "><itemformat command="strong"><indexterm index="vr">itemx
now</indexterm>itemx now</itemformat></itemx>
+<vindex index="vr" spaces=" "><indexterm index="vr"
number="2">vindex</indexterm></vindex>
+<itemx spaces=" "><itemformat command="strong"><indexterm index="vr"
number="3">itemx now</indexterm>itemx now</itemformat></itemx>
</tableterm><tableitem>
<para>Description
</para></tableitem></tableentry></vtable>
<vtable commandarg="r" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="r"><indexterm
index="vr">item</indexterm>item</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="r"><indexterm
index="vr" number="4">item</indexterm>item</itemformat></item>
-<itemx spaces=" "><itemformat command="r"><indexterm index="vr">itemx after an
empty line</indexterm>itemx after an empty line</itemformat></itemx>
+<itemx spaces=" "><itemformat command="r"><indexterm index="vr"
number="5">itemx after an empty line</indexterm>itemx after an empty
line</itemformat></itemx>
</tableterm><tableitem>
<para>Description.
</para>
Index: t/results/xtable/empty_item_itemx.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/empty_item_itemx.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/xtable/empty_item_itemx.pl 3 Sep 2012 21:58:50 -0000
1.25
+++ t/results/xtable/empty_item_itemx.pl 18 Jan 2013 22:55:03 -0000
1.26
@@ -559,11 +559,11 @@
<beforefirstitem>
<para>VTable
</para>
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr">first item</indexterm>first
item</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr" number="1">first item</indexterm>first
item</itemformat></item>
<itemx><itemformat command="asis"></itemformat></itemx>
-<itemx spaces=" "><itemformat command="asis"><indexterm index="vr">after an
empty itemx, before an empty item</indexterm>after an empty itemx, before an
empty item</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="vr"
number="2">after an empty itemx, before an empty item</indexterm>after an empty
itemx, before an empty item</itemformat></itemx>
</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis"> </itemformat></item>
-</tableterm></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr">in item before end table</indexterm>in
item before end table</itemformat></item>
+</tableterm></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr" number="3">in item before end
table</indexterm>in item before end table</itemformat></item>
</tableterm></tableentry></vtable>
';
Index: t/results/xtable/inter_item_commands_in_table.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/xtable/inter_item_commands_in_table.pl 8 Sep 2012 21:56:25
-0000 1.26
+++ t/results/xtable/inter_item_commands_in_table.pl 18 Jan 2013 22:55:03
-0000 1.27
@@ -1901,42 +1901,42 @@
$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<vtable
commandarg="code" spaces=" " endspaces=" ">
<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="code"><indexterm index="vr">a</indexterm>a</itemformat></item>
+</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="code"><indexterm index="vr"
number="1">a</indexterm>a</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
<vtable commandarg="asis" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr" number="2">a</indexterm>a</itemformat></item>
<!-- c comment between item and itemx -->
-<itemx spaces=" "><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="vr"
number="3">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
<ftable commandarg="var" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="var"><indexterm
index="fn">a</indexterm>a</itemformat></item>
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry between item
and itemx</indexterm></cindex>
+<tableentry><tableterm><item spaces=" "><itemformat command="var"><indexterm
index="fn" number="1">a</indexterm>a</itemformat></item>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index entry
between item and itemx</indexterm></cindex>
<!-- c and a comment -->
<!-- comment and another comment -->
-<itemx spaces=" "><itemformat command="var"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="var"><indexterm index="fn"
number="2">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
-</para></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="var"><indexterm
index="fn">c</indexterm>c</itemformat></item>
+</para></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="var"><indexterm index="fn"
number="3">c</indexterm>c</itemformat></item>
<!-- c comment between lines -->
-<itemx spaces=" "><itemformat command="var"><indexterm
index="fn">d</indexterm>d</itemformat></itemx>
+<itemx spaces=" "><itemformat command="var"><indexterm index="fn"
number="4">d</indexterm>d</itemformat></itemx>
</tableterm><tableitem>
<!-- c comment at end -->
</tableitem></tableentry></ftable>
<table commandarg="code" spaces=" " endspaces=" ">
-<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp">cindex in
table</indexterm></cindex>
+<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp"
number="2">cindex in table</indexterm></cindex>
<!-- c comment in table -->
</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="code">abb</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<table commandarg="code" spaces=" " endspaces=" ">
-<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp">cindex in
table</indexterm></cindex>
+<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp"
number="3">cindex in table</indexterm></cindex>
<para>Texte before first item.
</para></beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="code">abb</itemformat></item>
</tableterm></tableentry></table>
Index: t/results/xtable/inter_item_commands_in_table_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/xtable/inter_item_commands_in_table_in_example.pl 8 Sep 2012
21:56:25 -0000 1.9
+++ t/results/xtable/inter_item_commands_in_table_in_example.pl 18 Jan 2013
22:55:04 -0000 1.10
@@ -634,7 +634,7 @@
$result_converted{'xml'}->{'inter_item_commands_in_table_in_example'} =
'<example endspaces=" ">
<table commandarg="var" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat
command="var">a</itemformat></item>
-<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm
index="cp">index entry between item and itemx</indexterm></cindex>
+<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm index="cp"
number="1">index entry between item and itemx</indexterm></cindex>
<!-- c and a comment -->
<!-- comment and another comment -->
</pre><itemx spaces=" "><itemformat command="var">b</itemformat></itemx>
Index: t/results/xtable/table_nested.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/table_nested.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/xtable/table_nested.pl 8 Sep 2012 21:56:25 -0000 1.24
+++ t/results/xtable/table_nested.pl 18 Jan 2013 22:55:04 -0000 1.25
@@ -3408,16 +3408,16 @@
<para>Quotation
</para><quotation endspaces=" ">
<vtable commandarg="asis" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
-<itemx spaces=" "><itemformat command="asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr" number="1">first item</indexterm>first item</itemformat></item>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="vr"
number="2">second itemx</indexterm>second itemx</itemformat></itemx>
</tableterm><tableitem>
<para>Text.
</para>
-</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr" number="3">second item</indexterm>second
item</itemformat></item>
</tableterm><tableitem>
<para>Text 2
</para>
-</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr"
number="4">last</indexterm>last</itemformat></item>
</tableterm></tableentry></vtable>
<para>Something.
@@ -3433,16 +3433,16 @@
<para>Example
</para><example endspaces=" ">
<vtable commandarg="asis" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
-<itemx spaces=" "><itemformat command="asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr" number="5">first item</indexterm>first item</itemformat></item>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="vr"
number="6">second itemx</indexterm>second itemx</itemformat></itemx>
</tableterm><tableitem><pre xml:space="preserve">
Text.
-</pre></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="asis"><indexterm index="vr">second
item</indexterm>second item</itemformat></item>
+</pre></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="asis"><indexterm index="vr" number="7">second
item</indexterm>second item</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">
Text 2
-</pre></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="asis"><indexterm
index="vr">last</indexterm>last</itemformat></item>
+</pre></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="asis"><indexterm index="vr"
number="8">last</indexterm>last</itemformat></item>
</tableterm></tableentry></vtable>
<pre xml:space="preserve">
Something.
@@ -3459,16 +3459,16 @@
</para><quotation endspaces=" ">
<quotation endspaces=" ">
<vtable commandarg="asis" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
-<itemx spaces=" "><itemformat command="asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr" number="9">first item</indexterm>first item</itemformat></item>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="vr"
number="10">second itemx</indexterm>second itemx</itemformat></itemx>
</tableterm><tableitem>
<para>Text.
</para>
-</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr" number="11">second item</indexterm>second
item</itemformat></item>
</tableterm><tableitem>
<para>Text 2
</para>
-</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis"><indexterm index="vr"
number="12">last</indexterm>last</itemformat></item>
</tableterm></tableentry></vtable>
<para>Something.
Index: tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- tests/layout/res_parser/formatting_xml/formatting.xml 15 Jan 2013
01:25:52 -0000 1.18
+++ tests/layout/res_parser/formatting_xml/formatting.xml 18 Jan 2013
22:55:04 -0000 1.19
@@ -759,10 +759,10 @@
</para>
<para>&textlsquo;<w></w>&textlsquo;simple-double-<w></w>-three&textmdash;four&textmdash;-&textrsquo;<w></w>&textrsquo;&linebreak;
</para>
-<cindex index="cp" spaces=" "><indexterm
index="cp">&textndash;option</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm
index="cp">&textldquo;</indexterm></cindex>
-<findex index="fn" spaces=" "><indexterm
index="fn">&textldquo;</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm
index="fn">&textndash;foption</indexterm></findex>
+<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>
<para>&arobase;"u <accent type="uml" bracketed="off">u</accent>
&arobase;"{U} <accent type="uml">U</accent>
@@ -1025,7 +1025,7 @@
</para></listitem></itemize>
<itemize spaces=" " endspaces=" "><itemprepend>• a&textndash;n itemize
line</itemprepend>
-<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp">index
entry within itemize</indexterm></cindex>
+<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp"
number="3">index entry within itemize</indexterm></cindex>
</beforefirstitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 1
</para></listitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 2
</para></listitem></itemize>
@@ -1039,7 +1039,7 @@
</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
multitable</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="4">index entry
within multitable</indexterm></cindex>
</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
@@ -1080,122 +1080,122 @@
<pre xml:space="preserve">s&textndash;mallformat
</pre></smallformat>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">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&textndash;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">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&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>
<definitionitem><para>def&textndash;fn
</para></definitionitem></deffn>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
deffn</indexterm></cindex>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp>
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id
<samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="5"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="5">index entry
within deffn</indexterm></cindex>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="6">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="7">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="8">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="9">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="10"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="11"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
<deffnx><definitionterm></definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="12">machin</indexterm><defcategory bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn" number="13">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="14">machin</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
<deffnx><definitionterm><defcategory bracketed="on">truc</defcategory>
<deffunction bracketed="on" spaces=" "></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">followed</indexterm><defcategory
bracketed="on">truc</defcategory> <deffunction>followed</deffunction>
<defparam>by</defparam> <defparam>a</defparam>
<defparam>comment</defparam></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="15">followed</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>followed</deffunction> <defparam>by</defparam>
<defparam>a</defparam> <defparam>comment</defparam></definitionterm></deffnx>
<!-- c comment -->
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">a</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam bracketed="on">h i</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="16">a</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam bracketed="on">h i</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="17">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
</deffn>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="18">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
</deffn>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction> <defparam>with</defparam>
<defparam>deffnx</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="19">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction> <defparam>with</defparam>
<defparam>deffnx</defparam></definitionterm>
<!-- c comment between deffn and deffnx -->
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="20">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
</deffn>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="21"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="22">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<definitionitem><!-- c comment -->
<para>text in def item for second def item
</para></definitionitem></deffn>
-<defvr spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">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&textndash;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">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&textndash;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">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&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>
<definitionitem><para>d&textndash;eftypeop
</para></definitionitem></deftypeop>
-<deftypevr spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">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&textndash;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">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&textndash;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">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&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>
<definitionitem><para>d&textndash;efop
</para></definitionitem></defop>
-<deftp spaces=" " endspaces=" "><definitionterm><indexterm
index="tp">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&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>
<definitionitem><para>d&textndash;efivar
</para></definitionitem></defivar>
-<deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">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&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>
<definitionitem><para>d&textndash;eftypeivar
</para></definitionitem></deftypeivar>
-<defmethod spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">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&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>
<definitionitem><para>d&textndash;efmethod
</para></definitionitem></defmethod>
-<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">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&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>
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
@@ -1269,16 +1269,16 @@
</para></tableitem></tableentry></table>
<vtable commandarg="asis" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr" number="9">a</indexterm>a</itemformat></item>
<!-- c comment between item and itemx -->
-<itemx spaces=" "><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="vr"
number="10">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
<ftable commandarg="asis" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry between item
and itemx</indexterm></cindex>
-<itemx spaces=" "><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn" number="32">a</indexterm>a</itemformat></item>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="6">index entry
between item and itemx</indexterm></cindex>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="fn"
number="33">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></ftable>
@@ -1360,10 +1360,10 @@
</para>
<para>&textlsquo;<w></w>&textlsquo;simple-double-<w></w>-three&textmdash;four&textmdash;-&textrsquo;<w></w>&textrsquo;&linebreak;
</para>
-<cindex index="cp" spaces=" "><indexterm
index="cp">&textndash;option</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm
index="cp">&textldquo;</indexterm></cindex>
-<findex index="fn" spaces=" "><indexterm
index="fn">&textldquo;</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm
index="fn">&textndash;foption</indexterm></findex>
+<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>
<para>&arobase;"u <accent type="uml" bracketed="off">u</accent>
&arobase;"{U} <accent type="uml">U</accent>
@@ -1626,7 +1626,7 @@
</para></listitem></itemize>
<itemize spaces=" " endspaces=" "><itemprepend>• a&textndash;n itemize
line</itemprepend>
-<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp">index
entry within itemize</indexterm></cindex>
+<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp"
number="9">index entry within itemize</indexterm></cindex>
</beforefirstitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 1
</para></listitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 2
</para></listitem></itemize>
@@ -1640,7 +1640,7 @@
</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
multitable</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="10">index entry
within multitable</indexterm></cindex>
</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
@@ -1681,122 +1681,122 @@
<pre xml:space="preserve">s&textndash;mallformat
</pre></smallformat>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">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&textndash;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">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&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>
<definitionitem><para>def&textndash;fn
</para></definitionitem></deffn>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
deffn</indexterm></cindex>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp>
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id
<samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="38"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="11">index entry
within deffn</indexterm></cindex>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="39">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="40">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="41">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="42">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="43"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="44"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
<deffnx><definitionterm></definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="45">machin</indexterm><defcategory bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn" number="46">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="47">machin</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
<deffnx><definitionterm><defcategory bracketed="on">truc</defcategory>
<deffunction bracketed="on" spaces=" "></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">followed</indexterm><defcategory
bracketed="on">truc</defcategory> <deffunction>followed</deffunction>
<defparam>by</defparam> <defparam>a</defparam>
<defparam>comment</defparam></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="48">followed</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>followed</deffunction> <defparam>by</defparam>
<defparam>a</defparam> <defparam>comment</defparam></definitionterm></deffnx>
<!-- c comment -->
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">a</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam bracketed="on">h i</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="49">a</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam bracketed="on">h i</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="50">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
</deffn>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="51">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
</deffn>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction> <defparam>with</defparam>
<defparam>deffnx</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="52">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction> <defparam>with</defparam>
<defparam>deffnx</defparam></definitionterm>
<!-- c comment between deffn and deffnx -->
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="53">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
</deffn>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="54"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="55">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<definitionitem><!-- c comment -->
<para>text in def item for second def item
</para></definitionitem></deffn>
-<defvr spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">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&textndash;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">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&textndash;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">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&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>
<definitionitem><para>d&textndash;eftypeop
</para></definitionitem></deftypeop>
-<deftypevr spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">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&textndash;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">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&textndash;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">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&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>
<definitionitem><para>d&textndash;efop
</para></definitionitem></defop>
-<deftp spaces=" " endspaces=" "><definitionterm><indexterm
index="tp">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&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>
<definitionitem><para>d&textndash;efivar
</para></definitionitem></defivar>
-<deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">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&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>
<definitionitem><para>d&textndash;eftypeivar
</para></definitionitem></deftypeivar>
-<defmethod spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">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&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>
<definitionitem><para>d&textndash;efmethod
</para></definitionitem></defmethod>
-<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">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&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>
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
@@ -1870,16 +1870,16 @@
</para></tableitem></tableentry></table>
<vtable commandarg="asis" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr" number="19">a</indexterm>a</itemformat></item>
<!-- c comment between item and itemx -->
-<itemx spaces=" "><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="vr"
number="20">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
<ftable commandarg="asis" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry between item
and itemx</indexterm></cindex>
-<itemx spaces=" "><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn" number="65">a</indexterm>a</itemformat></item>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="12">index entry
between item and itemx</indexterm></cindex>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="fn"
number="66">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></ftable>
@@ -1961,10 +1961,10 @@
</para>
<para>&textlsquo;<w></w>&textlsquo;simple-double-<w></w>-three&textmdash;four&textmdash;-&textrsquo;<w></w>&textrsquo;&linebreak;
</para>
-<cindex index="cp" spaces=" "><indexterm
index="cp">&textndash;option</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm
index="cp">&textldquo;</indexterm></cindex>
-<findex index="fn" spaces=" "><indexterm
index="fn">&textldquo;</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm
index="fn">&textndash;foption</indexterm></findex>
+<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>
<para>&arobase;"u <accent type="uml" bracketed="off">u</accent>
&arobase;"{U} <accent type="uml">U</accent>
@@ -2227,7 +2227,7 @@
</para></listitem></itemize>
<itemize spaces=" " endspaces=" "><itemprepend>• a&textndash;n itemize
line</itemprepend>
-<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp">index
entry within itemize</indexterm></cindex>
+<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp"
number="15">index entry within itemize</indexterm></cindex>
</beforefirstitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 1
</para></listitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 2
</para></listitem></itemize>
@@ -2241,7 +2241,7 @@
</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
multitable</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="16">index entry
within multitable</indexterm></cindex>
</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
@@ -2282,122 +2282,122 @@
<pre xml:space="preserve">s&textndash;mallformat
</pre></smallformat>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">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&textndash;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">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&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>
<definitionitem><para>def&textndash;fn
</para></definitionitem></deffn>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
deffn</indexterm></cindex>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp>
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id
<samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="71"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="17">index entry
within deffn</indexterm></cindex>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="72">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="73">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="74">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="75">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="76"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="77"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
<deffnx><definitionterm></definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="78">machin</indexterm><defcategory bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn" number="79">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="80">machin</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
<deffnx><definitionterm><defcategory bracketed="on">truc</defcategory>
<deffunction bracketed="on" spaces=" "></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">followed</indexterm><defcategory
bracketed="on">truc</defcategory> <deffunction>followed</deffunction>
<defparam>by</defparam> <defparam>a</defparam>
<defparam>comment</defparam></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="81">followed</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>followed</deffunction> <defparam>by</defparam>
<defparam>a</defparam> <defparam>comment</defparam></definitionterm></deffnx>
<!-- c comment -->
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">a</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam bracketed="on">h i</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="82">a</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam bracketed="on">h i</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="83">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
</deffn>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="84">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
</deffn>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction> <defparam>with</defparam>
<defparam>deffnx</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="85">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction> <defparam>with</defparam>
<defparam>deffnx</defparam></definitionterm>
<!-- c comment between deffn and deffnx -->
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="86">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
</deffn>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="87"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="88">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<definitionitem><!-- c comment -->
<para>text in def item for second def item
</para></definitionitem></deffn>
-<defvr spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">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&textndash;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">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&textndash;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">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&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>
<definitionitem><para>d&textndash;eftypeop
</para></definitionitem></deftypeop>
-<deftypevr spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">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&textndash;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">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&textndash;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">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&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>
<definitionitem><para>d&textndash;efop
</para></definitionitem></defop>
-<deftp spaces=" " endspaces=" "><definitionterm><indexterm
index="tp">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&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>
<definitionitem><para>d&textndash;efivar
</para></definitionitem></defivar>
-<deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">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&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>
<definitionitem><para>d&textndash;eftypeivar
</para></definitionitem></deftypeivar>
-<defmethod spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">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&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>
<definitionitem><para>d&textndash;efmethod
</para></definitionitem></defmethod>
-<deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">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&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>
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
@@ -2471,16 +2471,16 @@
</para></tableitem></tableentry></table>
<vtable commandarg="asis" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr" number="29">a</indexterm>a</itemformat></item>
<!-- c comment between item and itemx -->
-<itemx spaces=" "><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="vr"
number="30">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
<ftable commandarg="asis" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry between item
and itemx</indexterm></cindex>
-<itemx spaces=" "><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn" number="98">a</indexterm>a</itemformat></item>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="18">index entry
between item and itemx</indexterm></cindex>
+<itemx spaces=" "><itemformat command="asis"><indexterm index="fn"
number="99">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></ftable>
@@ -2556,10 +2556,10 @@
`<w></w>`simple-double-<w></w>-three---four----'<w></w>'&linebreak;
-<cindex index="cp" spaces=" "><indexterm
index="cp">&textndash;option</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm
index="cp">&textldquo;</indexterm></cindex>
-<findex index="fn" spaces=" "><indexterm
index="fn">&textldquo;</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm
index="fn">&textndash;foption</indexterm></findex>
+<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>
&arobase;"u <accent type="uml" bracketed="off">u</accent>
&arobase;"{U} <accent type="uml">U</accent>
@@ -2822,7 +2822,7 @@
</pre></listitem></itemize>
<pre xml:space="preserve">
</pre><itemize spaces=" " endspaces=" "><itemprepend>• a--n itemize
line</itemprepend>
-<beforefirstitem><pre xml:space="preserve"><cindex index="cp" spaces="
"><indexterm index="cp">index entry within itemize</indexterm></cindex>
+<beforefirstitem><pre xml:space="preserve"><cindex index="cp" spaces="
"><indexterm index="cp" number="21">index entry within
itemize</indexterm></cindex>
</pre></beforefirstitem><listitem spaces=" "><prepend>• a--n itemize
line</prepend><pre xml:space="preserve">i--tem 1
</pre></listitem><listitem spaces=" "><prepend>• a--n itemize
line</prepend><pre xml:space="preserve">i--tem 2
</pre></listitem></itemize>
@@ -2836,7 +2836,7 @@
</pre></entry></row></thead><tbody><row><entry command="item" spaces=" "><pre
xml:space="preserve">mu--ltitable item </pre></entry><entry command="tab"
spaces=" "><pre xml:space="preserve">multitable tab
<!-- c comment in multitable -->
</pre></entry></row><row><entry command="item" spaces=" "><pre
xml:space="preserve">mu--ltitable item 2 </pre></entry><entry command="tab"
spaces=" "><pre xml:space="preserve">multitable tab 2
-<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
multitable</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp" number="22">index entry
within multitable</indexterm></cindex>
</pre></entry></row><row><entry command="item" spaces=" "><pre
xml:space="preserve">lone mu--ltitable item
</pre></entry></row></tbody></multitable>
<pre xml:space="preserve">
@@ -2877,122 +2877,122 @@
<pre xml:space="preserve">s--mallformat
</pre></smallformat>
<pre xml:space="preserve">
-</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">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&textndash;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">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&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>
<definitionitem><pre xml:space="preserve">def--fn
</pre></definitionitem></deffn>
<pre xml:space="preserve">
-</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm
index="cp">index entry within deffn</indexterm></cindex>
-</pre><deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp>
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id
<samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
+</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="104"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
+<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm index="cp"
number="23">index entry within deffn</indexterm></cindex>
+</pre><deffnx spaces=" "><definitionterm><indexterm index="fn"
number="105">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="106">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="107">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="108">log
trap2 </indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="109"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="110"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
<deffnx><definitionterm></definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="111">machin</indexterm><defcategory bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn" number="112">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="113">machin</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
<deffnx><definitionterm><defcategory bracketed="on">truc</defcategory>
<deffunction bracketed="on" spaces=" "></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">followed</indexterm><defcategory
bracketed="on">truc</defcategory> <deffunction>followed</deffunction>
<defparam>by</defparam> <defparam>a</defparam>
<defparam>comment</defparam></definitionterm></deffnx>
+<deffnx><definitionterm><indexterm index="fn"
number="114">followed</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>followed</deffunction> <defparam>by</defparam>
<defparam>a</defparam> <defparam>comment</defparam></definitionterm></deffnx>
<pre xml:space="preserve"><!-- c comment -->
</pre><deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">a</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam bracketed="on">h i</defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="115">a</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam bracketed="on">h i</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="116">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
</deffn>
<pre xml:space="preserve">
-</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
+</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="117">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
</deffn>
<pre xml:space="preserve">
-</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction> <defparam>with</defparam>
<defparam>deffnx</defparam></definitionterm>
+</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="118">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction> <defparam>with</defparam>
<defparam>deffnx</defparam></definitionterm>
<pre xml:space="preserve"><!-- c comment between deffn and deffnx -->
-</pre><deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
+</pre><deffnx spaces=" "><definitionterm><indexterm index="fn"
number="119">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
</deffn>
<pre xml:space="preserve">
-</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="120"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
+<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="121">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<definitionitem><pre xml:space="preserve"><!-- c comment -->
text in def item for second def item
</pre></definitionitem></deffn>
<pre xml:space="preserve">
-</pre><defvr spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">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&textndash;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">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&textndash;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">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&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>
<definitionitem><pre xml:space="preserve">d--eftypeop
</pre></definitionitem></deftypeop>
<pre xml:space="preserve">
-</pre><deftypevr spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">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&textndash;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">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&textndash;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">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&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>
<definitionitem><pre xml:space="preserve">d--efop
</pre></definitionitem></defop>
<pre xml:space="preserve">
-</pre><deftp spaces=" " endspaces=" "><definitionterm><indexterm
index="tp">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&textndash;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">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&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>
<definitionitem><pre xml:space="preserve">d--efivar
</pre></definitionitem></defivar>
<pre xml:space="preserve">
-</pre><deftypeivar spaces=" " endspaces=" "><definitionterm><indexterm
index="vr">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&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>
<definitionitem><pre xml:space="preserve">d--eftypeivar
</pre></definitionitem></deftypeivar>
<pre xml:space="preserve">
-</pre><defmethod spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">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&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>
<definitionitem><pre xml:space="preserve">d--efmethod
</pre></definitionitem></defmethod>
<pre xml:space="preserve">
-</pre><deftypemethod spaces=" " endspaces=" "><definitionterm><indexterm
index="fn">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&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>
<definitionitem><pre xml:space="preserve">d--eftypemethod
</pre></definitionitem></deftypemethod>
<pre xml:space="preserve">
@@ -3066,16 +3066,16 @@
</pre></tableitem></tableentry></table>
<pre xml:space="preserve">
</pre><vtable commandarg="asis" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="vr" number="39">a</indexterm>a</itemformat></item>
<pre xml:space="preserve"><!-- c comment between item and itemx -->
-</pre><itemx spaces=" "><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
+</pre><itemx spaces=" "><itemformat command="asis"><indexterm index="vr"
number="40">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><pre xml:space="preserve">l--ine
</pre></tableitem></tableentry></vtable>
<pre xml:space="preserve">
</pre><ftable commandarg="asis" spaces=" " endspaces=" ">
-<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
-<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm
index="cp">index entry between item and itemx</indexterm></cindex>
-</pre><itemx spaces=" "><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
+<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn" number="131">a</indexterm>a</itemformat></item>
+<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm index="cp"
number="24">index entry between item and itemx</indexterm></cindex>
+</pre><itemx spaces=" "><itemformat command="asis"><indexterm index="fn"
number="132">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><pre xml:space="preserve">l--ine
</pre></tableitem></tableentry></ftable>
<pre xml:space="preserve">
@@ -3134,16 +3134,16 @@
</pre></example>
-<cindex index="cp" spaces=" "><indexterm
index="cp">t&textndash;ruc</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm
index="cp">T&textndash;ruc</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm index="cp">.</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm index="cp">?</indexterm></cindex>
-<cindex index="cp" spaces=" "><indexterm index="cp">a</indexterm></cindex>
-<findex index="fn" spaces=" "><indexterm
index="fn">t&textndash;ruc</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm
index="fn">T&textndash;ruc</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm index="fn">.</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm index="fn">?</indexterm></findex>
-<findex index="fn" spaces=" "><indexterm index="fn">a</indexterm></findex>
+<cindex index="cp" spaces=" "><indexterm index="cp"
number="25">t&textndash;ruc</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp"
number="26">T&textndash;ruc</indexterm></cindex>
+<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="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>
<para>cp
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Convert/TexinfoXML.pm t/resu...,
Patrice Dumas <=