[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo tp/Texinfo/Convert/Text.pm tp/Texinfo/C...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo tp/Texinfo/Convert/Text.pm tp/Texinfo/C... |
|
Date: |
Fri, 21 Dec 2012 00:30:47 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/12/21 00:30:47
Modified files:
tp/Texinfo/Convert: Text.pm XML.pm
tp/t/results/converters_tests: at_commands_in_refs.pl
ref_error_formatting.pl
ref_in_sectioning.pl
refs_formatting.pl
some_at_commands_in_ref_nodes.pl
spaces_in_empty_node_names.pl
spaces_in_node_names.pl
things_before_setfilename.pl
things_before_setfilename_no_element.pl
top_in_ref.pl
tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_xml:
char_latin1_utf8_in_refs.xml
tp/tests/layout/res_parser/formatting_xml: formatting.xml
util : texinfo.dtd
Log message:
Add label and manual attribute to @*ref commands in XML.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/ref_error_formatting.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/refs_formatting.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/spaces_in_empty_node_names.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/spaces_in_node_names.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/top_in_ref.pl?cvsroot=texinfo&r1=1.7&r2=1.8
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.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texinfo.dtd?cvsroot=texinfo&r1=1.34&r2=1.35
Patches:
Index: tp/Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- tp/Texinfo/Convert/Text.pm 18 Dec 2012 23:38:30 -0000 1.100
+++ tp/Texinfo/Convert/Text.pm 21 Dec 2012 00:30:45 -0000 1.101
@@ -28,7 +28,7 @@
# for debugging
use Texinfo::Convert::Texinfo;
use Data::Dumper;
-use Carp qw(cluck);
+use Carp qw(cluck carp);
require Exporter;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@@ -307,7 +307,11 @@
{
my $root = shift;
# means it was called object oriented
- if (ref ($root) ne 'HASH') {
+ if (ref($root) ne 'HASH') {
+ if (ref($root) eq 'ARRAY') {
+ carp ("convert argument $root not blessed reference or HASH");
+ return undef;
+ }
$root = shift;
}
my $options = shift;
Index: tp/Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- tp/Texinfo/Convert/XML.pm 18 Dec 2012 23:38:30 -0000 1.91
+++ tp/Texinfo/Convert/XML.pm 21 Dec 2012 00:30:45 -0000 1.92
@@ -972,6 +972,8 @@
if (scalar(@elements) > 1) {
$command = shift @elements;
}
+ # this is used for commands without args, or associated to the
+ # first argument
my $attribute = '';
if ($root->{'cmdname'} eq 'verb') {
$attribute = " delimiter=\"".$self->xml_protect_text($root->{'type'})
@@ -1017,11 +1019,46 @@
}
$arg_index++;
}
+ # This is for the main command
$attribute = '';
if ($root->{'cmdname'} eq 'image') {
if ($self->_is_inline($root)) {
$attribute = " where=\"inline\"";
}
+ } elsif ($Texinfo::Common::ref_commands{$root->{'cmdname'}}) {
+ if ($root->{'extra'}->{'brace_command_contents'}) {
+ if ($root->{'extra'}->{'node_argument'}
+ and $root->{'extra'}->{'node_argument'}->{'node_content'}
+ and
defined($root->{'extra'}->{'node_argument'}->{'normalized'})) {
+ $attribute = " label=\"".$self->xml_protect_text(
+ $root->{'extra'}->{'node_argument'}->{'normalized'})."\"";
+ }
+ my $manual;
+ my $manual_arg_index = 3;
+ if ($root->{'cmdname'} eq 'inforef') {
+ $manual_arg_index = 2;
+ }
+ if
($root->{'extra'}->{'brace_command_contents'}->[$manual_arg_index]) {
+ $manual = Texinfo::Convert::Text::convert({'contents'
+ =>
$root->{'extra'}->{'brace_command_contents'}->[$manual_arg_index]},
+ {'code' => 1,
+ Texinfo::Common::_convert_text_options($self)});
+ }
+ if (!defined($manual) and $root->{'extra'}->{'node_argument'}
+ and $root->{'extra'}->{'node_argument'}->{'manual_content'}) {
+ $manual = Texinfo::Convert::Text::convert({'contents'
+ => $root->{'extra'}->{'node_argument'}->{'manual_content'}},
+ {'code' => 1, Texinfo::Common::_convert_text_options($self)});
+ }
+ if (defined($manual)) {
+ my $manual_base = $manual;
+ $manual_base =~ s/\.[^\.]*$//;
+ $manual_base =~ s/^.*\///;
+
+ $attribute .= "
manual=\"".$self->xml_protect_text($manual_base)."\""
+ if ($manual_base ne '');
+ }
+ }
}
if (defined($command)) {
$attribute .= _leading_spaces_before_argument($root);
Index: tp/t/results/converters_tests/at_commands_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- tp/t/results/converters_tests/at_commands_in_refs.pl 9 Nov 2012
22:30:16 -0000 1.28
+++ tp/t/results/converters_tests/at_commands_in_refs.pl 21 Dec 2012
00:30:45 -0000 1.29
@@ -22804,35 +22804,35 @@
<node
name="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"
spaces=" "><nodename><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></nodename><nodeprev
automatic="on"><indicateurl>indicateurl</indicateurl></nodeprev><nodeup
automatic="on">Top</nodeup></node>
<chapter spaces="
"><sectiontitle><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></sectiontitle>
-<para><ref><xrefnodename>&hyphenbreak; { }</xrefnodename></ref>
+<para><ref label="-_007b-_007d"><xrefnodename>&hyphenbreak; {
}</xrefnodename></ref>
</para>
-<para><ref><xrefnodename><spacecmd type="spc"/> <spacecmd type="tab"/>
&eosexcl; &linebreak; &eosperiod; &noeos; .&noeos; &eosquest;
&arobase;</xrefnodename></ref>
-<ref><xrefnodename>&atchar; &lbracechar; &rbracechar; &backslashchar;
&hashchar;</xrefnodename></ref>
-<ref><xrefnodename>&latex; &tex; • , ©right; &dots;
&enddots;</xrefnodename></ref>
-<ref><xrefnodename>≡ &errorglyph; € ¡ &expansion;
−</xrefnodename></ref>
+<para><ref
label="----_0021---_002e--_002e-_003f-_0040"><xrefnodename><spacecmd
type="spc"/> <spacecmd type="tab"/> &eosexcl; &linebreak; &eosperiod; &noeos;
.&noeos; &eosquest; &arobase;</xrefnodename></ref>
+<ref label="_0040-_007b-_007d-_005c-_0023"><xrefnodename>&atchar; &lbracechar;
&rbracechar; &backslashchar; &hashchar;</xrefnodename></ref>
+<ref
label="LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e"><xrefnodename>&latex;
&tex; • , ©right; &dots; &enddots;</xrefnodename></ref>
+<ref
label="_2261-error_002d_002d_003e-_20ac-_00a1-_21a6-_2212"><xrefnodename>≡
&errorglyph; € ¡ &expansion; −</xrefnodename></ref>
</para>
-<para><ref><xrefnodename>≥ ≤ →</xrefnodename></ref>
+<para><ref label="_2265-_2264-_2192"><xrefnodename>≥ ≤
→</xrefnodename></ref>
</para>
-<para><ref><xrefnodename>ª º &point; £ &printglyph; ¿
®istered;</xrefnodename></ref>
-<ref><xrefnodename>&result; ° a b <today/>
å</xrefnodename></ref>
-<ref><xrefnodename>Å æ œ Æ Œ ø Ø
ß &lslash; &Lslash; Ð ð Þ þ</xrefnodename></ref>
-<ref><xrefnodename><accent type="uml">a</accent> <accent
type="tilde">e</accent> <accent type="circ"><dotless>i</dotless></accent>
<accent type="circ">a</accent> <accent type="grave">a</accent> <accent
type="acute" bracketed="off">e</accent> <accent type="cedil">c</accent> <accent
type="macr">e</accent> <accent type="ring">e</accent> <accent
type="doubleacute">e</accent> <accent
type="ogon">e</accent></xrefnodename></ref>
-<ref><xrefnodename><accent type="dotaccent">e</accent> <accent
type="breve">e</accent> <accent type="ubaraccent">e</accent> <accent
type="udotaccent">e</accent> <accent type="caron">e</accent>
<dotless>j</dotless> <accent type="tieaccent">ee</accent></xrefnodename></ref>
-<ref><xrefnodename><dotless>i</dotless> <accent type="grave"><accent
type="macr" bracketed="off">E</accent></accent> <accent type="cedil"><accent
type="acute" bracketed="off">C</accent></accent></xrefnodename></ref>
-<ref><xrefnodename>“ ” ‘ ’ „
‚</xrefnodename></ref>
-<ref><xrefnodename>« » « » ‹
›</xrefnodename></ref>
-<ref><xrefnodename>`` \'\' --- -- ` \'</xrefnodename></ref>
-<ref><xrefnodename><acronym><acronymword>AAA</acronymword><acronymdesc
spaces=" ">fff</acronymdesc></acronym>
<acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></xrefnodename></ref>
-<ref><xrefnodename><abbr><abbrword>CCC</abbrword><abbrdesc spaces="
">rrr</abbrdesc></abbr> <abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></xrefnodename></ref>
-<ref><xrefnodename><email><emailaddress>someone&arobase;somewher</emailaddress><emailname
spaces=" ">the someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></xrefnodename></ref>
-<ref><xrefnodename><image
where="inline"><imagefile>f--ile1</imagefile></image> <image
where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></xrefnodename></ref>
-<ref><xrefnodename><verb delimiter="."> @ {} . </verb></xrefnodename></ref>
-<ref><xrefnodename><cite>cite <asis>asis</asis></cite> <w>in &arobase;w
<b>b</b></w> <r>in r</r> <sc>sc</sc> <strong>str</strong> <t>t</t>
<var>var</var> <dfn>dfn</dfn> <i>i</i></xrefnodename></ref>
-<ref><xrefnodename><env>env</env> <code>code</code> <option>option</option>
<samp>samp</samp> <command>command</command> <file>file</file> <kbd>C-x
<key>ESC</key></kbd></xrefnodename></ref>
-<ref><xrefnodename>8.27<dmn>in</dmn></xrefnodename></ref>
-<ref><xrefnodename><sansserif>sansserif</sansserif>
<slanted>slanted</slanted></xrefnodename></ref>
-<ref><xrefnodename><indicateurl>indicateurl</indicateurl></xrefnodename></ref>
-<ref><xrefnodename><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></xrefnodename></ref>
+<para><ref
label="_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae"><xrefnodename>ª º
&point; £ &printglyph; ¿ ®istered;</xrefnodename></ref>
+<ref label="_21d2-_00b0-a-b--_00e5"><xrefnodename>&result; ° a b
<today/> å</xrefnodename></ref>
+<ref
label="_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"><xrefnodename>Å
æ œ Æ Œ ø Ø ß &lslash; &Lslash;
Ð ð Þ þ</xrefnodename></ref>
+<ref
label="_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119"><xrefnodename><accent
type="uml">a</accent> <accent type="tilde">e</accent> <accent
type="circ"><dotless>i</dotless></accent> <accent type="circ">a</accent>
<accent type="grave">a</accent> <accent type="acute" bracketed="off">e</accent>
<accent type="cedil">c</accent> <accent type="macr">e</accent> <accent
type="ring">e</accent> <accent type="doubleacute">e</accent> <accent
type="ogon">e</accent></xrefnodename></ref>
+<ref label="_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361"><xrefnodename><accent
type="dotaccent">e</accent> <accent type="breve">e</accent> <accent
type="ubaraccent">e</accent> <accent type="udotaccent">e</accent> <accent
type="caron">e</accent> <dotless>j</dotless> <accent
type="tieaccent">ee</accent></xrefnodename></ref>
+<ref label="_0131-_1e14-_1e08"><xrefnodename><dotless>i</dotless> <accent
type="grave"><accent type="macr" bracketed="off">E</accent></accent> <accent
type="cedil"><accent type="acute"
bracketed="off">C</accent></accent></xrefnodename></ref>
+<ref label="_201c-_201d-_2018-_2019-_201e-_201a"><xrefnodename>“ ”
‘ ’ „ ‚</xrefnodename></ref>
+<ref label="_00ab-_00bb-_00ab-_00bb-_2039-_203a"><xrefnodename>« »
« » ‹ ›</xrefnodename></ref>
+<ref
label="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027"><xrefnodename>``
\'\' --- -- ` \'</xrefnodename></ref>
+<ref
label="AAA-AAA-BBB"><xrefnodename><acronym><acronymword>AAA</acronymword><acronymdesc
spaces=" ">fff</acronymdesc></acronym>
<acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></xrefnodename></ref>
+<ref label="CCC-CCC-DDD"><xrefnodename><abbr><abbrword>CCC</abbrword><abbrdesc
spaces=" ">rrr</abbrdesc></abbr> <abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></xrefnodename></ref>
+<ref
label="someone_0040somewher-no_005fexplain_0040there"><xrefnodename><email><emailaddress>someone&arobase;somewher</emailaddress><emailname
spaces=" ">the someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></xrefnodename></ref>
+<ref label="f_002d_002dile1-f_002d_002dile"><xrefnodename><image
where="inline"><imagefile>f--ile1</imagefile></image> <image
where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></xrefnodename></ref>
+<ref label="-_0040-_007b_007d-_002e-"><xrefnodename><verb delimiter="."> @ {}
. </verb></xrefnodename></ref>
+<ref
label="cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i"><xrefnodename><cite>cite
<asis>asis</asis></cite> <w>in &arobase;w <b>b</b></w> <r>in r</r> <sc>sc</sc>
<strong>str</strong> <t>t</t> <var>var</var> <dfn>dfn</dfn>
<i>i</i></xrefnodename></ref>
+<ref
label="env-code-option-samp-command-file-C_002dx-ESC"><xrefnodename><env>env</env>
<code>code</code> <option>option</option> <samp>samp</samp>
<command>command</command> <file>file</file> <kbd>C-x
<key>ESC</key></kbd></xrefnodename></ref>
+<ref label="8_002e27in"><xrefnodename>8.27<dmn>in</dmn></xrefnodename></ref>
+<ref label="sansserif-slanted"><xrefnodename><sansserif>sansserif</sansserif>
<slanted>slanted</slanted></xrefnodename></ref>
+<ref
label="indicateurl"><xrefnodename><indicateurl>indicateurl</indicateurl></xrefnodename></ref>
+<ref
label="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"><xrefnodename><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></xrefnodename></ref>
</para>
</chapter>
<bye></bye>
Index: tp/t/results/converters_tests/ref_error_formatting.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/ref_error_formatting.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- tp/t/results/converters_tests/ref_error_formatting.pl 16 Sep 2012
21:08:55 -0000 1.13
+++ tp/t/results/converters_tests/ref_error_formatting.pl 21 Dec 2012
00:30:45 -0000 1.14
@@ -4981,46 +4981,46 @@
$result_converted{'xml'}->{'ref_error_formatting'} = '
-<para><code>&arobase;ref{node}</code>
<ref><xrefnodename>node</xrefnodename></ref>
+<para><code>&arobase;ref{node}</code> <ref
label="node"><xrefnodename>node</xrefnodename></ref>
</para>
<para><code>&arobase;ref{,cross ref name}</code>
<ref><xrefinfoname>cross ref name</xrefinfoname></ref>
<code>&arobase;ref{,,title}</code>
<ref><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{,,,file name}</code> <ref><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{,,,file name}</code> <ref manual="file
name"><xrefinfofile>file name</xrefinfofile></ref>
<code>&arobase;ref{,,,,manual}</code>
<ref><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{node,cross ref name}</code>
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{node,,title}</code>
<ref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{node,,,file name}</code>
<ref><xrefnodename>node</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{node,,,,manual}</code>
<ref><xrefnodename>node</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{node,cross ref name,title,}</code>
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{node,cross ref name,,file name}</code>
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{node,cross ref name,,,manual}</code>
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{node,cross ref name,title,file name}</code>
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{node,cross ref name,title,,manual}</code>
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{node,cross ref name,title, file name,
manual}</code> <ref><xrefnodename>node</xrefnodename><xrefinfoname>cross
ref name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{node,,title,file name}</code>
<ref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{node,,title,,manual}</code>
<ref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{node,,title, file name, manual}</code>
<ref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{node,,,file name,manual}</code>
<ref><xrefnodename>node</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{node,cross ref name}</code> <ref
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{node,,title}</code> <ref
label="node"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{node,,,file name}</code> <ref label="node"
manual="file name"><xrefnodename>node</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{node,,,,manual}</code> <ref
label="node"><xrefnodename>node</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{node,cross ref name,title,}</code> <ref
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{node,cross ref name,,file name}</code> <ref
label="node" manual="file
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{node,cross ref name,,,manual}</code> <ref
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{node,cross ref name,title,file name}</code>
<ref label="node" manual="file
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{node,cross ref name,title,,manual}</code>
<ref label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{node,cross ref name,title, file name,
manual}</code> <ref label="node" manual="file
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{node,,title,file name}</code> <ref
label="node" manual="file
name"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{node,,title,,manual}</code> <ref
label="node"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{node,,title, file name, manual}</code> <ref
label="node" manual="file
name"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{node,,,file name,manual}</code> <ref
label="node" manual="file
name"><xrefnodename>node</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{,cross ref name,title,}</code>
<ref><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{,cross ref name,,file name}</code>
<ref><xrefinfoname>cross ref name</xrefinfoname><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{,cross ref name,,file name}</code> <ref
manual="file name"><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
<code>&arobase;ref{,cross ref name,,,manual}</code>
<ref><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{,cross ref name,title,file name}</code>
<ref><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{,cross ref name,title,file name}</code> <ref
manual="file name"><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{,cross ref name,title,,manual}</code>
<ref><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{,cross ref name,title, file name,
manual}</code> <ref><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{,,title,file name}</code>
<ref><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{,cross ref name,title, file name,
manual}</code> <ref manual="file name"><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{,,title,file name}</code> <ref manual="file
name"><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{,,title,,manual}</code>
<ref><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{,,title, file name, manual}</code>
<ref><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
-<code>&arobase;ref{,,,file name,manual}</code>
<ref><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{,,title, file name, manual}</code> <ref
manual="file name"><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{,,,file name,manual}</code> <ref manual="file
name"><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
<para><code>&arobase;inforef{,cross ref name }</code>
<inforef><inforefrefname>cross ref name </inforefrefname></inforef>
-<code>&arobase;inforef{,,file name}</code>
<inforef><inforefinfoname>file name</inforefinfoname></inforef>
-<code>&arobase;inforef{,cross ref name, file name}</code>
<inforef><inforefrefname>cross ref name</inforefrefname><inforefinfoname
spaces=" ">file name</inforefinfoname></inforef>
+<code>&arobase;inforef{,,file name}</code> <inforef manual="file
name"><inforefinfoname>file name</inforefinfoname></inforef>
+<code>&arobase;inforef{,cross ref name, file name}</code>
<inforef manual="file name"><inforefrefname>cross ref
name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;inforef{}</code> <inforef></inforef>
</para>
-<para><code>&arobase;inforef{node, cross ref name, file
name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node}</code>
<inforef><inforefnodename>node</inforefnodename></inforef>
-<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
-<code>&arobase;inforef{node,,file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
+<para><code>&arobase;inforef{node, cross ref name, file
name}</code> <inforef label="node" manual="file
name"><inforefnodename>node</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{node}</code> <inforef
label="node"><inforefnodename>node</inforefnodename></inforef>
+<code>&arobase;inforef{node, cross ref name}</code> <inforef
label="node"><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
+<code>&arobase;inforef{node,,file name}</code> <inforef
label="node" manual="file
name"><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
</para>';
Index: tp/t/results/converters_tests/ref_in_sectioning.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- tp/t/results/converters_tests/ref_in_sectioning.pl 16 Sep 2012 21:08:55
-0000 1.14
+++ tp/t/results/converters_tests/ref_in_sectioning.pl 21 Dec 2012 00:30:46
-0000 1.15
@@ -3219,7 +3219,7 @@
$result_converted{'xml'}->{'ref_in_sectioning'} = '<contents></contents>
<node name="Top" spaces=" "><nodename>Top</nodename><nodenext
automatic="on">node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
-<top spaces=" "><sectiontitle>for example
<ref><xrefnodename>node</xrefnodename></ref>
(<pxref><xrefnodename>node</xrefnodename></pxref>)
(<pxref><xrefnodename>Top</xrefnodename><xrefinfofile spaces="
">file</xrefinfofile><xrefprintedname spaces="
">Manual</xrefprintedname></pxref>)</sectiontitle>
+<top spaces=" "><sectiontitle>for example <ref
label="node"><xrefnodename>node</xrefnodename></ref> (<pxref
label="node"><xrefnodename>node</xrefnodename></pxref>) (<pxref label="Top"
manual="file"><xrefnodename>Top</xrefnodename><xrefinfofile spaces="
">file</xrefinfofile><xrefprintedname spaces="
">Manual</xrefprintedname></pxref>)</sectiontitle>
<menu endspaces=" ">
<menuentry leadingtext="* "><menunode
separator="::">node</menunode><menudescription><pre xml:space="preserve">
@@ -3228,46 +3228,46 @@
</top>
<node name="node" spaces=" "><nodename>node</nodename><nodenext
automatic="on">chap</nodenext><nodeprev automatic="on">Top</nodeprev><nodeup
automatic="on">Top</nodeup></node>
-<chapter spaces="
"><sectiontitle><xref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">Manual</xrefprintedname></xref>.</sectiontitle>
+<chapter spaces=" "><sectiontitle><xref label="node" manual="file
name"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">Manual</xrefprintedname></xref>.</sectiontitle>
</chapter>
<node name="chap" spaces=" "><nodename>chap</nodename><nodeprev
automatic="on">node</nodeprev><nodeup automatic="on">Top</nodeup></node>
-<chapter spaces=" "><sectiontitle><ref><xrefnodename>node</xrefnodename></ref>
just node</sectiontitle>
+<chapter spaces=" "><sectiontitle><ref
label="node"><xrefnodename>node</xrefnodename></ref> just node</sectiontitle>
-<section spaces="
"><sectiontitle><ref><xrefnodename>node</xrefnodename><xrefinfoname spaces="
">cross ref name</xrefinfoname></ref> node, crossref arg2</sectiontitle>
+<section spaces=" "><sectiontitle><ref
label="node"><xrefnodename>node</xrefnodename><xrefinfoname spaces=" ">cross
ref name</xrefinfoname></ref> node, crossref arg2</sectiontitle>
</section>
-<section spaces="
"><sectiontitle><ref><xrefnodename><code>node</code></xrefnodename><xrefprinteddesc
spaces=" "><samp>title</samp></xrefprinteddesc></ref> code node, samptitle
arg3</sectiontitle>
+<section spaces=" "><sectiontitle><ref
label="node"><xrefnodename><code>node</code></xrefnodename><xrefprinteddesc
spaces=" "><samp>title</samp></xrefprinteddesc></ref> code node, samptitle
arg3</sectiontitle>
</section>
-<section spaces="
"><sectiontitle><ref><xrefnodename><code>node</code></xrefnodename><xrefinfofile
spaces=" ">file name</xrefinfofile></ref> code node, file name</sectiontitle>
+<section spaces=" "><sectiontitle><ref label="node" manual="file
name"><xrefnodename><code>node</code></xrefnodename><xrefinfofile spaces="
">file name</xrefinfofile></ref> code node, file name</sectiontitle>
</section>
-<section spaces="
"><sectiontitle><ref><xrefnodename>node</xrefnodename><xrefprintedname spaces="
">Manual </xrefprintedname></ref> node and manual</sectiontitle>
+<section spaces=" "><sectiontitle><ref
label="node"><xrefnodename>node</xrefnodename><xrefprintedname spaces="
">Manual </xrefprintedname></ref> node and manual</sectiontitle>
</section>
-<section spaces="
"><sectiontitle><ref><xrefnodename>Top</xrefnodename><xrefprintedname spaces="
">Manual </xrefprintedname></ref> Top and manual</sectiontitle>
+<section spaces=" "><sectiontitle><ref
label="Top"><xrefnodename>Top</xrefnodename><xrefprintedname spaces=" ">Manual
</xrefprintedname></ref> Top and manual</sectiontitle>
</section>
<section spaces=" "><sectiontitle><ref><xrefprintedname spaces=" ">Manual
</xrefprintedname></ref> no node just manual</sectiontitle>
</section>
-<section spaces=" "><sectiontitle><ref><xrefinfofile spaces=" ">file
name</xrefinfofile></ref> no node just file name</sectiontitle>
+<section spaces=" "><sectiontitle><ref manual="file name"><xrefinfofile
spaces=" ">file name</xrefinfofile></ref> no node just file name</sectiontitle>
</section>
-<section spaces="
"><sectiontitle><inforef><inforefnodename>a</inforefnodename><inforefrefname
spaces=" ">b</inforefrefname><inforefinfoname spaces="
">c</inforefinfoname></inforef> inforef a b c </sectiontitle>
+<section spaces=" "><sectiontitle><inforef label="a"
manual="c"><inforefnodename>a</inforefnodename><inforefrefname spaces="
">b</inforefrefname><inforefinfoname spaces=" ">c</inforefinfoname></inforef>
inforef a b c </sectiontitle>
</section>
-<section spaces=" "><sectiontitle>(<pxref spaces=" "><xrefnodename>Top
</xrefnodename><xrefinfofile spaces=" ">file name </xrefinfofile></pxref>)
pxref Top file name, spaces</sectiontitle>
+<section spaces=" "><sectiontitle>(<pxref label="Top" manual="file name"
spaces=" "><xrefnodename>Top </xrefnodename><xrefinfofile spaces=" ">file name
</xrefinfofile></pxref>) pxref Top file name, spaces</sectiontitle>
</section>
-<section spaces=" "><sectiontitle>(<pxref><xrefinfofile spaces=" ">file name
</xrefinfofile></pxref>) pxref file name only, spaces</sectiontitle>
+<section spaces=" "><sectiontitle>(<pxref manual="file name"><xrefinfofile
spaces=" ">file name </xrefinfofile></pxref>) pxref file name only,
spaces</sectiontitle>
</section>
-<section spaces="
"><sectiontitle><xref><xrefnodename>Top</xrefnodename><xrefinfofile>filename</xrefinfofile></xref>,
xref Top filename only, no spaces</sectiontitle>
+<section spaces=" "><sectiontitle><xref label="Top"
manual="filename"><xrefnodename>Top</xrefnodename><xrefinfofile>filename</xrefinfofile></xref>,
xref Top filename only, no spaces</sectiontitle>
</section>
-<section spaces="
"><sectiontitle><xref><xrefinfofile>filename</xrefinfofile></xref>. xref
filename only, no spaces</sectiontitle>
+<section spaces=" "><sectiontitle><xref
manual="filename"><xrefinfofile>filename</xrefinfofile></xref>. xref filename
only, no spaces</sectiontitle>
</section>
</chapter>
Index: tp/t/results/converters_tests/refs_formatting.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/refs_formatting.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- tp/t/results/converters_tests/refs_formatting.pl 16 Sep 2012 21:08:55
-0000 1.13
+++ tp/t/results/converters_tests/refs_formatting.pl 21 Dec 2012 00:30:46
-0000 1.14
@@ -4914,40 +4914,40 @@
$result_converted{'xml'}->{'refs_formatting'} = '<node name="chapter" spaces="
"><nodename>chapter</nodename></node>
<chapter spaces=" "><sectiontitle>chapter</sectiontitle>
-<para><code>&arobase;ref{chapter,cross ref name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{chapter,,title}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{chapter,,,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title,}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{chapter,cross ref name,,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,cross ref name,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title,file
name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,,file name,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<para><code>&arobase;ref{chapter,cross ref name}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{chapter,,title}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{chapter,,,file name}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,,,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title,}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{chapter,cross ref name,,file name}</code>
<ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,cross ref name,,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title,file
name}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross
ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title,file name}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,,title,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,,file name,manual}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
-<para><code>&arobase;ref{(pman)anode,cross ref name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{(pman)anode,,title}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{(pman)anode,,,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title,}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,,file name,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<para><code>&arobase;ref{(pman)anode,cross ref name}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{(pman)anode,,title}</code> <ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{(pman)anode,,,file name}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,,,,manual}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title,}</code>
<ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,,file name}</code>
<ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code> <ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code> <ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code> <ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title,file name}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,,title,,manual}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,,file name,manual}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
-<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter}</code>
<inforef><inforefnodename>chapter</inforefnodename></inforef>
-<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
-<code>&arobase;inforef{chapter,,file name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
+<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code> <inforef label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter}</code> <inforef
label="chapter"><inforefnodename>chapter</inforefnodename></inforef>
+<code>&arobase;inforef{chapter, cross ref name}</code> <inforef
label="chapter"><inforefnodename>chapter</inforefnodename><inforefrefname
spaces=" ">cross ref name</inforefrefname></inforef>
+<code>&arobase;inforef{chapter,,file name}</code> <inforef
label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
</para></chapter>
';
Index: tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl 16 Sep
2012 21:08:55 -0000 1.9
+++ tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl 21 Dec
2012 00:30:46 -0000 1.10
@@ -1782,7 +1782,7 @@
<node name="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1"
spaces=" "><nodename>A <sc>sc <accent type="tilde" bracketed="off">n</accent>
å &tex;</sc> node <accent type="uml" bracketed="off">i</accent> <accent
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent
type="macr" bracketed="off">E</accent></accent> &lslash; <accent
type="cedil"><accent type="acute" bracketed="off">C</accent></accent>
¡</nodename><nodeprev automatic="on">Top</nodeprev><nodeup
automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>A <sc>sc</sc> node <accent type="uml"
bracketed="off">i</accent> <accent type="uml"><dotless>i</dotless></accent>
<accent type="grave"><accent type="macr" bracketed="off">E</accent></accent>
&lslash; <accent type="cedil"><accent type="acute"
bracketed="off">C</accent></accent> ¡</sectiontitle>
-<para>see <ref><xrefnodename>a <strong>strong</strong> ref with
<sc>sc</sc>, a i trema <accent type="uml"
bracketed="off">i</accent>, a dotless i trema <accent
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent
type="macr" bracketed="off">E</accent></accent> and exclamdown
¡</xrefnodename><xrefinfofile>manual</xrefinfofile></ref>.
+<para>see <ref
label="a-strong-ref-with-SC_002c-a-i-trema-_00ef_002c-a-dotless-i-trema-_00ef-_1e14-and-exclamdown-_00a1"
manual="manual"><xrefnodename>a <strong>strong</strong> ref with
<sc>sc</sc>, a i trema <accent type="uml"
bracketed="off">i</accent>, a dotless i trema <accent
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent
type="macr" bracketed="off">E</accent></accent> and exclamdown
¡</xrefnodename><xrefinfofile>manual</xrefinfofile></ref>.
</para></chapter>
';
Index: tp/t/results/converters_tests/spaces_in_empty_node_names.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_empty_node_names.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tp/t/results/converters_tests/spaces_in_empty_node_names.pl 16 Sep 2012
21:08:55 -0000 1.7
+++ tp/t/results/converters_tests/spaces_in_empty_node_names.pl 21 Dec 2012
00:30:46 -0000 1.8
@@ -1113,11 +1113,11 @@
<node name="" spaces=" "><nodename></nodename></node>
-<para><ref><xrefnodename><spacecmd type="spc"/><spacecmd
type="spc"/></xrefnodename></ref>
+<para><ref label="--"><xrefnodename><spacecmd type="spc"/><spacecmd
type="spc"/></xrefnodename></ref>
</para>
-<para><ref><xrefnodename><verb delimiter=":"> </verb></xrefnodename></ref>
+<para><ref label="-"><xrefnodename><verb delimiter=":">
</verb></xrefnodename></ref>
</para>
-<para><ref><xrefnodename><w> </w></xrefnodename></ref>
+<para><ref label="-"><xrefnodename><w> </w></xrefnodename></ref>
</para>';
Index: tp/t/results/converters_tests/spaces_in_node_names.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/spaces_in_node_names.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tp/t/results/converters_tests/spaces_in_node_names.pl 16 Sep 2012
21:08:55 -0000 1.7
+++ tp/t/results/converters_tests/spaces_in_node_names.pl 21 Dec 2012
00:30:46 -0000 1.8
@@ -1200,11 +1200,11 @@
<node name="c-" spaces=" "><nodename>c<w> </w></nodename><nodeprev
automatic="on">b<verb delimiter=":"> </verb></nodeprev><nodeup
automatic="on">Top</nodeup></node>
-<para><ref><xrefnodename>a<spacecmd type="spc"/><spacecmd
type="spc"/></xrefnodename></ref>
+<para><ref label="a--"><xrefnodename>a<spacecmd type="spc"/><spacecmd
type="spc"/></xrefnodename></ref>
</para>
-<para><ref><xrefnodename>b<verb delimiter=":"> </verb></xrefnodename></ref>
+<para><ref label="b-"><xrefnodename>b<verb delimiter=":">
</verb></xrefnodename></ref>
</para>
-<para><ref><xrefnodename>c<w> </w></xrefnodename></ref>
+<para><ref label="c-"><xrefnodename>c<w> </w></xrefnodename></ref>
</para>';
Index: tp/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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- tp/t/results/converters_tests/things_before_setfilename.pl 9 Nov 2012
22:30:16 -0000 1.20
+++ tp/t/results/converters_tests/things_before_setfilename.pl 21 Dec 2012
00:30:46 -0000 1.21
@@ -1869,17 +1869,17 @@
</preamble><anchor name="An-anchor">An anchor</anchor>
<para>Ref to the anchor:
-<ref><xrefnodename>An anchor</xrefnodename></ref>
+<ref label="An-anchor"><xrefnodename>An anchor</xrefnodename></ref>
</para>
<para>Ref to the anchor in footnote:
-<ref><xrefnodename>Anchor in footnote</xrefnodename></ref>.
+<ref label="Anchor-in-footnote"><xrefnodename>Anchor in
footnote</xrefnodename></ref>.
</para>
<para><footnote><para>In footnote.
</para>
<anchor name="Anchor-in-footnote">Anchor in footnote</anchor>
<para>Ref to main text anchor
-<ref><xrefnodename>An anchor</xrefnodename></ref>
+<ref label="An-anchor"><xrefnodename>An anchor</xrefnodename></ref>
</para></footnote>
</para>
<float name="float-anchor" type="" spaces=" " endspaces=" "><floatname
spaces=" ">float anchor</floatname>
@@ -1887,7 +1887,7 @@
</para></float>
<para>Ref to float
-<ref><xrefnodename>float anchor</xrefnodename></ref>.
+<ref label="float-anchor"><xrefnodename>float anchor</xrefnodename></ref>.
</para>
<float name="ta" type="Text" spaces=" " endspaces="
"><floattype>Text</floattype><floatname spaces=" ">ta</floatname>
<para>In float
@@ -1913,10 +1913,10 @@
<top spaces=" "><sectiontitle>top section</sectiontitle>
<para>Ref to anchor
-<ref><xrefnodename>An anchor</xrefnodename></ref>
+<ref label="An-anchor"><xrefnodename>An anchor</xrefnodename></ref>
</para>
<para>Ref to footnote anchor
-<ref><xrefnodename>Anchor in footnote</xrefnodename></ref>
+<ref label="Anchor-in-footnote"><xrefnodename>Anchor in
footnote</xrefnodename></ref>
</para>
</top>
';
Index: tp/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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- tp/t/results/converters_tests/things_before_setfilename_no_element.pl
9 Nov 2012 22:30:16 -0000 1.20
+++ tp/t/results/converters_tests/things_before_setfilename_no_element.pl
21 Dec 2012 00:30:46 -0000 1.21
@@ -1688,17 +1688,17 @@
</preamble><anchor name="An-anchor">An anchor</anchor>
<para>Ref to the anchor:
-<ref><xrefnodename>An anchor</xrefnodename></ref>
+<ref label="An-anchor"><xrefnodename>An anchor</xrefnodename></ref>
</para>
<para>Ref to the anchor in footnote:
-<ref><xrefnodename>Anchor in footnote</xrefnodename></ref>.
+<ref label="Anchor-in-footnote"><xrefnodename>Anchor in
footnote</xrefnodename></ref>.
</para>
<para><footnote><para>In footnote.
</para>
<anchor name="Anchor-in-footnote">Anchor in footnote</anchor>
<para>Ref to main text anchor
-<ref><xrefnodename>An anchor</xrefnodename></ref>
+<ref label="An-anchor"><xrefnodename>An anchor</xrefnodename></ref>
</para></footnote>
</para>
<float name="float-anchor" type="" spaces=" " endspaces=" "><floatname
spaces=" ">float anchor</floatname>
@@ -1706,7 +1706,7 @@
</para></float>
<para>Ref to float
-<ref><xrefnodename>float anchor</xrefnodename></ref>.
+<ref label="float-anchor"><xrefnodename>float anchor</xrefnodename></ref>.
</para>
<float name="ta" type="Text" spaces=" " endspaces="
"><floattype>Text</floattype><floatname spaces=" ">ta</floatname>
<para>In float
@@ -1729,10 +1729,10 @@
<setfilename file="things_before_setfilename_no_element.info" spaces="
">things_before_setfilename_no_element.info </setfilename>
<para>Ref to anchor
-<ref><xrefnodename>An anchor</xrefnodename></ref>
+<ref label="An-anchor"><xrefnodename>An anchor</xrefnodename></ref>
</para>
<para>Ref to footnote anchor
-<ref><xrefnodename>Anchor in footnote</xrefnodename></ref>
+<ref label="Anchor-in-footnote"><xrefnodename>Anchor in
footnote</xrefnodename></ref>
</para>
';
Index: tp/t/results/converters_tests/top_in_ref.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tp/t/results/converters_tests/top_in_ref.pl 16 Sep 2012 21:08:56 -0000
1.7
+++ tp/t/results/converters_tests/top_in_ref.pl 21 Dec 2012 00:30:46 -0000
1.8
@@ -4838,40 +4838,40 @@
$result_converted{'xml'}->{'top_in_ref'} = '<node name="Top" spaces="
"><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
-<para><code>&arobase;ref{Top,cross ref name}</code>
<ref><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{Top,,title}</code>
<ref><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{Top,,,file name}</code>
<ref><xrefnodename>Top</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{Top,,,,manual}</code>
<ref><xrefnodename>Top</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{Top,cross ref name,title,}</code>
<ref><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{Top,cross ref name,,file name}</code>
<ref><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{Top,cross ref name,,,manual}</code>
<ref><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{Top,cross ref name,title,file name}</code>
<ref><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{Top,cross ref name,title,,manual}</code>
<ref><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{Top,cross ref name,title, file name,
manual}</code> <ref><xrefnodename>Top</xrefnodename><xrefinfoname>cross
ref name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{Top,,title,file name}</code>
<ref><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{Top,,title,,manual}</code>
<ref><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{Top,,title, file name, manual}</code>
<ref><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{Top,,,file name,manual}</code>
<ref><xrefnodename>Top</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<para><code>&arobase;ref{Top,cross ref name}</code> <ref
label="Top"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{Top,,title}</code> <ref
label="Top"><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{Top,,,file name}</code> <ref label="Top"
manual="file name"><xrefnodename>Top</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{Top,,,,manual}</code> <ref
label="Top"><xrefnodename>Top</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{Top,cross ref name,title,}</code> <ref
label="Top"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{Top,cross ref name,,file name}</code> <ref
label="Top" manual="file
name"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{Top,cross ref name,,,manual}</code> <ref
label="Top"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{Top,cross ref name,title,file name}</code>
<ref label="Top" manual="file
name"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{Top,cross ref name,title,,manual}</code> <ref
label="Top"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{Top,cross ref name,title, file name,
manual}</code> <ref label="Top" manual="file
name"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{Top,,title,file name}</code> <ref label="Top"
manual="file
name"><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{Top,,title,,manual}</code> <ref
label="Top"><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{Top,,title, file name, manual}</code> <ref
label="Top" manual="file
name"><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{Top,,,file name,manual}</code> <ref
label="Top" manual="file
name"><xrefnodename>Top</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
-<para><code>&arobase;ref{(pman)Top,cross ref name}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{(pman)Top,,title}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{(pman)Top,,,file name}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)Top,,,,manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)Top,cross ref name,title,}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{(pman)Top,cross ref name,,file name}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)Top,cross ref name,,,manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)Top,cross ref name,title,file
name}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)Top,cross ref
name,title,,manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)Top,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)Top,,title,file name}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)Top,,title,,manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)Top,,title, file name, manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)Top,,,file name,manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<para><code>&arobase;ref{(pman)Top,cross ref name}</code> <ref
label="Top"
manual="pman"><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{(pman)Top,,title}</code> <ref label="Top"
manual="pman"><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{(pman)Top,,,file name}</code> <ref
label="Top" manual="file
name"><xrefnodename>(pman)Top</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)Top,,,,manual}</code> <ref label="Top"
manual="pman"><xrefnodename>(pman)Top</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)Top,cross ref name,title,}</code> <ref
label="Top"
manual="pman"><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{(pman)Top,cross ref name,,file name}</code>
<ref label="Top" manual="file
name"><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)Top,cross ref name,,,manual}</code>
<ref label="Top"
manual="pman"><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)Top,cross ref name,title,file
name}</code> <ref label="Top" manual="file
name"><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)Top,cross ref
name,title,,manual}</code> <ref label="Top"
manual="pman"><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)Top,cross ref name,title, file name,
manual}</code> <ref label="Top" manual="file
name"><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)Top,,title,file name}</code> <ref
label="Top" manual="file
name"><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)Top,,title,,manual}</code> <ref
label="Top"
manual="pman"><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)Top,,title, file name, manual}</code>
<ref label="Top" manual="file
name"><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)Top,,,file name,manual}</code> <ref
label="Top" manual="file
name"><xrefnodename>(pman)Top</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
-<para><code>&arobase;inforef{Top, cross ref name, file
name}</code>
<inforef><inforefnodename>Top</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{Top}</code>
<inforef><inforefnodename>Top</inforefnodename></inforef>
-<code>&arobase;inforef{Top, cross ref name}</code>
<inforef><inforefnodename>Top</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname></inforef>
-<code>&arobase;inforef{Top,,file name}</code>
<inforef><inforefnodename>Top</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
+<para><code>&arobase;inforef{Top, cross ref name, file
name}</code> <inforef label="Top" manual="file
name"><inforefnodename>Top</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{Top}</code> <inforef
label="Top"><inforefnodename>Top</inforefnodename></inforef>
+<code>&arobase;inforef{Top, cross ref name}</code> <inforef
label="Top"><inforefnodename>Top</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
+<code>&arobase;inforef{Top,,file name}</code> <inforef
label="Top" manual="file
name"><inforefnodename>Top</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
</para>';
Index:
tp/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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
---
tp/t/results/converters_tests/char_latin1_latin1_in_refs/res_xml/char_latin1_utf8_in_refs.xml
18 Dec 2012 23:38:30 -0000 1.3
+++
tp/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
@@ -41,11 +41,11 @@
<node name="_00e7" spaces=" "><nodename>ç</nodename><nodeprev automatic="on">â
ê î ô û Â Ê Î Ô Û</nodeprev><nodeup automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>ç</sectiontitle>
-<para><ref><xrefnodename>ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</xrefnodename></ref>
-<ref><xrefnodename>é</xrefnodename></ref>
-<ref><xrefnodename>à è ù</xrefnodename></ref>
-<ref><xrefnodename>â ê î ô û Â Ê Î Ô Û</xrefnodename></ref>
-<ref><xrefnodename>ç</xrefnodename></ref>
+<para><ref
label="_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"><xrefnodename>ä
ë ï ö ü ÿ Ä Ë Ï Ö Ü</xrefnodename></ref>
+<ref label="_00e9"><xrefnodename>é</xrefnodename></ref>
+<ref label="_00e0-_00e8-_00f9"><xrefnodename>à è ù</xrefnodename></ref>
+<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>
Index: tp/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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- tp/tests/layout/res_parser/formatting_xml/formatting.xml 18 Dec 2012
23:38:30 -0000 1.16
+++ tp/tests/layout/res_parser/formatting_xml/formatting.xml 21 Dec 2012
00:30:46 -0000 1.17
@@ -1199,66 +1199,66 @@
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
-<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code>
<xref><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname spaces="
">cross r&textmdash;ef name&arobase;</xrefinfoname><xrefprinteddesc spaces="
">t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile spaces=" ">file
n---ame&arobase;</xrefinfofile><xrefprintedname spaces="
">ma&textmdash;nual&arobase;</xrefprintedname></xref>.
-<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
-<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code> <pxref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></pxref>
-<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-</para>
-<para><code>&arobase;ref{chapter}</code>
<ref><xrefnodename>chapter</xrefnodename></ref>
-<code>&arobase;xref{chapter}</code>
<xref><xrefnodename>chapter</xrefnodename></xref>.
-<code>&arobase;pxref{chapter}</code>
<pxref><xrefnodename>chapter</xrefnodename></pxref>
-<code>&arobase;ref{s--ect&arobase;comma{}ion}</code>
<ref><xrefnodename>s--ect,ion</xrefnodename></ref>
+<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code> <xref
label="c_002d_002d_002dhapter_0040" manual="file
n---ame@"><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname
spaces=" ">cross r&textmdash;ef name&arobase;</xrefinfoname><xrefprinteddesc
spaces=" ">t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile spaces="
">file n---ame&arobase;</xrefinfofile><xrefprintedname spaces="
">ma&textmdash;nual&arobase;</xrefprintedname></xref>.
+<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname spaces=" ">cross ref
name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
+<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code> <pxref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname spaces=" ">cross ref
name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></pxref>
+<code>&arobase;inforef{chapter, cross ref name, file
name}</code> <inforef label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+</para>
+<para><code>&arobase;ref{chapter}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename></ref>
+<code>&arobase;xref{chapter}</code> <xref
label="chapter"><xrefnodename>chapter</xrefnodename></xref>.
+<code>&arobase;pxref{chapter}</code> <pxref
label="chapter"><xrefnodename>chapter</xrefnodename></pxref>
+<code>&arobase;ref{s--ect&arobase;comma{}ion}</code>
<ref
label="s_002d_002dect_002cion"><xrefnodename>s--ect,ion</xrefnodename></ref>
</para>
<para><code>&arobase;ref{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in title, a
comma&arobase;comma{} in file, a &arobase;comma{}
in manual name }</code>
-<ref><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname spaces=" ">a
, in cross
+<ref label="s_002d_002dect_002cion" manual="a comma, in
file"><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname spaces=" ">a
, in cross
ref</xrefinfoname><xrefprinteddesc spaces=" ">a comma, in
title</xrefprinteddesc><xrefinfofile spaces=" ">a comma, in
file</xrefinfofile><xrefprintedname spaces=" ">a , in manual name
</xrefprintedname></ref>
</para>
-<para><code>&arobase;ref{chapter,cross ref name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{chapter,,title}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{chapter,,,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title,}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{chapter,cross ref name,,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,cross ref name,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title,file
name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,,file name,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-</para>
-
-<para><code>&arobase;ref{(pman)anode,cross ref name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{(pman)anode,,title}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{(pman)anode,,,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title,}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,,file name,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-</para>
-
-<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter}</code>
<inforef><inforefnodename>chapter</inforefnodename></inforef>
-<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
-<code>&arobase;inforef{chapter,,file name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node}</code>
<inforef><inforefnodename>node</inforefnodename></inforef>
-<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
-<code>&arobase;inforef{node,,file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file name,
spurious arg</inforefinfoname></inforef>
+<para><code>&arobase;ref{chapter,cross ref name}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{chapter,,title}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{chapter,,,file name}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,,,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title,}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{chapter,cross ref name,,file name}</code>
<ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,cross ref name,,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title,file
name}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross
ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title,file name}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,,title,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,,file name,manual}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+</para>
+
+<para><code>&arobase;ref{(pman)anode,cross ref name}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{(pman)anode,,title}</code> <ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{(pman)anode,,,file name}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,,,,manual}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title,}</code>
<ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,,file name}</code>
<ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code> <ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code> <ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code> <ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title,file name}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,,title,,manual}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,,file name,manual}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+</para>
+
+<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code> <inforef label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter}</code> <inforef
label="chapter"><inforefnodename>chapter</inforefnodename></inforef>
+<code>&arobase;inforef{chapter, cross ref name}</code> <inforef
label="chapter"><inforefnodename>chapter</inforefnodename><inforefrefname
spaces=" ">cross ref name</inforefrefname></inforef>
+<code>&arobase;inforef{chapter,,file name}</code> <inforef
label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef label="node" manual="file
name"><inforefnodename>node</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{node}</code> <inforef
label="node"><inforefnodename>node</inforefnodename></inforef>
+<code>&arobase;inforef{node, cross ref name}</code> <inforef
label="node"><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
+<code>&arobase;inforef{node,,file name}</code> <inforef
label="node" manual="file
name"><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code> <inforef label="chapter" manual="file name, spurious
arg"><inforefnodename>chapter</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname><inforefinfoname spaces=" ">file name, spurious
arg</inforefinfoname></inforef>
</para>
<para><code>&arobase;inforef{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in file}</code>
-<inforef><inforefnodename>s--ect,ion</inforefnodename><inforefrefname
spaces=" ">a , in cross
+<inforef label="s_002d_002dect_002cion" manual="a comma, in
file"><inforefnodename>s--ect,ion</inforefnodename><inforefrefname
spaces=" ">a , in cross
ref</inforefrefname><inforefinfoname spaces=" ">a comma, in
file</inforefinfoname></inforef>
</para>
@@ -1800,66 +1800,66 @@
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
-<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code>
<xref><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname spaces="
">cross r&textmdash;ef name&arobase;</xrefinfoname><xrefprinteddesc spaces="
">t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile spaces=" ">file
n---ame&arobase;</xrefinfofile><xrefprintedname spaces="
">ma&textmdash;nual&arobase;</xrefprintedname></xref>.
-<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
-<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code> <pxref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></pxref>
-<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-</para>
-<para><code>&arobase;ref{chapter}</code>
<ref><xrefnodename>chapter</xrefnodename></ref>
-<code>&arobase;xref{chapter}</code>
<xref><xrefnodename>chapter</xrefnodename></xref>.
-<code>&arobase;pxref{chapter}</code>
<pxref><xrefnodename>chapter</xrefnodename></pxref>
-<code>&arobase;ref{s--ect&arobase;comma{}ion}</code>
<ref><xrefnodename>s--ect,ion</xrefnodename></ref>
+<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code> <xref
label="c_002d_002d_002dhapter_0040" manual="file
n---ame@"><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname
spaces=" ">cross r&textmdash;ef name&arobase;</xrefinfoname><xrefprinteddesc
spaces=" ">t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile spaces="
">file n---ame&arobase;</xrefinfofile><xrefprintedname spaces="
">ma&textmdash;nual&arobase;</xrefprintedname></xref>.
+<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname spaces=" ">cross ref
name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
+<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code> <pxref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname spaces=" ">cross ref
name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></pxref>
+<code>&arobase;inforef{chapter, cross ref name, file
name}</code> <inforef label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+</para>
+<para><code>&arobase;ref{chapter}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename></ref>
+<code>&arobase;xref{chapter}</code> <xref
label="chapter"><xrefnodename>chapter</xrefnodename></xref>.
+<code>&arobase;pxref{chapter}</code> <pxref
label="chapter"><xrefnodename>chapter</xrefnodename></pxref>
+<code>&arobase;ref{s--ect&arobase;comma{}ion}</code>
<ref
label="s_002d_002dect_002cion"><xrefnodename>s--ect,ion</xrefnodename></ref>
</para>
<para><code>&arobase;ref{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in title, a
comma&arobase;comma{} in file, a &arobase;comma{}
in manual name }</code>
-<ref><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname spaces=" ">a
, in cross
+<ref label="s_002d_002dect_002cion" manual="a comma, in
file"><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname spaces=" ">a
, in cross
ref</xrefinfoname><xrefprinteddesc spaces=" ">a comma, in
title</xrefprinteddesc><xrefinfofile spaces=" ">a comma, in
file</xrefinfofile><xrefprintedname spaces=" ">a , in manual name
</xrefprintedname></ref>
</para>
-<para><code>&arobase;ref{chapter,cross ref name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{chapter,,title}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{chapter,,,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title,}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{chapter,cross ref name,,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,cross ref name,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title,file
name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,,file name,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-</para>
-
-<para><code>&arobase;ref{(pman)anode,cross ref name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{(pman)anode,,title}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{(pman)anode,,,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title,}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,,file name,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-</para>
-
-<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter}</code>
<inforef><inforefnodename>chapter</inforefnodename></inforef>
-<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
-<code>&arobase;inforef{chapter,,file name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node}</code>
<inforef><inforefnodename>node</inforefnodename></inforef>
-<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
-<code>&arobase;inforef{node,,file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file name,
spurious arg</inforefinfoname></inforef>
+<para><code>&arobase;ref{chapter,cross ref name}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{chapter,,title}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{chapter,,,file name}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,,,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title,}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{chapter,cross ref name,,file name}</code>
<ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,cross ref name,,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title,file
name}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross
ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title,file name}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,,title,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,,file name,manual}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+</para>
+
+<para><code>&arobase;ref{(pman)anode,cross ref name}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{(pman)anode,,title}</code> <ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{(pman)anode,,,file name}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,,,,manual}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title,}</code>
<ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,,file name}</code>
<ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code> <ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code> <ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code> <ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title,file name}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,,title,,manual}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,,file name,manual}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+</para>
+
+<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code> <inforef label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter}</code> <inforef
label="chapter"><inforefnodename>chapter</inforefnodename></inforef>
+<code>&arobase;inforef{chapter, cross ref name}</code> <inforef
label="chapter"><inforefnodename>chapter</inforefnodename><inforefrefname
spaces=" ">cross ref name</inforefrefname></inforef>
+<code>&arobase;inforef{chapter,,file name}</code> <inforef
label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef label="node" manual="file
name"><inforefnodename>node</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{node}</code> <inforef
label="node"><inforefnodename>node</inforefnodename></inforef>
+<code>&arobase;inforef{node, cross ref name}</code> <inforef
label="node"><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
+<code>&arobase;inforef{node,,file name}</code> <inforef
label="node" manual="file
name"><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code> <inforef label="chapter" manual="file name, spurious
arg"><inforefnodename>chapter</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname><inforefinfoname spaces=" ">file name, spurious
arg</inforefinfoname></inforef>
</para>
<para><code>&arobase;inforef{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in file}</code>
-<inforef><inforefnodename>s--ect,ion</inforefnodename><inforefrefname
spaces=" ">a , in cross
+<inforef label="s_002d_002dect_002cion" manual="a comma, in
file"><inforefnodename>s--ect,ion</inforefnodename><inforefrefname
spaces=" ">a , in cross
ref</inforefrefname><inforefinfoname spaces=" ">a comma, in
file</inforefinfoname></inforef>
</para>
@@ -2401,66 +2401,66 @@
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
-<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code>
<xref><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname spaces="
">cross r&textmdash;ef name&arobase;</xrefinfoname><xrefprinteddesc spaces="
">t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile spaces=" ">file
n---ame&arobase;</xrefinfofile><xrefprintedname spaces="
">ma&textmdash;nual&arobase;</xrefprintedname></xref>.
-<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
-<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code> <pxref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></pxref>
-<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-</para>
-<para><code>&arobase;ref{chapter}</code>
<ref><xrefnodename>chapter</xrefnodename></ref>
-<code>&arobase;xref{chapter}</code>
<xref><xrefnodename>chapter</xrefnodename></xref>.
-<code>&arobase;pxref{chapter}</code>
<pxref><xrefnodename>chapter</xrefnodename></pxref>
-<code>&arobase;ref{s--ect&arobase;comma{}ion}</code>
<ref><xrefnodename>s--ect,ion</xrefnodename></ref>
+<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code> <xref
label="c_002d_002d_002dhapter_0040" manual="file
n---ame@"><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname
spaces=" ">cross r&textmdash;ef name&arobase;</xrefinfoname><xrefprinteddesc
spaces=" ">t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile spaces="
">file n---ame&arobase;</xrefinfofile><xrefprintedname spaces="
">ma&textmdash;nual&arobase;</xrefprintedname></xref>.
+<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname spaces=" ">cross ref
name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
+<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code> <pxref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname spaces=" ">cross ref
name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></pxref>
+<code>&arobase;inforef{chapter, cross ref name, file
name}</code> <inforef label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+</para>
+<para><code>&arobase;ref{chapter}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename></ref>
+<code>&arobase;xref{chapter}</code> <xref
label="chapter"><xrefnodename>chapter</xrefnodename></xref>.
+<code>&arobase;pxref{chapter}</code> <pxref
label="chapter"><xrefnodename>chapter</xrefnodename></pxref>
+<code>&arobase;ref{s--ect&arobase;comma{}ion}</code>
<ref
label="s_002d_002dect_002cion"><xrefnodename>s--ect,ion</xrefnodename></ref>
</para>
<para><code>&arobase;ref{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in title, a
comma&arobase;comma{} in file, a &arobase;comma{}
in manual name }</code>
-<ref><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname spaces=" ">a
, in cross
+<ref label="s_002d_002dect_002cion" manual="a comma, in
file"><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname spaces=" ">a
, in cross
ref</xrefinfoname><xrefprinteddesc spaces=" ">a comma, in
title</xrefprinteddesc><xrefinfofile spaces=" ">a comma, in
file</xrefinfofile><xrefprintedname spaces=" ">a , in manual name
</xrefprintedname></ref>
</para>
-<para><code>&arobase;ref{chapter,cross ref name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{chapter,,title}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{chapter,,,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title,}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{chapter,cross ref name,,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,cross ref name,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title,file
name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,,file name,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-</para>
-
-<para><code>&arobase;ref{(pman)anode,cross ref name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{(pman)anode,,title}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{(pman)anode,,,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title,}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,,file name,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-</para>
-
-<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter}</code>
<inforef><inforefnodename>chapter</inforefnodename></inforef>
-<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
-<code>&arobase;inforef{chapter,,file name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node}</code>
<inforef><inforefnodename>node</inforefnodename></inforef>
-<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
-<code>&arobase;inforef{node,,file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file name,
spurious arg</inforefinfoname></inforef>
+<para><code>&arobase;ref{chapter,cross ref name}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{chapter,,title}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{chapter,,,file name}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,,,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title,}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{chapter,cross ref name,,file name}</code>
<ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,cross ref name,,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title,file
name}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross
ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title,file name}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,,title,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,,file name,manual}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+</para>
+
+<para><code>&arobase;ref{(pman)anode,cross ref name}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{(pman)anode,,title}</code> <ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{(pman)anode,,,file name}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,,,,manual}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title,}</code>
<ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,,file name}</code>
<ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code> <ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code> <ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code> <ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title,file name}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,,title,,manual}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,,file name,manual}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+</para>
+
+<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code> <inforef label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter}</code> <inforef
label="chapter"><inforefnodename>chapter</inforefnodename></inforef>
+<code>&arobase;inforef{chapter, cross ref name}</code> <inforef
label="chapter"><inforefnodename>chapter</inforefnodename><inforefrefname
spaces=" ">cross ref name</inforefrefname></inforef>
+<code>&arobase;inforef{chapter,,file name}</code> <inforef
label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef label="node" manual="file
name"><inforefnodename>node</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{node}</code> <inforef
label="node"><inforefnodename>node</inforefnodename></inforef>
+<code>&arobase;inforef{node, cross ref name}</code> <inforef
label="node"><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
+<code>&arobase;inforef{node,,file name}</code> <inforef
label="node" manual="file
name"><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code> <inforef label="chapter" manual="file name, spurious
arg"><inforefnodename>chapter</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname><inforefinfoname spaces=" ">file name, spurious
arg</inforefinfoname></inforef>
</para>
<para><code>&arobase;inforef{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in file}</code>
-<inforef><inforefnodename>s--ect,ion</inforefnodename><inforefrefname
spaces=" ">a , in cross
+<inforef label="s_002d_002dect_002cion" manual="a comma, in
file"><inforefnodename>s--ect,ion</inforefnodename><inforefrefname
spaces=" ">a , in cross
ref</inforefrefname><inforefinfoname spaces=" ">a comma, in
file</inforefinfoname></inforef>
</para>
@@ -2996,66 +2996,66 @@
<definitionitem><pre xml:space="preserve">d--eftypemethod
</pre></definitionitem></deftypemethod>
<pre xml:space="preserve">
-<code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code>
<xref><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname spaces="
">cross r---ef name&arobase;</xrefinfoname><xrefprinteddesc spaces="
">t---itle&arobase;</xrefprinteddesc><xrefinfofile spaces=" ">file
n---ame&arobase;</xrefinfofile><xrefprintedname spaces="
">ma---nual&arobase;</xrefprintedname></xref>.
-<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
-<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code> <pxref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></pxref>
-<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-
-<code>&arobase;ref{chapter}</code>
<ref><xrefnodename>chapter</xrefnodename></ref>
-<code>&arobase;xref{chapter}</code>
<xref><xrefnodename>chapter</xrefnodename></xref>.
-<code>&arobase;pxref{chapter}</code>
<pxref><xrefnodename>chapter</xrefnodename></pxref>
-<code>&arobase;ref{s--ect&arobase;comma{}ion}</code>
<ref><xrefnodename>s--ect,ion</xrefnodename></ref>
+<code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code> <xref
label="c_002d_002d_002dhapter_0040" manual="file
n---ame@"><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname
spaces=" ">cross r---ef name&arobase;</xrefinfoname><xrefprinteddesc spaces="
">t---itle&arobase;</xrefprinteddesc><xrefinfofile spaces=" ">file
n---ame&arobase;</xrefinfofile><xrefprintedname spaces="
">ma---nual&arobase;</xrefprintedname></xref>.
+<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname spaces=" ">cross ref
name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
+<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code> <pxref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname spaces=" ">cross ref
name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></pxref>
+<code>&arobase;inforef{chapter, cross ref name, file
name}</code> <inforef label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+
+<code>&arobase;ref{chapter}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename></ref>
+<code>&arobase;xref{chapter}</code> <xref
label="chapter"><xrefnodename>chapter</xrefnodename></xref>.
+<code>&arobase;pxref{chapter}</code> <pxref
label="chapter"><xrefnodename>chapter</xrefnodename></pxref>
+<code>&arobase;ref{s--ect&arobase;comma{}ion}</code>
<ref
label="s_002d_002dect_002cion"><xrefnodename>s--ect,ion</xrefnodename></ref>
<code>&arobase;ref{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in title, a
comma&arobase;comma{} in file, a &arobase;comma{}
in manual name }</code>
-<ref><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname spaces=" ">a
, in cross
+<ref label="s_002d_002dect_002cion" manual="a comma, in
file"><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname spaces=" ">a
, in cross
ref</xrefinfoname><xrefprinteddesc spaces=" ">a comma, in
title</xrefprinteddesc><xrefinfofile spaces=" ">a comma, in
file</xrefinfofile><xrefprintedname spaces=" ">a , in manual name
</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{chapter,,title}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{chapter,,,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title,}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{chapter,cross ref name,,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,cross ref name,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title,file
name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{chapter,,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,,file name,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-
-
-<code>&arobase;ref{(pman)anode,cross ref name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
-<code>&arobase;ref{(pman)anode,,title}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{(pman)anode,,,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title,}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
-<code>&arobase;ref{(pman)anode,,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,,file name,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-
-
-<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter}</code>
<inforef><inforefnodename>chapter</inforefnodename></inforef>
-<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
-<code>&arobase;inforef{chapter,,file name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node}</code>
<inforef><inforefnodename>node</inforefnodename></inforef>
-<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
-<code>&arobase;inforef{node,,file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file name,
spurious arg</inforefinfoname></inforef>
+<code>&arobase;ref{chapter,cross ref name}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{chapter,,title}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{chapter,,,file name}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,,,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title,}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{chapter,cross ref name,,file name}</code>
<ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,cross ref name,,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title,file
name}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross
ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title,file name}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{chapter,,title,,manual}</code> <ref
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,,file name,manual}</code> <ref
label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+
+
+<code>&arobase;ref{(pman)anode,cross ref name}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
+<code>&arobase;ref{(pman)anode,,title}</code> <ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{(pman)anode,,,file name}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,,,,manual}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title,}</code>
<ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,,file name}</code>
<ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code> <ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code> <ref label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code> <ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title,file name}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
+<code>&arobase;ref{(pman)anode,,title,,manual}</code> <ref
label="anode"
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,,file name,manual}</code> <ref
label="anode" manual="file
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+
+
+<code>&arobase;inforef{chapter, cross ref name, file
name}</code> <inforef label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter}</code> <inforef
label="chapter"><inforefnodename>chapter</inforefnodename></inforef>
+<code>&arobase;inforef{chapter, cross ref name}</code> <inforef
label="chapter"><inforefnodename>chapter</inforefnodename><inforefrefname
spaces=" ">cross ref name</inforefrefname></inforef>
+<code>&arobase;inforef{chapter,,file name}</code> <inforef
label="chapter" manual="file
name"><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef label="node" manual="file
name"><inforefnodename>node</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{node}</code> <inforef
label="node"><inforefnodename>node</inforefnodename></inforef>
+<code>&arobase;inforef{node, cross ref name}</code> <inforef
label="node"><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
+<code>&arobase;inforef{node,,file name}</code> <inforef
label="node" manual="file
name"><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code> <inforef label="chapter" manual="file name, spurious
arg"><inforefnodename>chapter</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname><inforefinfoname spaces=" ">file name, spurious
arg</inforefinfoname></inforef>
<code>&arobase;inforef{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in file}</code>
-<inforef><inforefnodename>s--ect,ion</inforefnodename><inforefrefname
spaces=" ">a , in cross
+<inforef label="s_002d_002dect_002cion" manual="a comma, in
file"><inforefnodename>s--ect,ion</inforefnodename><inforefrefname
spaces=" ">a , in cross
ref</inforefrefname><inforefinfoname spaces=" ">a comma, in
file</inforefinfoname></inforef>
Index: util/texinfo.dtd
===================================================================
RCS file: /sources/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- util/texinfo.dtd 15 Dec 2012 18:19:16 -0000 1.34
+++ util/texinfo.dtd 21 Dec 2012 00:30:46 -0000 1.35
@@ -1,4 +1,4 @@
-<!-- $Id: texinfo.dtd,v 1.34 2012/12/15 18:19:16 pertusus Exp $
+<!-- $Id: texinfo.dtd,v 1.35 2012/12/21 00:30:46 pertusus Exp $
Document Type Definition for Texinfo XML output (the '-'-xml option).
Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
@@ -1062,16 +1062,20 @@
<!ENTITY % xref.args "xrefnodename?, xrefinfoname?, xrefprinteddesc?,
xrefinfofile?, xrefprintedname?">
+<!ENTITY % xref.attr
+ "%spacesattr;
+ label CDATA #IMPLIED
+ manual CDATA #IMPLIED">
<!ELEMENT xref (%xref.args;)>
<!ATTLIST xref
- %spacesattr;>
+ %xref.attr;>
<!ELEMENT ref (%xref.args;)>
<!ATTLIST ref
- %spacesattr;>
+ %xref.attr;>
<!ELEMENT pxref (%xref.args;)>
<!ATTLIST pxref
- %spacesattr;>
+ %xref.attr;>
<!ELEMENT xrefnodename (#PCDATA | %Inline.phrase;)*>
<!ELEMENT xrefinfoname (#PCDATA | %Inline.phrase;)*>
@@ -1089,7 +1093,7 @@
<!ELEMENT inforef (inforefnodename?, inforefrefname?, inforefinfoname?)>
<!ATTLIST inforef
- %spacesattr;>
+ %xref.attr;>
<!ELEMENT inforefnodename (#PCDATA | %Inline.phrase;)*>
<!ELEMENT inforefrefname (#PCDATA | %Inline.phrase;)*>
<!ATTLIST inforefrefname
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo tp/Texinfo/Convert/Text.pm tp/Texinfo/C...,
Patrice Dumas <=