[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (_default_format_spe
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (_default_format_special_body_about): show the button desciption if the button specification is an array reference of length 2. Do not show a button, only the description and explanation, as we do not know what the button text could look like. |
|
Date: |
Wed, 04 Jan 2023 10:28:21 -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 94c9789624 * tp/Texinfo/Convert/HTML.pm
(_default_format_special_body_about): show the button desciption if the button
specification is an array reference of length 2. Do not show a button, only
the description and explanation, as we do not know what the button text could
look like.
94c9789624 is described below
commit 94c97896242bbf5128b6506ac55d3cada6e5788e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jan 4 16:28:11 2023 +0100
* tp/Texinfo/Convert/HTML.pm (_default_format_special_body_about):
show the button desciption if the button specification is an array
reference of length 2. Do not show a button, only the description and
explanation, as we do not know what the button text could look like.
---
ChangeLog | 7 +
tp/Texinfo/Convert/HTML.pm | 33 +-
.../res_parser/formatting_html32/formatting.html | 18 +
.../res_parser/formatting_xhtml/formatting.html | 18 +
.../sectioning_directions/sectioning.html | 236 ++++++++++
.../sectioning_abt.html | 474 +++++++++++++++++++++
.../os\303\251_utf8_abt.html" | 18 +
.../formatting_enable_encoding/formatting.html | 18 +
.../formatting_inline_css/formatting.html | 18 +
.../formatting_numerical_entities/formatting.html | 18 +
.../formatting_weird_quotes/formatting.html | 18 +
11 files changed, 865 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 84de882d1d..73e65fee49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-04 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (_default_format_special_body_about):
+ show the button desciption if the button specification is an array
+ reference of length 2. Do not show a button, only the description and
+ explanation, as we do not know what the button text could look like.
+
2023-01-04 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (%defaults): add About to the default
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index b29b27822f..44a140a2d9 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -9908,20 +9908,31 @@ EOT
' <th> ' . $self->convert_tree($self->gdt('From 1.2.3 go to')) .
"</th>\n"
. " </tr>\n";
- foreach my $button (@{$self->get_conf('SECTION_BUTTONS')}) {
- next if ($button eq ' ' or ref($button) eq 'CODE'
- or ref($button) eq 'SCALAR' or ref($button) eq 'ARRAY');
- my $button_name_string
- = $self->direction_string($button, 'button', 'string');
+ foreach my $button_spec (@{$self->get_conf('SECTION_BUTTONS')}) {
+ next if ($button_spec eq ' ' or ref($button_spec) eq 'CODE'
+ or ref($button_spec) eq 'SCALAR'
+ or (ref($button_spec) eq 'ARRAY' and scalar(@$button_spec) != 2));
+ my $button;
+ if (ref($button_spec) eq 'ARRAY') {
+ $button = $button_spec->[0];
+ } else {
+ $button = $button_spec;
+ }
$about .= " <tr>\n ".$self->html_attribute_class('td',
['button-direction-about']) .'>';
- # FIXME strip FirstInFile from $button to get active icon file?
- $about .=
- (($self->get_conf('ICONS') &&
- $self->get_conf('ACTIVE_ICONS')->{$button}) ?
- &{$self->formatting_function('format_button_icon_img')}($self,
- $button_name_string, $self->get_conf('ACTIVE_ICONS')->{$button})
+ # if the button spec is an array we do not knwow what the button
+ # looks like, so we do not show the button but still show explanations.
+ if (ref($button_spec) ne 'ARRAY') {
+ my $button_name_string
+ = $self->direction_string($button, 'button', 'string');
+ # FIXME strip FirstInFile from $button to get active icon file?
+ $about .=
+ (($self->get_conf('ICONS') &&
+ $self->get_conf('ACTIVE_ICONS')->{$button}) ?
+ &{$self->formatting_function('format_button_icon_img')}($self,
+ $button_name_string, $self->get_conf('ACTIVE_ICONS')->{$button})
: ' [' . $self->direction_string($button, 'text') . '] ');
+ }
$about .= "</td>\n";
my $button_name
= $self->direction_string($button, 'button');
diff --git a/tp/tests/coverage/res_parser/formatting_html32/formatting.html
b/tp/tests/coverage/res_parser/formatting_html32/formatting.html
index c364e4db03..1589141b91 100644
--- a/tp/tests/coverage/res_parser/formatting_html32/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_html32/formatting.html
@@ -7711,6 +7711,24 @@ Previous: <a href="#chapter" rel="prev">chapter</a>, Up:
<a href="#Top" rel="up"
<th> Go to </th>
<th> From 1.2.3 go to</th>
</tr>
+ <tr>
+ <td></td>
+ <td>Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
<tr>
<td> [Contents] </td>
<td>Contents</td>
diff --git a/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
b/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
index 05071a9a11..be21028cc3 100644
--- a/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
+++ b/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
@@ -7853,6 +7853,24 @@ Previous: <a href="#chapter" accesskey="p"
rel="prev">chapter</a>, Up: <a href="
<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">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
<tr>
<td class="button-direction-about"> [Contents] </td>
<td class="name-direction-about">Contents</td>
diff --git
a/tp/tests/customization/res_parser/sectioning_directions/sectioning.html
b/tp/tests/customization/res_parser/sectioning_directions/sectioning.html
index 80b36e5cb7..5ed0ae3fc7 100644
--- a/tp/tests/customization/res_parser/sectioning_directions/sectioning.html
+++ b/tp/tests/customization/res_parser/sectioning_directions/sectioning.html
@@ -20,8 +20,10 @@
<style type="text/css">
<!--
pre.menu-comment-preformatted {font-family: serif}
+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}
th.menu-comment {text-align:left}
ul.toc-numbered-mark {list-style: none}
-->
@@ -1686,6 +1688,240 @@ description here
<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">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></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">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">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">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">Back</td>
+ <td>Previous section in reading order</td>
+ <td>1.2.2</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"></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"></td>
+ <td class="name-direction-about">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</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"></td>
+ <td class="name-direction-about">FastForward</td>
+ <td>Next chapter</td>
+ <td>2</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"></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">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">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">This</td>
+ <td>Current section</td>
+ <td>1.2.3</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">This</td>
+ <td>Current section</td>
+ <td>1.2.3</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">This</td>
+ <td>Current section</td>
+ <td>1.2.3</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeUp</td>
+ <td>Up node</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeUp</td>
+ <td>Up node</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeUp</td>
+ <td>Up node</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodePrev</td>
+ <td>Previous node</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodePrev</td>
+ <td>Previous node</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodePrev</td>
+ <td>Previous node</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeNext</td>
+ <td>Next node</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeNext</td>
+ <td>Next node</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeNext</td>
+ <td>Next node</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeForward</td>
+ <td>Next node in node reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeForward</td>
+ <td>Next node in node reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeForward</td>
+ <td>Next node in node reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeBack</td>
+ <td>Previous node in node reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeBack</td>
+ <td>Previous node in node reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeBack</td>
+ <td>Previous node in node reading order</td>
+ <td>1.2.2</td>
+ </tr>
</table>
<p>
diff --git
a/tp/tests/customization/res_parser/sectioning_directions_split_chapter/sectioning_abt.html
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/sectioning_abt.html
index c6fe8b2421..ddedd28c42 100644
---
a/tp/tests/customization/res_parser/sectioning_directions_split_chapter/sectioning_abt.html
+++
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/sectioning_abt.html
@@ -15,6 +15,12 @@
<link href="index.html" rel="start" title="">
<link href="sectioning_toc.html#SEC_Contents" rel="contents" title="Table of
Contents">
<link href="#SEC_About" rel="help" title="About This Document">
+<style type="text/css">
+<!--
+td.button-direction-about {text-align:center}
+td.name-direction-about {text-align:center}
+-->
+</style>
</head>
@@ -243,6 +249,474 @@
<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">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></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">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">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">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">Back</td>
+ <td>Previous section in reading order</td>
+ <td>1.2.2</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"></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"></td>
+ <td class="name-direction-about">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</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"></td>
+ <td class="name-direction-about">FastForward</td>
+ <td>Next chapter</td>
+ <td>2</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"></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">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">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">This</td>
+ <td>Current section</td>
+ <td>1.2.3</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">This</td>
+ <td>Current section</td>
+ <td>1.2.3</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">This</td>
+ <td>Current section</td>
+ <td>1.2.3</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeUp</td>
+ <td>Up node</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeUp</td>
+ <td>Up node</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeUp</td>
+ <td>Up node</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodePrev</td>
+ <td>Previous node</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodePrev</td>
+ <td>Previous node</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodePrev</td>
+ <td>Previous node</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeNext</td>
+ <td>Next node</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeNext</td>
+ <td>Next node</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeNext</td>
+ <td>Next node</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeForward</td>
+ <td>Next node in node reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeForward</td>
+ <td>Next node in node reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeForward</td>
+ <td>Next node in node reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeBack</td>
+ <td>Previous node in node reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeBack</td>
+ <td>Previous node in node reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeBack</td>
+ <td>Previous node in node reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></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">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></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">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">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">Back</td>
+ <td>Previous section in reading order</td>
+ <td>1.2.2</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"></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"></td>
+ <td class="name-direction-about">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</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"></td>
+ <td class="name-direction-about">FastForward</td>
+ <td>Next chapter</td>
+ <td>2</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"></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">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">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">This</td>
+ <td>Current section</td>
+ <td>1.2.3</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">This</td>
+ <td>Current section</td>
+ <td>1.2.3</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">This</td>
+ <td>Current section</td>
+ <td>1.2.3</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeUp</td>
+ <td>Up node</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeUp</td>
+ <td>Up node</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeUp</td>
+ <td>Up node</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodePrev</td>
+ <td>Previous node</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodePrev</td>
+ <td>Previous node</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodePrev</td>
+ <td>Previous node</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeNext</td>
+ <td>Next node</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeNext</td>
+ <td>Next node</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeNext</td>
+ <td>Next node</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeForward</td>
+ <td>Next node in node reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeForward</td>
+ <td>Next node in node reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeForward</td>
+ <td>Next node in node reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeBack</td>
+ <td>Previous node in node reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeBack</td>
+ <td>Previous node in node reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">NodeBack</td>
+ <td>Previous node in node reading order</td>
+ <td>1.2.2</td>
+ </tr>
</table>
<p>
diff --git
"a/tp/tests/encoded/res_parser/non_ascii_command_line/os\303\251_utf8_abt.html"
"b/tp/tests/encoded/res_parser/non_ascii_command_line/os\303\251_utf8_abt.html"
index f642bf6784..ddb65ab52a 100644
---
"a/tp/tests/encoded/res_parser/non_ascii_command_line/os\303\251_utf8_abt.html"
+++
"b/tp/tests/encoded/res_parser/non_ascii_command_line/os\303\251_utf8_abt.html"
@@ -60,6 +60,24 @@ ul.mark-néni {list-style-type: "vàça"}
<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">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
<tr>
<td class="button-direction-about"> [Contents] </td>
<td class="name-direction-about">Contents</td>
diff --git
a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
index 505f89a4cc..e2da0d8298 100644
--- a/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_enable_encoding/formatting.html
@@ -7888,6 +7888,24 @@ Previous: <a href="#chapter" accesskey="p"
rel="prev">chapter</a>, Up: <a href="
<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">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
<tr>
<td class="button-direction-about"> [Contents] </td>
<td class="name-direction-about">Contents</td>
diff --git a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
index 0223699907..a079ae4d94 100644
--- a/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_inline_css/formatting.html
@@ -7856,6 +7856,24 @@ Previous: <a href="#chapter" accesskey="p"
rel="prev">chapter</a>, Up: <a href="
<th> Go to </th>
<th> From 1.2.3 go to</th>
</tr>
+ <tr>
+ <td class="button-direction-about" style="text-align:center"></td>
+ <td class="name-direction-about" style="text-align:center">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about" style="text-align:center"></td>
+ <td class="name-direction-about" style="text-align:center">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about" style="text-align:center"></td>
+ <td class="name-direction-about" style="text-align:center">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
<tr>
<td class="button-direction-about" style="text-align:center"> [Contents]
</td>
<td class="name-direction-about" style="text-align:center">Contents</td>
diff --git
a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
index 5c4fa43d66..15822281bb 100644
--- a/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_numerical_entities/formatting.html
@@ -7888,6 +7888,24 @@ Previous: <a href="#chapter" accesskey="p"
rel="prev">chapter</a>, Up: <a href="
<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">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
<tr>
<td class="button-direction-about"> [Contents] </td>
<td class="name-direction-about">Contents</td>
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 203a47d320..334f633644 100644
--- a/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
@@ -7888,6 +7888,24 @@ Previous: <a href="#chapter" accesskey="p"
rel="prev">chapter</a>, Up: <a href="
<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">Next</td>
+ <td>Next section on same level</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Prev</td>
+ <td>Previous section on same level</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td class="button-direction-about"></td>
+ <td class="name-direction-about">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
<tr>
<td class="button-direction-about"> [Contents] </td>
<td class="name-direction-about">Contents</td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (_default_format_special_body_about): show the button desciption if the button specification is an array reference of length 2. Do not show a button, only the description and explanation, as we do not know what the button text could look like.,
Patrice Dumas <=