[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (from_element_direct
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (from_element_direction): use TOP_NODE_UP_URL in priority, even if the Up/NodeUp direction is set. |
|
Date: |
Mon, 02 Jan 2023 11:38:48 -0500 |
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 5f4382ab2c * tp/Texinfo/Convert/HTML.pm (from_element_direction): use
TOP_NODE_UP_URL in priority, even if the Up/NodeUp direction is set.
5f4382ab2c is described below
commit 5f4382ab2cb5b5ea0fcf3d8dc444d2e739386af0
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jan 2 17:38:37 2023 +0100
* tp/Texinfo/Convert/HTML.pm (from_element_direction): use
TOP_NODE_UP_URL in priority, even if the Up/NodeUp direction
is set.
* tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/html_tests.t,
t/96moresectioning.t: inline top_node_up_implicit and
top_node_up_explicit tests from 96moresectioning.t in t/html_tests.t,
adding variants with USE_NODES set to 0. Remove the corresponding
files. Remove the nw empty 96moresectioning.t file.
---
ChangeLog | 12 +
tp/Makefile.am | 2 -
tp/Makefile.tres | 9 +-
tp/Texinfo/Convert/HTML.pm | 12 +-
tp/t/96moresectioning.t | 26 ---
tp/t/html_tests.t | 49 ++++
tp/t/input_files/top_node_up_explicit.texi | 21 --
tp/t/input_files/top_node_up_implicit.texi | 20 --
.../top_node_up_explicit.pl | 202 ++++++-----------
.../top_node_up_explicit_no_nodes.pl} | 246 ++++++++-------------
.../top_node_up_implicit.pl | 185 ++++++----------
.../top_node_up_implicit_no_nodes.pl} | 225 ++++++++-----------
.../res_html/top_node_up_explicit.html | 187 ----------------
.../res_html/top_node_up_implicit.html | 187 ----------------
.../sectioning/non_automatic_top_node_up_url.pl | 2 +-
15 files changed, 386 insertions(+), 999 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b983ee6f03..bbd756178a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-01-02 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (from_element_direction): use
+ TOP_NODE_UP_URL in priority, even if the Up/NodeUp direction
+ is set.
+
+ * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/html_tests.t,
+ t/96moresectioning.t: inline top_node_up_implicit and
+ top_node_up_explicit tests from 96moresectioning.t in t/html_tests.t,
+ adding variants with USE_NODES set to 0. Remove the corresponding
+ files. Remove the nw empty 96moresectioning.t file.
+
2023-01-02 Patrice Dumas <pertusus@free.fr>
* tp/Makefile.tres, tp/t/96moresectioning.t, tp/t/html_tests.t:
diff --git a/tp/Makefile.am b/tp/Makefile.am
index 54fc45a1c4..db44e81571 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -245,8 +245,6 @@ test_files = \
t/input_files/special_spaces_in_nodes.texi \
t/input_files/test_refs.texi \
t/input_files/test_two_include.texi \
- t/input_files/top_node_up_explicit.texi \
- t/input_files/top_node_up_implicit.texi \
t/input_files/topic_guide.texi \
t/input_files/things_before_setfilename_no_element.texi \
t/input_files/things_before_setfilename.texi \
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 1dbe1b127a..45a4830751 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -32,7 +32,6 @@ test_tap_files_generated_list = \
t/92formatting.t \
t/93layout.t \
t/94htmlxref.t \
- t/96moresectioning.t \
t/accents.t \
t/automatic_menus.t \
t/automatic_nodes.t \
@@ -720,6 +719,10 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/html_tests/text_before_top_and_contents_after_title.pl \
t/results/html_tests/text_before_top_and_summarycontents_after_title.pl \
t/results/html_tests/titles.pl \
+ t/results/html_tests/top_node_up_explicit.pl \
+ t/results/html_tests/top_node_up_explicit_no_nodes.pl \
+ t/results/html_tests/top_node_up_implicit.pl \
+ t/results/html_tests/top_node_up_implicit_no_nodes.pl \
t/results/html_tests/uref_accented_letter.pl \
t/results/html_tests/uref_accented_letter_ascii.pl \
t/results/html_tests/uref_accented_letter_latin1.pl \
@@ -1581,10 +1584,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/misc_commands/vskip.pl \
t/results/morecoverage/formatting_fr.pl \
t/results/morecoverage/texi_formatting.pl \
- t/results/moresectioning/top_node_up_explicit.pl \
-
t/results/moresectioning/top_node_up_explicit/res_html/top_node_up_explicit.html
\
- t/results/moresectioning/top_node_up_implicit.pl \
-
t/results/moresectioning/top_node_up_implicit/res_html/top_node_up_implicit.html
\
t/results/multitable/empty_headitem.pl \
t/results/multitable/empty_item_tab.pl \
t/results/multitable/empty_multitable_with_cells.pl \
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index b6babd3ac3..40d9a96489 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1287,12 +1287,6 @@ sub from_element_direction($$$;$$$)
my $global_target_element = $self->global_direction_element($direction);
if ($global_target_element) {
$target_element = $global_target_element;
- } elsif (not $target_element and $source_element and
$source_element->{'extra'}
- and $source_element->{'structure'}
- and $source_element->{'structure'}->{'directions'}
- and $source_element->{'structure'}->{'directions'}->{$direction}) {
- $target_element
- = $source_element->{'structure'}->{'directions'}->{$direction};
# output TOP_NODE_UP related infos even if element is not
# defined which should mostly correspond to cases when there is no
# output file, for example in the tests.
@@ -1310,6 +1304,12 @@ sub from_element_direction($$$;$$$)
cluck("type $type not available for TOP_NODE_UP\n");
return '';
}
+ } elsif (not $target_element and $source_element
+ and $source_element->{'structure'}
+ and $source_element->{'structure'}->{'directions'}
+ and $source_element->{'structure'}->{'directions'}->{$direction}) {
+ $target_element
+ = $source_element->{'structure'}->{'directions'}->{$direction};
}
if ($target_element) {
diff --git a/tp/t/96moresectioning.t b/tp/t/96moresectioning.t
deleted file mode 100644
index 7bf59e831c..0000000000
--- a/tp/t/96moresectioning.t
+++ /dev/null
@@ -1,26 +0,0 @@
-use strict;
-
-use lib '.';
-use Texinfo::ModulePath (undef, undef, undef, 'updirs' => 2);
-
-require 't/test_utils.pl';
-
-my @test_cases = (
-['top_node_up_implicit',
- undef,
- {'test_file' => 'top_node_up_implicit.texi'},
- {'TEXI2HTML' => 1, 'TOP_NODE_UP_URL' => 'http://itop.example.org'}
-],
-['top_node_up_explicit',
- undef,
- {'test_file' => 'top_node_up_explicit.texi'},
- {'TEXI2HTML' => 1, 'TOP_NODE_UP_URL' => 'http://etop.example.org'}
-],
-);
-
-foreach my $test (@test_cases) {
- push @{$test->[2]->{'test_formats'}}, 'file_html';
- $test->[2]->{'test_input_file_name'} = $test->[0] . '.texi';
-}
-
-run_all('moresectioning', [@test_cases]);
diff --git a/tp/t/html_tests.t b/tp/t/html_tests.t
index 299e24ce7c..15a0b93c2b 100644
--- a/tp/t/html_tests.t
+++ b/tp/t/html_tests.t
@@ -165,6 +165,36 @@ my $check_htmlxref_text = '
@chapter Chapter
';
+my $top_node_up_implicit_text = '@node Top
+@top The top
+
+Just a top node.
+
+@menu
+* Chap::
+@end menu
+
+@node Chap
+@chapter A chapter
+
+Without the chapter, no up node from top is generated.
+';
+
+my $top_node_up_explicit_text =
+'@node Top, (dir), (weird), (dir)
+@top The top
+
+Just a top node.
+
+@menu
+* Chap::
+@end menu
+
+@node Chap
+@chapter A chapter
+
+Without the chapter, no up node from top is generated.
+';
my @test_cases = (
['verbatim_in_multitable_in_example',
@@ -347,6 +377,25 @@ in cartouche in menu comment in menu in example
@end menu
@end example
', {'SIMPLE_MENU' => 1, 'test_formats' => ['info']}, {'FORMAT_MENU' =>
'menu'}],
+# the following tests are somewhat redundant with tests in
+# XXsectioning.t, but here there is a clearer comparison with
+# and without 'USE_NODES' here. There is no test of TOP_NODE_UP, here,
however.
+['top_node_up_implicit',
+$top_node_up_implicit_text,
+{}, {'TOP_NODE_UP_URL' => 'http://itop.example.org'},
+],
+['top_node_up_implicit_no_nodes',
+$top_node_up_implicit_text,
+{}, {'TOP_NODE_UP_URL' => 'http://itop.example.org', 'USE_NODES' => 0},
+],
+['top_node_up_explicit',
+$top_node_up_explicit_text,
+{}, {'TOP_NODE_UP_URL' => 'http://etop.example.org'},
+],
+['top_node_up_explicit_no_nodes',
+$top_node_up_explicit_text,
+{}, {'TOP_NODE_UP_URL' => 'http://etop.example.org', 'USE_NODES' => 0},
+],
['character_number_leading_toc_stoc',
'@top top
@chapter 0
diff --git a/tp/t/input_files/top_node_up_explicit.texi
b/tp/t/input_files/top_node_up_explicit.texi
deleted file mode 100644
index b1d4607857..0000000000
--- a/tp/t/input_files/top_node_up_explicit.texi
+++ /dev/null
@@ -1,21 +0,0 @@
-\input texinfo @c public domain
-@setfilename top_node_up_explicit
-
-@c should replace all explicit (dir) pointers, but not
-@c pointers to other files.
-
-@node Top, (dir), (weird), (dir)
-@top The top
-
-Just a top node.
-
-@menu
-* Chap::
-@end menu
-
-@node Chap
-@chapter A chapter
-
-Without the chapter, no up node from top is generated.
-
-@bye
diff --git a/tp/t/input_files/top_node_up_implicit.texi
b/tp/t/input_files/top_node_up_implicit.texi
deleted file mode 100644
index fbf4b9d2c7..0000000000
--- a/tp/t/input_files/top_node_up_implicit.texi
+++ /dev/null
@@ -1,20 +0,0 @@
-\input texinfo @c public domain
-@setfilename top_node_up_implicit
-
-@c should replace implicit Up.
-
-@node Top
-@top The top
-
-Just a top node.
-
-@menu
-* Chap::
-@end menu
-
-@node Chap
-@chapter A chapter
-
-Without the chapter, no up node from top is generated.
-
-@bye
diff --git a/tp/t/results/moresectioning/top_node_up_explicit.pl
b/tp/t/results/html_tests/top_node_up_explicit.pl
similarity index 79%
copy from tp/t/results/moresectioning/top_node_up_explicit.pl
copy to tp/t/results/html_tests/top_node_up_explicit.pl
index 6ebf9e4401..46d0d1fd37 100644
--- a/tp/t/results/moresectioning/top_node_up_explicit.pl
+++ b/tp/t/results/html_tests/top_node_up_explicit.pl
@@ -8,98 +8,6 @@ use utf8;
$result_trees{'top_node_up_explicit'} = {
'contents' => [
{
- 'contents' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c public domain
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'top_node_up_explicit'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'top_node_up_explicit'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 2,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'text' => ' should replace all explicit (dir) pointers, but
not
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' should replace all explicit (dir) pointers, but not
-'
- ]
- }
- },
- {
- 'args' => [
- {
- 'text' => ' pointers to other files.
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' pointers to other files.
-'
- ]
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
'type' => 'before_node_section'
},
{
@@ -200,8 +108,8 @@ $result_trees{'top_node_up_explicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 7,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -296,8 +204,8 @@ $result_trees{'top_node_up_explicit'} = {
}
},
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 13,
+ 'file_name' => '',
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -325,15 +233,15 @@ $result_trees{'top_node_up_explicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 14,
+ 'file_name' => '',
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 12,
+ 'file_name' => '',
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -348,8 +256,8 @@ $result_trees{'top_node_up_explicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 8,
+ 'file_name' => '',
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -387,8 +295,8 @@ $result_trees{'top_node_up_explicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 16,
+ 'file_name' => '',
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -422,11 +330,6 @@ $result_trees{'top_node_up_explicit'} = {
}
],
'type' => 'paragraph'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
}
],
'extra' => {},
@@ -434,20 +337,10 @@ $result_trees{'top_node_up_explicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 17,
+ 'file_name' => '',
+ 'line_nr' => 11,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
}
],
'type' => 'document_root'
@@ -462,13 +355,7 @@
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[
$result_trees{'top_node_up_explicit'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'top_node_up_explicit'}{'contents'}[3]{'args'}[0]{'contents'}[0];
$result_trees{'top_node_up_explicit'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'top_node_up_explicit'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_texis{'top_node_up_explicit'} = '\\input texinfo @c public domain
-@setfilename top_node_up_explicit
-
-@c should replace all explicit (dir) pointers, but not
-@c pointers to other files.
-
-@node Top, (dir), (weird), (dir)
+$result_texis{'top_node_up_explicit'} = '@node Top, (dir), (weird), (dir)
@top The top
Just a top node.
@@ -481,14 +368,10 @@ Just a top node.
@chapter A chapter
Without the chapter, no up node from top is generated.
-
-@bye
';
-$result_texts{'top_node_up_explicit'} = '
-
-The top
+$result_texts{'top_node_up_explicit'} = 'The top
*******
Just a top node.
@@ -499,7 +382,6 @@ Just a top node.
***********
Without the chapter, no up node from top is generated.
-
';
$result_sectioning{'top_node_up_explicit'} = {
@@ -652,4 +534,56 @@ $result_errors{'top_node_up_explicit'} = [];
$result_floats{'top_node_up_explicit'} = {};
+
+$result_converted{'html'}->{'top_node_up_explicit'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>The top</title>
+
+<meta name="description" content="The top">
+<meta name="keywords" content="The top">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<link href="http://etop.example.org"; rel="up" title="(dir)">
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="dir.html#Top" accesskey="n" rel="next">(dir)</a>, Previous: <a
href="weird.html#Top" accesskey="p" rel="prev">(weird)</a>, Up: <a
href="http://etop.example.org"; accesskey="u" rel="up">(dir)</a> </p>
+</div>
+<h1 class="top" id="The-top">The top</h1>
+
+<p>Just a top node.
+</p>
+
+<ul class="mini-toc">
+<li><a href="#Chap" accesskey="1">A chapter</a></li>
+</ul>
+<hr>
+<div class="chapter-level-extent" id="Chap">
+<div class="nav-panel">
+<p>
+Up: <a href="#Top" accesskey="u" rel="up">The top</a> </p>
+</div>
+<h2 class="chapter" id="A-chapter">1 A chapter</h2>
+
+<p>Without the chapter, no up node from top is generated.
+</p></div>
+</div>
+
+
+
+</body>
+</html>
+';
+
1;
diff --git a/tp/t/results/moresectioning/top_node_up_explicit.pl
b/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
similarity index 60%
rename from tp/t/results/moresectioning/top_node_up_explicit.pl
rename to tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
index 6ebf9e4401..5b500985bf 100644
--- a/tp/t/results/moresectioning/top_node_up_explicit.pl
+++ b/tp/t/results/html_tests/top_node_up_explicit_no_nodes.pl
@@ -5,101 +5,9 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'top_node_up_explicit'} = {
+$result_trees{'top_node_up_explicit_no_nodes'} = {
'contents' => [
{
- 'contents' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c public domain
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'top_node_up_explicit'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'top_node_up_explicit'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 2,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'text' => ' should replace all explicit (dir) pointers, but
not
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' should replace all explicit (dir) pointers, but not
-'
- ]
- }
- },
- {
- 'args' => [
- {
- 'text' => ' pointers to other files.
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' pointers to other files.
-'
- ]
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
'type' => 'before_node_section'
},
{
@@ -200,8 +108,8 @@ $result_trees{'top_node_up_explicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 7,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -296,8 +204,8 @@ $result_trees{'top_node_up_explicit'} = {
}
},
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 13,
+ 'file_name' => '',
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -325,15 +233,15 @@ $result_trees{'top_node_up_explicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 14,
+ 'file_name' => '',
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 12,
+ 'file_name' => '',
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -348,8 +256,8 @@ $result_trees{'top_node_up_explicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 8,
+ 'file_name' => '',
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -387,8 +295,8 @@ $result_trees{'top_node_up_explicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 16,
+ 'file_name' => '',
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -422,11 +330,6 @@ $result_trees{'top_node_up_explicit'} = {
}
],
'type' => 'paragraph'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
}
],
'extra' => {},
@@ -434,41 +337,25 @@ $result_trees{'top_node_up_explicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_explicit.texi',
- 'line_nr' => 17,
+ 'file_name' => '',
+ 'line_nr' => 11,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
}
],
'type' => 'document_root'
};
-$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
=
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0]
=
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[2]{'contents'}[1];
-$result_trees{'top_node_up_explicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
=
$result_trees{'top_node_up_explicit'}{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[3];
-$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'top_node_up_explicit'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'top_node_up_explicit'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'top_node_up_explicit'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'top_node_up_explicit'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-
-$result_texis{'top_node_up_explicit'} = '\\input texinfo @c public domain
-@setfilename top_node_up_explicit
-
-@c should replace all explicit (dir) pointers, but not
-@c pointers to other files.
-
-@node Top, (dir), (weird), (dir)
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]
=
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[1]{'contents'}[1];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0]
=
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[2]{'contents'}[1];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
=
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[1];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[3];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'top_node_up_explicit_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+
+$result_texis{'top_node_up_explicit_no_nodes'} = '@node Top, (dir), (weird),
(dir)
@top The top
Just a top node.
@@ -481,14 +368,10 @@ Just a top node.
@chapter A chapter
Without the chapter, no up node from top is generated.
-
-@bye
';
-$result_texts{'top_node_up_explicit'} = '
-
-The top
+$result_texts{'top_node_up_explicit_no_nodes'} = 'The top
*******
Just a top node.
@@ -499,10 +382,9 @@ Just a top node.
***********
Without the chapter, no up node from top is generated.
-
';
-$result_sectioning{'top_node_up_explicit'} = {
+$result_sectioning{'top_node_up_explicit_no_nodes'} = {
'structure' => {
'section_childs' => [
{
@@ -550,12 +432,12 @@ $result_sectioning{'top_node_up_explicit'} = {
'section_level' => -1
}
};
-$result_sectioning{'top_node_up_explicit'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'top_node_up_explicit'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'top_node_up_explicit'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
= $result_sectioning{'top_node_up_explicit'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'top_node_up_explicit'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
= $result_sectioning{'top_node_up_explicit'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'top_node_up_explicit'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'top_node_up_explicit'};
+$result_sectioning{'top_node_up_explicit_no_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
=
$result_sectioning{'top_node_up_explicit_no_nodes'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'top_node_up_explicit_no_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
=
$result_sectioning{'top_node_up_explicit_no_nodes'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'top_node_up_explicit_no_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
=
$result_sectioning{'top_node_up_explicit_no_nodes'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'top_node_up_explicit_no_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'top_node_up_explicit_no_nodes'};
-$result_nodes{'top_node_up_explicit'} = {
+$result_nodes{'top_node_up_explicit_no_nodes'} = {
'cmdname' => 'node',
'extra' => {
'associated_section' => {
@@ -620,9 +502,9 @@ $result_nodes{'top_node_up_explicit'} = {
}
}
};
-$result_nodes{'top_node_up_explicit'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'top_node_up_explicit'};
+$result_nodes{'top_node_up_explicit_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'top_node_up_explicit_no_nodes'};
-$result_menus{'top_node_up_explicit'} = {
+$result_menus{'top_node_up_explicit_no_nodes'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
@@ -644,12 +526,64 @@ $result_menus{'top_node_up_explicit'} = {
}
}
};
-$result_menus{'top_node_up_explicit'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'top_node_up_explicit'};
+$result_menus{'top_node_up_explicit_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'top_node_up_explicit_no_nodes'};
+
+$result_errors{'top_node_up_explicit_no_nodes'} = [];
+
-$result_errors{'top_node_up_explicit'} = [];
+$result_floats{'top_node_up_explicit_no_nodes'} = {};
-$result_floats{'top_node_up_explicit'} = {};
+$result_converted{'html'}->{'top_node_up_explicit_no_nodes'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>The top</title>
+
+<meta name="description" content="The top">
+<meta name="keywords" content="The top">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="The top">
+<link href="http://etop.example.org"; rel="up" title="(dir)">
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+ Up : <a href="http://etop.example.org"; accesskey="u" rel="up">(dir)</a>
</p>
+</div>
+<h1 class="top" id="The-top">The top</h1>
+
+<p>Just a top node.
+</p>
+
+<ul class="mini-toc">
+<li><a href="#Chap" accesskey="1">A chapter</a></li>
+</ul>
+<hr>
+<div class="chapter-level-extent" id="Chap">
+<div class="nav-panel">
+<p>
+ Up : <a href="#Top" accesskey="u" rel="up">The top</a> </p>
+</div>
+<h2 class="chapter" id="A-chapter">1 A chapter</h2>
+
+<p>Without the chapter, no up node from top is generated.
+</p></div>
+</div>
+
+
+
+</body>
+</html>
+';
1;
diff --git a/tp/t/results/moresectioning/top_node_up_implicit.pl
b/tp/t/results/html_tests/top_node_up_implicit.pl
similarity index 79%
copy from tp/t/results/moresectioning/top_node_up_implicit.pl
copy to tp/t/results/html_tests/top_node_up_implicit.pl
index c8bf134033..08cf2e7bad 100644
--- a/tp/t/results/moresectioning/top_node_up_implicit.pl
+++ b/tp/t/results/html_tests/top_node_up_implicit.pl
@@ -8,82 +8,6 @@ use utf8;
$result_trees{'top_node_up_implicit'} = {
'contents' => [
{
- 'contents' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c public domain
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'top_node_up_implicit'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'top_node_up_implicit'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 2,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'text' => ' should replace implicit Up.
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' should replace implicit Up.
-'
- ]
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
'type' => 'before_node_section'
},
{
@@ -120,8 +44,8 @@ $result_trees{'top_node_up_implicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 6,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -216,8 +140,8 @@ $result_trees{'top_node_up_implicit'} = {
}
},
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 12,
+ 'file_name' => '',
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -245,15 +169,15 @@ $result_trees{'top_node_up_implicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 13,
+ 'file_name' => '',
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 11,
+ 'file_name' => '',
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -268,8 +192,8 @@ $result_trees{'top_node_up_implicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 7,
+ 'file_name' => '',
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -307,8 +231,8 @@ $result_trees{'top_node_up_implicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 15,
+ 'file_name' => '',
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -342,11 +266,6 @@ $result_trees{'top_node_up_implicit'} = {
}
],
'type' => 'paragraph'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
}
],
'extra' => {},
@@ -354,20 +273,10 @@ $result_trees{'top_node_up_implicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 16,
+ 'file_name' => '',
+ 'line_nr' => 11,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
}
],
'type' => 'document_root'
@@ -379,12 +288,7 @@
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[
$result_trees{'top_node_up_implicit'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'top_node_up_implicit'}{'contents'}[3]{'args'}[0]{'contents'}[0];
$result_trees{'top_node_up_implicit'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'top_node_up_implicit'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_texis{'top_node_up_implicit'} = '\\input texinfo @c public domain
-@setfilename top_node_up_implicit
-
-@c should replace implicit Up.
-
-@node Top
+$result_texis{'top_node_up_implicit'} = '@node Top
@top The top
Just a top node.
@@ -397,14 +301,10 @@ Just a top node.
@chapter A chapter
Without the chapter, no up node from top is generated.
-
-@bye
';
-$result_texts{'top_node_up_implicit'} = '
-
-The top
+$result_texts{'top_node_up_implicit'} = 'The top
*******
Just a top node.
@@ -415,7 +315,6 @@ Just a top node.
***********
Without the chapter, no up node from top is generated.
-
';
$result_sectioning{'top_node_up_implicit'} = {
@@ -545,4 +444,56 @@ $result_errors{'top_node_up_implicit'} = [];
$result_floats{'top_node_up_implicit'} = {};
+
+$result_converted{'html'}->{'top_node_up_implicit'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>The top</title>
+
+<meta name="description" content="The top">
+<meta name="keywords" content="The top">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<link href="http://itop.example.org"; rel="up" title="(dir)">
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="#Chap" accesskey="n" rel="next">A chapter</a>, Up: <a
href="http://itop.example.org"; accesskey="u" rel="up">(dir)</a> </p>
+</div>
+<h1 class="top" id="The-top">The top</h1>
+
+<p>Just a top node.
+</p>
+
+<ul class="mini-toc">
+<li><a href="#Chap" accesskey="1">A chapter</a></li>
+</ul>
+<hr>
+<div class="chapter-level-extent" id="Chap">
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">The top</a>, Up: <a
href="#Top" accesskey="u" rel="up">The top</a> </p>
+</div>
+<h2 class="chapter" id="A-chapter">1 A chapter</h2>
+
+<p>Without the chapter, no up node from top is generated.
+</p></div>
+</div>
+
+
+
+</body>
+</html>
+';
+
1;
diff --git a/tp/t/results/moresectioning/top_node_up_implicit.pl
b/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
similarity index 59%
rename from tp/t/results/moresectioning/top_node_up_implicit.pl
rename to tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
index c8bf134033..917519c6c7 100644
--- a/tp/t/results/moresectioning/top_node_up_implicit.pl
+++ b/tp/t/results/html_tests/top_node_up_implicit_no_nodes.pl
@@ -5,85 +5,9 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'top_node_up_implicit'} = {
+$result_trees{'top_node_up_implicit_no_nodes'} = {
'contents' => [
{
- 'contents' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c public domain
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'top_node_up_implicit'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'top_node_up_implicit'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 2,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'text' => ' should replace implicit Up.
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' should replace implicit Up.
-'
- ]
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
'type' => 'before_node_section'
},
{
@@ -120,8 +44,8 @@ $result_trees{'top_node_up_implicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 6,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -216,8 +140,8 @@ $result_trees{'top_node_up_implicit'} = {
}
},
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 12,
+ 'file_name' => '',
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -245,15 +169,15 @@ $result_trees{'top_node_up_implicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 13,
+ 'file_name' => '',
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 11,
+ 'file_name' => '',
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -268,8 +192,8 @@ $result_trees{'top_node_up_implicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 7,
+ 'file_name' => '',
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -307,8 +231,8 @@ $result_trees{'top_node_up_implicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 15,
+ 'file_name' => '',
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -342,11 +266,6 @@ $result_trees{'top_node_up_implicit'} = {
}
],
'type' => 'paragraph'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
}
],
'extra' => {},
@@ -354,37 +273,22 @@ $result_trees{'top_node_up_implicit'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'top_node_up_implicit.texi',
- 'line_nr' => 16,
+ 'file_name' => '',
+ 'line_nr' => 11,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
}
],
'type' => 'document_root'
};
-$result_trees{'top_node_up_implicit'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'top_node_up_implicit'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'top_node_up_implicit'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'top_node_up_implicit'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[3];
-$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'top_node_up_implicit'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'top_node_up_implicit'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'top_node_up_implicit'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'top_node_up_implicit'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-
-$result_texis{'top_node_up_implicit'} = '\\input texinfo @c public domain
-@setfilename top_node_up_implicit
+$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[3];
+$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'top_node_up_implicit_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-@c should replace implicit Up.
-
-@node Top
+$result_texis{'top_node_up_implicit_no_nodes'} = '@node Top
@top The top
Just a top node.
@@ -397,14 +301,10 @@ Just a top node.
@chapter A chapter
Without the chapter, no up node from top is generated.
-
-@bye
';
-$result_texts{'top_node_up_implicit'} = '
-
-The top
+$result_texts{'top_node_up_implicit_no_nodes'} = 'The top
*******
Just a top node.
@@ -415,10 +315,9 @@ Just a top node.
***********
Without the chapter, no up node from top is generated.
-
';
-$result_sectioning{'top_node_up_implicit'} = {
+$result_sectioning{'top_node_up_implicit_no_nodes'} = {
'structure' => {
'section_childs' => [
{
@@ -466,12 +365,12 @@ $result_sectioning{'top_node_up_implicit'} = {
'section_level' => -1
}
};
-$result_sectioning{'top_node_up_implicit'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'top_node_up_implicit'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'top_node_up_implicit'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
= $result_sectioning{'top_node_up_implicit'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'top_node_up_implicit'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
= $result_sectioning{'top_node_up_implicit'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'top_node_up_implicit'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'top_node_up_implicit'};
+$result_sectioning{'top_node_up_implicit_no_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
=
$result_sectioning{'top_node_up_implicit_no_nodes'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'top_node_up_implicit_no_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
=
$result_sectioning{'top_node_up_implicit_no_nodes'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'top_node_up_implicit_no_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
=
$result_sectioning{'top_node_up_implicit_no_nodes'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'top_node_up_implicit_no_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'top_node_up_implicit_no_nodes'};
-$result_nodes{'top_node_up_implicit'} = {
+$result_nodes{'top_node_up_implicit_no_nodes'} = {
'cmdname' => 'node',
'extra' => {
'associated_section' => {
@@ -511,11 +410,11 @@ $result_nodes{'top_node_up_implicit'} = {
'node_next' => {}
}
};
-$result_nodes{'top_node_up_implicit'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'top_node_up_implicit'};
-$result_nodes{'top_node_up_implicit'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'top_node_up_implicit'};
-$result_nodes{'top_node_up_implicit'}{'structure'}{'node_next'} =
$result_nodes{'top_node_up_implicit'}{'structure'}{'menu_child'};
+$result_nodes{'top_node_up_implicit_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'top_node_up_implicit_no_nodes'};
+$result_nodes{'top_node_up_implicit_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'top_node_up_implicit_no_nodes'};
+$result_nodes{'top_node_up_implicit_no_nodes'}{'structure'}{'node_next'} =
$result_nodes{'top_node_up_implicit_no_nodes'}{'structure'}{'menu_child'};
-$result_menus{'top_node_up_implicit'} = {
+$result_menus{'top_node_up_implicit_no_nodes'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
@@ -537,12 +436,64 @@ $result_menus{'top_node_up_implicit'} = {
}
}
};
-$result_menus{'top_node_up_implicit'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'top_node_up_implicit'};
+$result_menus{'top_node_up_implicit_no_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'top_node_up_implicit_no_nodes'};
+
+$result_errors{'top_node_up_implicit_no_nodes'} = [];
+
+
+$result_floats{'top_node_up_implicit_no_nodes'} = {};
+
-$result_errors{'top_node_up_implicit'} = [];
+$result_converted{'html'}->{'top_node_up_implicit_no_nodes'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>The top</title>
-$result_floats{'top_node_up_implicit'} = {};
+<meta name="description" content="The top">
+<meta name="keywords" content="The top">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link href="#Top" rel="start" title="The top">
+<link href="http://itop.example.org"; rel="up" title="(dir)">
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+ Up : <a href="http://itop.example.org"; accesskey="u" rel="up">(dir)</a>
</p>
+</div>
+<h1 class="top" id="The-top">The top</h1>
+
+<p>Just a top node.
+</p>
+
+<ul class="mini-toc">
+<li><a href="#Chap" accesskey="1">A chapter</a></li>
+</ul>
+<hr>
+<div class="chapter-level-extent" id="Chap">
+<div class="nav-panel">
+<p>
+ Up : <a href="#Top" accesskey="u" rel="up">The top</a> </p>
+</div>
+<h2 class="chapter" id="A-chapter">1 A chapter</h2>
+
+<p>Without the chapter, no up node from top is generated.
+</p></div>
+</div>
+
+
+
+</body>
+</html>
+';
1;
diff --git
a/tp/t/results/moresectioning/top_node_up_explicit/res_html/top_node_up_explicit.html
b/tp/t/results/moresectioning/top_node_up_explicit/res_html/top_node_up_explicit.html
deleted file mode 100644
index 201c38dbba..0000000000
---
a/tp/t/results/moresectioning/top_node_up_explicit/res_html/top_node_up_explicit.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>The top</title>
-
-<meta name="description" content="The top">
-<meta name="keywords" content="The top">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
-td.name-direction-about {text-align:center}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-
-
-<div class="top-level-extent" id="Top">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ < ]</td>
-<td>[<a href="#Chap" title="Next section in reading order"> > </a>]</td>
-<td> </td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="top" id="The-top">The top</h1>
-
-<p>Just a top node.
-</p>
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#Chap">1 A
chapter</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-</table>
-
-<hr style="height: 6px;">
-<div class="chapter-level-extent" id="Chap">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Beginning of this chapter or previous chapter">
<< </a>]</td>
-<td>[<a href="#Top" title="Previous section in reading order"> < </a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
-<td>[ > ]</td>
-<td>[ >> ]</td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="A-chapter">1 A chapter</h1>
-
-<p>Without the chapter, no up node from top is generated.
-</p>
-<hr style="height: 6px;">
-</div>
-</div>
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="about-heading">About This Document</h1>
-
-<p>
- This document was generated on <em class="emph">a sunny day</em>.
-</p>
-<p>
- The buttons in the navigation panels have the following meaning:
-</p>
-<table border="1">
- <tr>
- <th> Button </th>
- <th> Name </th>
- <th> Go to </th>
- <th> From 1.2.3 go to</th>
- </tr>
- <tr>
- <td class="button-direction-about"> [ << ] </td>
- <td class="name-direction-about">FastBack</td>
- <td>Beginning of this chapter or previous chapter</td>
- <td>1</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ < ] </td>
- <td class="name-direction-about">Back</td>
- <td>Previous section in reading order</td>
- <td>1.2.2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ Up ] </td>
- <td class="name-direction-about">Up</td>
- <td>Up section</td>
- <td>1.2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ > ] </td>
- <td class="name-direction-about">Forward</td>
- <td>Next section in reading order</td>
- <td>1.2.4</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ >> ] </td>
- <td class="name-direction-about">FastForward</td>
- <td>Next chapter</td>
- <td>2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Top] </td>
- <td class="name-direction-about">Top</td>
- <td>Cover (top) of document</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Contents] </td>
- <td class="name-direction-about">Contents</td>
- <td>Table of contents</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Index] </td>
- <td class="name-direction-about">Index</td>
- <td>Index</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ ? ] </td>
- <td class="name-direction-about">About</td>
- <td>About (help)</td>
- <td> </td>
- </tr>
-</table>
-
-<p>
- where the <strong class="strong"> Example </strong> assumes that the current
position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of
a document of the following structure:
-</p>
-
-<ul>
- <li> 1. Section One
- <ul>
- <li>1.1 Subsection One-One
- <ul>
- <li>...</li>
- </ul>
- </li>
- <li>1.2 Subsection One-Two
- <ul>
- <li>1.2.1 Subsubsection One-Two-One</li>
- <li>1.2.2 Subsubsection One-Two-Two</li>
- <li>1.2.3 Subsubsection One-Two-Three
- <strong><== Current Position </strong></li>
- <li>1.2.4 Subsubsection One-Two-Four</li>
- </ul>
- </li>
- <li>1.3 Subsection One-Three
- <ul>
- <li>...</li>
- </ul>
- </li>
- <li>1.4 Subsection One-Four</li>
- </ul>
- </li>
-</ul>
-</div><hr>
-<p>
- <span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em>.</span>
-</p>
-
-
-</body>
-</html>
diff --git
a/tp/t/results/moresectioning/top_node_up_implicit/res_html/top_node_up_implicit.html
b/tp/t/results/moresectioning/top_node_up_implicit/res_html/top_node_up_implicit.html
deleted file mode 100644
index 201c38dbba..0000000000
---
a/tp/t/results/moresectioning/top_node_up_implicit/res_html/top_node_up_implicit.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>The top</title>
-
-<meta name="description" content="The top">
-<meta name="keywords" content="The top">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
-td.name-direction-about {text-align:center}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-
-
-<div class="top-level-extent" id="Top">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ < ]</td>
-<td>[<a href="#Chap" title="Next section in reading order"> > </a>]</td>
-<td> </td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="top" id="The-top">The top</h1>
-
-<p>Just a top node.
-</p>
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#Chap">1 A
chapter</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-</table>
-
-<hr style="height: 6px;">
-<div class="chapter-level-extent" id="Chap">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Beginning of this chapter or previous chapter">
<< </a>]</td>
-<td>[<a href="#Top" title="Previous section in reading order"> < </a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
-<td>[ > ]</td>
-<td>[ >> ]</td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="A-chapter">1 A chapter</h1>
-
-<p>Without the chapter, no up node from top is generated.
-</p>
-<hr style="height: 6px;">
-</div>
-</div>
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="about-heading">About This Document</h1>
-
-<p>
- This document was generated on <em class="emph">a sunny day</em>.
-</p>
-<p>
- The buttons in the navigation panels have the following meaning:
-</p>
-<table border="1">
- <tr>
- <th> Button </th>
- <th> Name </th>
- <th> Go to </th>
- <th> From 1.2.3 go to</th>
- </tr>
- <tr>
- <td class="button-direction-about"> [ << ] </td>
- <td class="name-direction-about">FastBack</td>
- <td>Beginning of this chapter or previous chapter</td>
- <td>1</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ < ] </td>
- <td class="name-direction-about">Back</td>
- <td>Previous section in reading order</td>
- <td>1.2.2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ Up ] </td>
- <td class="name-direction-about">Up</td>
- <td>Up section</td>
- <td>1.2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ > ] </td>
- <td class="name-direction-about">Forward</td>
- <td>Next section in reading order</td>
- <td>1.2.4</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ >> ] </td>
- <td class="name-direction-about">FastForward</td>
- <td>Next chapter</td>
- <td>2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Top] </td>
- <td class="name-direction-about">Top</td>
- <td>Cover (top) of document</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Contents] </td>
- <td class="name-direction-about">Contents</td>
- <td>Table of contents</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Index] </td>
- <td class="name-direction-about">Index</td>
- <td>Index</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ ? ] </td>
- <td class="name-direction-about">About</td>
- <td>About (help)</td>
- <td> </td>
- </tr>
-</table>
-
-<p>
- where the <strong class="strong"> Example </strong> assumes that the current
position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of
a document of the following structure:
-</p>
-
-<ul>
- <li> 1. Section One
- <ul>
- <li>1.1 Subsection One-One
- <ul>
- <li>...</li>
- </ul>
- </li>
- <li>1.2 Subsection One-Two
- <ul>
- <li>1.2.1 Subsubsection One-Two-One</li>
- <li>1.2.2 Subsubsection One-Two-Two</li>
- <li>1.2.3 Subsubsection One-Two-Three
- <strong><== Current Position </strong></li>
- <li>1.2.4 Subsubsection One-Two-Four</li>
- </ul>
- </li>
- <li>1.3 Subsection One-Three
- <ul>
- <li>...</li>
- </ul>
- </li>
- <li>1.4 Subsection One-Four</li>
- </ul>
- </li>
-</ul>
-</div><hr>
-<p>
- <span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em>.</span>
-</p>
-
-
-</body>
-</html>
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
index db02aae8cc..c8e3ff664e 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
@@ -869,7 +869,7 @@
$result_converted{'html'}->{'non_automatic_top_node_up_url'} = '<!DOCTYPE html>
<div class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
-Next: <a href="#first" accesskey="n" rel="next">first</a>, Previous: <a
href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a
href="dir.html#Top" accesskey="u" rel="up">(dir)</a> </p>
+Next: <a href="#first" accesskey="n" rel="next">first</a>, Previous: <a
href="dir.html#Top" accesskey="p" rel="prev">(dir)</a>, Up: <a
href="http://www.gnu.org/manual/"; accesskey="u" rel="up">(dir)</a> </p>
</div>
<h1 class="top" id="internal-top-node-up">internal top node up</h1>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (from_element_direction): use TOP_NODE_UP_URL in priority, even if the Up/NodeUp direction is set.,
Patrice Dumas <=