[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert): do no
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert): do not format @inforef especially, format similarly with @xref. |
|
Date: |
Tue, 16 Aug 2022 19:34:20 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new e3c7169fd6 * tp/Texinfo/Convert/DocBook.pm (_convert): do not format
@inforef especially, format similarly with @xref.
e3c7169fd6 is described below
commit e3c7169fd6c44c8160338d133df16596c6daa03d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Aug 17 01:34:07 2022 +0200
* tp/Texinfo/Convert/DocBook.pm (_convert): do not format @inforef
especially, format similarly with @xref.
---
ChangeLog | 5 +
tp/Texinfo/Convert/DocBook.pm | 327 ++++++++++-----------
.../converters_tests/ref_error_formatting.pl | 12 +-
tp/t/results/converters_tests/ref_in_sectioning.pl | 2 +-
tp/t/results/converters_tests/refs_formatting.pl | 8 +-
tp/t/results/converters_tests/top_in_ref.pl | 8 +-
.../res_parser/formatting_docbook/formatting.xml | 108 +++----
7 files changed, 229 insertions(+), 241 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c19a3647ce..3cb296f4be 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 format @inforef
+ especially, format similarly with @xref.
+
2022-08-16 Patrice Dumas <pertusus@free.fr>
* doc/texinfo.texi (Cross Reference Parts): update text referring to
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 7ac8acfc93..ce87fa994e 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1034,201 +1034,180 @@ sub _convert($$;$)
}
} elsif ($Texinfo::Common::ref_commands{$element->{'cmdname'}}) {
if ($element->{'args'}) {
+ my $cmdname;
+ my $book_contents;
+ my ($section_name, $node_name);
+ my $manual_file_index = 3;
if ($element->{'cmdname'} eq 'inforef') {
- my $filename;
- if (scalar(@{$element->{'args'}}) == 3
- and defined($element->{'args'}->[-1])
- and @{$element->{'args'}->[-1]->{'contents'}}) {
- $filename =
-
$self->xml_protect_text(Texinfo::Convert::Text::convert_to_text(
- {'contents' => $element->{'args'}->[-1]->{'contents'}},
- {'code' => 1,
-
Texinfo::Convert::Text::copy_options_for_convert_text($self, 1)}));
- }
- my $node;
- if (defined($element->{'args'}->[0])
- and @{$element->{'args'}->[0]->{'contents'}}) {
- $node = {'contents' => $element->{'args'}->[0]->{'contents'}};
- }
- if ($node and defined($filename)) {
- return $self->_convert($self->gdt(
- "See Info file \@file{{myfile}}, node \@samp{{mynode}}",
- { 'myfile' => {'type' => '_converted', 'text' => $filename},
- 'mynode' => $node}));
- } elsif ($node) {
- return $self->_convert($self->gdt(
- "See node \@samp{{mynode}}",
- {'mynode' => $node}));
- } elsif (defined($filename)) {
- return $self->_convert($self->gdt(
- "See Info file \@file{{myfile}}",
- { 'myfile' => {'type' => '_converted', 'text' =>
$filename}}));
- }
+ $manual_file_index = 2;
+ $cmdname = 'xref';
} else {
- my $book_contents;
if (scalar(@{$element->{'args'}}) == 5
and defined($element->{'args'}->[-1])
and @{$element->{'args'}->[-1]->{'contents'}}) {
$book_contents = $element->{'args'}->[-1]->{'contents'};
}
- my $manual_file_contents;
- if (scalar(@{$element->{'args'}}) >= 4
- and defined($element->{'args'}->[3])
- and @{$element->{'args'}->[3]->{'contents'}}) {
- $manual_file_contents = $element->{'args'}->[3]->{'contents'};
- }
- my ($section_name, $node_name);
if (defined($element->{'args'}->[2])
and @{$element->{'args'}->[2]->{'contents'}}) {
my $section_name_contents =
$element->{'args'}->[2]->{'contents'};
$section_name = $self->_convert(
- {'contents' => $section_name_contents});
- } elsif (defined($element->{'args'}->[1])
- and @{$element->{'args'}->[1]->{'contents'}}) {
- my $section_name_contents
- = $element->{'args'}->[1]->{'contents'};
- $section_name = $self->_convert(
- {'contents' => $section_name_contents});
- } elsif (defined($element->{'args'}->[0])
- and @{$element->{'args'}->[0]->{'contents'}}) {
- my $node_contents
- = $element->{'args'}->[0]->{'contents'};
- $node_name = $self->_convert(
- {'contents' => $node_contents});
-
- if (($book_contents or $manual_file_contents)
- and $node_name eq 'Top') {
- $node_name = undef;
- }
+ {'contents' => $section_name_contents});
+ }
+ $cmdname = $element->{'cmdname'};
+ }
+ my $manual_file_contents;
+ if (scalar(@{$element->{'args'}}) >= $manual_file_index+1
+ and defined($element->{'args'}->[$manual_file_index])
+ and @{$element->{'args'}->[$manual_file_index]->{'contents'}}) {
+ $manual_file_contents =
$element->{'args'}->[$manual_file_index]->{'contents'};
+ }
+ if (! defined($section_name) and defined($element->{'args'}->[1])
+ and @{$element->{'args'}->[1]->{'contents'}}) {
+ my $section_name_contents
+ = $element->{'args'}->[1]->{'contents'};
+ $section_name = $self->_convert(
+ {'contents' => $section_name_contents});
+ } elsif (defined($element->{'args'}->[0])
+ and @{$element->{'args'}->[0]->{'contents'}}) {
+ my $node_contents
+ = $element->{'args'}->[0]->{'contents'};
+ $node_name = $self->_convert(
+ {'contents' => $node_contents});
+
+ if (($book_contents or $manual_file_contents)
+ and $node_name eq 'Top') {
+ $node_name = undef;
}
+ }
- # external ref
- if ($book_contents) {
- if ($section_name) {
- if ($element->{'cmdname'} eq 'ref') {
- return $self->_convert(
- $self->gdt('section ``{section_name}\'\' in @cite{{book}}',
- { 'section_name' => {'type' => '_converted', 'text' =>
$section_name},
- 'book' => $book_contents }));
- } elsif ($element->{'cmdname'} eq 'xref') {
- return $self->_convert(
- $self->gdt('See section ``{section_name}\'\' in
@cite{{book}}',
- { 'section_name' => {'type' => '_converted', 'text' =>
$section_name},
- 'book' => $book_contents }));
- } elsif ($element->{'cmdname'} eq 'pxref') {
- return $self->_convert(
- $self->gdt('see section ``{section_name}\'\' in
@cite{{book}}',
- { '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(
- $self->gdt('@cite{{book}}',
- {'book' => $book_contents }));
- } elsif ($element->{'cmdname'} eq 'xref') {
- return $self->_convert(
- $self->gdt('See @cite{{book}}',
- {'book' => $book_contents }));
- } elsif ($element->{'cmdname'} eq 'pxref') {
- return $self->_convert(
- $self->gdt('see @cite{{book}}',
- {'book' => $book_contents }));
- }
+ # external book ref
+ if ($book_contents) {
+ if ($section_name) {
+ if ($cmdname eq 'ref') {
+ return $self->_convert(
+ $self->gdt('section ``{section_name}\'\' in @cite{{book}}',
+ { 'section_name' => {'type' => '_converted', 'text' =>
$section_name},
+ 'book' => $book_contents }));
+ } elsif ($cmdname eq 'xref') {
+ return $self->_convert(
+ $self->gdt('See section ``{section_name}\'\' in
@cite{{book}}',
+ { 'section_name' => {'type' => '_converted', 'text' =>
$section_name},
+ 'book' => $book_contents }));
+ } elsif ($cmdname eq 'pxref') {
+ return $self->_convert(
+ $self->gdt('see section ``{section_name}\'\' in
@cite{{book}}',
+ { 'section_name' => {'type' => '_converted', 'text' =>
$section_name},
+ 'book' => $book_contents }));
}
- } elsif ($manual_file_contents) {
- if ($section_name) {
- if ($element->{'cmdname'} eq 'ref') {
- return $self->_convert(
- $self->gdt('section ``{section_name}\'\' in
@file{{manual}}',
- { 'section_name' => {'type' => '_converted', 'text' =>
$section_name},
- 'manual' => $manual_file_contents }));
- } elsif ($element->{'cmdname'} eq 'xref') {
- return $self->_convert(
- $self->gdt('See section ``{section_name}\'\' in
@file{{manual}}',
- { 'section_name' => {'type' => '_converted', 'text' =>
$section_name},
- 'manual' => $manual_file_contents }));
- } elsif ($element->{'cmdname'} eq 'pxref') {
- return $self->_convert(
- $self->gdt('see section ``{section_name}\'\' in
@file{{manual}}',
- { '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(
- $self->gdt('@file{{manual}}',
- {'manual' => $manual_file_contents }));
- } elsif ($element->{'cmdname'} eq 'xref') {
- return $self->_convert(
- $self->gdt('See @file{{manual}}',
- {'manual' => $manual_file_contents }));
- } elsif ($element->{'cmdname'} eq 'pxref') {
- return $self->_convert(
- $self->gdt('see @file{{manual}}',
- {'manual' => $manual_file_contents }));
- }
+ } elsif ($node_name) {
+ if ($cmdname eq 'ref') {
+ return $self->_convert(
+ $self->gdt('``{node_name}\'\' in @cite{{book}}',
+ { 'node_name' => {'type' => '_converted', 'text' =>
$node_name},
+ 'book' => $book_contents }));
+ } elsif ($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 ($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 {
- my $linkend = '';
- if ($element->{'extra'}->{'node_argument'}
- and
defined($element->{'extra'}->{'node_argument'}->{'normalized'})
- and
!$element->{'extra'}->{'node_argument'}->{'manual_content'}) {
- $linkend = "
linkend=\"$element->{'extra'}->{'node_argument'}->{'normalized'}\"";
+ if ($cmdname eq 'ref') {
+ return $self->_convert(
+ $self->gdt('@cite{{book}}',
+ {'book' => $book_contents }));
+ } elsif ($cmdname eq 'xref') {
+ return $self->_convert(
+ $self->gdt('See @cite{{book}}',
+ {'book' => $book_contents }));
+ } elsif ($cmdname eq 'pxref') {
+ return $self->_convert(
+ $self->gdt('see @cite{{book}}',
+ {'book' => $book_contents }));
}
- 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') {
+ }
+ } elsif ($manual_file_contents) {
+ if ($section_name) {
+ if ($cmdname eq 'ref') {
return $self->_convert(
- $self->gdt('{title_ref}', {'title_ref' =>
- {'type' => '_converted',
- 'text' => $argument}}));
- } elsif ($element->{'cmdname'} eq 'xref') {
+ $self->gdt('section ``{section_name}\'\' in @file{{manual}}',
+ { 'section_name' => {'type' => '_converted', 'text' =>
$section_name},
+ 'manual' => $manual_file_contents }));
+ } elsif ($cmdname eq 'xref') {
return $self->_convert(
- $self->gdt('See {title_ref}', {'title_ref' =>
- {'type' => '_converted',
- 'text' => $argument}}));
- } elsif ($element->{'cmdname'} eq 'pxref') {
+ $self->gdt('See section ``{section_name}\'\' in
@file{{manual}}',
+ { 'section_name' => {'type' => '_converted', 'text' =>
$section_name},
+ 'manual' => $manual_file_contents }));
+ } elsif ($cmdname eq 'pxref') {
return $self->_convert(
- $self->gdt('see {title_ref}', {'title_ref' =>
- {'type' => '_converted',
- 'text' => $argument}}));
+ $self->gdt('see section ``{section_name}\'\' in
@file{{manual}}',
+ { 'section_name' => {'type' => '_converted', 'text' =>
$section_name},
+ 'manual' => $manual_file_contents }));
}
+ } elsif ($node_name) {
+ if ($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 ($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 ($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 ($cmdname eq 'ref') {
+ return $self->_convert(
+ $self->gdt('@file{{manual}}',
+ {'manual' => $manual_file_contents }));
+ } elsif ($cmdname eq 'xref') {
+ return $self->_convert(
+ $self->gdt('See @file{{manual}}',
+ {'manual' => $manual_file_contents }));
+ } elsif ($cmdname eq 'pxref') {
+ return $self->_convert(
+ $self->gdt('see @file{{manual}}',
+ {'manual' => $manual_file_contents }));
+ }
+ }
+ } elsif ($element->{'cmdname'} eq 'inforef') {
+ return '';
+ } else {
+ my $linkend = '';
+ if ($element->{'extra'}->{'node_argument'}
+ and
defined($element->{'extra'}->{'node_argument'}->{'normalized'})
+ and
!$element->{'extra'}->{'node_argument'}->{'manual_content'}) {
+ $linkend = "
linkend=\"$element->{'extra'}->{'node_argument'}->{'normalized'}\"";
+ }
+ 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' =>
+ {'type' => '_converted',
+ 'text' => $argument}}));
+ } elsif ($element->{'cmdname'} eq 'xref') {
+ return $self->_convert(
+ $self->gdt('See {title_ref}', {'title_ref' =>
+ {'type' => '_converted',
+ 'text' => $argument}}));
+ } elsif ($element->{'cmdname'} eq 'pxref') {
+ return $self->_convert(
+ $self->gdt('see {title_ref}', {'title_ref' =>
+ {'type' => '_converted',
+ 'text' => $argument}}));
}
}
} else {
diff --git a/tp/t/results/converters_tests/ref_error_formatting.pl
b/tp/t/results/converters_tests/ref_error_formatting.pl
index 9879a9b2c8..f3fae2214c 100644
--- a/tp/t/results/converters_tests/ref_error_formatting.pl
+++ b/tp/t/results/converters_tests/ref_error_formatting.pl
@@ -4586,14 +4586,14 @@ $result_converted{'docbook'}->{'ref_error_formatting'}
= '
<literal>@ref{,,,file name,manual}</literal> <citetitle>manual</citetitle>
</para>
<para><literal>@inforef{,cross ref name }</literal>
-<literal>@inforef{,,file name}</literal> See Info file <filename>file
name</filename>
-<literal>@inforef{,cross ref name, file name}</literal> See Info file
<filename>file name</filename>
+<literal>@inforef{,,file name}</literal> See <filename>file name</filename>
+<literal>@inforef{,cross ref name, file name}</literal> See section
“cross ref name” in <filename>file name</filename>
<literal>@inforef{}</literal>
</para>
-<para><literal>@inforef{node, cross ref name, file name}</literal> See Info
file <filename>file name</filename>, node ‘<literal>node</literal>’
-<literal>@inforef{node}</literal> See node
‘<literal>node</literal>’
-<literal>@inforef{node, cross ref name}</literal> See node
‘<literal>node</literal>’
-<literal>@inforef{node,,file name}</literal> See Info file <filename>file
name</filename>, node ‘<literal>node</literal>’
+<para><literal>@inforef{node, cross ref name, file name}</literal> See section
“cross ref name” in <filename>file name</filename>
+<literal>@inforef{node}</literal>
+<literal>@inforef{node, cross ref name}</literal>
+<literal>@inforef{node,,file name}</literal> See “node” in
<filename>file name</filename>
</para>';
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 0384abdce6..1d002709fa 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2957,7 +2957,7 @@ $result_converted{'docbook'}->{'ref_in_sectioning'} =
'<chapter label="1" id="no
</sect1>
<sect1 label="2.9">
-<title>See Info file <filename>c</filename>, node
‘<literal>a</literal>’ inforef a b c</title>
+<title>See section “b” in <filename>c</filename> inforef a b
c</title>
</sect1>
<sect1 label="2.10">
diff --git a/tp/t/results/converters_tests/refs_formatting.pl
b/tp/t/results/converters_tests/refs_formatting.pl
index e35e07da27..43e4da12ca 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -4576,10 +4576,10 @@ $result_converted{'docbook'}->{'refs_formatting'} =
'<chapter label="1" id="chap
<literal>@ref{(pman)anode,,title, file name, manual}</literal> section
“title” 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>’
-<literal>@inforef{chapter, cross ref name}</literal> See node
‘<literal>chapter</literal>’
-<literal>@inforef{chapter,,file name}</literal> See Info file <filename>file
name</filename>, node ‘<literal>chapter</literal>’
+<para><literal>@inforef{chapter, cross ref name, file name}</literal> See
section “cross ref name” in <filename>file name</filename>
+<literal>@inforef{chapter}</literal>
+<literal>@inforef{chapter, cross ref name}</literal>
+<literal>@inforef{chapter,,file name}</literal> See “chapter” in
<filename>file name</filename>
</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 2bcf3afc5f..fa1d2550a1 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -4581,10 +4581,10 @@ $result_converted{'docbook'}->{'top_in_ref'} = '<anchor
id="refs-node"/>
<literal>@ref{(pman)Top,,title, file name, manual}</literal> section
“title” 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>’
-<literal>@inforef{Top, cross ref name}</literal> See node
‘<literal>Top</literal>’
-<literal>@inforef{Top,,file name}</literal> See Info file <filename>file
name</filename>, node ‘<literal>Top</literal>’
+<para><literal>@inforef{Top, cross ref name, file name}</literal> See section
“cross ref name” in <filename>file name</filename>
+<literal>@inforef{Top}</literal>
+<literal>@inforef{Top, cross ref name}</literal>
+<literal>@inforef{Top,,file name}</literal> See <filename>file name</filename>
</para>';
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index df70750128..2116f4508f 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -582,7 +582,7 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<para><literal>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file
n---ame@@, ma---nual@@}</literal> See section “t—itle@” in
<citetitle>ma—nual@</citetitle>.
<literal>@ref{chapter, cross ref name, title, file name, manual}</literal>
section “title” in <citetitle>manual</citetitle>
<literal>@pxref{chapter, cross ref name, title, file name, manual}</literal>
see section “title” in <citetitle>manual</citetitle>
-<literal>@inforef{chapter, cross ref name, file name}</literal> See Info file
<filename>file name</filename>, node ‘<literal>chapter</literal>’
+<literal>@inforef{chapter, cross ref name, file name}</literal> See section
“cross ref name” in <filename>file name</filename>
</para>
<para><literal>@ref{chapter}</literal> <link linkend="chapter">chapter</link>
<literal>@xref{chapter}</literal> See <link linkend="chapter">chapter</link>.
@@ -625,19 +625,20 @@ section “a comma, in title” in
<citetitle>a , in manual name
<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>’
-<literal>@inforef{chapter, cross ref name}</literal> See node
‘<literal>chapter</literal>’
-<literal>@inforef{chapter,,file name}</literal> See Info file <filename>file
name</filename>, node ‘<literal>chapter</literal>’
-<literal>@inforef{node, cross ref name, file name}</literal> See Info file
<filename>file name</filename>, node ‘<literal>node</literal>’
-<literal>@inforef{node}</literal> See node
‘<literal>node</literal>’
-<literal>@inforef{node, cross ref name}</literal> See node
‘<literal>node</literal>’
-<literal>@inforef{node,,file name}</literal> See Info file <filename>file
name</filename>, node ‘<literal>node</literal>’
-<literal>@inforef{chapter, cross ref name, file name, spurious arg}</literal>
See Info file <filename>file name, spurious arg</filename>, node
‘<literal>chapter</literal>’
+<para><literal>@inforef{chapter, cross ref name, file name}</literal> See
section “cross ref name” in <filename>file name</filename>
+<literal>@inforef{chapter}</literal>
+<literal>@inforef{chapter, cross ref name}</literal>
+<literal>@inforef{chapter,,file name}</literal> See “chapter” in
<filename>file name</filename>
+<literal>@inforef{node, cross ref name, file name}</literal> See section
“cross ref name” in <filename>file name</filename>
+<literal>@inforef{node}</literal>
+<literal>@inforef{node, cross ref name}</literal>
+<literal>@inforef{node,,file name}</literal> See “node” in
<filename>file name</filename>
+<literal>@inforef{chapter, cross ref name, file name, spurious arg}</literal>
See section “cross ref name” in <filename>file name, spurious
arg</filename>
</para>
<para><literal>@inforef{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in file}</literal>
-See Info file <filename>a comma, in file</filename>, node
‘<literal>s--ect,ion</literal>’
+See section “a , in cross
+ref” in <filename>a comma, in file</filename>
</para>
<!-- special cases with @uref -->
<para>‘<literal><link linkend="chapter">chapter</link></literal>’.
@@ -912,8 +913,8 @@ aaa</literallayout></textobject></inlinemediaobject>
<literal>@ref{,,,file name,manual}</literal> <citetitle>manual</citetitle>
</para>
<para><literal>@inforef{,cross ref name }</literal>
-<literal>@inforef{,,file name}</literal> See Info file <filename>file
name</filename>
-<literal>@inforef{,cross ref name, file name}</literal> See Info file
<filename>file name</filename>
+<literal>@inforef{,,file name}</literal> See <filename>file name</filename>
+<literal>@inforef{,cross ref name, file name}</literal> See section
“cross ref name” in <filename>file name</filename>
<literal>@inforef{}</literal>
</para>
@@ -1497,7 +1498,7 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<para><literal>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file
n---ame@@, ma---nual@@}</literal> See section “t—itle@” in
<citetitle>ma—nual@</citetitle>.
<literal>@ref{chapter, cross ref name, title, file name, manual}</literal>
section “title” in <citetitle>manual</citetitle>
<literal>@pxref{chapter, cross ref name, title, file name, manual}</literal>
see section “title” in <citetitle>manual</citetitle>
-<literal>@inforef{chapter, cross ref name, file name}</literal> See Info file
<filename>file name</filename>, node ‘<literal>chapter</literal>’
+<literal>@inforef{chapter, cross ref name, file name}</literal> See section
“cross ref name” in <filename>file name</filename>
</para>
<para><literal>@ref{chapter}</literal> <link linkend="chapter">chapter</link>
<literal>@xref{chapter}</literal> See <link linkend="chapter">chapter</link>.
@@ -1540,19 +1541,20 @@ section “a comma, in title” in
<citetitle>a , in manual name
<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>’
-<literal>@inforef{chapter, cross ref name}</literal> See node
‘<literal>chapter</literal>’
-<literal>@inforef{chapter,,file name}</literal> See Info file <filename>file
name</filename>, node ‘<literal>chapter</literal>’
-<literal>@inforef{node, cross ref name, file name}</literal> See Info file
<filename>file name</filename>, node ‘<literal>node</literal>’
-<literal>@inforef{node}</literal> See node
‘<literal>node</literal>’
-<literal>@inforef{node, cross ref name}</literal> See node
‘<literal>node</literal>’
-<literal>@inforef{node,,file name}</literal> See Info file <filename>file
name</filename>, node ‘<literal>node</literal>’
-<literal>@inforef{chapter, cross ref name, file name, spurious arg}</literal>
See Info file <filename>file name, spurious arg</filename>, node
‘<literal>chapter</literal>’
+<para><literal>@inforef{chapter, cross ref name, file name}</literal> See
section “cross ref name” in <filename>file name</filename>
+<literal>@inforef{chapter}</literal>
+<literal>@inforef{chapter, cross ref name}</literal>
+<literal>@inforef{chapter,,file name}</literal> See “chapter” in
<filename>file name</filename>
+<literal>@inforef{node, cross ref name, file name}</literal> See section
“cross ref name” in <filename>file name</filename>
+<literal>@inforef{node}</literal>
+<literal>@inforef{node, cross ref name}</literal>
+<literal>@inforef{node,,file name}</literal> See “node” in
<filename>file name</filename>
+<literal>@inforef{chapter, cross ref name, file name, spurious arg}</literal>
See section “cross ref name” in <filename>file name, spurious
arg</filename>
</para>
<para><literal>@inforef{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in file}</literal>
-See Info file <filename>a comma, in file</filename>, node
‘<literal>s--ect,ion</literal>’
+See section “a , in cross
+ref” in <filename>a comma, in file</filename>
</para>
<!-- special cases with @uref -->
<para>‘<literal><link linkend="chapter">chapter</link></literal>’.
@@ -1827,8 +1829,8 @@ aaa</literallayout></textobject></inlinemediaobject>
<literal>@ref{,,,file name,manual}</literal> <citetitle>manual</citetitle>
</para>
<para><literal>@inforef{,cross ref name }</literal>
-<literal>@inforef{,,file name}</literal> See Info file <filename>file
name</filename>
-<literal>@inforef{,cross ref name, file name}</literal> See Info file
<filename>file name</filename>
+<literal>@inforef{,,file name}</literal> See <filename>file name</filename>
+<literal>@inforef{,cross ref name, file name}</literal> See section
“cross ref name” in <filename>file name</filename>
<literal>@inforef{}</literal>
</para>
@@ -2399,7 +2401,7 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<para><literal>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file
n---ame@@, ma---nual@@}</literal> See section “t—itle@” in
<citetitle>ma—nual@</citetitle>.
<literal>@ref{chapter, cross ref name, title, file name, manual}</literal>
section “title” in <citetitle>manual</citetitle>
<literal>@pxref{chapter, cross ref name, title, file name, manual}</literal>
see section “title” in <citetitle>manual</citetitle>
-<literal>@inforef{chapter, cross ref name, file name}</literal> See Info file
<filename>file name</filename>, node ‘<literal>chapter</literal>’
+<literal>@inforef{chapter, cross ref name, file name}</literal> See section
“cross ref name” in <filename>file name</filename>
</para>
<para><literal>@ref{chapter}</literal> <link linkend="chapter">chapter</link>
<literal>@xref{chapter}</literal> See <link linkend="chapter">chapter</link>.
@@ -2442,19 +2444,20 @@ section “a comma, in title” in
<citetitle>a , in manual name
<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>’
-<literal>@inforef{chapter, cross ref name}</literal> See node
‘<literal>chapter</literal>’
-<literal>@inforef{chapter,,file name}</literal> See Info file <filename>file
name</filename>, node ‘<literal>chapter</literal>’
-<literal>@inforef{node, cross ref name, file name}</literal> See Info file
<filename>file name</filename>, node ‘<literal>node</literal>’
-<literal>@inforef{node}</literal> See node
‘<literal>node</literal>’
-<literal>@inforef{node, cross ref name}</literal> See node
‘<literal>node</literal>’
-<literal>@inforef{node,,file name}</literal> See Info file <filename>file
name</filename>, node ‘<literal>node</literal>’
-<literal>@inforef{chapter, cross ref name, file name, spurious arg}</literal>
See Info file <filename>file name, spurious arg</filename>, node
‘<literal>chapter</literal>’
+<para><literal>@inforef{chapter, cross ref name, file name}</literal> See
section “cross ref name” in <filename>file name</filename>
+<literal>@inforef{chapter}</literal>
+<literal>@inforef{chapter, cross ref name}</literal>
+<literal>@inforef{chapter,,file name}</literal> See “chapter” in
<filename>file name</filename>
+<literal>@inforef{node, cross ref name, file name}</literal> See section
“cross ref name” in <filename>file name</filename>
+<literal>@inforef{node}</literal>
+<literal>@inforef{node, cross ref name}</literal>
+<literal>@inforef{node,,file name}</literal> See “node” in
<filename>file name</filename>
+<literal>@inforef{chapter, cross ref name, file name, spurious arg}</literal>
See section “cross ref name” in <filename>file name, spurious
arg</filename>
</para>
<para><literal>@inforef{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in file}</literal>
-See Info file <filename>a comma, in file</filename>, node
‘<literal>s--ect,ion</literal>’
+See section “a , in cross
+ref” in <filename>a comma, in file</filename>
</para>
<!-- special cases with @uref -->
<para>‘<literal><link linkend="chapter">chapter</link></literal>’.
@@ -2729,8 +2732,8 @@ aaa</literallayout></textobject></inlinemediaobject>
<literal>@ref{,,,file name,manual}</literal> <citetitle>manual</citetitle>
</para>
<para><literal>@inforef{,cross ref name }</literal>
-<literal>@inforef{,,file name}</literal> See Info file <filename>file
name</filename>
-<literal>@inforef{,cross ref name, file name}</literal> See Info file
<filename>file name</filename>
+<literal>@inforef{,,file name}</literal> See <filename>file name</filename>
+<literal>@inforef{,cross ref name, file name}</literal> See section
“cross ref name” in <filename>file name</filename>
<literal>@inforef{}</literal>
</para>
@@ -3294,7 +3297,7 @@ text in def item for second def item
<literal>@xref{c---hapter@@, cross r---ef name@@, t---itle@@, file n---ame@@,
ma---nual@@}</literal> See section ``t---itle@'' in
<citetitle>ma---nual@</citetitle>.
<literal>@ref{chapter, cross ref name, title, file name, manual}</literal>
section ``title'' in <citetitle>manual</citetitle>
<literal>@pxref{chapter, cross ref name, title, file name, manual}</literal>
see section ``title'' in <citetitle>manual</citetitle>
-<literal>@inforef{chapter, cross ref name, file name}</literal> See Info file
<filename>file name</filename>, node ‘<literal>chapter</literal>’
+<literal>@inforef{chapter, cross ref name, file name}</literal> See section
``cross ref name'' in <filename>file name</filename>
<literal>@ref{chapter}</literal> <link linkend="chapter">chapter</link>
<literal>@xref{chapter}</literal> See <link linkend="chapter">chapter</link>.
@@ -3337,19 +3340,20 @@ section ``a comma, in title'' in <citetitle>a ,
in manual name</citetitl
<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>’
-<literal>@inforef{chapter}</literal> See node
‘<literal>chapter</literal>’
-<literal>@inforef{chapter, cross ref name}</literal> See node
‘<literal>chapter</literal>’
-<literal>@inforef{chapter,,file name}</literal> See Info file <filename>file
name</filename>, node ‘<literal>chapter</literal>’
-<literal>@inforef{node, cross ref name, file name}</literal> See Info file
<filename>file name</filename>, node ‘<literal>node</literal>’
-<literal>@inforef{node}</literal> See node
‘<literal>node</literal>’
-<literal>@inforef{node, cross ref name}</literal> See node
‘<literal>node</literal>’
-<literal>@inforef{node,,file name}</literal> See Info file <filename>file
name</filename>, node ‘<literal>node</literal>’
-<literal>@inforef{chapter, cross ref name, file name, spurious arg}</literal>
See Info file <filename>file name, spurious arg</filename>, node
‘<literal>chapter</literal>’
+<literal>@inforef{chapter, cross ref name, file name}</literal> See section
``cross ref name'' in <filename>file name</filename>
+<literal>@inforef{chapter}</literal>
+<literal>@inforef{chapter, cross ref name}</literal>
+<literal>@inforef{chapter,,file name}</literal> See ``chapter'' in
<filename>file name</filename>
+<literal>@inforef{node, cross ref name, file name}</literal> See section
``cross ref name'' in <filename>file name</filename>
+<literal>@inforef{node}</literal>
+<literal>@inforef{node, cross ref name}</literal>
+<literal>@inforef{node,,file name}</literal> See ``node'' in <filename>file
name</filename>
+<literal>@inforef{chapter, cross ref name, file name, spurious arg}</literal>
See section ``cross ref name'' in <filename>file name, spurious arg</filename>
<literal>@inforef{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in file}</literal>
-See Info file <filename>a comma, in file</filename>, node
‘<literal>s--ect,ion</literal>’
+See section ``a , in cross
+ref'' in <filename>a comma, in file</filename>
<!-- special cases with @uref -->
‘<literal><link linkend="chapter">chapter</link></literal>’.
@@ -3622,8 +3626,8 @@ Various deff lines
<literal>@ref{,,,file name,manual}</literal> <citetitle>manual</citetitle>
<literal>@inforef{,cross ref name }</literal>
-<literal>@inforef{,,file name}</literal> See Info file <filename>file
name</filename>
-<literal>@inforef{,cross ref name, file name}</literal> See Info file
<filename>file name</filename>
+<literal>@inforef{,,file name}</literal> See <filename>file name</filename>
+<literal>@inforef{,cross ref name, file name}</literal> See section ``cross
ref name'' in <filename>file name</filename>
<literal>@inforef{}</literal>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert): do not format @inforef especially, format similarly with @xref.,
Patrice Dumas <=