[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: LaTeX.pm: handle @uref and @url.
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: LaTeX.pm: handle @uref and @url. |
|
Date: |
Wed, 18 Aug 2021 18:50:46 -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 2c5ca29 LaTeX.pm: handle @uref and @url.
2c5ca29 is described below
commit 2c5ca290ee30cb62f4548dbf26dd3f2fe60859f2
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Aug 19 00:50:16 2021 +0200
LaTeX.pm: handle @uref and @url.
---
tp/Texinfo/Convert/LaTeX.pm | 45 +-
tp/t/03coverage_braces.t | 10 +-
tp/t/results/coverage_braces/abbr_acronym.pl | 8 +
tp/t/results/coverage_braces/nested.pl | 3 +
tp/t/results/coverage_braces/uref_in_ref.pl | 4 +
tp/t/results/coverage_braces/uref_url.pl | 12 +
.../uref_with_commands_characters.pl | 192 ++++++++
.../no_titlepage_and_setchapternewpage_odd.tex | 3 +-
.../no_titlepage_and_setchapternewpage_on.tex | 3 +-
.../setchapternewpage_on_odd_titlepage.tex | 3 +-
.../res_latex/settitle_and_headings.tex | 3 +-
.../three_setchapternewpage_on_odd_off.tex | 3 +-
.../res_latex/titlepage_and_headings.tex | 3 +-
.../titlepage_and_setchapternewpage_odd.tex | 3 +-
.../titlepage_and_setchapternewpage_on.tex | 3 +-
.../res_latex/titlepage_in_top_node.tex | 3 +-
.../res_latex/two_setchapternewpage_odd_on.tex | 3 +-
.../res_latex/two_setchapternewpage_on_odd.tex | 3 +-
.../res_latex/chapter_between_nodes.tex | 3 +-
.../lone_Top_node/res_latex/lone_Top_node.tex | 3 +-
.../sectioning/loop_nodes/res_latex/loop_nodes.tex | 3 +-
.../node_sectop_before_chapter_no_node.tex | 3 +-
.../res_latex/node_sectop_before_lone_node_Top.tex | 3 +-
.../res_latex/nodes_before_after_top.tex | 3 +-
.../res_latex/nodes_before_top.tex | 3 +-
.../res_latex/section_before_after_top_node.tex | 3 +-
.../section_before_after_top_node_last_node.tex | 3 +-
.../res_latex/section_chapter_before_top_nodes.tex | 3 +-
tp/tests/coverage_macro.texi | 5 +
.../layout/res_parser/formatting/formatting.html | 32 +-
.../layout/res_parser/formatting_chm/anchor.html | 4 +
.../layout/res_parser/formatting_chm/chapter.html | 20 +-
.../layout/res_parser/formatting_chm/chapter2.html | 4 +
.../res_parser/formatting_chm/formatting.html | 16 +-
.../res_parser/formatting_chm/formatting_abt.html | 4 +
.../res_parser/formatting_chm/formatting_ovr.html | 4 +
.../res_parser/formatting_chm/formatting_toc.html | 4 +
.../layout/res_parser/formatting_chm/index.html | 4 +
.../formatting_chm/s_002d_002dect_002cion.html | 4 +
.../res_parser/formatting_chm/subsection.html | 4 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 4 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 4 +
.../res_parser/formatting_docbook/formatting.xml | 40 +-
.../res_parser/formatting_exotic/anchor.html | 4 +
.../res_parser/formatting_exotic/chapter.html | 20 +-
.../res_parser/formatting_exotic/chapter2.html | 4 +
.../formatting_exotic/formatting_abt.html | 4 +
.../formatting_exotic/formatting_ovr.html | 4 +
.../formatting_exotic/formatting_toc.html | 4 +
.../layout/res_parser/formatting_exotic/index.html | 4 +
.../formatting_exotic/s_002d_002dect_002cion.html | 4 +
.../res_parser/formatting_exotic/subsection.html | 4 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 4 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 4 +
.../res_parser/formatting_fr_icons/formatting.html | 32 +-
.../res_parser/formatting_html/formatting.html | 32 +-
.../res_parser/formatting_html32/formatting.html | 32 +-
.../formatting_html_no_texi2html/formatting.html | 20 +-
.../res_parser/formatting_html_nodes/anchor.html | 4 +
.../res_parser/formatting_html_nodes/chapter.html | 20 +-
.../res_parser/formatting_html_nodes/chapter2.html | 4 +
.../formatting_html_nodes/formatting_abt.html | 4 +
.../formatting_html_nodes/formatting_fot.html | 4 +
.../formatting_html_nodes/formatting_ovr.html | 4 +
.../formatting_html_nodes/formatting_toc.html | 4 +
.../res_parser/formatting_html_nodes/index.html | 16 +-
.../s_002d_002dect_002cion.html | 4 +
.../formatting_html_nodes/subsection.html | 4 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 4 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 4 +
.../layout/res_parser/formatting_info/formatting.2 | 8 +
.../res_parser/formatting_info/formatting.info | Bin 89751 -> 90735 bytes
.../res_parser/formatting_latex/formatting.tex | 153 ++++---
.../res_parser/formatting_mathjax/formatting.html | 32 +-
.../layout/res_parser/formatting_nodes/anchor.html | 4 +
.../res_parser/formatting_nodes/chapter.html | 20 +-
.../res_parser/formatting_nodes/chapter2.html | 4 +
.../formatting_nodes/formatting_abt.html | 4 +
.../formatting_nodes/formatting_fot.html | 4 +
.../formatting_nodes/formatting_ovr.html | 4 +
.../formatting_nodes/formatting_toc.html | 4 +
.../layout/res_parser/formatting_nodes/index.html | 16 +-
.../formatting_nodes/s_002d_002dect_002cion.html | 4 +
.../res_parser/formatting_nodes/subsection.html | 4 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 4 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 4 +
.../res_parser/formatting_plaintext/formatting.2 | 6 +
.../res_parser/formatting_plaintext/formatting.txt | 502 +++++++++++----------
.../formatting_regions/formatting_regions.html | 32 +-
.../formatting_weird_quotes/formatting.html | 32 +-
.../res_parser/formatting_xml/formatting.xml | 31 +-
.../res_parser/formatting_singular/anchor.html | 4 +
.../res_parser/formatting_singular/chapter.html | 20 +-
.../res_parser/formatting_singular/chapter2.html | 4 +
.../res_parser/formatting_singular/index.htm | 4 +
.../res_parser/formatting_singular/index.html | 4 +
.../s_002d_002dect_002cion.html | 4 +
.../res_parser/formatting_singular/sing_abt.htm | 4 +
.../res_parser/formatting_singular/sing_fot.htm | 4 +
.../res_parser/formatting_singular/sing_ovr.htm | 4 +
.../res_parser/formatting_singular/sing_toc.htm | 4 +
.../res_parser/formatting_singular/subsection.html | 4 +
...tion-_0060_0060simple_002ddouble_002d_002d.html | 4 +
...02d_002dfour_002d_002d_002d_002d_0027_0027.html | 4 +
104 files changed, 1283 insertions(+), 399 deletions(-)
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 81d9a32..0cc67a1 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -592,6 +592,7 @@ sub _latex_header {
# graphicx for \includegraphics
# needspace for \needspace. In texlive-latex-extra in debian
# etoolbox for \patchcmd. In texlive-latex-recommended in debian
+ # \usepackage[linkbordercolor={0 0 0}]{hyperref}
my $header =
'\documentclass{book}
\usepackage{makeidx}\makeindex
@@ -604,7 +605,8 @@ sub _latex_header {
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
';
if ($self->{'output_encoding_name'}) {
my $encoding = $self->{'output_encoding_name'};
@@ -890,6 +892,14 @@ sub convert_tree($$)
return $self->_convert($root);
}
+sub _protect_url($$)
+{
+ my ($self, $text) = @_;
+
+ $text =~ s/([{}\\#%])/\\$1/g;
+ return $text;
+}
+
# Protect LaTeX special characters.
sub _protect_text($$)
{
@@ -1336,20 +1346,25 @@ sub _convert($$)
unshift @{$self->{'current_contents'}->[-1]},
{'contents' => $root->{'args'}->[2]->{'contents'}};
} elsif (@{$root->{'args'}->[0]->{'contents'}}) {
- # no mangling of --- and similar in url.
- my $url = {'type' => '_code',
- 'contents' => $root->{'args'}->[0]->{'contents'}};
+ my $url_content = $root->{'args'}->[0]->{'contents'};
+ my $url_text = $self->_protect_url(
+ Texinfo::Convert::Text::convert_to_text(
+ {'contents' => $url_content},
+ {'code' => 1,
+
Texinfo::Common::_convert_text_options($self)}));
if (scalar(@{$root->{'args'}}) == 2
and defined($root->{'args'}->[1])
and @{$root->{'args'}->[1]->{'contents'}}) {
- my $prepended = $self->gdt('{text} ({url})',
- {'text' => $root->{'args'}->[1]->{'contents'},
- 'url' => $url });
- unshift @{$self->{'current_contents'}->[-1]}, $prepended;
+ my $description = _convert($self, {'contents',
+ $root->{'args'}->[1]->{'contents'}});
+ my $text = $self->gdt('{text} ({url})',
+ {'text' => $description, 'url' =>
"\\nolinkurl{$url_text}"},
+ 'translated_text');
+ $result .= "\\href{$url_text}{$text}";
+ return $result;
} else {
- my $prepended = $self->gdt('@t{<{url}>}',
- {'url' => $url});
- unshift @{$self->{'current_contents'}->[-1]}, $prepended
+ $result .= "\\url{$url_text}";
+ return $result;
}
} elsif (scalar(@{$root->{'args'}}) == 2
and defined($root->{'args'}->[1])
@@ -1495,13 +1510,13 @@ sub _convert($$)
#
# If an unwanted comma is added, follow the argument with a
command such as @:
if ($section_command) {
- if ($section_command->{'level'} > 0) {
- $result .= "Section~\\ref{$node_label} [$name_text],
page~\\pageref{$node_label}";
+ if ($section_command->{'level'} > 1) {
+ $result .=
"\\hyperref[$node_label]{Section~\\ref*{$node_label} [$name_text],
page~\\pageref*{$node_label}}";
} else {
- $result .= "Chapter~\\ref{$node_label} [$name_text],
page~\\pageref{$node_label}";
+ $result .=
"\\hyperref[$node_label]{Chapter~\\ref*{$node_label} [$name_text],
page~\\pageref*{$node_label}}";
}
} else {
- $result .= "\\ref{$node_label} [$name_text],
page~\\pageref{$node_label}";
+ $result .= "\\hyperref[$node_label]{\\ref*{$node_label}
[$name_text], page~\\pageref*{$node_label}}";
}
}
return $result;
diff --git a/tp/t/03coverage_braces.t b/tp/t/03coverage_braces.t
index d5d0cb0..483936c 100644
--- a/tp/t/03coverage_braces.t
+++ b/tp/t/03coverage_braces.t
@@ -63,6 +63,9 @@ my @test_cases = (
@url{--m,--n}
@url{--o,--p,--q}
'],
+['uref_with_commands_characters',
+'@uref{http://my-host.com/~@strong{toto}%5Cs\'q"a&e?b@}b@{ba@@s\s p+h#aaa, see
that @strong{@LaTeX{}}}
+'],
['empty_commands',
'@titlefont{}
@@ -328,13 +331,18 @@ third}
']
);
-our ($arg_test_case, $arg_generate, $arg_debug);
+my @latex_tests_cases_tests = ('abbr_acronym', 'uref_url',
+ 'uref_with_commands_characters', 'nested', 'uref_in_ref');
foreach my $test (@test_cases) {
push @{$test->[2]->{'test_formats'}}, 'plaintext';
push @{$test->[2]->{'test_formats'}}, 'html_text';
+ push @{$test->[2]->{'test_formats'}}, 'latex'
+ if (grep {$_ eq $test->[0]} @latex_tests_cases_tests);
}
+our ($arg_test_case, $arg_generate, $arg_debug);
+
run_all ('coverage_braces', [@test_cases, @test_invalid], $arg_test_case,
$arg_generate, $arg_debug);
diff --git a/tp/t/results/coverage_braces/abbr_acronym.pl
b/tp/t/results/coverage_braces/abbr_acronym.pl
index c8ff350..9cd5047 100644
--- a/tp/t/results/coverage_braces/abbr_acronym.pl
+++ b/tp/t/results/coverage_braces/abbr_acronym.pl
@@ -470,4 +470,12 @@ $result_converted{'html_text'}->{'abbr_acronym'} =
'<p><acronym title="an accron
<abbr title="Étude–, Autonome">É–a. ,A.</abbr>
</p>';
+
+$result_converted{'latex'}->{'abbr_acronym'} = '--a (an accronym)
+--a
+--a (an accronym , \\dots{})
+\\\'{E}--a.\\@ ,A.\\@ (\\\'{E}tude--, \\textbf{Autonome})
+\\\'{E}--a.\\@ ,A.\\@
+';
+
1;
diff --git a/tp/t/results/coverage_braces/nested.pl
b/tp/t/results/coverage_braces/nested.pl
index 930f585..b813b2f 100644
--- a/tp/t/results/coverage_braces/nested.pl
+++ b/tp/t/results/coverage_braces/nested.pl
@@ -96,4 +96,7 @@ $result_converted{'plaintext'}->{'nested'} = 'type the
characters \'l o g o u t
$result_converted{'html_text'}->{'nested'} = '<p>type the characters <kbd>l o
g o u t <span class="key">RET</span></kbd>.</p>';
+
+$result_converted{'latex'}->{'nested'} = 'type the characters
{\\ttfamily\\textsl{l o g o u t \\texttt{RET}}}.';
+
1;
diff --git a/tp/t/results/coverage_braces/uref_in_ref.pl
b/tp/t/results/coverage_braces/uref_in_ref.pl
index bef3a23..90a9dfd 100644
--- a/tp/t/results/coverage_braces/uref_in_ref.pl
+++ b/tp/t/results/coverage_braces/uref_in_ref.pl
@@ -320,4 +320,8 @@ $result_converted_errors{'plaintext'}->{'uref_in_ref'} = [
$result_converted{'html_text'}->{'uref_in_ref'} = '<p><a data-manual="info
file with uref3 href://http/myhost.com/index3.html (uref3)" href="index3.html
(uref3).html#node">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
</p>';
+
+$result_converted{'latex'}->{'uref_in_ref'} = 'Section ``title with uref2
\\href{href://http/myhost.com/index2.html}{uref2
(\\nolinkurl{href://http/myhost.com/index2.html})}\'\' in \\textit{printed
manual with uref4 \\href{href://http/myhost.com/index4.html}{uref4
(\\nolinkurl{href://http/myhost.com/index4.html})}}
+';
+
1;
diff --git a/tp/t/results/coverage_braces/uref_url.pl
b/tp/t/results/coverage_braces/uref_url.pl
index bfd9f88..fc63a7a 100644
--- a/tp/t/results/coverage_braces/uref_url.pl
+++ b/tp/t/results/coverage_braces/uref_url.pl
@@ -468,4 +468,16 @@ $result_converted{'html_text'}->{'uref_url'} = '<p><a
href="--a">–b</a>
<a href="--o">–q</a>
</p>';
+
+$result_converted{'latex'}->{'uref_url'} = '\\href{--a}{--b (\\nolinkurl{--a})}
+\\url{--c}
+--d
+--g
+--i
+--k
+--l
+\\href{--m}{--n (\\nolinkurl{--m})}
+--q
+';
+
1;
diff --git a/tp/t/results/coverage_braces/uref_with_commands_characters.pl
b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
new file mode 100644
index 0000000..9a8604c
--- /dev/null
+++ b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
@@ -0,0 +1,192 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'uref_with_commands_characters'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'http://my-host.com/~'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'toto'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'strong',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '%5Cs\'q"a&e?b'
+ },
+ {
+ 'cmdname' => '}',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => 'b'
+ },
+ {
+ 'cmdname' => '{',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => 'ba'
+ },
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => 's\\s p+h#aaa'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'see that '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'LaTeX',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'strong',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'uref',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'uref_with_commands_characters'}{'contents'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'uref_with_commands_characters'}{'contents'}[0];
+$result_trees{'uref_with_commands_characters'}{'contents'}[0]{'parent'} =
$result_trees{'uref_with_commands_characters'};
+
+$result_texis{'uref_with_commands_characters'} =
'@uref{http://my-host.com/~@strong{toto}%5Cs\'q"a&e?b@}b@{ba@@s\\s p+h#aaa, see
that @strong{@LaTeX{}}}
+';
+
+
+$result_texts{'uref_with_commands_characters'} =
'http://my-host.com/~toto%5Cs\'q"a&e?b}b{ba@s\\s p+h#aaa (see that LaTeX)
+';
+
+$result_errors{'uref_with_commands_characters'} = [];
+
+
+$result_floats{'uref_with_commands_characters'} = {};
+
+
+
+$result_converted{'plaintext'}->{'uref_with_commands_characters'} = 'see that
*LaTeX* (http://my-host.com/~*toto*%5Cs\'q"a&e?b}b{ba@s\\s
+p+h#aaa)
+';
+
+
+$result_converted{'html_text'}->{'uref_with_commands_characters'} = '<p><a
href="http://my-host.com/~toto%5Cs\'q"a&e?b}b{ba@s\\s p+h#aaa">see
that <strong>LaTeX</strong></a>
+</p>';
+
+
+$result_converted{'latex'}->{'uref_with_commands_characters'} =
'\\href{http://my-host.com/~toto\\%5Cs\'q"a&e?b\\}b\\{ba@s\\\\s p+h\\#aaa}{see
that \\textbf{\\LaTeX{}}
(\\nolinkurl{http://my-host.com/~toto\\%5Cs\'q"a&e?b\\}b\\{ba@s\\\\s
p+h\\#aaa})}
+';
+
+1;
diff --git
a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd/res_latex/no_titlepage_and_setchapternewpage_odd.tex
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd/res_latex/no_titlepage_and_setchapternewpage_odd.tex
index ccc6476..a6aaa73 100644
---
a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd/res_latex/no_titlepage_and_setchapternewpage_odd.tex
+++
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd/res_latex/no_titlepage_and_setchapternewpage_odd.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on/res_latex/no_titlepage_and_setchapternewpage_on.tex
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on/res_latex/no_titlepage_and_setchapternewpage_on.tex
index 30cd79b..6a7041b 100644
---
a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on/res_latex/no_titlepage_and_setchapternewpage_on.tex
+++
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on/res_latex/no_titlepage_and_setchapternewpage_on.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage/res_latex/setchapternewpage_on_odd_titlepage.tex
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage/res_latex/setchapternewpage_on_odd_titlepage.tex
index 1c8a72d..dcabc25 100644
---
a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage/res_latex/setchapternewpage_on_odd_titlepage.tex
+++
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage/res_latex/setchapternewpage_on_odd_titlepage.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/latex_tests/settitle_and_headings/res_latex/settitle_and_headings.tex
b/tp/t/results/latex_tests/settitle_and_headings/res_latex/settitle_and_headings.tex
index 8044477..4b5acca 100644
---
a/tp/t/results/latex_tests/settitle_and_headings/res_latex/settitle_and_headings.tex
+++
b/tp/t/results/latex_tests/settitle_and_headings/res_latex/settitle_and_headings.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off/res_latex/three_setchapternewpage_on_odd_off.tex
b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off/res_latex/three_setchapternewpage_on_odd_off.tex
index c599dd4..9ceace0 100644
---
a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off/res_latex/three_setchapternewpage_on_odd_off.tex
+++
b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off/res_latex/three_setchapternewpage_on_odd_off.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
b/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
index 52fd315..2aeb767 100644
---
a/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
+++
b/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
index c4feea4..38f4ac5 100644
---
a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
+++
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on/res_latex/titlepage_and_setchapternewpage_on.tex
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on/res_latex/titlepage_and_setchapternewpage_on.tex
index 52fd315..2aeb767 100644
---
a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on/res_latex/titlepage_and_setchapternewpage_on.tex
+++
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on/res_latex/titlepage_and_setchapternewpage_on.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
b/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
index 2d6f284..aef10b2 100644
---
a/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
+++
b/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/latex_tests/two_setchapternewpage_odd_on/res_latex/two_setchapternewpage_odd_on.tex
b/tp/t/results/latex_tests/two_setchapternewpage_odd_on/res_latex/two_setchapternewpage_odd_on.tex
index 5958365..b356971 100644
---
a/tp/t/results/latex_tests/two_setchapternewpage_odd_on/res_latex/two_setchapternewpage_odd_on.tex
+++
b/tp/t/results/latex_tests/two_setchapternewpage_odd_on/res_latex/two_setchapternewpage_odd_on.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/latex_tests/two_setchapternewpage_on_odd/res_latex/two_setchapternewpage_on_odd.tex
b/tp/t/results/latex_tests/two_setchapternewpage_on_odd/res_latex/two_setchapternewpage_on_odd.tex
index 5d6d684..1b9dbe3 100644
---
a/tp/t/results/latex_tests/two_setchapternewpage_on_odd/res_latex/two_setchapternewpage_on_odd.tex
+++
b/tp/t/results/latex_tests/two_setchapternewpage_on_odd/res_latex/two_setchapternewpage_on_odd.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/sectioning/chapter_between_nodes/res_latex/chapter_between_nodes.tex
b/tp/t/results/sectioning/chapter_between_nodes/res_latex/chapter_between_nodes.tex
index e3f2f30..567d544 100644
---
a/tp/t/results/sectioning/chapter_between_nodes/res_latex/chapter_between_nodes.tex
+++
b/tp/t/results/sectioning/chapter_between_nodes/res_latex/chapter_between_nodes.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git a/tp/t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex
b/tp/t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex
index 9cf52b8..19a43aa 100644
--- a/tp/t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex
+++ b/tp/t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git a/tp/t/results/sectioning/loop_nodes/res_latex/loop_nodes.tex
b/tp/t/results/sectioning/loop_nodes/res_latex/loop_nodes.tex
index b40adf3..5acf76e 100644
--- a/tp/t/results/sectioning/loop_nodes/res_latex/loop_nodes.tex
+++ b/tp/t/results/sectioning/loop_nodes/res_latex/loop_nodes.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
index 0b0d644..6ca2bff 100644
---
a/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
+++
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/sectioning/node_sectop_before_lone_node_Top/res_latex/node_sectop_before_lone_node_Top.tex
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top/res_latex/node_sectop_before_lone_node_Top.tex
index e2f92e4..4ab2429 100644
---
a/tp/t/results/sectioning/node_sectop_before_lone_node_Top/res_latex/node_sectop_before_lone_node_Top.tex
+++
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top/res_latex/node_sectop_before_lone_node_Top.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
b/tp/t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
index 08ee93a..8b9da64 100644
---
a/tp/t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
+++
b/tp/t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex
b/tp/t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex
index c371cc9..564ec89 100644
--- a/tp/t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex
+++ b/tp/t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
b/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
index 2b9f1ca..641f29b 100644
---
a/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
+++
b/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/sectioning/section_before_after_top_node_last_node/res_latex/section_before_after_top_node_last_node.tex
b/tp/t/results/sectioning/section_before_after_top_node_last_node/res_latex/section_before_after_top_node_last_node.tex
index a61c17e..dc26e1c 100644
---
a/tp/t/results/sectioning/section_before_after_top_node_last_node/res_latex/section_before_after_top_node_last_node.tex
+++
b/tp/t/results/sectioning/section_before_after_top_node_last_node/res_latex/section_before_after_top_node_last_node.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git
a/tp/t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
b/tp/t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
index b1cee49..d6dd48a 100644
---
a/tp/t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
+++
b/tp/t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
diff --git a/tp/tests/coverage_macro.texi b/tp/tests/coverage_macro.texi
index 683c707..139e87a 100644
--- a/tp/tests/coverage_macro.texi
+++ b/tp/tests/coverage_macro.texi
@@ -666,6 +666,11 @@ ref, a comma@@comma@{@} in file@}}
@inforef{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in file}
+@c special cases with @uref
+@samp{@ref{chapter}}.
+
+@ref{ext, cross ref with uref @uref{href://http/myhost.com/index.html,uref1},
title with uref2 @uref{href://http/myhost.com/index2.html,uref2}, info file
with uref3 @uref{href://http/myhost.com/index3.html,uref3}, printed manual with
uref4 @uref{href://http/myhost.com/index4.html,uref4}}
+@ref{chapter, cross ref with uref
@uref{href://http/myhost.com/index.html,uref1}, title with uref2
@uref{href://http/myhost.com/index2.html,uref2}}
@table @bullet
@c comment in table
diff --git a/tp/tests/layout/res_parser/formatting/formatting.html
b/tp/tests/layout/res_parser/formatting/formatting.html
index 1526084..cfead42 100644
--- a/tp/tests/layout/res_parser/formatting/formatting.html
+++ b/tp/tests/layout/res_parser/formatting/formatting.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1384,7 +1388,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2217,7 +2225,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3105,7 +3117,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3937,7 +3953,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -4858,6 +4878,10 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
+‘<samp><a href="#chapter">chapter</a></samp>’.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
diff --git a/tp/tests/layout/res_parser/formatting_chm/anchor.html
b/tp/tests/layout/res_parser/formatting_chm/anchor.html
index 6001441..ec4c5d3 100644
--- a/tp/tests/layout/res_parser/formatting_chm/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_chm/anchor.html
@@ -525,6 +525,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html
b/tp/tests/layout/res_parser/formatting_chm/chapter.html
index be8af10..a6ae003 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1391,7 +1395,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2223,7 +2231,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3144,6 +3156,10 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
+‘<samp><a href="#chapter">chapter</a></samp>’.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
index 3838f08..82f29f4 100644
--- a/tp/tests/layout/res_parser/formatting_chm/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_chm/chapter2.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html
b/tp/tests/layout/res_parser/formatting_chm/formatting.html
index de144df..cace2ab 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1384,7 +1388,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="chapter.html">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="chapter.html">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2217,7 +2225,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="chapter.html">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="chapter.html">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
index 5aaa682..c003bad 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
index 3f32e90..ab88712 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
index f9da847..ea55118 100644
--- a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_chm/index.html
b/tp/tests/layout/res_parser/formatting_chm/index.html
index 9435721..d6fd706 100644
--- a/tp/tests/layout/res_parser/formatting_chm/index.html
+++ b/tp/tests/layout/res_parser/formatting_chm/index.html
@@ -525,6 +525,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
index 3d7bb4b..70594b1 100644
--- a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html
b/tp/tests/layout/res_parser/formatting_chm/subsection.html
index 0be1fca..0118a3c 100644
--- a/tp/tests/layout/res_parser/formatting_chm/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_chm/subsection.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index ac06bdb..07b3c84 100644
---
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index d3ae2ce..3fe339a 100644
---
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index d943b7e..3aa4ad1 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -534,7 +534,12 @@ section “a comma, in title” in
<citetitle>a , in manual name
ref, a comma@comma{} in file}</literal>
See Info file <filename>a comma, in file</filename>, node
‘<literal>s--ect,ion</literal>’
</para>
-
+<!-- special cases with @uref -->
+<para>‘<literal><link linkend="chapter">chapter</link></literal>’.
+</para>
+<para>section “title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2</ulink>” in
<citetitle>printed manual with uref4 <ulink
url="href://http/myhost.com/index4.html">uref4</ulink></citetitle>
+<link linkend="chapter">title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2</ulink></link>
+</para>
<variablelist><!-- comment in table -->
<varlistentry><term>a
</term><listitem><para>l–ine
@@ -1235,7 +1240,12 @@ section “a comma, in title” in
<citetitle>a , in manual name
ref, a comma@comma{} in file}</literal>
See Info file <filename>a comma, in file</filename>, node
‘<literal>s--ect,ion</literal>’
</para>
-
+<!-- special cases with @uref -->
+<para>‘<literal><link linkend="chapter">chapter</link></literal>’.
+</para>
+<para>section “title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2</ulink>” in
<citetitle>printed manual with uref4 <ulink
url="href://http/myhost.com/index4.html">uref4</ulink></citetitle>
+<link linkend="chapter">title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2</ulink></link>
+</para>
<variablelist><!-- comment in table -->
<varlistentry><term>a
</term><listitem><para>l–ine
@@ -1937,7 +1947,12 @@ section “a comma, in title” in
<citetitle>a , in manual name
ref, a comma@comma{} in file}</literal>
See Info file <filename>a comma, in file</filename>, node
‘<literal>s--ect,ion</literal>’
</para>
-
+<!-- special cases with @uref -->
+<para>‘<literal><link linkend="chapter">chapter</link></literal>’.
+</para>
+<para>section “title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2</ulink>” in
<citetitle>printed manual with uref4 <ulink
url="href://http/myhost.com/index4.html">uref4</ulink></citetitle>
+<link linkend="chapter">title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2</ulink></link>
+</para>
<variablelist><!-- comment in table -->
<varlistentry><term>a
</term><listitem><para>l–ine
@@ -2657,7 +2672,12 @@ section “a comma, in title” in
<citetitle>a , in manual name
ref, a comma@comma{} in file}</literal>
See Info file <filename>a comma, in file</filename>, node
‘<literal>s--ect,ion</literal>’
</para>
-
+<!-- special cases with @uref -->
+<para>‘<literal><link linkend="chapter">chapter</link></literal>’.
+</para>
+<para>section “title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2</ulink>” in
<citetitle>printed manual with uref4 <ulink
url="href://http/myhost.com/index4.html">uref4</ulink></citetitle>
+<link linkend="chapter">title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2</ulink></link>
+</para>
<variablelist><!-- comment in table -->
<varlistentry><term>a
</term><listitem><para>l–ine
@@ -3358,7 +3378,12 @@ section “a comma, in title” in
<citetitle>a , in manual name
ref, a comma@comma{} in file}</literal>
See Info file <filename>a comma, in file</filename>, node
‘<literal>s--ect,ion</literal>’
</para>
-
+<!-- special cases with @uref -->
+<para>‘<literal><link linkend="chapter">chapter</link></literal>’.
+</para>
+<para>section “title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2</ulink>” in
<citetitle>printed manual with uref4 <ulink
url="href://http/myhost.com/index4.html">uref4</ulink></citetitle>
+<link linkend="chapter">title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2</ulink></link>
+</para>
<variablelist><!-- comment in table -->
<varlistentry><term>a
</term><listitem><para>l–ine
@@ -4052,6 +4077,11 @@ section ``a comma, in title'' in <citetitle>a ,
in manual name</citetitl
ref, a comma@comma{} in file}</literal>
See Info file <filename>a comma, in file</filename>, node
‘<literal>s--ect,ion</literal>’
+<!-- special cases with @uref -->
+‘<literal><link linkend="chapter">chapter</link></literal>’.
+
+section ``title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2</ulink>'' in <citetitle>printed
manual with uref4 <ulink
url="href://http/myhost.com/index4.html">uref4</ulink></citetitle>
+<link linkend="chapter">title with uref2 <ulink
url="href://http/myhost.com/index2.html">uref2</ulink></link>
</screen><variablelist><screen><!-- comment in table -->
</screen><varlistentry><term>a
diff --git a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
index fe5b2c8..7f4e008 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/anchor.html
@@ -525,6 +525,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
index 81d9af7..696609f 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1407,7 +1411,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2239,7 +2247,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3160,6 +3172,10 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
+‘<samp><a href="#chapter">chapter</a></samp>’.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
diff --git a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
index 1169a31..ef2a7d5 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
index f8b801c..7c4f896 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
index 53f4750..ed8dd67 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
index b4000ed..fbd1e3f 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_exotic/index.html
b/tp/tests/layout/res_parser/formatting_exotic/index.html
index 9f331b7..e8ae9cb 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/index.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/index.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
index 14c50b0..a218a6e 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
index 3f48740..a143051 100644
--- a/tp/tests/layout/res_parser/formatting_exotic/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_exotic/subsection.html
@@ -525,6 +525,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index e8d7b38..56f13cb 100644
---
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -525,6 +525,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 16f58b5..5d98495 100644
---
a/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -525,6 +525,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index ccf9a81..cd87bbc 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1384,7 +1388,11 @@ ref, a comma@comma{} in file}</code>
Voir <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> dans <cite>printed
manual with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2217,7 +2225,11 @@ ref, a comma@comma{} in file}</code>
Voir <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> dans <cite>printed
manual with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3105,7 +3117,11 @@ ref, a comma@comma{} in file}</code>
Voir <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> dans <cite>printed
manual with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3937,7 +3953,11 @@ ref, a comma@comma{} in file}</code>
Voir <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> dans <cite>printed
manual with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -4858,6 +4878,10 @@ ref, a comma@comma{} in file}</code>
Voir <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
+‘<samp><a href="#chapter">chapter</a></samp>’.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> dans <cite>printed
manual with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
diff --git a/tp/tests/layout/res_parser/formatting_html/formatting.html
b/tp/tests/layout/res_parser/formatting_html/formatting.html
index 1526084..cfead42 100644
--- a/tp/tests/layout/res_parser/formatting_html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html/formatting.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1384,7 +1388,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2217,7 +2225,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3105,7 +3117,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3937,7 +3953,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -4858,6 +4878,10 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
+‘<samp><a href="#chapter">chapter</a></samp>’.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html
b/tp/tests/layout/res_parser/formatting_html32/formatting.html
index 18ed13e..9dbcba8 100644
--- a/tp/tests/layout/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html32/formatting.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1343,7 +1347,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>`<samp><a href="#chapter">chapter</a></samp>'.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l-ine
@@ -2154,7 +2162,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>`<samp><a href="#chapter">chapter</a></samp>'.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l-ine
@@ -3020,7 +3032,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>`<samp><a href="#chapter">chapter</a></samp>'.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l-ine
@@ -3830,7 +3846,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>`<samp><a href="#chapter">chapter</a></samp>'.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l-ine
@@ -4728,6 +4748,10 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
+`<samp><a href="#chapter">chapter</a></samp>'.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
diff --git
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
index 60a6f5c..dc95edb 100644
--- a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1445,7 +1449,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2277,7 +2285,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3198,6 +3210,10 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
+‘<samp><a href="#chapter">chapter</a></samp>’.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
index 6001441..ec4c5d3 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
@@ -525,6 +525,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
index 0a4d8c1..6105f23 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1407,7 +1411,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2239,7 +2247,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3160,6 +3172,10 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
+‘<samp><a href="#chapter">chapter</a></samp>’.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
index 5b1bf20..cca9fc9 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
index db177f8..3dfcafd 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
index af936d0..7e55ad3 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
index 26e68a2..fa739db 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
index 510f77b..52524d3 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
index 5db7248..cfad359 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/index.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1384,7 +1388,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="chapter.html">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="chapter.html">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2217,7 +2225,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="chapter.html">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="chapter.html">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
index b4b923a..13bedf9 100644
---
a/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
+++
b/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
index 44113d1..6ca8e22 100644
--- a/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 3e421d5..69df005 100644
---
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 4ffe2a0..e064e59 100644
---
a/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.2
b/tp/tests/layout/res_parser/formatting_info/formatting.2
index b4042fa..83278c2 100644
--- a/tp/tests/layout/res_parser/formatting_info/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_info/formatting.2
@@ -265,10 +265,18 @@ formatting.texi:65: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:65: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:15: warning: @ref node name should not contain `,' (possibly
involving @mymacro)
formatting.texi:15: warning: @inforef node name should not contain `,'
(possibly involving @mymacro)
+formatting.texi:15: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
+formatting.texi:15: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
formatting.texi:15: warning: @ref node name should not contain `,' (possibly
involving @mymacro)
formatting.texi:15: warning: @inforef node name should not contain `,'
(possibly involving @mymacro)
+formatting.texi:15: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
+formatting.texi:15: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
formatting.texi:61: warning: @ref node name should not contain `,' (possibly
involving @mymacro)
formatting.texi:61: warning: @inforef node name should not contain `,'
(possibly involving @mymacro)
+formatting.texi:61: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
+formatting.texi:61: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
formatting.texi:65: warning: @ref node name should not contain `,' (possibly
involving @mymacro)
formatting.texi:65: warning: @inforef node name should not contain `,'
(possibly involving @mymacro)
+formatting.texi:65: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
+formatting.texi:65: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
formatting.texi:112: warning: @node name should not contain `,': s--ect,ion
diff --git a/tp/tests/layout/res_parser/formatting_info/formatting.info
b/tp/tests/layout/res_parser/formatting_info/formatting.info
index 8de567e..189d837 100644
Binary files a/tp/tests/layout/res_parser/formatting_info/formatting.info and
b/tp/tests/layout/res_parser/formatting_info/formatting.info differ
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index c26dc43..60c7392 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -9,7 +9,8 @@
\usepackage{needspace}
\usepackage{etoolbox}
\usepackage{fancyhdr}
-\usepackage{hyperref}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\usepackage[hidelinks]{hyperref}
\usepackage[utf8]{inputenc}
% command that does nothing used to help with substitutions in commands
@@ -190,9 +191,9 @@ but , ,\@
\texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@dfn\{{-}{-}a\}} \emph{--a}
\texttt{@dmn\{{-}{-}a\}} --a
-\texttt{@email\{{-}{-}a,{-}{-}b\}} --b \texttt{<{-}{-}a>}
+\texttt{@email\{{-}{-}a,{-}{-}b\}} --b \url{--a}
\texttt{@email\{,{-}{-}b\}} --b
-\texttt{@email\{{-}{-}a\}} \texttt{<{-}{-}a>}
+\texttt{@email\{{-}{-}a\}} \url{--a}
\texttt{@emph\{{-}{-}a\}} \emph{--a}
\texttt{@env\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@file\{{-}{-}a\}} \texttt{{-}{-}a}
@@ -210,15 +211,15 @@ but , ,\@
\texttt{@slanted\{{-}{-}a\}} \textsl{--a}
\texttt{@titlefont\{{-}{-}a\}} {\Huge \bfseries --a}
\texttt{@indicateurl\{{-}{-}a\}} `\texttt{{-}{-}a}'
-\texttt{@uref\{{-}{-}a,{-}{-}b\}} --b (--a)
-\texttt{@uref\{{-}{-}a\}} \texttt{<{-}{-}a>}
+\texttt{@uref\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
+\texttt{@uref\{{-}{-}a\}} \url{--a}
\texttt{@uref\{,{-}{-}b\}} --b
\texttt{@uref\{{-}{-}a,{-}{-}b,{-}{-}c\}} --c
\texttt{@uref\{,{-}{-}b,{-}{-}c\}} --c
\texttt{@uref\{{-}{-}a,,{-}{-}c\}} --c
\texttt{@uref\{,,{-}{-}c\}} --c
-\texttt{@url\{{-}{-}a,{-}{-}b\}} --b (--a)
-\texttt{@url\{{-}{-}a,\}} \texttt{<{-}{-}a>}
+\texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
+\texttt{@url\{{-}{-}a,\}} \url{--a}
\texttt{@url\{,{-}{-}b\}} --b
\texttt{@var\{{-}{-}a\}} \emph{--a}
\texttt{@verb\{:{-}{-}a:\}} \verb:--a:
@@ -627,20 +628,20 @@ d--eftypemethod
\texttt{@pxref\{chapter, cross ref name, title, file name, manual\}} see
Section ``title'' in \textit{manual}
\texttt{@inforef\{chapter, cross ref name, file name\}} Section ``chapter'' in
\texttt{file name}
-\texttt{@ref\{chapter\}} Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}
-\texttt{@xref\{chapter\}} See Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}.
-\texttt{@pxref\{chapter\}} see Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}
-\texttt{@ref\{s{-}{-}ect@comma\{\}ion\}}
Section~\ref{anchor:s_002d_002dect_002cion} [s--ect,ion],
page~\pageref{anchor:s_002d_002dect_002cion}
+\texttt{@ref\{chapter\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@xref\{chapter\}} See
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}.
+\texttt{@pxref\{chapter\}} see
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@ref\{s{-}{-}ect@comma\{\}ion\}}
\hyperref[anchor:s_002d_002dect_002cion]{Section~\ref*{anchor:s_002d_002dect_002cion}
[s--ect,ion], page~\pageref*{anchor:s_002d_002dect_002cion}}
\texttt{@ref\{s{-}{-}ect@comma\{\}ion, a @comma\{\} in cross
ref, a comma@comma\{\} in title, a comma@comma\{\} in file, a @comma\{\} in
manual name \}}
Section ``a comma, in title'' in \textit{a , in manual name}
-\texttt{@ref\{chapter,cross ref name\}} Section~\ref{anchor:chapter}
[chapter], page~\pageref{anchor:chapter}
-\texttt{@ref\{chapter,,title\}} Section~\ref{anchor:chapter} [title],
page~\pageref{anchor:chapter}
+\texttt{@ref\{chapter,cross ref name\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@ref\{chapter,,title\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title],
page~\pageref*{anchor:chapter}}
\texttt{@ref\{chapter,,,file name\}} Section ``chapter'' in \texttt{file name}
\texttt{@ref\{chapter,,,,manual\}} Section ``chapter'' in \textit{manual}
-\texttt{@ref\{chapter,cross ref name,title,\}} Section~\ref{anchor:chapter}
[title], page~\pageref{anchor:chapter}
+\texttt{@ref\{chapter,cross ref name,title,\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title],
page~\pageref*{anchor:chapter}}
\texttt{@ref\{chapter,cross ref name,,file name\}} Section ``chapter'' in
\texttt{file name}
\texttt{@ref\{chapter,cross ref name,,,manual\}} Section ``chapter'' in
\textit{manual}
\texttt{@ref\{chapter,cross ref name,title,file name\}} Section ``title'' in
\texttt{file name}
@@ -682,6 +683,10 @@ Section ``a comma, in title'' in \textit{a , in manual
name}
ref, a comma@comma\{\} in file\}}
Section ``s--ect,ion'' in \texttt{a comma, in file}
+`\texttt{\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}}'.
+
+Section ``title with uref2 \href{href://http/myhost.com/index2.html}{uref2
(\nolinkurl{href://http/myhost.com/index2.html})}'' in \textit{printed manual
with uref4 \href{href://http/myhost.com/index4.html}{uref4
(\nolinkurl{href://http/myhost.com/index4.html})}}
+\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title with uref2
\href{href://http/myhost.com/index2.html}{uref2
(\nolinkurl{href://http/myhost.com/index2.html})}],
page~\pageref*{anchor:chapter}}
a
l--ine
@@ -992,9 +997,9 @@ but , ,\@
\texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@dfn\{{-}{-}a\}} \emph{--a}
\texttt{@dmn\{{-}{-}a\}} --a
-\texttt{@email\{{-}{-}a,{-}{-}b\}} --b \texttt{<{-}{-}a>}
+\texttt{@email\{{-}{-}a,{-}{-}b\}} --b \url{--a}
\texttt{@email\{,{-}{-}b\}} --b
-\texttt{@email\{{-}{-}a\}} \texttt{<{-}{-}a>}
+\texttt{@email\{{-}{-}a\}} \url{--a}
\texttt{@emph\{{-}{-}a\}} \emph{--a}
\texttt{@env\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@file\{{-}{-}a\}} \texttt{{-}{-}a}
@@ -1012,15 +1017,15 @@ but , ,\@
\texttt{@slanted\{{-}{-}a\}} \textsl{--a}
\texttt{@titlefont\{{-}{-}a\}} {\Huge \bfseries --a}
\texttt{@indicateurl\{{-}{-}a\}} `\texttt{{-}{-}a}'
-\texttt{@uref\{{-}{-}a,{-}{-}b\}} --b (--a)
-\texttt{@uref\{{-}{-}a\}} \texttt{<{-}{-}a>}
+\texttt{@uref\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
+\texttt{@uref\{{-}{-}a\}} \url{--a}
\texttt{@uref\{,{-}{-}b\}} --b
\texttt{@uref\{{-}{-}a,{-}{-}b,{-}{-}c\}} --c
\texttt{@uref\{,{-}{-}b,{-}{-}c\}} --c
\texttt{@uref\{{-}{-}a,,{-}{-}c\}} --c
\texttt{@uref\{,,{-}{-}c\}} --c
-\texttt{@url\{{-}{-}a,{-}{-}b\}} --b (--a)
-\texttt{@url\{{-}{-}a,\}} \texttt{<{-}{-}a>}
+\texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
+\texttt{@url\{{-}{-}a,\}} \url{--a}
\texttt{@url\{,{-}{-}b\}} --b
\texttt{@var\{{-}{-}a\}} \emph{--a}
\texttt{@verb\{:{-}{-}a:\}} \verb:--a:
@@ -1429,20 +1434,20 @@ d--eftypemethod
\texttt{@pxref\{chapter, cross ref name, title, file name, manual\}} see
Section ``title'' in \textit{manual}
\texttt{@inforef\{chapter, cross ref name, file name\}} Section ``chapter'' in
\texttt{file name}
-\texttt{@ref\{chapter\}} Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}
-\texttt{@xref\{chapter\}} See Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}.
-\texttt{@pxref\{chapter\}} see Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}
-\texttt{@ref\{s{-}{-}ect@comma\{\}ion\}}
Section~\ref{anchor:s_002d_002dect_002cion} [s--ect,ion],
page~\pageref{anchor:s_002d_002dect_002cion}
+\texttt{@ref\{chapter\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@xref\{chapter\}} See
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}.
+\texttt{@pxref\{chapter\}} see
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@ref\{s{-}{-}ect@comma\{\}ion\}}
\hyperref[anchor:s_002d_002dect_002cion]{Section~\ref*{anchor:s_002d_002dect_002cion}
[s--ect,ion], page~\pageref*{anchor:s_002d_002dect_002cion}}
\texttt{@ref\{s{-}{-}ect@comma\{\}ion, a @comma\{\} in cross
ref, a comma@comma\{\} in title, a comma@comma\{\} in file, a @comma\{\} in
manual name \}}
Section ``a comma, in title'' in \textit{a , in manual name}
-\texttt{@ref\{chapter,cross ref name\}} Section~\ref{anchor:chapter}
[chapter], page~\pageref{anchor:chapter}
-\texttt{@ref\{chapter,,title\}} Section~\ref{anchor:chapter} [title],
page~\pageref{anchor:chapter}
+\texttt{@ref\{chapter,cross ref name\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@ref\{chapter,,title\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title],
page~\pageref*{anchor:chapter}}
\texttt{@ref\{chapter,,,file name\}} Section ``chapter'' in \texttt{file name}
\texttt{@ref\{chapter,,,,manual\}} Section ``chapter'' in \textit{manual}
-\texttt{@ref\{chapter,cross ref name,title,\}} Section~\ref{anchor:chapter}
[title], page~\pageref{anchor:chapter}
+\texttt{@ref\{chapter,cross ref name,title,\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title],
page~\pageref*{anchor:chapter}}
\texttt{@ref\{chapter,cross ref name,,file name\}} Section ``chapter'' in
\texttt{file name}
\texttt{@ref\{chapter,cross ref name,,,manual\}} Section ``chapter'' in
\textit{manual}
\texttt{@ref\{chapter,cross ref name,title,file name\}} Section ``title'' in
\texttt{file name}
@@ -1484,6 +1489,10 @@ Section ``a comma, in title'' in \textit{a , in manual
name}
ref, a comma@comma\{\} in file\}}
Section ``s--ect,ion'' in \texttt{a comma, in file}
+`\texttt{\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}}'.
+
+Section ``title with uref2 \href{href://http/myhost.com/index2.html}{uref2
(\nolinkurl{href://http/myhost.com/index2.html})}'' in \textit{printed manual
with uref4 \href{href://http/myhost.com/index4.html}{uref4
(\nolinkurl{href://http/myhost.com/index4.html})}}
+\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title with uref2
\href{href://http/myhost.com/index2.html}{uref2
(\nolinkurl{href://http/myhost.com/index2.html})}],
page~\pageref*{anchor:chapter}}
a
l--ine
@@ -1809,9 +1818,9 @@ but , ,\@
\texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@dfn\{{-}{-}a\}} \emph{--a}
\texttt{@dmn\{{-}{-}a\}} --a
-\texttt{@email\{{-}{-}a,{-}{-}b\}} --b \texttt{<{-}{-}a>}
+\texttt{@email\{{-}{-}a,{-}{-}b\}} --b \url{--a}
\texttt{@email\{,{-}{-}b\}} --b
-\texttt{@email\{{-}{-}a\}} \texttt{<{-}{-}a>}
+\texttt{@email\{{-}{-}a\}} \url{--a}
\texttt{@emph\{{-}{-}a\}} \emph{--a}
\texttt{@env\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@file\{{-}{-}a\}} \texttt{{-}{-}a}
@@ -1829,15 +1838,15 @@ but , ,\@
\texttt{@slanted\{{-}{-}a\}} \textsl{--a}
\texttt{@titlefont\{{-}{-}a\}} {\Huge \bfseries --a}
\texttt{@indicateurl\{{-}{-}a\}} `\texttt{{-}{-}a}'
-\texttt{@uref\{{-}{-}a,{-}{-}b\}} --b (--a)
-\texttt{@uref\{{-}{-}a\}} \texttt{<{-}{-}a>}
+\texttt{@uref\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
+\texttt{@uref\{{-}{-}a\}} \url{--a}
\texttt{@uref\{,{-}{-}b\}} --b
\texttt{@uref\{{-}{-}a,{-}{-}b,{-}{-}c\}} --c
\texttt{@uref\{,{-}{-}b,{-}{-}c\}} --c
\texttt{@uref\{{-}{-}a,,{-}{-}c\}} --c
\texttt{@uref\{,,{-}{-}c\}} --c
-\texttt{@url\{{-}{-}a,{-}{-}b\}} --b (--a)
-\texttt{@url\{{-}{-}a,\}} \texttt{<{-}{-}a>}
+\texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
+\texttt{@url\{{-}{-}a,\}} \url{--a}
\texttt{@url\{,{-}{-}b\}} --b
\texttt{@var\{{-}{-}a\}} \emph{--a}
\texttt{@verb\{:{-}{-}a:\}} \verb:--a:
@@ -2246,20 +2255,20 @@ d--eftypemethod
\texttt{@pxref\{chapter, cross ref name, title, file name, manual\}} see
Section ``title'' in \textit{manual}
\texttt{@inforef\{chapter, cross ref name, file name\}} Section ``chapter'' in
\texttt{file name}
-\texttt{@ref\{chapter\}} Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}
-\texttt{@xref\{chapter\}} See Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}.
-\texttt{@pxref\{chapter\}} see Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}
-\texttt{@ref\{s{-}{-}ect@comma\{\}ion\}}
Section~\ref{anchor:s_002d_002dect_002cion} [s--ect,ion],
page~\pageref{anchor:s_002d_002dect_002cion}
+\texttt{@ref\{chapter\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@xref\{chapter\}} See
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}.
+\texttt{@pxref\{chapter\}} see
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@ref\{s{-}{-}ect@comma\{\}ion\}}
\hyperref[anchor:s_002d_002dect_002cion]{Section~\ref*{anchor:s_002d_002dect_002cion}
[s--ect,ion], page~\pageref*{anchor:s_002d_002dect_002cion}}
\texttt{@ref\{s{-}{-}ect@comma\{\}ion, a @comma\{\} in cross
ref, a comma@comma\{\} in title, a comma@comma\{\} in file, a @comma\{\} in
manual name \}}
Section ``a comma, in title'' in \textit{a , in manual name}
-\texttt{@ref\{chapter,cross ref name\}} Section~\ref{anchor:chapter}
[chapter], page~\pageref{anchor:chapter}
-\texttt{@ref\{chapter,,title\}} Section~\ref{anchor:chapter} [title],
page~\pageref{anchor:chapter}
+\texttt{@ref\{chapter,cross ref name\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@ref\{chapter,,title\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title],
page~\pageref*{anchor:chapter}}
\texttt{@ref\{chapter,,,file name\}} Section ``chapter'' in \texttt{file name}
\texttt{@ref\{chapter,,,,manual\}} Section ``chapter'' in \textit{manual}
-\texttt{@ref\{chapter,cross ref name,title,\}} Section~\ref{anchor:chapter}
[title], page~\pageref{anchor:chapter}
+\texttt{@ref\{chapter,cross ref name,title,\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title],
page~\pageref*{anchor:chapter}}
\texttt{@ref\{chapter,cross ref name,,file name\}} Section ``chapter'' in
\texttt{file name}
\texttt{@ref\{chapter,cross ref name,,,manual\}} Section ``chapter'' in
\textit{manual}
\texttt{@ref\{chapter,cross ref name,title,file name\}} Section ``title'' in
\texttt{file name}
@@ -2301,6 +2310,10 @@ Section ``a comma, in title'' in \textit{a , in manual
name}
ref, a comma@comma\{\} in file\}}
Section ``s--ect,ion'' in \texttt{a comma, in file}
+`\texttt{\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}}'.
+
+Section ``title with uref2 \href{href://http/myhost.com/index2.html}{uref2
(\nolinkurl{href://http/myhost.com/index2.html})}'' in \textit{printed manual
with uref4 \href{href://http/myhost.com/index4.html}{uref4
(\nolinkurl{href://http/myhost.com/index4.html})}}
+\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title with uref2
\href{href://http/myhost.com/index2.html}{uref2
(\nolinkurl{href://http/myhost.com/index2.html})}],
page~\pageref*{anchor:chapter}}
a
l--ine
@@ -2610,9 +2623,9 @@ but , ,\@
\texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@dfn\{{-}{-}a\}} \emph{--a}
\texttt{@dmn\{{-}{-}a\}} --a
-\texttt{@email\{{-}{-}a,{-}{-}b\}} --b \texttt{<{-}{-}a>}
+\texttt{@email\{{-}{-}a,{-}{-}b\}} --b \url{--a}
\texttt{@email\{,{-}{-}b\}} --b
-\texttt{@email\{{-}{-}a\}} \texttt{<{-}{-}a>}
+\texttt{@email\{{-}{-}a\}} \url{--a}
\texttt{@emph\{{-}{-}a\}} \emph{--a}
\texttt{@env\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@file\{{-}{-}a\}} \texttt{{-}{-}a}
@@ -2630,15 +2643,15 @@ but , ,\@
\texttt{@slanted\{{-}{-}a\}} \textsl{--a}
\texttt{@titlefont\{{-}{-}a\}} {\Huge \bfseries --a}
\texttt{@indicateurl\{{-}{-}a\}} `\texttt{{-}{-}a}'
-\texttt{@uref\{{-}{-}a,{-}{-}b\}} --b (--a)
-\texttt{@uref\{{-}{-}a\}} \texttt{<{-}{-}a>}
+\texttt{@uref\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
+\texttt{@uref\{{-}{-}a\}} \url{--a}
\texttt{@uref\{,{-}{-}b\}} --b
\texttt{@uref\{{-}{-}a,{-}{-}b,{-}{-}c\}} --c
\texttt{@uref\{,{-}{-}b,{-}{-}c\}} --c
\texttt{@uref\{{-}{-}a,,{-}{-}c\}} --c
\texttt{@uref\{,,{-}{-}c\}} --c
-\texttt{@url\{{-}{-}a,{-}{-}b\}} --b (--a)
-\texttt{@url\{{-}{-}a,\}} \texttt{<{-}{-}a>}
+\texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
+\texttt{@url\{{-}{-}a,\}} \url{--a}
\texttt{@url\{,{-}{-}b\}} --b
\texttt{@var\{{-}{-}a\}} \emph{--a}
\texttt{@verb\{:{-}{-}a:\}} \verb:--a:
@@ -3047,20 +3060,20 @@ d--eftypemethod
\texttt{@pxref\{chapter, cross ref name, title, file name, manual\}} see
Section ``title'' in \textit{manual}
\texttt{@inforef\{chapter, cross ref name, file name\}} Section ``chapter'' in
\texttt{file name}
-\texttt{@ref\{chapter\}} Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}
-\texttt{@xref\{chapter\}} See Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}.
-\texttt{@pxref\{chapter\}} see Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}
-\texttt{@ref\{s{-}{-}ect@comma\{\}ion\}}
Section~\ref{anchor:s_002d_002dect_002cion} [s--ect,ion],
page~\pageref{anchor:s_002d_002dect_002cion}
+\texttt{@ref\{chapter\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@xref\{chapter\}} See
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}.
+\texttt{@pxref\{chapter\}} see
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@ref\{s{-}{-}ect@comma\{\}ion\}}
\hyperref[anchor:s_002d_002dect_002cion]{Section~\ref*{anchor:s_002d_002dect_002cion}
[s--ect,ion], page~\pageref*{anchor:s_002d_002dect_002cion}}
\texttt{@ref\{s{-}{-}ect@comma\{\}ion, a @comma\{\} in cross
ref, a comma@comma\{\} in title, a comma@comma\{\} in file, a @comma\{\} in
manual name \}}
Section ``a comma, in title'' in \textit{a , in manual name}
-\texttt{@ref\{chapter,cross ref name\}} Section~\ref{anchor:chapter}
[chapter], page~\pageref{anchor:chapter}
-\texttt{@ref\{chapter,,title\}} Section~\ref{anchor:chapter} [title],
page~\pageref{anchor:chapter}
+\texttt{@ref\{chapter,cross ref name\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@ref\{chapter,,title\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title],
page~\pageref*{anchor:chapter}}
\texttt{@ref\{chapter,,,file name\}} Section ``chapter'' in \texttt{file name}
\texttt{@ref\{chapter,,,,manual\}} Section ``chapter'' in \textit{manual}
-\texttt{@ref\{chapter,cross ref name,title,\}} Section~\ref{anchor:chapter}
[title], page~\pageref{anchor:chapter}
+\texttt{@ref\{chapter,cross ref name,title,\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title],
page~\pageref*{anchor:chapter}}
\texttt{@ref\{chapter,cross ref name,,file name\}} Section ``chapter'' in
\texttt{file name}
\texttt{@ref\{chapter,cross ref name,,,manual\}} Section ``chapter'' in
\textit{manual}
\texttt{@ref\{chapter,cross ref name,title,file name\}} Section ``title'' in
\texttt{file name}
@@ -3102,6 +3115,10 @@ Section ``a comma, in title'' in \textit{a , in manual
name}
ref, a comma@comma\{\} in file\}}
Section ``s--ect,ion'' in \texttt{a comma, in file}
+`\texttt{\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}}'.
+
+Section ``title with uref2 \href{href://http/myhost.com/index2.html}{uref2
(\nolinkurl{href://http/myhost.com/index2.html})}'' in \textit{printed manual
with uref4 \href{href://http/myhost.com/index4.html}{uref4
(\nolinkurl{href://http/myhost.com/index4.html})}}
+\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title with uref2
\href{href://http/myhost.com/index2.html}{uref2
(\nolinkurl{href://http/myhost.com/index2.html})}],
page~\pageref*{anchor:chapter}}
a
l--ine
@@ -3411,9 +3428,9 @@ but , ,\@
\texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@dfn\{{-}{-}a\}} \emph{--a}
\texttt{@dmn\{{-}{-}a\}} --a
-\texttt{@email\{{-}{-}a,{-}{-}b\}} --b \texttt{<{-}{-}a>}
+\texttt{@email\{{-}{-}a,{-}{-}b\}} --b \url{--a}
\texttt{@email\{,{-}{-}b\}} --b
-\texttt{@email\{{-}{-}a\}} \texttt{<{-}{-}a>}
+\texttt{@email\{{-}{-}a\}} \url{--a}
\texttt{@emph\{{-}{-}a\}} \emph{--a}
\texttt{@env\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@file\{{-}{-}a\}} \texttt{{-}{-}a}
@@ -3431,15 +3448,15 @@ but , ,\@
\texttt{@slanted\{{-}{-}a\}} \textsl{--a}
\texttt{@titlefont\{{-}{-}a\}} {\Huge \bfseries --a}
\texttt{@indicateurl\{{-}{-}a\}} `\texttt{{-}{-}a}'
-\texttt{@uref\{{-}{-}a,{-}{-}b\}} --b (--a)
-\texttt{@uref\{{-}{-}a\}} \texttt{<{-}{-}a>}
+\texttt{@uref\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
+\texttt{@uref\{{-}{-}a\}} \url{--a}
\texttt{@uref\{,{-}{-}b\}} --b
\texttt{@uref\{{-}{-}a,{-}{-}b,{-}{-}c\}} --c
\texttt{@uref\{,{-}{-}b,{-}{-}c\}} --c
\texttt{@uref\{{-}{-}a,,{-}{-}c\}} --c
\texttt{@uref\{,,{-}{-}c\}} --c
-\texttt{@url\{{-}{-}a,{-}{-}b\}} --b (--a)
-\texttt{@url\{{-}{-}a,\}} \texttt{<{-}{-}a>}
+\texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
+\texttt{@url\{{-}{-}a,\}} \url{--a}
\texttt{@url\{,{-}{-}b\}} --b
\texttt{@var\{{-}{-}a\}} \emph{--a}
\texttt{@verb\{:{-}{-}a:\}} \verb:--a:
@@ -3848,20 +3865,20 @@ d--eftypemethod
\texttt{@pxref\{chapter, cross ref name, title, file name, manual\}} see
Section ``title'' in \textit{manual}
\texttt{@inforef\{chapter, cross ref name, file name\}} Section ``chapter'' in
\texttt{file name}
-\texttt{@ref\{chapter\}} Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}
-\texttt{@xref\{chapter\}} See Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}.
-\texttt{@pxref\{chapter\}} see Section~\ref{anchor:chapter} [chapter],
page~\pageref{anchor:chapter}
-\texttt{@ref\{s{-}{-}ect@comma\{\}ion\}}
Section~\ref{anchor:s_002d_002dect_002cion} [s--ect,ion],
page~\pageref{anchor:s_002d_002dect_002cion}
+\texttt{@ref\{chapter\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@xref\{chapter\}} See
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}.
+\texttt{@pxref\{chapter\}} see
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@ref\{s{-}{-}ect@comma\{\}ion\}}
\hyperref[anchor:s_002d_002dect_002cion]{Section~\ref*{anchor:s_002d_002dect_002cion}
[s--ect,ion], page~\pageref*{anchor:s_002d_002dect_002cion}}
\texttt{@ref\{s{-}{-}ect@comma\{\}ion, a @comma\{\} in cross
ref, a comma@comma\{\} in title, a comma@comma\{\} in file, a @comma\{\} in
manual name \}}
Section ``a comma, in title'' in \textit{a , in manual name}
-\texttt{@ref\{chapter,cross ref name\}} Section~\ref{anchor:chapter}
[chapter], page~\pageref{anchor:chapter}
-\texttt{@ref\{chapter,,title\}} Section~\ref{anchor:chapter} [title],
page~\pageref{anchor:chapter}
+\texttt{@ref\{chapter,cross ref name\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}
+\texttt{@ref\{chapter,,title\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title],
page~\pageref*{anchor:chapter}}
\texttt{@ref\{chapter,,,file name\}} Section ``chapter'' in \texttt{file name}
\texttt{@ref\{chapter,,,,manual\}} Section ``chapter'' in \textit{manual}
-\texttt{@ref\{chapter,cross ref name,title,\}} Section~\ref{anchor:chapter}
[title], page~\pageref{anchor:chapter}
+\texttt{@ref\{chapter,cross ref name,title,\}}
\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title],
page~\pageref*{anchor:chapter}}
\texttt{@ref\{chapter,cross ref name,,file name\}} Section ``chapter'' in
\texttt{file name}
\texttt{@ref\{chapter,cross ref name,,,manual\}} Section ``chapter'' in
\textit{manual}
\texttt{@ref\{chapter,cross ref name,title,file name\}} Section ``title'' in
\texttt{file name}
@@ -3903,6 +3920,10 @@ Section ``a comma, in title'' in \textit{a , in manual
name}
ref, a comma@comma\{\} in file\}}
Section ``s--ect,ion'' in \texttt{a comma, in file}
+`\texttt{\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [chapter],
page~\pageref*{anchor:chapter}}}'.
+
+Section ``title with uref2 \href{href://http/myhost.com/index2.html}{uref2
(\nolinkurl{href://http/myhost.com/index2.html})}'' in \textit{printed manual
with uref4 \href{href://http/myhost.com/index4.html}{uref4
(\nolinkurl{href://http/myhost.com/index4.html})}}
+\hyperref[anchor:chapter]{Chapter~\ref*{anchor:chapter} [title with uref2
\href{href://http/myhost.com/index2.html}{uref2
(\nolinkurl{href://http/myhost.com/index2.html})}],
page~\pageref*{anchor:chapter}}
a
l--ine
diff --git a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
index c1da244..2ad6a09 100644
--- a/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_mathjax/formatting.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1394,7 +1398,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2227,7 +2235,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3115,7 +3127,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3947,7 +3963,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -4868,6 +4888,10 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
+‘<samp><a href="#chapter">chapter</a></samp>’.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
index 6001441..ec4c5d3 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/anchor.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/anchor.html
@@ -525,6 +525,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
index 0a4d8c1..6105f23 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1407,7 +1411,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2239,7 +2247,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3160,6 +3172,10 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
+‘<samp><a href="#chapter">chapter</a></samp>’.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
diff --git a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
index 5b1bf20..cca9fc9 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
index db177f8..3dfcafd 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
index af936d0..7e55ad3 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
index 26e68a2..fa739db 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
index 510f77b..52524d3 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_nodes/index.html
b/tp/tests/layout/res_parser/formatting_nodes/index.html
index 5db7248..cfad359 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/index.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/index.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1384,7 +1388,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="chapter.html">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="chapter.html">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2217,7 +2225,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="chapter.html">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="chapter.html">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
diff --git
a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
index b4b923a..13bedf9 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
index 44113d1..6ca8e22 100644
--- a/tp/tests/layout/res_parser/formatting_nodes/subsection.html
+++ b/tp/tests/layout/res_parser/formatting_nodes/subsection.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index 3e421d5..69df005 100644
---
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 4ffe2a0..e064e59 100644
---
a/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/layout/res_parser/formatting_plaintext/formatting.2
b/tp/tests/layout/res_parser/formatting_plaintext/formatting.2
index ec46f2d..136486d 100644
--- a/tp/tests/layout/res_parser/formatting_plaintext/formatting.2
+++ b/tp/tests/layout/res_parser/formatting_plaintext/formatting.2
@@ -265,7 +265,13 @@ formatting.texi:65: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:65: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:15: warning: @ref node name should not contain `,' (possibly
involving @mymacro)
formatting.texi:15: warning: @inforef node name should not contain `,'
(possibly involving @mymacro)
+formatting.texi:15: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
+formatting.texi:15: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
formatting.texi:61: warning: @ref node name should not contain `,' (possibly
involving @mymacro)
formatting.texi:61: warning: @inforef node name should not contain `,'
(possibly involving @mymacro)
+formatting.texi:61: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
+formatting.texi:61: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
formatting.texi:65: warning: @ref node name should not contain `,' (possibly
involving @mymacro)
formatting.texi:65: warning: @inforef node name should not contain `,'
(possibly involving @mymacro)
+formatting.texi:65: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
+formatting.texi:65: warning: @ref cross-reference name should not contain `:'
(possibly involving @mymacro)
diff --git a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
index 7e3194a..da5f027 100644
--- a/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
+++ b/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
@@ -396,6 +396,13 @@ arg}' *note cross ref name: (file name, spurious
arg)chapter.
'@inforef{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{}
in file}' *note a , in cross ref: (a comma, in file)s--ect,ion.
+ '*note chapter::'.
+
+ *note cross ref with uref uref1 (href://http/myhost.com/index.html):
+(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext.
+*note cross ref with uref uref1 (href://http/myhost.com/index.html):
+chapter.
+
a
l-ine
@@ -911,6 +918,13 @@ arg}' *note cross ref name: (file name, spurious
arg)chapter.
'@inforef{s--ect@comma{}ion, a @comma{} in cross ref, a comma@comma{}
in file}' *note a , in cross ref: (a comma, in file)s--ect,ion.
+ '*note chapter::'.
+
+ *note cross ref with uref uref1 (href://http/myhost.com/index.html):
+(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext.
+*note cross ref with uref uref1 (href://http/myhost.com/index.html):
+chapter.
+
a
l-ine
@@ -1565,6 +1579,10 @@ aaa
*note a , in cross
ref: (a comma, in file)s--ect,ion.
+ '*note chapter::'.
+
+ *note cross ref with uref uref1 (href://http/myhost.com/index.html):
(info file with uref3 uref3 (href://http/myhost.com/index3.html))ext.
+ *note cross ref with uref uref1 (href://http/myhost.com/index.html):
chapter.
a
l--ine
@@ -1738,190 +1756,190 @@ aaa
* Menu:
* ": chapter. (line 28)
-* " <1>: chapter. (line 543)
-* " <2>: chapter. (line 1069)
+* " <1>: chapter. (line 550)
+* " <2>: chapter. (line 1083)
* -option: chapter. (line 28)
-* -option <1>: chapter. (line 543)
-* -option <2>: chapter. (line 1069)
-* .: chapter. (line 1735)
-* ?: chapter. (line 1735)
-* a: chapter. (line 1735)
-* index entry between item and itemx: chapter. (line 406)
-* index entry between item and itemx <1>: chapter. (line 921)
-* index entry between item and itemx <2>: chapter. (line 1576)
+* -option <1>: chapter. (line 550)
+* -option <2>: chapter. (line 1083)
+* .: chapter. (line 1753)
+* ?: chapter. (line 1753)
+* a: chapter. (line 1753)
+* index entry between item and itemx: chapter. (line 413)
+* index entry between item and itemx <1>: chapter. (line 935)
+* index entry between item and itemx <2>: chapter. (line 1594)
* index entry within deffn: chapter. (line 252)
-* index entry within deffn <1>: chapter. (line 767)
-* index entry within deffn <2>: chapter. (line 1422)
+* index entry within deffn <1>: chapter. (line 774)
+* index entry within deffn <2>: chapter. (line 1436)
* index entry within itemize: chapter. (line 188)
-* index entry within itemize <1>: chapter. (line 703)
-* index entry within itemize <2>: chapter. (line 1358)
+* index entry within itemize <1>: chapter. (line 710)
+* index entry within itemize <2>: chapter. (line 1372)
* index entry within multitable: chapter. (line 196)
-* index entry within multitable <1>: chapter. (line 711)
-* index entry within multitable <2>: chapter. (line 1367)
-* t-ruc: chapter. (line 1735)
-* T-ruc: chapter. (line 1735)
+* index entry within multitable <1>: chapter. (line 718)
+* index entry within multitable <2>: chapter. (line 1381)
+* t-ruc: chapter. (line 1753)
+* T-ruc: chapter. (line 1753)
fn
* Menu:
* --foption: chapter. (line 28)
-* --foption <1>: chapter. (line 543)
-* --foption <2>: chapter. (line 1069)
-* .: chapter. (line 1735)
-* ?: chapter. (line 1735)
+* --foption <1>: chapter. (line 550)
+* --foption <2>: chapter. (line 1083)
+* .: chapter. (line 1753)
+* ?: chapter. (line 1753)
* ``: chapter. (line 28)
-* `` <1>: chapter. (line 543)
-* `` <2>: chapter. (line 1069)
+* `` <1>: chapter. (line 550)
+* `` <2>: chapter. (line 1083)
* a: chapter. (line 269)
-* a <1>: chapter. (line 405)
-* a <2>: chapter. (line 784)
-* a <3>: chapter. (line 920)
-* a <4>: chapter. (line 1439)
-* a <5>: chapter. (line 1575)
-* a <6>: chapter. (line 1735)
-* after: chapter. (line 496)
-* after <1>: chapter. (line 1011)
-* after <2>: chapter. (line 1694)
-* b: chapter. (line 406)
-* b <1>: chapter. (line 921)
-* b <2>: chapter. (line 1576)
+* a <1>: chapter. (line 412)
+* a <2>: chapter. (line 791)
+* a <3>: chapter. (line 934)
+* a <4>: chapter. (line 1453)
+* a <5>: chapter. (line 1593)
+* a <6>: chapter. (line 1753)
+* after: chapter. (line 503)
+* after <1>: chapter. (line 1025)
+* after <2>: chapter. (line 1712)
+* b: chapter. (line 413)
+* b <1>: chapter. (line 935)
+* b <2>: chapter. (line 1594)
* bidule machin: chapter. (line 263)
-* bidule machin <1>: chapter. (line 778)
-* bidule machin <2>: chapter. (line 1433)
+* bidule machin <1>: chapter. (line 785)
+* bidule machin <2>: chapter. (line 1447)
* d--effn_name: chapter. (line 244)
-* d--effn_name <1>: chapter. (line 759)
-* d--effn_name <2>: chapter. (line 1414)
+* d--effn_name <1>: chapter. (line 766)
+* d--effn_name <2>: chapter. (line 1428)
* d--efmac_name: chapter. (line 305)
-* d--efmac_name <1>: chapter. (line 820)
-* d--efmac_name <2>: chapter. (line 1475)
+* d--efmac_name <1>: chapter. (line 827)
+* d--efmac_name <2>: chapter. (line 1489)
* d--efmethod_name on c--lass: chapter. (line 329)
-* d--efmethod_name on c--lass <1>: chapter. (line 844)
-* d--efmethod_name on c--lass <2>: chapter. (line 1499)
+* d--efmethod_name on c--lass <1>: chapter. (line 851)
+* d--efmethod_name on c--lass <2>: chapter. (line 1513)
* d--efop_name on c--lass: chapter. (line 296)
-* d--efop_name on c--lass <1>: chapter. (line 811)
-* d--efop_name on c--lass <2>: chapter. (line 1466)
+* d--efop_name on c--lass <1>: chapter. (line 818)
+* d--efop_name on c--lass <2>: chapter. (line 1480)
* d--efspec_name: chapter. (line 308)
-* d--efspec_name <1>: chapter. (line 823)
-* d--efspec_name <2>: chapter. (line 1478)
+* d--efspec_name <1>: chapter. (line 830)
+* d--efspec_name <2>: chapter. (line 1492)
* d--eftypefn_name: chapter. (line 284)
-* d--eftypefn_name <1>: chapter. (line 799)
-* d--eftypefn_name <2>: chapter. (line 1454)
+* d--eftypefn_name <1>: chapter. (line 806)
+* d--eftypefn_name <2>: chapter. (line 1468)
* d--eftypefun_name: chapter. (line 317)
-* d--eftypefun_name <1>: chapter. (line 832)
-* d--eftypefun_name <2>: chapter. (line 1487)
+* d--eftypefun_name <1>: chapter. (line 839)
+* d--eftypefun_name <2>: chapter. (line 1501)
* d--eftypemethod_name on c--lass: chapter. (line 332)
-* d--eftypemethod_name on c--lass <1>: chapter. (line 847)
-* d--eftypemethod_name on c--lass <2>: chapter. (line 1502)
+* d--eftypemethod_name on c--lass <1>: chapter. (line 854)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1516)
* d--eftypeop_name on c--lass: chapter. (line 287)
-* d--eftypeop_name on c--lass <1>: chapter. (line 802)
-* d--eftypeop_name on c--lass <2>: chapter. (line 1457)
+* d--eftypeop_name on c--lass <1>: chapter. (line 809)
+* d--eftypeop_name on c--lass <2>: chapter. (line 1471)
* d--efun_name: chapter. (line 302)
-* d--efun_name <1>: chapter. (line 817)
-* d--efun_name <2>: chapter. (line 1472)
+* d--efun_name <1>: chapter. (line 824)
+* d--efun_name <2>: chapter. (line 1486)
* de--ffn_name: chapter. (line 247)
-* de--ffn_name <1>: chapter. (line 762)
-* de--ffn_name <2>: chapter. (line 1417)
+* de--ffn_name <1>: chapter. (line 769)
+* de--ffn_name <2>: chapter. (line 1431)
* deffn: chapter. (line 272)
* deffn <1>: chapter. (line 274)
-* deffn <2>: chapter. (line 787)
-* deffn <3>: chapter. (line 789)
-* deffn <4>: chapter. (line 1442)
-* deffn <5>: chapter. (line 1444)
+* deffn <2>: chapter. (line 794)
+* deffn <3>: chapter. (line 796)
+* deffn <4>: chapter. (line 1456)
+* deffn <5>: chapter. (line 1458)
* deffnx: chapter. (line 270)
* deffnx <1>: chapter. (line 275)
-* deffnx <2>: chapter. (line 785)
-* deffnx <3>: chapter. (line 790)
-* deffnx <4>: chapter. (line 1440)
-* deffnx <5>: chapter. (line 1445)
+* deffnx <2>: chapter. (line 792)
+* deffnx <3>: chapter. (line 797)
+* deffnx <4>: chapter. (line 1454)
+* deffnx <5>: chapter. (line 1459)
* followed: chapter. (line 266)
-* followed <1>: chapter. (line 494)
-* followed <2>: chapter. (line 781)
-* followed <3>: chapter. (line 1009)
-* followed <4>: chapter. (line 1436)
-* followed <5>: chapter. (line 1692)
+* followed <1>: chapter. (line 501)
+* followed <2>: chapter. (line 788)
+* followed <3>: chapter. (line 1023)
+* followed <4>: chapter. (line 1450)
+* followed <5>: chapter. (line 1710)
* I: chapter. (line 251)
* I <1>: chapter. (line 277)
-* I <2>: chapter. (line 766)
-* I <3>: chapter. (line 792)
-* I <4>: chapter. (line 1421)
-* I <5>: chapter. (line 1447)
+* I <2>: chapter. (line 773)
+* I <3>: chapter. (line 799)
+* I <4>: chapter. (line 1435)
+* I <5>: chapter. (line 1461)
* id i ule: chapter. (line 257)
-* id i ule <1>: chapter. (line 772)
-* id i ule <2>: chapter. (line 1427)
+* id i ule <1>: chapter. (line 779)
+* id i ule <2>: chapter. (line 1441)
* id ule: chapter. (line 256)
-* id ule <1>: chapter. (line 771)
-* id ule <2>: chapter. (line 1426)
+* id ule <1>: chapter. (line 778)
+* id ule <2>: chapter. (line 1440)
* log trap: chapter. (line 253)
-* log trap <1>: chapter. (line 768)
-* log trap <2>: chapter. (line 1423)
+* log trap <1>: chapter. (line 775)
+* log trap <2>: chapter. (line 1437)
* log trap1: chapter. (line 254)
-* log trap1 <1>: chapter. (line 769)
-* log trap1 <2>: chapter. (line 1424)
+* log trap1 <1>: chapter. (line 776)
+* log trap1 <2>: chapter. (line 1438)
* log trap2: chapter. (line 255)
-* log trap2 <1>: chapter. (line 770)
-* log trap2 <2>: chapter. (line 1425)
+* log trap2 <1>: chapter. (line 777)
+* log trap2 <2>: chapter. (line 1439)
* machin: chapter. (line 262)
* machin <1>: chapter. (line 264)
-* machin <2>: chapter. (line 490)
-* machin <3>: chapter. (line 491)
-* machin <4>: chapter. (line 492)
-* machin <5>: chapter. (line 493)
-* machin <6>: chapter. (line 777)
-* machin <7>: chapter. (line 779)
-* machin <8>: chapter. (line 1005)
-* machin <9>: chapter. (line 1006)
-* machin <10>: chapter. (line 1007)
-* machin <11>: chapter. (line 1008)
-* machin <12>: chapter. (line 1432)
-* machin <13>: chapter. (line 1434)
-* machin <14>: chapter. (line 1688)
-* machin <15>: chapter. (line 1689)
-* machin <16>: chapter. (line 1690)
-* machin <17>: chapter. (line 1691)
-* t--ruc: chapter. (line 1735)
-* T--ruc: chapter. (line 1735)
+* machin <2>: chapter. (line 497)
+* machin <3>: chapter. (line 498)
+* machin <4>: chapter. (line 499)
+* machin <5>: chapter. (line 500)
+* machin <6>: chapter. (line 784)
+* machin <7>: chapter. (line 786)
+* machin <8>: chapter. (line 1019)
+* machin <9>: chapter. (line 1020)
+* machin <10>: chapter. (line 1021)
+* machin <11>: chapter. (line 1022)
+* machin <12>: chapter. (line 1446)
+* machin <13>: chapter. (line 1448)
+* machin <14>: chapter. (line 1706)
+* machin <15>: chapter. (line 1707)
+* machin <16>: chapter. (line 1708)
+* machin <17>: chapter. (line 1709)
+* t--ruc: chapter. (line 1753)
+* T--ruc: chapter. (line 1753)
* truc: chapter. (line 252)
* truc <1>: chapter. (line 278)
-* truc <2>: chapter. (line 767)
-* truc <3>: chapter. (line 793)
-* truc <4>: chapter. (line 1422)
-* truc <5>: chapter. (line 1448)
+* truc <2>: chapter. (line 774)
+* truc <3>: chapter. (line 800)
+* truc <4>: chapter. (line 1436)
+* truc <5>: chapter. (line 1462)
vr
* Menu:
-* a: chapter. (line 401)
-* a <1>: chapter. (line 916)
-* a <2>: chapter. (line 1571)
-* b: chapter. (line 402)
-* b <1>: chapter. (line 917)
-* b <2>: chapter. (line 1572)
+* a: chapter. (line 408)
+* a <1>: chapter. (line 930)
+* a <2>: chapter. (line 1589)
+* b: chapter. (line 409)
+* b <1>: chapter. (line 931)
+* b <2>: chapter. (line 1590)
* d--efcv_name: chapter. (line 293)
-* d--efcv_name <1>: chapter. (line 808)
-* d--efcv_name <2>: chapter. (line 1463)
+* d--efcv_name <1>: chapter. (line 815)
+* d--efcv_name <2>: chapter. (line 1477)
* d--efivar_name of c--lass: chapter. (line 323)
-* d--efivar_name of c--lass <1>: chapter. (line 838)
-* d--efivar_name of c--lass <2>: chapter. (line 1493)
+* d--efivar_name of c--lass <1>: chapter. (line 845)
+* d--efivar_name of c--lass <2>: chapter. (line 1507)
* d--efopt_name: chapter. (line 314)
-* d--efopt_name <1>: chapter. (line 829)
-* d--efopt_name <2>: chapter. (line 1484)
+* d--efopt_name <1>: chapter. (line 836)
+* d--efopt_name <2>: chapter. (line 1498)
* d--eftypeivar_name of c--lass: chapter. (line 326)
-* d--eftypeivar_name of c--lass <1>: chapter. (line 841)
-* d--eftypeivar_name of c--lass <2>: chapter. (line 1496)
+* d--eftypeivar_name of c--lass <1>: chapter. (line 848)
+* d--eftypeivar_name of c--lass <2>: chapter. (line 1510)
* d--eftypevar_name: chapter. (line 320)
-* d--eftypevar_name <1>: chapter. (line 835)
-* d--eftypevar_name <2>: chapter. (line 1490)
+* d--eftypevar_name <1>: chapter. (line 842)
+* d--eftypevar_name <2>: chapter. (line 1504)
* d--eftypevr_name: chapter. (line 290)
-* d--eftypevr_name <1>: chapter. (line 805)
-* d--eftypevr_name <2>: chapter. (line 1460)
+* d--eftypevr_name <1>: chapter. (line 812)
+* d--eftypevr_name <2>: chapter. (line 1474)
* d--efvar_name: chapter. (line 311)
-* d--efvar_name <1>: chapter. (line 826)
-* d--efvar_name <2>: chapter. (line 1481)
+* d--efvar_name <1>: chapter. (line 833)
+* d--efvar_name <2>: chapter. (line 1495)
* d--efvr_name: chapter. (line 281)
-* d--efvr_name <1>: chapter. (line 796)
-* d--efvr_name <2>: chapter. (line 1451)
+* d--efvr_name <1>: chapter. (line 803)
+* d--efvr_name <2>: chapter. (line 1465)
ky
@@ -1932,8 +1950,8 @@ aaa
* Menu:
* d--eftp_name: chapter. (line 299)
-* d--eftp_name <1>: chapter. (line 814)
-* d--eftp_name <2>: chapter. (line 1469)
+* d--eftp_name <1>: chapter. (line 821)
+* d--eftp_name <2>: chapter. (line 1483)
(7)
@@ -1972,153 +1990,153 @@ chapter 2
* Menu:
* ": chapter. (line 28)
-* " <1>: chapter. (line 543)
-* " <2>: chapter. (line 1069)
+* " <1>: chapter. (line 550)
+* " <2>: chapter. (line 1083)
* -option: chapter. (line 28)
-* -option <1>: chapter. (line 543)
-* -option <2>: chapter. (line 1069)
-* .: chapter. (line 1735)
-* ?: chapter. (line 1735)
-* a: chapter. (line 1735)
-* index entry between item and itemx: chapter. (line 406)
-* index entry between item and itemx <1>: chapter. (line 921)
-* index entry between item and itemx <2>: chapter. (line 1576)
+* -option <1>: chapter. (line 550)
+* -option <2>: chapter. (line 1083)
+* .: chapter. (line 1753)
+* ?: chapter. (line 1753)
+* a: chapter. (line 1753)
+* index entry between item and itemx: chapter. (line 413)
+* index entry between item and itemx <1>: chapter. (line 935)
+* index entry between item and itemx <2>: chapter. (line 1594)
* index entry within deffn: chapter. (line 252)
-* index entry within deffn <1>: chapter. (line 767)
-* index entry within deffn <2>: chapter. (line 1422)
+* index entry within deffn <1>: chapter. (line 774)
+* index entry within deffn <2>: chapter. (line 1436)
* index entry within itemize: chapter. (line 188)
-* index entry within itemize <1>: chapter. (line 703)
-* index entry within itemize <2>: chapter. (line 1358)
+* index entry within itemize <1>: chapter. (line 710)
+* index entry within itemize <2>: chapter. (line 1372)
* index entry within multitable: chapter. (line 196)
-* index entry within multitable <1>: chapter. (line 711)
-* index entry within multitable <2>: chapter. (line 1367)
-* t-ruc: chapter. (line 1735)
-* T-ruc: chapter. (line 1735)
+* index entry within multitable <1>: chapter. (line 718)
+* index entry within multitable <2>: chapter. (line 1381)
+* t-ruc: chapter. (line 1753)
+* T-ruc: chapter. (line 1753)
* Menu:
* --foption: chapter. (line 28)
-* --foption <1>: chapter. (line 543)
-* --foption <2>: chapter. (line 1069)
-* .: chapter. (line 1735)
-* ?: chapter. (line 1735)
+* --foption <1>: chapter. (line 550)
+* --foption <2>: chapter. (line 1083)
+* .: chapter. (line 1753)
+* ?: chapter. (line 1753)
* ``: chapter. (line 28)
-* `` <1>: chapter. (line 543)
-* `` <2>: chapter. (line 1069)
+* `` <1>: chapter. (line 550)
+* `` <2>: chapter. (line 1083)
* a: chapter. (line 269)
-* a <1>: chapter. (line 405)
-* a <2>: chapter. (line 784)
-* a <3>: chapter. (line 920)
-* a <4>: chapter. (line 1439)
-* a <5>: chapter. (line 1575)
-* a <6>: chapter. (line 1735)
-* after: chapter. (line 496)
-* after <1>: chapter. (line 1011)
-* after <2>: chapter. (line 1694)
-* b: chapter. (line 406)
-* b <1>: chapter. (line 921)
-* b <2>: chapter. (line 1576)
+* a <1>: chapter. (line 412)
+* a <2>: chapter. (line 791)
+* a <3>: chapter. (line 934)
+* a <4>: chapter. (line 1453)
+* a <5>: chapter. (line 1593)
+* a <6>: chapter. (line 1753)
+* after: chapter. (line 503)
+* after <1>: chapter. (line 1025)
+* after <2>: chapter. (line 1712)
+* b: chapter. (line 413)
+* b <1>: chapter. (line 935)
+* b <2>: chapter. (line 1594)
* bidule machin: chapter. (line 263)
-* bidule machin <1>: chapter. (line 778)
-* bidule machin <2>: chapter. (line 1433)
+* bidule machin <1>: chapter. (line 785)
+* bidule machin <2>: chapter. (line 1447)
* d--effn_name: chapter. (line 244)
-* d--effn_name <1>: chapter. (line 759)
-* d--effn_name <2>: chapter. (line 1414)
+* d--effn_name <1>: chapter. (line 766)
+* d--effn_name <2>: chapter. (line 1428)
* d--efmac_name: chapter. (line 305)
-* d--efmac_name <1>: chapter. (line 820)
-* d--efmac_name <2>: chapter. (line 1475)
+* d--efmac_name <1>: chapter. (line 827)
+* d--efmac_name <2>: chapter. (line 1489)
* d--efmethod_name on c--lass: chapter. (line 329)
-* d--efmethod_name on c--lass <1>: chapter. (line 844)
-* d--efmethod_name on c--lass <2>: chapter. (line 1499)
+* d--efmethod_name on c--lass <1>: chapter. (line 851)
+* d--efmethod_name on c--lass <2>: chapter. (line 1513)
* d--efop_name on c--lass: chapter. (line 296)
-* d--efop_name on c--lass <1>: chapter. (line 811)
-* d--efop_name on c--lass <2>: chapter. (line 1466)
+* d--efop_name on c--lass <1>: chapter. (line 818)
+* d--efop_name on c--lass <2>: chapter. (line 1480)
* d--efspec_name: chapter. (line 308)
-* d--efspec_name <1>: chapter. (line 823)
-* d--efspec_name <2>: chapter. (line 1478)
+* d--efspec_name <1>: chapter. (line 830)
+* d--efspec_name <2>: chapter. (line 1492)
* d--eftypefn_name: chapter. (line 284)
-* d--eftypefn_name <1>: chapter. (line 799)
-* d--eftypefn_name <2>: chapter. (line 1454)
+* d--eftypefn_name <1>: chapter. (line 806)
+* d--eftypefn_name <2>: chapter. (line 1468)
* d--eftypefun_name: chapter. (line 317)
-* d--eftypefun_name <1>: chapter. (line 832)
-* d--eftypefun_name <2>: chapter. (line 1487)
+* d--eftypefun_name <1>: chapter. (line 839)
+* d--eftypefun_name <2>: chapter. (line 1501)
* d--eftypemethod_name on c--lass: chapter. (line 332)
-* d--eftypemethod_name on c--lass <1>: chapter. (line 847)
-* d--eftypemethod_name on c--lass <2>: chapter. (line 1502)
+* d--eftypemethod_name on c--lass <1>: chapter. (line 854)
+* d--eftypemethod_name on c--lass <2>: chapter. (line 1516)
* d--eftypeop_name on c--lass: chapter. (line 287)
-* d--eftypeop_name on c--lass <1>: chapter. (line 802)
-* d--eftypeop_name on c--lass <2>: chapter. (line 1457)
+* d--eftypeop_name on c--lass <1>: chapter. (line 809)
+* d--eftypeop_name on c--lass <2>: chapter. (line 1471)
* d--efun_name: chapter. (line 302)
-* d--efun_name <1>: chapter. (line 817)
-* d--efun_name <2>: chapter. (line 1472)
+* d--efun_name <1>: chapter. (line 824)
+* d--efun_name <2>: chapter. (line 1486)
* de--ffn_name: chapter. (line 247)
-* de--ffn_name <1>: chapter. (line 762)
-* de--ffn_name <2>: chapter. (line 1417)
+* de--ffn_name <1>: chapter. (line 769)
+* de--ffn_name <2>: chapter. (line 1431)
* deffn: chapter. (line 272)
* deffn <1>: chapter. (line 274)
-* deffn <2>: chapter. (line 787)
-* deffn <3>: chapter. (line 789)
-* deffn <4>: chapter. (line 1442)
-* deffn <5>: chapter. (line 1444)
+* deffn <2>: chapter. (line 794)
+* deffn <3>: chapter. (line 796)
+* deffn <4>: chapter. (line 1456)
+* deffn <5>: chapter. (line 1458)
* deffnx: chapter. (line 270)
* deffnx <1>: chapter. (line 275)
-* deffnx <2>: chapter. (line 785)
-* deffnx <3>: chapter. (line 790)
-* deffnx <4>: chapter. (line 1440)
-* deffnx <5>: chapter. (line 1445)
+* deffnx <2>: chapter. (line 792)
+* deffnx <3>: chapter. (line 797)
+* deffnx <4>: chapter. (line 1454)
+* deffnx <5>: chapter. (line 1459)
* followed: chapter. (line 266)
-* followed <1>: chapter. (line 494)
-* followed <2>: chapter. (line 781)
-* followed <3>: chapter. (line 1009)
-* followed <4>: chapter. (line 1436)
-* followed <5>: chapter. (line 1692)
+* followed <1>: chapter. (line 501)
+* followed <2>: chapter. (line 788)
+* followed <3>: chapter. (line 1023)
+* followed <4>: chapter. (line 1450)
+* followed <5>: chapter. (line 1710)
* I: chapter. (line 251)
* I <1>: chapter. (line 277)
-* I <2>: chapter. (line 766)
-* I <3>: chapter. (line 792)
-* I <4>: chapter. (line 1421)
-* I <5>: chapter. (line 1447)
+* I <2>: chapter. (line 773)
+* I <3>: chapter. (line 799)
+* I <4>: chapter. (line 1435)
+* I <5>: chapter. (line 1461)
* id i ule: chapter. (line 257)
-* id i ule <1>: chapter. (line 772)
-* id i ule <2>: chapter. (line 1427)
+* id i ule <1>: chapter. (line 779)
+* id i ule <2>: chapter. (line 1441)
* id ule: chapter. (line 256)
-* id ule <1>: chapter. (line 771)
-* id ule <2>: chapter. (line 1426)
+* id ule <1>: chapter. (line 778)
+* id ule <2>: chapter. (line 1440)
* log trap: chapter. (line 253)
-* log trap <1>: chapter. (line 768)
-* log trap <2>: chapter. (line 1423)
+* log trap <1>: chapter. (line 775)
+* log trap <2>: chapter. (line 1437)
* log trap1: chapter. (line 254)
-* log trap1 <1>: chapter. (line 769)
-* log trap1 <2>: chapter. (line 1424)
+* log trap1 <1>: chapter. (line 776)
+* log trap1 <2>: chapter. (line 1438)
* log trap2: chapter. (line 255)
-* log trap2 <1>: chapter. (line 770)
-* log trap2 <2>: chapter. (line 1425)
+* log trap2 <1>: chapter. (line 777)
+* log trap2 <2>: chapter. (line 1439)
* machin: chapter. (line 262)
* machin <1>: chapter. (line 264)
-* machin <2>: chapter. (line 490)
-* machin <3>: chapter. (line 491)
-* machin <4>: chapter. (line 492)
-* machin <5>: chapter. (line 493)
-* machin <6>: chapter. (line 777)
-* machin <7>: chapter. (line 779)
-* machin <8>: chapter. (line 1005)
-* machin <9>: chapter. (line 1006)
-* machin <10>: chapter. (line 1007)
-* machin <11>: chapter. (line 1008)
-* machin <12>: chapter. (line 1432)
-* machin <13>: chapter. (line 1434)
-* machin <14>: chapter. (line 1688)
-* machin <15>: chapter. (line 1689)
-* machin <16>: chapter. (line 1690)
-* machin <17>: chapter. (line 1691)
-* t--ruc: chapter. (line 1735)
-* T--ruc: chapter. (line 1735)
+* machin <2>: chapter. (line 497)
+* machin <3>: chapter. (line 498)
+* machin <4>: chapter. (line 499)
+* machin <5>: chapter. (line 500)
+* machin <6>: chapter. (line 784)
+* machin <7>: chapter. (line 786)
+* machin <8>: chapter. (line 1019)
+* machin <9>: chapter. (line 1020)
+* machin <10>: chapter. (line 1021)
+* machin <11>: chapter. (line 1022)
+* machin <12>: chapter. (line 1446)
+* machin <13>: chapter. (line 1448)
+* machin <14>: chapter. (line 1706)
+* machin <15>: chapter. (line 1707)
+* machin <16>: chapter. (line 1708)
+* machin <17>: chapter. (line 1709)
+* t--ruc: chapter. (line 1753)
+* T--ruc: chapter. (line 1753)
* truc: chapter. (line 252)
* truc <1>: chapter. (line 278)
-* truc <2>: chapter. (line 767)
-* truc <3>: chapter. (line 793)
-* truc <4>: chapter. (line 1422)
-* truc <5>: chapter. (line 1448)
+* truc <2>: chapter. (line 774)
+* truc <3>: chapter. (line 800)
+* truc <4>: chapter. (line 1436)
+* truc <5>: chapter. (line 1462)
Top section
1 chapter
diff --git
a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
index 4e6207e..739ed1f 100644
--- a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
+++ b/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
@@ -523,6 +523,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1384,7 +1388,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2216,7 +2224,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3082,7 +3094,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -4002,6 +4018,10 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
+‘<samp><a href="#chapter">chapter</a></samp>’.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
@@ -4857,7 +4877,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
diff --git a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
index 6e0bedc..8e69fdd 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1384,7 +1388,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>@<samp><a href="#chapter">chapter</a></samp>'‘.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2217,7 +2225,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>@<samp><a href="#chapter">chapter</a></samp>'‘.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3105,7 +3117,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>@<samp><a href="#chapter">chapter</a></samp>'‘.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3937,7 +3953,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
</p>
-
+<p>@<samp><a href="#chapter">chapter</a></samp>'‘.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -4858,6 +4878,10 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="a comma, in
file.html#s_002d_002dect_002cion">(a comma, in file)a , in cross
ref</a>
+@<samp><a href="#chapter">chapter</a></samp>'‘.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="index3.html (uref3).html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 2158ad8..df8d380 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -679,6 +679,11 @@ ref, a comma@@comma@{@} in file@}}
@inforef{s--ect@comma{}ion, a @comma{} in cross
ref, a comma@comma{} in file}
+@c special cases with @uref
+@samp{@ref{chapter}}.
+
+@ref{ext, cross ref with uref @uref{href://http/myhost.com/index.html,uref1},
title with uref2 @uref{href://http/myhost.com/index2.html,uref2}, info file
with uref3 @uref{href://http/myhost.com/index3.html,uref3}, printed manual with
uref4 @uref{href://http/myhost.com/index4.html,uref4}}
+@ref{chapter, cross ref with uref
@uref{href://http/myhost.com/index.html,uref1}, title with uref2
@uref{href://http/myhost.com/index2.html,uref2}}
@table @bullet
@c comment in table
@@ -1547,7 +1552,12 @@ ref, a comma&arobase;comma{} in
file}</code>
<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>
-
+<!-- c special cases with @uref -->
+<para><samp><ref
label="chapter"><xrefnodename>chapter</xrefnodename></ref></samp>.
+</para>
+<para><ref label="ext"
manual="index3"><xrefnodename>ext</xrefnodename><xrefinfoname spaces=" ">cross
ref with uref
<uref><urefurl>href://http/myhost.com/index.html</urefurl><urefdesc>uref1</urefdesc></uref></xrefinfoname><xrefprinteddesc
spaces=" ">title with uref2
<uref><urefurl>href://http/myhost.com/index2.html</urefurl><urefdesc>uref2</urefdesc></uref></xrefprinteddesc><xrefinfofile
spaces=" ">info file with uref3
<uref><urefurl>href://http/myhost.com/index3.html</urefurl><urefdesc> [...]
+<ref label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref with uref
<uref><urefurl>href://http/myhost.com/index.html</urefurl><urefdesc>uref1</urefdesc></uref></xrefinfoname><xrefprinteddesc
spaces=" ">title with uref2
<uref><urefurl>href://http/myhost.com/index2.html</urefurl><urefdesc>uref2</urefdesc></uref></xrefprinteddesc></ref>
+</para>
<table commandarg="asis" spaces=" " endspaces=" ">
<beforefirstitem><!-- c comment in table -->
</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a</itemformat></item>
@@ -2407,7 +2417,12 @@ ref, a comma&arobase;comma{} in
file}</code>
<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>
-
+<!-- c special cases with @uref -->
+<para><samp><ref
label="chapter"><xrefnodename>chapter</xrefnodename></ref></samp>.
+</para>
+<para><ref label="ext"
manual="index3"><xrefnodename>ext</xrefnodename><xrefinfoname spaces=" ">cross
ref with uref
<uref><urefurl>href://http/myhost.com/index.html</urefurl><urefdesc>uref1</urefdesc></uref></xrefinfoname><xrefprinteddesc
spaces=" ">title with uref2
<uref><urefurl>href://http/myhost.com/index2.html</urefurl><urefdesc>uref2</urefdesc></uref></xrefprinteddesc><xrefinfofile
spaces=" ">info file with uref3
<uref><urefurl>href://http/myhost.com/index3.html</urefurl><urefdesc> [...]
+<ref label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref with uref
<uref><urefurl>href://http/myhost.com/index.html</urefurl><urefdesc>uref1</urefdesc></uref></xrefinfoname><xrefprinteddesc
spaces=" ">title with uref2
<uref><urefurl>href://http/myhost.com/index2.html</urefurl><urefdesc>uref2</urefdesc></uref></xrefprinteddesc></ref>
+</para>
<table commandarg="asis" spaces=" " endspaces=" ">
<beforefirstitem><!-- c comment in table -->
</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a</itemformat></item>
@@ -3294,7 +3309,12 @@ ref, a comma&arobase;comma{} in
file}</code>
<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>
-
+<!-- c special cases with @uref -->
+<para><samp><ref
label="chapter"><xrefnodename>chapter</xrefnodename></ref></samp>.
+</para>
+<para><ref label="ext"
manual="index3"><xrefnodename>ext</xrefnodename><xrefinfoname spaces=" ">cross
ref with uref
<uref><urefurl>href://http/myhost.com/index.html</urefurl><urefdesc>uref1</urefdesc></uref></xrefinfoname><xrefprinteddesc
spaces=" ">title with uref2
<uref><urefurl>href://http/myhost.com/index2.html</urefurl><urefdesc>uref2</urefdesc></uref></xrefprinteddesc><xrefinfofile
spaces=" ">info file with uref3
<uref><urefurl>href://http/myhost.com/index3.html</urefurl><urefdesc> [...]
+<ref label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref with uref
<uref><urefurl>href://http/myhost.com/index.html</urefurl><urefdesc>uref1</urefdesc></uref></xrefinfoname><xrefprinteddesc
spaces=" ">title with uref2
<uref><urefurl>href://http/myhost.com/index2.html</urefurl><urefdesc>uref2</urefdesc></uref></xrefprinteddesc></ref>
+</para>
<table commandarg="asis" spaces=" " endspaces=" ">
<beforefirstitem><!-- c comment in table -->
</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a</itemformat></item>
@@ -4148,6 +4168,11 @@ ref, a comma&arobase;comma{} in
file}</code>
<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>
+<!-- c special cases with @uref -->
+<samp><ref label="chapter"><xrefnodename>chapter</xrefnodename></ref></samp>.
+
+<ref label="ext" manual="index3"><xrefnodename>ext</xrefnodename><xrefinfoname
spaces=" ">cross ref with uref
<uref><urefurl>href://http/myhost.com/index.html</urefurl><urefdesc>uref1</urefdesc></uref></xrefinfoname><xrefprinteddesc
spaces=" ">title with uref2
<uref><urefurl>href://http/myhost.com/index2.html</urefurl><urefdesc>uref2</urefdesc></uref></xrefprinteddesc><xrefinfofile
spaces=" ">info file with uref3
<uref><urefurl>href://http/myhost.com/index3.html</urefurl><urefdesc>uref3<
[...]
+<ref label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref with uref
<uref><urefurl>href://http/myhost.com/index.html</urefurl><urefdesc>uref1</urefdesc></uref></xrefinfoname><xrefprinteddesc
spaces=" ">title with uref2
<uref><urefurl>href://http/myhost.com/index2.html</urefurl><urefdesc>uref2</urefdesc></uref></xrefprinteddesc></ref>
</pre><table commandarg="asis" spaces=" " endspaces=" ">
<beforefirstitem><pre xml:space="preserve"><!-- c comment in table -->
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
index aa60e80..152c3e4 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/anchor.html
@@ -525,6 +525,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index 8c77048..b461f3f 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
@@ -1516,7 +1520,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -2448,7 +2456,11 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
</p>
-
+<p>‘<samp><a href="#chapter">chapter</a></samp>’.
+</p>
+<p><a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
+</p>
<dl compact="compact">
<dt><span>a</span></dt>
<dd><p>l–ine
@@ -3469,6 +3481,10 @@ ref, a comma@comma{} in file}</code>
See <a data-manual="a comma, in file" href="../a comma, in
file/s_002d_002dect_002cion.html#s_002d_002dect_002cion">(a comma, in file)a ,
in cross
ref</a>
+‘<samp><a href="#chapter">chapter</a></samp>’.
+
+<a data-manual="info file with uref3 href://http/myhost.com/index3.html
(uref3)" href="../index3.html (uref3)/ext.html#ext">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a> in <cite>printed manual
with uref4 <a href="href://http/myhost.com/index4.html">uref4</a></cite>
+<a href="#chapter">title with uref2 <a
href="href://http/myhost.com/index2.html">uref2</a></a>
</pre><dl compact="compact">
<dt><span><tt>a</tt></span></dt>
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
index 8bda1df..d83490a 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter2.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
index 7cb3808..3da2e0a 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.htm
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/index.html
b/tp/tests/tex_html/res_parser/formatting_singular/index.html
index 12e91be..989904f 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/index.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/index.html
@@ -525,6 +525,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
index ce2c0c5..fd81563 100644
---
a/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
+++
b/tp/tests/tex_html/res_parser/formatting_singular/s_002d_002dect_002cion.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
index 8818120..0c7d772 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_abt.htm
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
index 709a48c..9ee61ed 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_fot.htm
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
index dc59a85..d9d9b5f 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_ovr.htm
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
index c18c7bb..5689021 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_toc.htm
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
index 47c8c90..f7c913c 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/subsection.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
index aa57320..d21c91b 100644
---
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
+++
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
diff --git
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
index 5b9e973..9e03fe7 100644
---
a/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
+++
b/tp/tests/tex_html/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
@@ -524,6 +524,10 @@ s-ect,ion
ref, a comma@comma{} in file}
s-ect,ion
+chapter.
+
+ext
+chapter
a
l-ine
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: LaTeX.pm: handle @uref and @url.,
Patrice Dumas <=