[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Tue, 16 Aug 2022 13:40:27 -0400 (EDT) |
branch: master
commit 47ed47c70a09e941767faece00c69d0472431597
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Aug 16 19:40:13 2022 +0200
* tp/Texinfo/Convert/DocBook.pm (_convert): do not use section in
external references formatting if it is a node.
---
ChangeLog | 5 ++
tp/Texinfo/Convert/DocBook.pm | 50 ++++++++++++---
.../converters_tests/ref_error_formatting.pl | 6 +-
tp/t/results/converters_tests/ref_in_sectioning.pl | 8 +--
tp/t/results/converters_tests/refs_formatting.pl | 12 ++--
.../some_at_commands_in_ref_nodes.pl | 2 +-
tp/t/results/converters_tests/top_in_ref.pl | 8 +--
.../res_parser/formatting_docbook/formatting.xml | 72 +++++++++++-----------
8 files changed, 101 insertions(+), 62 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 36575a6616..908648c582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-08-16 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/DocBook.pm (_convert): do not use section in
+ external references formatting if it is a node.
+
2022-08-16 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/DocBook.pm (_convert): reuse already converted
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index eea891ff6b..7ac8acfc93 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1077,7 +1077,7 @@ sub _convert($$;$)
and @{$element->{'args'}->[3]->{'contents'}}) {
$manual_file_contents = $element->{'args'}->[3]->{'contents'};
}
- my $section_name;
+ my ($section_name, $node_name);
if (defined($element->{'args'}->[2])
and @{$element->{'args'}->[2]->{'contents'}}) {
my $section_name_contents =
$element->{'args'}->[2]->{'contents'};
@@ -1093,14 +1093,12 @@ sub _convert($$;$)
and @{$element->{'args'}->[0]->{'contents'}}) {
my $node_contents
= $element->{'args'}->[0]->{'contents'};
- $section_name = $self->_convert(
+ $node_name = $self->_convert(
{'contents' => $node_contents});
- if ($book_contents
- and
!$element->{'extra'}->{'node_argument'}->{'manual_content'}) {
- if ($section_name eq 'Top') {
- $section_name = undef;
- }
+ if (($book_contents or $manual_file_contents)
+ and $node_name eq 'Top') {
+ $node_name = undef;
}
}
@@ -1123,6 +1121,23 @@ sub _convert($$;$)
{ 'section_name' => {'type' => '_converted', 'text' =>
$section_name},
'book' => $book_contents }));
}
+ } elsif ($node_name) {
+ if ($element->{'cmdname'} eq 'ref') {
+ return $self->_convert(
+ $self->gdt('``{node_name}\'\' in @cite{{book}}',
+ { 'node_name' => {'type' => '_converted', 'text' =>
$node_name},
+ 'book' => $book_contents }));
+ } elsif ($element->{'cmdname'} eq 'xref') {
+ return $self->_convert(
+ $self->gdt('See ``{node_name}\'\' in @cite{{book}}',
+ { 'node_name' => {'type' => '_converted', 'text' =>
$node_name},
+ 'book' => $book_contents }));
+ } elsif ($element->{'cmdname'} eq 'pxref') {
+ return $self->_convert(
+ $self->gdt('see ``{node_name}\'\' in @cite{{book}}',
+ { 'node_name' => {'type' => '_converted', 'text' =>
$node_name},
+ 'book' => $book_contents }));
+ }
} else {
if ($element->{'cmdname'} eq 'ref') {
return $self->_convert(
@@ -1156,6 +1171,23 @@ sub _convert($$;$)
{ 'section_name' => {'type' => '_converted', 'text' =>
$section_name},
'manual' => $manual_file_contents }));
}
+ } elsif ($node_name) {
+ if ($element->{'cmdname'} eq 'ref') {
+ return $self->_convert(
+ $self->gdt('``{node_name}\'\' in @file{{manual}}',
+ { 'node_name' => {'type' => '_converted', 'text' =>
$node_name},
+ 'manual' => $manual_file_contents }));
+ } elsif ($element->{'cmdname'} eq 'xref') {
+ return $self->_convert(
+ $self->gdt('See ``{node_name}\'\' in @file{{manual}}',
+ { 'node_name' => {'type' => '_converted', 'text' =>
$node_name},
+ 'manual' => $manual_file_contents }));
+ } elsif ($element->{'cmdname'} eq 'pxref') {
+ return $self->_convert(
+ $self->gdt('see ``{node_name}\'\' in @file{{manual}}',
+ { 'node_name' => {'type' => '_converted', 'text' =>
$node_name},
+ 'manual' => $manual_file_contents }));
+ }
} else {
if ($element->{'cmdname'} eq 'ref') {
return $self->_convert(
@@ -1178,7 +1210,9 @@ sub _convert($$;$)
and
!$element->{'extra'}->{'node_argument'}->{'manual_content'}) {
$linkend = "
linkend=\"$element->{'extra'}->{'node_argument'}->{'normalized'}\"";
}
- my $argument = "<link${linkend}>".$section_name."</link>";
+ my $link_text = $section_name;
+ $link_text = $node_name if (! defined($link_text));
+ my $argument = "<link${linkend}>".$link_text."</link>";
if ($element->{'cmdname'} eq 'ref') {
return $self->_convert(
$self->gdt('{title_ref}', {'title_ref' =>
diff --git a/tp/t/results/converters_tests/ref_error_formatting.pl
b/tp/t/results/converters_tests/ref_error_formatting.pl
index 3d33b4f4fa..9879a9b2c8 100644
--- a/tp/t/results/converters_tests/ref_error_formatting.pl
+++ b/tp/t/results/converters_tests/ref_error_formatting.pl
@@ -4562,8 +4562,8 @@ $result_converted{'docbook'}->{'ref_error_formatting'} = '
<literal>@ref{,,,,manual}</literal> <citetitle>manual</citetitle>
<literal>@ref{node,cross ref name}</literal> <link linkend="node">cross ref
name</link>
<literal>@ref{node,,title}</literal> <link linkend="node">title</link>
-<literal>@ref{node,,,file name}</literal> section “node” in
<filename>file name</filename>
-<literal>@ref{node,,,,manual}</literal> section “node” in
<citetitle>manual</citetitle>
+<literal>@ref{node,,,file name}</literal> “node” in <filename>file
name</filename>
+<literal>@ref{node,,,,manual}</literal> “node” in
<citetitle>manual</citetitle>
<literal>@ref{node,cross ref name,title,}</literal> <link
linkend="node">title</link>
<literal>@ref{node,cross ref name,,file name}</literal> section “cross
ref name” in <filename>file name</filename>
<literal>@ref{node,cross ref name,,,manual}</literal> section “cross ref
name” in <citetitle>manual</citetitle>
@@ -4573,7 +4573,7 @@ $result_converted{'docbook'}->{'ref_error_formatting'} = '
<literal>@ref{node,,title,file name}</literal> section “title” in
<filename>file name</filename>
<literal>@ref{node,,title,,manual}</literal> section “title” in
<citetitle>manual</citetitle>
<literal>@ref{node,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{node,,,file name,manual}</literal> section “node” in
<citetitle>manual</citetitle>
+<literal>@ref{node,,,file name,manual}</literal> “node” in
<citetitle>manual</citetitle>
<literal>@ref{,cross ref name,title,}</literal> <link>title</link>
<literal>@ref{,cross ref name,,file name}</literal> section “cross ref
name” in <filename>file name</filename>
<literal>@ref{,cross ref name,,,manual}</literal> section “cross ref
name” in <citetitle>manual</citetitle>
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index e4da369441..0384abdce6 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2937,11 +2937,11 @@ $result_converted{'docbook'}->{'ref_in_sectioning'} =
'<chapter label="1" id="no
</sect1>
<sect1 label="2.4">
-<title>section “<literal>node</literal>” in <filename>file
name</filename> code node, file name</title>
+<title>“<literal>node</literal>” in <filename>file name</filename>
code node, file name</title>
</sect1>
<sect1 label="2.5">
-<title>section “node” in <citetitle>Manual</citetitle> node and
manual</title>
+<title>“node” in <citetitle>Manual</citetitle> node and
manual</title>
</sect1>
<sect1 label="2.6">
@@ -2961,7 +2961,7 @@ $result_converted{'docbook'}->{'ref_in_sectioning'} =
'<chapter label="1" id="no
</sect1>
<sect1 label="2.10">
-<title>(see section “Top” in <filename>file name</filename>) pxref
Top file name, spaces</title>
+<title>(see <filename>file name</filename>) pxref Top file name, spaces</title>
</sect1>
<sect1 label="2.11">
@@ -2969,7 +2969,7 @@ $result_converted{'docbook'}->{'ref_in_sectioning'} =
'<chapter label="1" id="no
</sect1>
<sect1 label="2.12">
-<title>See section “Top” in <filename>filename</filename>, xref
Top filename only, no spaces</title>
+<title>See <filename>filename</filename>, xref Top filename only, no
spaces</title>
</sect1>
<sect1 label="2.13">
diff --git a/tp/t/results/converters_tests/refs_formatting.pl
b/tp/t/results/converters_tests/refs_formatting.pl
index a0a7470188..e35e07da27 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -4548,8 +4548,8 @@ $result_converted{'docbook'}->{'refs_formatting'} =
'<chapter label="1" id="chap
<para><literal>@ref{chapter,cross ref name}</literal> <link
linkend="chapter">cross ref name</link>
<literal>@ref{chapter,,title}</literal> <link linkend="chapter">title</link>
-<literal>@ref{chapter,,,file name}</literal> section “chapter” in
<filename>file name</filename>
-<literal>@ref{chapter,,,,manual}</literal> section “chapter” in
<citetitle>manual</citetitle>
+<literal>@ref{chapter,,,file name}</literal> “chapter” in
<filename>file name</filename>
+<literal>@ref{chapter,,,,manual}</literal> “chapter” in
<citetitle>manual</citetitle>
<literal>@ref{chapter,cross ref name,title,}</literal> <link
linkend="chapter">title</link>
<literal>@ref{chapter,cross ref name,,file name}</literal> section
“cross ref name” in <filename>file name</filename>
<literal>@ref{chapter,cross ref name,,,manual}</literal> section “cross
ref name” in <citetitle>manual</citetitle>
@@ -4559,12 +4559,12 @@ $result_converted{'docbook'}->{'refs_formatting'} =
'<chapter label="1" id="chap
<literal>@ref{chapter,,title,file name}</literal> section “title”
in <filename>file name</filename>
<literal>@ref{chapter,,title,,manual}</literal> section “title” in
<citetitle>manual</citetitle>
<literal>@ref{chapter,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{chapter,,,file name,manual}</literal> section
“chapter” in <citetitle>manual</citetitle>
+<literal>@ref{chapter,,,file name,manual}</literal> “chapter” in
<citetitle>manual</citetitle>
</para>
<para><literal>@ref{(pman)anode,cross ref name}</literal> <link>cross ref
name</link>
<literal>@ref{(pman)anode,,title}</literal> <link>title</link>
-<literal>@ref{(pman)anode,,,file name}</literal> section
“(pman)anode” in <filename>file name</filename>
-<literal>@ref{(pman)anode,,,,manual}</literal> section
“(pman)anode” in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,,file name}</literal> “(pman)anode” in
<filename>file name</filename>
+<literal>@ref{(pman)anode,,,,manual}</literal> “(pman)anode” in
<citetitle>manual</citetitle>
<literal>@ref{(pman)anode,cross ref name,title,}</literal> <link>title</link>
<literal>@ref{(pman)anode,cross ref name,,file name}</literal> section
“cross ref name” in <filename>file name</filename>
<literal>@ref{(pman)anode,cross ref name,,,manual}</literal> section
“cross ref name” in <citetitle>manual</citetitle>
@@ -4574,7 +4574,7 @@ $result_converted{'docbook'}->{'refs_formatting'} =
'<chapter label="1" id="chap
<literal>@ref{(pman)anode,,title,file name}</literal> section
“title” in <filename>file name</filename>
<literal>@ref{(pman)anode,,title,,manual}</literal> section
“title” in <citetitle>manual</citetitle>
<literal>@ref{(pman)anode,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{(pman)anode,,,file name,manual}</literal> section
“(pman)anode” in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,,file name,manual}</literal>
“(pman)anode” in <citetitle>manual</citetitle>
</para>
<para><literal>@inforef{chapter, cross ref name, file name}</literal> See Info
file <filename>file name</filename>, node
‘<literal>chapter</literal>’
<literal>@inforef{chapter}</literal> See node
‘<literal>chapter</literal>’
diff --git a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index be391ee35b..672d2ca6ab 100644
--- a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
+++ b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
@@ -2283,7 +2283,7 @@
$result_converted{'xml'}->{'some_at_commands_in_ref_nodes'} = '
$result_converted{'docbook'}->{'some_at_commands_in_ref_nodes'} = '<chapter
label="1" id="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1">
<title>A SC node ï ï Ḕ ł Ḉ ¡</title>
-<para>see section “a <emphasis role="bold">strong</emphasis> ref with
SC, a i trema ï, a dotless i trema ï Ḕ and
exclamdown ¡” in <filename>manual</filename>.
+<para>see “a <emphasis role="bold">strong</emphasis> ref with SC, a
i trema ï, a dotless i trema ï Ḕ and exclamdown
¡” in <filename>manual</filename>.
</para>
<para>See <link
linkend="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1">A SC
Ñ Å &tex; node ï ï Ḕ ł Ḉ
¡</link>.
</para></chapter>
diff --git a/tp/t/results/converters_tests/top_in_ref.pl
b/tp/t/results/converters_tests/top_in_ref.pl
index 2d6c8f3fa2..2bcf3afc5f 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -4553,7 +4553,7 @@ $result_converted{'docbook'}->{'top_in_ref'} = '<anchor
id="refs-node"/>
<para><literal>@ref{Top,cross ref name}</literal> <link linkend="Top">cross
ref name</link>
<literal>@ref{Top,,title}</literal> <link linkend="Top">title</link>
-<literal>@ref{Top,,,file name}</literal> section “Top” in
<filename>file name</filename>
+<literal>@ref{Top,,,file name}</literal> <filename>file name</filename>
<literal>@ref{Top,,,,manual}</literal> <citetitle>manual</citetitle>
<literal>@ref{Top,cross ref name,title,}</literal> <link
linkend="Top">title</link>
<literal>@ref{Top,cross ref name,,file name}</literal> section “cross
ref name” in <filename>file name</filename>
@@ -4568,8 +4568,8 @@ $result_converted{'docbook'}->{'top_in_ref'} = '<anchor
id="refs-node"/>
</para>
<para><literal>@ref{(pman)Top,cross ref name}</literal> <link>cross ref
name</link>
<literal>@ref{(pman)Top,,title}</literal> <link>title</link>
-<literal>@ref{(pman)Top,,,file name}</literal> section “(pman)Top”
in <filename>file name</filename>
-<literal>@ref{(pman)Top,,,,manual}</literal> section “(pman)Top”
in <citetitle>manual</citetitle>
+<literal>@ref{(pman)Top,,,file name}</literal> “(pman)Top” in
<filename>file name</filename>
+<literal>@ref{(pman)Top,,,,manual}</literal> “(pman)Top” in
<citetitle>manual</citetitle>
<literal>@ref{(pman)Top,cross ref name,title,}</literal> <link>title</link>
<literal>@ref{(pman)Top,cross ref name,,file name}</literal> section
“cross ref name” in <filename>file name</filename>
<literal>@ref{(pman)Top,cross ref name,,,manual}</literal> section
“cross ref name” in <citetitle>manual</citetitle>
@@ -4579,7 +4579,7 @@ $result_converted{'docbook'}->{'top_in_ref'} = '<anchor
id="refs-node"/>
<literal>@ref{(pman)Top,,title,file name}</literal> section
“title” in <filename>file name</filename>
<literal>@ref{(pman)Top,,title,,manual}</literal> section “title”
in <citetitle>manual</citetitle>
<literal>@ref{(pman)Top,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{(pman)Top,,,file name,manual}</literal> section
“(pman)Top” in <citetitle>manual</citetitle>
+<literal>@ref{(pman)Top,,,file name,manual}</literal> “(pman)Top”
in <citetitle>manual</citetitle>
</para>
<para><literal>@inforef{Top, cross ref name, file name}</literal> See Info
file <filename>file name</filename>, node ‘<literal>Top</literal>’
<literal>@inforef{Top}</literal> See node ‘<literal>Top</literal>’
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index ecc65c5870..df70750128 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -595,8 +595,8 @@ section “a comma, in title” in <citetitle>a
, in manual name
</para>
<para><literal>@ref{chapter,cross ref name}</literal> <link
linkend="chapter">cross ref name</link>
<literal>@ref{chapter,,title}</literal> <link linkend="chapter">title</link>
-<literal>@ref{chapter,,,file name}</literal> section “chapter” in
<filename>file name</filename>
-<literal>@ref{chapter,,,,manual}</literal> section “chapter” in
<citetitle>manual</citetitle>
+<literal>@ref{chapter,,,file name}</literal> “chapter” in
<filename>file name</filename>
+<literal>@ref{chapter,,,,manual}</literal> “chapter” in
<citetitle>manual</citetitle>
<literal>@ref{chapter,cross ref name,title,}</literal> <link
linkend="chapter">title</link>
<literal>@ref{chapter,cross ref name,,file name}</literal> section
“cross ref name” in <filename>file name</filename>
<literal>@ref{chapter,cross ref name,,,manual}</literal> section “cross
ref name” in <citetitle>manual</citetitle>
@@ -606,13 +606,13 @@ section “a comma, in title” in
<citetitle>a , in manual name
<literal>@ref{chapter,,title,file name}</literal> section “title”
in <filename>file name</filename>
<literal>@ref{chapter,,title,,manual}</literal> section “title” in
<citetitle>manual</citetitle>
<literal>@ref{chapter,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{chapter,,,file name,manual}</literal> section
“chapter” in <citetitle>manual</citetitle>
+<literal>@ref{chapter,,,file name,manual}</literal> “chapter” in
<citetitle>manual</citetitle>
</para>
<para><literal>@ref{(pman)anode,cross ref name}</literal> <link>cross ref
name</link>
<literal>@ref{(pman)anode,,title}</literal> <link>title</link>
-<literal>@ref{(pman)anode,,,file name}</literal> section
“(pman)anode” in <filename>file name</filename>
-<literal>@ref{(pman)anode,,,,manual}</literal> section
“(pman)anode” in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,,file name}</literal> “(pman)anode” in
<filename>file name</filename>
+<literal>@ref{(pman)anode,,,,manual}</literal> “(pman)anode” in
<citetitle>manual</citetitle>
<literal>@ref{(pman)anode,cross ref name,title,}</literal> <link>title</link>
<literal>@ref{(pman)anode,cross ref name,,file name}</literal> section
“cross ref name” in <filename>file name</filename>
<literal>@ref{(pman)anode,cross ref name,,,manual}</literal> section
“cross ref name” in <citetitle>manual</citetitle>
@@ -622,7 +622,7 @@ section “a comma, in title” in <citetitle>a
, in manual name
<literal>@ref{(pman)anode,,title,file name}</literal> section
“title” in <filename>file name</filename>
<literal>@ref{(pman)anode,,title,,manual}</literal> section
“title” in <citetitle>manual</citetitle>
<literal>@ref{(pman)anode,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{(pman)anode,,,file name,manual}</literal> section
“(pman)anode” in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,,file name,manual}</literal>
“(pman)anode” in <citetitle>manual</citetitle>
</para>
<para><literal>@inforef{chapter, cross ref name, file name}</literal> See Info
file <filename>file name</filename>, node
‘<literal>chapter</literal>’
@@ -887,8 +887,8 @@ aaa</literallayout></textobject></inlinemediaobject>
<literal>@ref{,,,,manual}</literal> <citetitle>manual</citetitle>
<literal>@ref{node,cross ref name}</literal> <link linkend="node">cross ref
name</link>
<literal>@ref{node,,title}</literal> <link linkend="node">title</link>
-<literal>@ref{node,,,file name}</literal> section “node” in
<filename>file name</filename>
-<literal>@ref{node,,,,manual}</literal> section “node” in
<citetitle>manual</citetitle>
+<literal>@ref{node,,,file name}</literal> “node” in <filename>file
name</filename>
+<literal>@ref{node,,,,manual}</literal> “node” in
<citetitle>manual</citetitle>
<literal>@ref{node,cross ref name,title,}</literal> <link
linkend="node">title</link>
<literal>@ref{node,cross ref name,,file name}</literal> section “cross
ref name” in <filename>file name</filename>
<literal>@ref{node,cross ref name,,,manual}</literal> section “cross ref
name” in <citetitle>manual</citetitle>
@@ -899,7 +899,7 @@ aaa</literallayout></textobject></inlinemediaobject>
<literal>@ref{node,,title,,manual}</literal> section “title” in
<citetitle>manual</citetitle>
<literal>@ref{chapter,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
<literal>@ref{node,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{node,,,file name,manual}</literal> section “node” in
<citetitle>manual</citetitle>
+<literal>@ref{node,,,file name,manual}</literal> “node” in
<citetitle>manual</citetitle>
<literal>@ref{,cross ref name,title,}</literal> <link>title</link>
<literal>@ref{,cross ref name,,file name}</literal> section “cross ref
name” in <filename>file name</filename>
<literal>@ref{,cross ref name,,,manual}</literal> section “cross ref
name” in <citetitle>manual</citetitle>
@@ -1510,8 +1510,8 @@ section “a comma, in title” in
<citetitle>a , in manual name
</para>
<para><literal>@ref{chapter,cross ref name}</literal> <link
linkend="chapter">cross ref name</link>
<literal>@ref{chapter,,title}</literal> <link linkend="chapter">title</link>
-<literal>@ref{chapter,,,file name}</literal> section “chapter” in
<filename>file name</filename>
-<literal>@ref{chapter,,,,manual}</literal> section “chapter” in
<citetitle>manual</citetitle>
+<literal>@ref{chapter,,,file name}</literal> “chapter” in
<filename>file name</filename>
+<literal>@ref{chapter,,,,manual}</literal> “chapter” in
<citetitle>manual</citetitle>
<literal>@ref{chapter,cross ref name,title,}</literal> <link
linkend="chapter">title</link>
<literal>@ref{chapter,cross ref name,,file name}</literal> section
“cross ref name” in <filename>file name</filename>
<literal>@ref{chapter,cross ref name,,,manual}</literal> section “cross
ref name” in <citetitle>manual</citetitle>
@@ -1521,13 +1521,13 @@ section “a comma, in title” in
<citetitle>a , in manual name
<literal>@ref{chapter,,title,file name}</literal> section “title”
in <filename>file name</filename>
<literal>@ref{chapter,,title,,manual}</literal> section “title” in
<citetitle>manual</citetitle>
<literal>@ref{chapter,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{chapter,,,file name,manual}</literal> section
“chapter” in <citetitle>manual</citetitle>
+<literal>@ref{chapter,,,file name,manual}</literal> “chapter” in
<citetitle>manual</citetitle>
</para>
<para><literal>@ref{(pman)anode,cross ref name}</literal> <link>cross ref
name</link>
<literal>@ref{(pman)anode,,title}</literal> <link>title</link>
-<literal>@ref{(pman)anode,,,file name}</literal> section
“(pman)anode” in <filename>file name</filename>
-<literal>@ref{(pman)anode,,,,manual}</literal> section
“(pman)anode” in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,,file name}</literal> “(pman)anode” in
<filename>file name</filename>
+<literal>@ref{(pman)anode,,,,manual}</literal> “(pman)anode” in
<citetitle>manual</citetitle>
<literal>@ref{(pman)anode,cross ref name,title,}</literal> <link>title</link>
<literal>@ref{(pman)anode,cross ref name,,file name}</literal> section
“cross ref name” in <filename>file name</filename>
<literal>@ref{(pman)anode,cross ref name,,,manual}</literal> section
“cross ref name” in <citetitle>manual</citetitle>
@@ -1537,7 +1537,7 @@ section “a comma, in title” in
<citetitle>a , in manual name
<literal>@ref{(pman)anode,,title,file name}</literal> section
“title” in <filename>file name</filename>
<literal>@ref{(pman)anode,,title,,manual}</literal> section
“title” in <citetitle>manual</citetitle>
<literal>@ref{(pman)anode,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{(pman)anode,,,file name,manual}</literal> section
“(pman)anode” in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,,file name,manual}</literal>
“(pman)anode” in <citetitle>manual</citetitle>
</para>
<para><literal>@inforef{chapter, cross ref name, file name}</literal> See Info
file <filename>file name</filename>, node
‘<literal>chapter</literal>’
@@ -1802,8 +1802,8 @@ aaa</literallayout></textobject></inlinemediaobject>
<literal>@ref{,,,,manual}</literal> <citetitle>manual</citetitle>
<literal>@ref{node,cross ref name}</literal> <link linkend="node">cross ref
name</link>
<literal>@ref{node,,title}</literal> <link linkend="node">title</link>
-<literal>@ref{node,,,file name}</literal> section “node” in
<filename>file name</filename>
-<literal>@ref{node,,,,manual}</literal> section “node” in
<citetitle>manual</citetitle>
+<literal>@ref{node,,,file name}</literal> “node” in <filename>file
name</filename>
+<literal>@ref{node,,,,manual}</literal> “node” in
<citetitle>manual</citetitle>
<literal>@ref{node,cross ref name,title,}</literal> <link
linkend="node">title</link>
<literal>@ref{node,cross ref name,,file name}</literal> section “cross
ref name” in <filename>file name</filename>
<literal>@ref{node,cross ref name,,,manual}</literal> section “cross ref
name” in <citetitle>manual</citetitle>
@@ -1814,7 +1814,7 @@ aaa</literallayout></textobject></inlinemediaobject>
<literal>@ref{node,,title,,manual}</literal> section “title” in
<citetitle>manual</citetitle>
<literal>@ref{chapter,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
<literal>@ref{node,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{node,,,file name,manual}</literal> section “node” in
<citetitle>manual</citetitle>
+<literal>@ref{node,,,file name,manual}</literal> “node” in
<citetitle>manual</citetitle>
<literal>@ref{,cross ref name,title,}</literal> <link>title</link>
<literal>@ref{,cross ref name,,file name}</literal> section “cross ref
name” in <filename>file name</filename>
<literal>@ref{,cross ref name,,,manual}</literal> section “cross ref
name” in <citetitle>manual</citetitle>
@@ -2412,8 +2412,8 @@ section “a comma, in title” in
<citetitle>a , in manual name
</para>
<para><literal>@ref{chapter,cross ref name}</literal> <link
linkend="chapter">cross ref name</link>
<literal>@ref{chapter,,title}</literal> <link linkend="chapter">title</link>
-<literal>@ref{chapter,,,file name}</literal> section “chapter” in
<filename>file name</filename>
-<literal>@ref{chapter,,,,manual}</literal> section “chapter” in
<citetitle>manual</citetitle>
+<literal>@ref{chapter,,,file name}</literal> “chapter” in
<filename>file name</filename>
+<literal>@ref{chapter,,,,manual}</literal> “chapter” in
<citetitle>manual</citetitle>
<literal>@ref{chapter,cross ref name,title,}</literal> <link
linkend="chapter">title</link>
<literal>@ref{chapter,cross ref name,,file name}</literal> section
“cross ref name” in <filename>file name</filename>
<literal>@ref{chapter,cross ref name,,,manual}</literal> section “cross
ref name” in <citetitle>manual</citetitle>
@@ -2423,13 +2423,13 @@ section “a comma, in title” in
<citetitle>a , in manual name
<literal>@ref{chapter,,title,file name}</literal> section “title”
in <filename>file name</filename>
<literal>@ref{chapter,,title,,manual}</literal> section “title” in
<citetitle>manual</citetitle>
<literal>@ref{chapter,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{chapter,,,file name,manual}</literal> section
“chapter” in <citetitle>manual</citetitle>
+<literal>@ref{chapter,,,file name,manual}</literal> “chapter” in
<citetitle>manual</citetitle>
</para>
<para><literal>@ref{(pman)anode,cross ref name}</literal> <link>cross ref
name</link>
<literal>@ref{(pman)anode,,title}</literal> <link>title</link>
-<literal>@ref{(pman)anode,,,file name}</literal> section
“(pman)anode” in <filename>file name</filename>
-<literal>@ref{(pman)anode,,,,manual}</literal> section
“(pman)anode” in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,,file name}</literal> “(pman)anode” in
<filename>file name</filename>
+<literal>@ref{(pman)anode,,,,manual}</literal> “(pman)anode” in
<citetitle>manual</citetitle>
<literal>@ref{(pman)anode,cross ref name,title,}</literal> <link>title</link>
<literal>@ref{(pman)anode,cross ref name,,file name}</literal> section
“cross ref name” in <filename>file name</filename>
<literal>@ref{(pman)anode,cross ref name,,,manual}</literal> section
“cross ref name” in <citetitle>manual</citetitle>
@@ -2439,7 +2439,7 @@ section “a comma, in title” in
<citetitle>a , in manual name
<literal>@ref{(pman)anode,,title,file name}</literal> section
“title” in <filename>file name</filename>
<literal>@ref{(pman)anode,,title,,manual}</literal> section
“title” in <citetitle>manual</citetitle>
<literal>@ref{(pman)anode,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{(pman)anode,,,file name,manual}</literal> section
“(pman)anode” in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,,file name,manual}</literal>
“(pman)anode” in <citetitle>manual</citetitle>
</para>
<para><literal>@inforef{chapter, cross ref name, file name}</literal> See Info
file <filename>file name</filename>, node
‘<literal>chapter</literal>’
@@ -2704,8 +2704,8 @@ aaa</literallayout></textobject></inlinemediaobject>
<literal>@ref{,,,,manual}</literal> <citetitle>manual</citetitle>
<literal>@ref{node,cross ref name}</literal> <link linkend="node">cross ref
name</link>
<literal>@ref{node,,title}</literal> <link linkend="node">title</link>
-<literal>@ref{node,,,file name}</literal> section “node” in
<filename>file name</filename>
-<literal>@ref{node,,,,manual}</literal> section “node” in
<citetitle>manual</citetitle>
+<literal>@ref{node,,,file name}</literal> “node” in <filename>file
name</filename>
+<literal>@ref{node,,,,manual}</literal> “node” in
<citetitle>manual</citetitle>
<literal>@ref{node,cross ref name,title,}</literal> <link
linkend="node">title</link>
<literal>@ref{node,cross ref name,,file name}</literal> section “cross
ref name” in <filename>file name</filename>
<literal>@ref{node,cross ref name,,,manual}</literal> section “cross ref
name” in <citetitle>manual</citetitle>
@@ -2716,7 +2716,7 @@ aaa</literallayout></textobject></inlinemediaobject>
<literal>@ref{node,,title,,manual}</literal> section “title” in
<citetitle>manual</citetitle>
<literal>@ref{chapter,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
<literal>@ref{node,,title, file name, manual}</literal> section
“title” in <citetitle>manual</citetitle>
-<literal>@ref{node,,,file name,manual}</literal> section “node” in
<citetitle>manual</citetitle>
+<literal>@ref{node,,,file name,manual}</literal> “node” in
<citetitle>manual</citetitle>
<literal>@ref{,cross ref name,title,}</literal> <link>title</link>
<literal>@ref{,cross ref name,,file name}</literal> section “cross ref
name” in <filename>file name</filename>
<literal>@ref{,cross ref name,,,manual}</literal> section “cross ref
name” in <citetitle>manual</citetitle>
@@ -3307,8 +3307,8 @@ section ``a comma, in title'' in <citetitle>a ,
in manual name</citetitl
<literal>@ref{chapter,cross ref name}</literal> <link linkend="chapter">cross
ref name</link>
<literal>@ref{chapter,,title}</literal> <link linkend="chapter">title</link>
-<literal>@ref{chapter,,,file name}</literal> section ``chapter'' in
<filename>file name</filename>
-<literal>@ref{chapter,,,,manual}</literal> section ``chapter'' in
<citetitle>manual</citetitle>
+<literal>@ref{chapter,,,file name}</literal> ``chapter'' in <filename>file
name</filename>
+<literal>@ref{chapter,,,,manual}</literal> ``chapter'' in
<citetitle>manual</citetitle>
<literal>@ref{chapter,cross ref name,title,}</literal> <link
linkend="chapter">title</link>
<literal>@ref{chapter,cross ref name,,file name}</literal> section ``cross ref
name'' in <filename>file name</filename>
<literal>@ref{chapter,cross ref name,,,manual}</literal> section ``cross ref
name'' in <citetitle>manual</citetitle>
@@ -3318,13 +3318,13 @@ section ``a comma, in title'' in <citetitle>a ,
in manual name</citetitl
<literal>@ref{chapter,,title,file name}</literal> section ``title'' in
<filename>file name</filename>
<literal>@ref{chapter,,title,,manual}</literal> section ``title'' in
<citetitle>manual</citetitle>
<literal>@ref{chapter,,title, file name, manual}</literal> section ``title''
in <citetitle>manual</citetitle>
-<literal>@ref{chapter,,,file name,manual}</literal> section ``chapter'' in
<citetitle>manual</citetitle>
+<literal>@ref{chapter,,,file name,manual}</literal> ``chapter'' in
<citetitle>manual</citetitle>
<literal>@ref{(pman)anode,cross ref name}</literal> <link>cross ref name</link>
<literal>@ref{(pman)anode,,title}</literal> <link>title</link>
-<literal>@ref{(pman)anode,,,file name}</literal> section ``(pman)anode'' in
<filename>file name</filename>
-<literal>@ref{(pman)anode,,,,manual}</literal> section ``(pman)anode'' in
<citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,,file name}</literal> ``(pman)anode'' in
<filename>file name</filename>
+<literal>@ref{(pman)anode,,,,manual}</literal> ``(pman)anode'' in
<citetitle>manual</citetitle>
<literal>@ref{(pman)anode,cross ref name,title,}</literal> <link>title</link>
<literal>@ref{(pman)anode,cross ref name,,file name}</literal> section ``cross
ref name'' in <filename>file name</filename>
<literal>@ref{(pman)anode,cross ref name,,,manual}</literal> section ``cross
ref name'' in <citetitle>manual</citetitle>
@@ -3334,7 +3334,7 @@ section ``a comma, in title'' in <citetitle>a ,
in manual name</citetitl
<literal>@ref{(pman)anode,,title,file name}</literal> section ``title'' in
<filename>file name</filename>
<literal>@ref{(pman)anode,,title,,manual}</literal> section ``title'' in
<citetitle>manual</citetitle>
<literal>@ref{(pman)anode,,title, file name, manual}</literal> section
``title'' in <citetitle>manual</citetitle>
-<literal>@ref{(pman)anode,,,file name,manual}</literal> section
``(pman)anode'' in <citetitle>manual</citetitle>
+<literal>@ref{(pman)anode,,,file name,manual}</literal> ``(pman)anode'' in
<citetitle>manual</citetitle>
<literal>@inforef{chapter, cross ref name, file name}</literal> See Info file
<filename>file name</filename>, node ‘<literal>chapter</literal>’
@@ -3597,8 +3597,8 @@ Various deff lines
<literal>@ref{,,,,manual}</literal> <citetitle>manual</citetitle>
<literal>@ref{node,cross ref name}</literal> <link linkend="node">cross ref
name</link>
<literal>@ref{node,,title}</literal> <link linkend="node">title</link>
-<literal>@ref{node,,,file name}</literal> section ``node'' in <filename>file
name</filename>
-<literal>@ref{node,,,,manual}</literal> section ``node'' in
<citetitle>manual</citetitle>
+<literal>@ref{node,,,file name}</literal> ``node'' in <filename>file
name</filename>
+<literal>@ref{node,,,,manual}</literal> ``node'' in
<citetitle>manual</citetitle>
<literal>@ref{node,cross ref name,title,}</literal> <link
linkend="node">title</link>
<literal>@ref{node,cross ref name,,file name}</literal> section ``cross ref
name'' in <filename>file name</filename>
<literal>@ref{node,cross ref name,,,manual}</literal> section ``cross ref
name'' in <citetitle>manual</citetitle>
@@ -3609,7 +3609,7 @@ Various deff lines
<literal>@ref{node,,title,,manual}</literal> section ``title'' in
<citetitle>manual</citetitle>
<literal>@ref{chapter,,title, file name, manual}</literal> section ``title''
in <citetitle>manual</citetitle>
<literal>@ref{node,,title, file name, manual}</literal> section ``title'' in
<citetitle>manual</citetitle>
-<literal>@ref{node,,,file name,manual}</literal> section ``node'' in
<citetitle>manual</citetitle>
+<literal>@ref{node,,,file name,manual}</literal> ``node'' in
<citetitle>manual</citetitle>
<literal>@ref{,cross ref name,title,}</literal> <link>title</link>
<literal>@ref{,cross ref name,,file name}</literal> section ``cross ref name''
in <filename>file name</filename>
<literal>@ref{,cross ref name,,,manual}</literal> section ``cross ref name''
in <citetitle>manual</citetitle>