[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Structuring.pm (output_unit_texi) (p
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Structuring.pm (output_unit_texi) (print_output_unit_directions), tp/Texinfo/XS/main/output_unit.c (output_unit_texi, print_output_unit_directions): rename print_element_directions as print_output_unit_directions and unit_or_external_element_texi as output_unit_texi. Update callers. |
|
Date: |
Sat, 21 Oct 2023 05:08:32 -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 a3a0eb682c * tp/Texinfo/Structuring.pm (output_unit_texi)
(print_output_unit_directions), tp/Texinfo/XS/main/output_unit.c
(output_unit_texi, print_output_unit_directions): rename
print_element_directions as print_output_unit_directions and
unit_or_external_element_texi as output_unit_texi. Update callers.
a3a0eb682c is described below
commit a3a0eb682c1680c0ae3620239bee9d59c2cfa6f5
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Oct 21 11:08:31 2023 +0200
* tp/Texinfo/Structuring.pm (output_unit_texi)
(print_output_unit_directions), tp/Texinfo/XS/main/output_unit.c
(output_unit_texi, print_output_unit_directions): rename
print_element_directions as print_output_unit_directions and
unit_or_external_element_texi as output_unit_texi. Update callers.
* tp/Texinfo/Convert/HTML.pm (from_element_direction),
tp/Texinfo/Convert/Plaintext.pm (count_context_bug_message)
(convert_output_unit), tp/Texinfo/Structuring.pm (output_unit_texi)
(print_output_unit_directions), tp/Texinfo/XS/main/output_unit.c
(output_unit_texi, print_output_unit_directions): rename variables
names with element in their name replacing element by output_unit or
unit when they correspond to output units.
---
ChangeLog | 16 ++++
tp/TODO | 5 +-
tp/Texinfo/Convert/Converter.pm | 2 +-
tp/Texinfo/Convert/HTML.pm | 86 +++++++++++-----------
tp/Texinfo/Convert/Plaintext.pm | 27 +++----
tp/Texinfo/Structuring.pm | 53 ++++++-------
tp/Texinfo/XS/convert/convert_html.c | 4 +-
tp/Texinfo/XS/main/output_unit.c | 37 +++++-----
tp/Texinfo/XS/main/output_unit.h | 2 +-
.../html_tests/footnotestyle_separate_late.pl | 6 +-
tp/t/results/html_tests/index_below.pl | 6 +-
tp/t/results/html_tests/redirection_same_labels.pl | 6 +-
tp/t/results/html_tests/split_html_text.pl | 4 +-
.../html_tests/transliterated_names_conflicts.pl | 6 +-
tp/t/results/moresectioning/chapter_sections.pl | 16 ++--
.../character_and_spaces_in_refs_out.pl | 12 +--
tp/t/results/moresectioning/complex.pl | 26 +++----
.../moresectioning/complex_split_at_node.pl | 30 ++++----
.../results/moresectioning/internal_top_node_up.pl | 4 +-
.../non_automatic_internal_top_node_up.pl | 4 +-
.../non_automatic_top_node_up_and_url.pl | 4 +-
.../non_automatic_top_node_up_url.pl | 4 +-
.../moresectioning/sectioning_part_appendix.pl | 20 ++---
.../sectioning_part_appendix_no_top.pl | 18 ++---
.../results/moresectioning/top_chapter_sections.pl | 18 ++---
tp/t/results/moresectioning/top_node_up_url.pl | 4 +-
.../sectioning/chapter_before_and_after_part.pl | 4 +-
tp/t/results/sectioning/chapter_before_part.pl | 4 +-
tp/t/results/sectioning/double_part.pl | 6 +-
.../results/sectioning/explicit_node_directions.pl | 6 +-
tp/t/results/sectioning/lone_Top_node.pl | 2 +-
.../sectioning/node_part_chapter_after_chapter.pl | 6 +-
.../sectioning/node_part_chapter_after_top.pl | 4 +-
tp/t/results/sectioning/node_up_external_node.pl | 4 +-
.../nodes_after_top_before_chapter_nodes.pl | 6 +-
.../nodes_after_top_before_chapter_sections.pl | 2 +-
.../nodes_after_top_before_section_nodes.pl | 6 +-
.../nodes_after_top_before_section_sections.pl | 2 +-
.../nodes_no_node_top_explicit_directions.pl | 4 +-
tp/t/results/sectioning/part_before_chapter.pl | 2 +-
tp/t/results/sectioning/part_before_section.pl | 2 +-
tp/t/results/sectioning/part_before_top.pl | 2 +-
tp/t/results/sectioning/part_chapter_after_top.pl | 4 +-
tp/t/results/sectioning/part_node_after_top.pl | 4 +-
tp/t/results/sectioning/part_node_before_top.pl | 2 +-
.../sectioning/part_node_chapter_after_top.pl | 4 +-
.../sectioning/part_node_chapter_appendix.pl | 6 +-
.../sectioning/part_node_chapter_node_appendix.pl | 6 +-
.../sectioning/part_node_node_part_appendix.pl | 6 +-
tp/t/results/sectioning/part_node_part_appendix.pl | 6 +-
.../sectioning/part_node_part_node_appendix.pl | 6 +-
tp/t/results/sectioning/top_node_part_top.pl | 2 +-
tp/t/results/sectioning/top_part_chapter.pl | 4 +-
tp/t/results/sectioning/top_without_node_nodes.pl | 2 +-
.../sectioning/top_without_node_sections.pl | 4 +-
.../transliterated_split_equivalent_nodes.pl | 8 +-
tp/t/results/sectioning/two_nodes_at_the_end.pl | 4 +-
.../sectioning/two_nodes_between_chapters.pl | 6 +-
.../sectioning/unnumbered_before_node_top_top.pl | 4 +-
.../sectioning/unnumbered_before_top_node.pl | 2 +-
.../unnumbered_top_without_node_nodes.pl | 4 +-
.../unnumbered_top_without_node_sections.pl | 6 +-
tp/t/results/xml_tests/top_node_and_bye.pl | 2 +-
tp/t/test_utils.pl | 2 +-
64 files changed, 298 insertions(+), 278 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f441e2d05f..e1d641f04c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2023-10-21 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Structuring.pm (output_unit_texi)
+ (print_output_unit_directions), tp/Texinfo/XS/main/output_unit.c
+ (output_unit_texi, print_output_unit_directions): rename
+ print_element_directions as print_output_unit_directions and
+ unit_or_external_element_texi as output_unit_texi. Update callers.
+
+ * tp/Texinfo/Convert/HTML.pm (from_element_direction),
+ tp/Texinfo/Convert/Plaintext.pm (count_context_bug_message)
+ (convert_output_unit), tp/Texinfo/Structuring.pm (output_unit_texi)
+ (print_output_unit_directions), tp/Texinfo/XS/main/output_unit.c
+ (output_unit_texi, print_output_unit_directions): rename variables
+ names with element in their name replacing element by output_unit or
+ unit when they correspond to output units.
+
2023-10-21 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (_html_set_pages_files): put
diff --git a/tp/TODO b/tp/TODO
index c109516d7f..277ee8601d 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -10,12 +10,15 @@ This is the todo list for texi2any
Before next release
===================
+Find a workaround to be able to change the locale for gettext in C for
+in-document strings, even if the locale is C/POSIX.
+
Check format_translate_message_tree api after the changes in gdt api
when the translation of HTML to C is advnaced enough that it becomes clear
that the API won't change again.
For unicode sorting in C for index sorting, strcoll_l or even better strxfrm_l
-could be used, it sorts accoding to a locale specified in argument. However,
+could be used, it sorts according to a locale specified in argument. However,
it does not seems to be that portable, there is no associated gnulib
module, and the _l variants seem to be in glibc but are are not in the glibc
documentation. According to Eli, if the locale's codeset is UTF-8, glibc
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index f90a212d35..c4de256c40 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1102,7 +1102,7 @@ sub _set_output_units_files($$$$$$)
print STDERR 'Page '
# uncomment for perl object name
#."$output_unit "
- .Texinfo::Structuring::unit_or_external_element_texi($output_unit)
+ .Texinfo::Structuring::output_unit_texi($output_unit)
.":
$output_unit_filename($self->{'file_counters'}->{$output_unit_filename})\n"
if ($self->get_conf('DEBUG'));
}
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 2c038a7f05..e830bc9f54 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1262,15 +1262,15 @@ foreach my $no_number_type ('text', 'tree', 'string') {
$valid_direction_return_type{$no_number_type .'_nonumber'} = 1;
}
-# sub from_element_direction($SELF, $DIRECTION, $TYPE, $SOURCE_ELEMENT,
+# sub from_element_direction($SELF, $DIRECTION, $TYPE, $SOURCE_UNIT,
# $SOURCE_FILENAME, $SOURCE_FOR_MESSAGES)
#
-# Return text used for linking from $SOURCE_ELEMENT in direction $DIRECTION.
+# Return text used for linking from $SOURCE_UNIT in direction $DIRECTION.
# The text returned depends on $TYPE.
#
# This is used both for tree unit elements and external nodes
#
-# If $SOURCE_ELEMENT is undef, $self->{'current_output_unit'} is used.
+# If $SOURCE_UNIT is undef, $self->{'current_output_unit'} is used.
#
# $SOURCE_FOR_MESSAGES is an element used for messages formatting, to get a
# location in input file. It is better to choose the node and not the
@@ -1288,31 +1288,31 @@ sub from_element_direction($$$;$$$)
my $self = shift;
my $direction = shift;
my $type = shift;
- my $source_element = shift;
+ my $source_unit = shift;
my $source_filename = shift;
# for messages only
my $source_command = shift;
- my $target_element;
+ my $target_unit;
my $command;
my $target;
- $source_element = $self->{'current_output_unit'} if
(!defined($source_element));
+ $source_unit = $self->{'current_output_unit'} if (!defined($source_unit));
$source_filename = $self->{'current_filename'} if
(!defined($source_filename));
if (!$valid_direction_return_type{$type}) {
print STDERR "Incorrect type $type in from_element_direction call\n";
return undef;
}
- my $global_target_element = $self->global_direction_unit($direction);
- if ($global_target_element) {
- $target_element = $global_target_element;
+ my $global_target_unit = $self->global_direction_unit($direction);
+ if ($global_target_unit) {
+ $target_unit = $global_target_unit;
# 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.
- } elsif ((not defined($source_element)
- or ($source_element
- and $self->unit_is_top_output_unit($source_element)))
+ } elsif ((not defined($source_unit)
+ or ($source_unit
+ and $self->unit_is_top_output_unit($source_unit)))
and defined($self->get_conf('TOP_NODE_UP_URL'))
and ($direction eq 'Up' or $direction eq 'NodeUp')) {
if ($type eq 'href') {
@@ -1324,24 +1324,24 @@ 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->{'directions'}
- and $source_element->{'directions'}->{$direction}) {
- $target_element
- = $source_element->{'directions'}->{$direction};
+ } elsif (not $target_unit and $source_unit
+ and $source_unit->{'directions'}
+ and $source_unit->{'directions'}->{$direction}) {
+ $target_unit
+ = $source_unit->{'directions'}->{$direction};
}
- if ($target_element) {
+ if ($target_unit) {
######## debug
- if (!$target_element->{'unit_type'}) {
- die "No unit type for element_target $direction $target_element: "
- . Texinfo::Common::debug_print_output_unit($target_element)
+ if (!$target_unit->{'unit_type'}) {
+ die "No unit type for element_target $direction $target_unit: "
+ . Texinfo::Common::debug_print_output_unit($target_unit)
. "directions :"
- . Texinfo::Structuring::print_element_directions($source_element);
+ . Texinfo::Structuring::print_output_unit_directions($source_unit);
}
########
- if ($target_element->{'unit_type'} eq 'external_node_unit') {
- my $external_node_element = $target_element->{'unit_command'};
+ if ($target_unit->{'unit_type'} eq 'external_node_unit') {
+ my $external_node_element = $target_unit->{'unit_command'};
#print STDERR "FROM_ELEMENT_DIRECTION ext node $type $direction\n"
# if ($self->get_conf('DEBUG'));
if ($type eq 'href') {
@@ -1353,34 +1353,34 @@ sub from_element_direction($$$;$$$)
return $self->command_text($external_node_element, $type);
}
} elsif ($type eq 'node') {
- if ($target_element->{'unit_command'}) {
- if ($target_element->{'unit_command'}->{'cmdname'}
- and $target_element->{'unit_command'}->{'cmdname'} eq 'node') {
- $command = $target_element->{'unit_command'};
- } elsif ($target_element->{'unit_command'}->{'extra'}
- and $target_element->{'unit_command'}
- ->{'extra'}->{'associated_node'}) {
- $command = $target_element->{'unit_command'}
- ->{'extra'}->{'associated_node'};
+ if ($target_unit->{'unit_command'}) {
+ if ($target_unit->{'unit_command'}->{'cmdname'}
+ and $target_unit->{'unit_command'}->{'cmdname'} eq 'node') {
+ $command = $target_unit->{'unit_command'};
+ } elsif ($target_unit->{'unit_command'}->{'extra'}
+ and $target_unit->{'unit_command'}
+ ->{'extra'}->{'associated_node'}) {
+ $command = $target_unit->{'unit_command'}
+ ->{'extra'}->{'associated_node'};
}
}
$target = $self->{'targets'}->{$command} if ($command);
$type = 'text';
} elsif ($type eq 'section') {
- if ($target_element->{'unit_command'}) {
- if ($target_element->{'unit_command'}->{'cmdname'} ne 'node') {
- $command = $target_element->{'unit_command'};
- } elsif ($target_element->{'unit_command'}->{'extra'}
- and $target_element->{'unit_command'}
+ if ($target_unit->{'unit_command'}) {
+ if ($target_unit->{'unit_command'}->{'cmdname'} ne 'node') {
+ $command = $target_unit->{'unit_command'};
+ } elsif ($target_unit->{'unit_command'}->{'extra'}
+ and $target_unit->{'unit_command'}
->{'extra'}->{'associated_section'}) {
- $command = $target_element->{'unit_command'}
+ $command = $target_unit->{'unit_command'}
->{'extra'}->{'associated_section'};
}
}
$target = $self->{'targets'}->{$command} if ($command);
$type = 'text_nonumber';
} else {
- $command = $target_element->{'unit_command'};
+ $command = $target_unit->{'unit_command'};
if ($type eq 'href') {
if (defined($command)) {
return $self->command_href($command, $source_filename);
@@ -4041,7 +4041,7 @@ sub _default_format_element_header($$$$)
#."$output_unit (@{$output_unit->{'unit_contents'}}) ".
. "(".join('|', map{Texinfo::Common::debug_print_element($_)}
@{$output_unit->{'unit_contents'}}) . ") ".
- Texinfo::Structuring::unit_or_external_element_texi($output_unit) ."\n"
+ Texinfo::Structuring::output_unit_texi($output_unit) ."\n"
if ($self->get_conf('DEBUG'));
# Do the heading if the command is the first command in the element
@@ -9116,7 +9116,7 @@ sub _html_set_pages_files($$$$$$$$$)
print STDERR 'Page '
# uncomment for perl object name
#."$output_unit "
- .Texinfo::Structuring::unit_or_external_element_texi($output_unit)
+ .Texinfo::Structuring::output_unit_texi($output_unit)
.":
$output_unit_filename($self->{'file_counters'}->{$output_unit_filename})\n"
if ($self->get_conf('DEBUG'));
}
@@ -9677,7 +9677,7 @@ sub _prepare_output_units_global_targets($$$$)
print STDERR "$global_direction"
# uncomment to get the perl object name
# ."($global_unit)"
- .': '.
Texinfo::Structuring::unit_or_external_element_texi($global_unit)."\n";
+ .': '. Texinfo::Structuring::output_unit_texi($global_unit)."\n";
}
}
}
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 9da6199b73..eeec991359 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -536,18 +536,19 @@ sub converter_initialize($)
sub count_context_bug_message($$$)
{
- my ($self, $precision, $element) = @_;
+ my ($self, $precision, $output_unit) = @_;
if (scalar(@{$self->{'count_context'}}) != 1) {
- my $element_text;
- if ($element) {
- $element_text
- = Texinfo::Structuring::unit_or_external_element_texi($element);
+ my $output_unit_text;
+ if ($output_unit) {
+ $output_unit_text
+ = Texinfo::Structuring::output_unit_texi($output_unit);
} else {
- $element_text = '';
+ $output_unit_text = '';
}
$self->present_bug_message("Too much count_context ${precision}(".
- scalar(@{$self->{'count_context'}}). "): ". $element_text, $element);
+ scalar(@{$self->{'count_context'}}). "): ". $output_unit_text,
+ $output_unit->{'unit_command'});
die;
}
}
@@ -572,19 +573,19 @@ sub _initialize_converter_state($)
# to be done here by calling _initialize_converter_state.
sub convert_output_unit($$)
{
- my ($self, $element) = @_;
+ my ($self, $output_unit) = @_;
_initialize_converter_state($self);
my $result = '';
- if ($element->{'unit_contents'}) {
- foreach my $content (@{$element->{'unit_contents'}}) {
+ if ($output_unit->{'unit_contents'}) {
+ foreach my $content (@{$output_unit->{'unit_contents'}}) {
$result .= _convert($self, $content);
}
}
- $self->count_context_bug_message('', $element);
- $result .= $self->process_footnotes($element);
- $self->count_context_bug_message('footnotes ', $element);
+ $self->count_context_bug_message('', $output_unit);
+ $result .= $self->process_footnotes($output_unit);
+ $self->count_context_bug_message('footnotes ', $output_unit);
return $result;
}
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 2dc3d2f8b4..7384a28e23 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -1755,6 +1755,8 @@ sub split_by_node($;$)
if (!$no_XS) {
$output_units = _XS_split_by_node($root);
+ # If the XS code returns something, we use it as it will have the
references
+ # needed for XS code called later on.
# FIXME use XS $output_units only if $XS_only?
if (defined($output_units)) {
return $output_units;
@@ -1963,7 +1965,7 @@ sub split_pages($$;$)
$level = $section->{'extra'}->{'section_level'};
}
#print STDERR "level($split_level) $level "
- # .unit_or_external_element_texi($output_unit)."\n";
+ # .output_unit_texi($output_unit)."\n";
if (!defined($split_level) or (defined($level) and $split_level >= $level)
or !$current_first_in_page) {
$current_first_in_page = $output_unit;
@@ -2220,7 +2222,7 @@ sub units_directions($$$)
and $node->{'extra'}->{'node_directions'}
and $node->{'extra'}->{'node_directions'}->{'up'}
and (!$node_top or ($node ne $node_top))) {
- #print STDERR "Node for up:
".unit_or_external_element_texi($output_unit)."\n";
+ #print STDERR "Node for up: ".output_unit_texi($output_unit)."\n";
my $up_node_unit_element
= _label_target_unit_element(
$node->{'extra'}->{'node_directions'}->{'up'});
@@ -2238,7 +2240,7 @@ sub units_directions($$$)
print STDERR 'Directions'
# uncomment to show the perl object name
# . "($output_unit)"
- . ': '.print_element_directions($output_unit)."\n";
+ . ': '.print_output_unit_directions($output_unit)."\n";
}
}
}
@@ -2311,48 +2313,47 @@ sub units_file_directions($)
}
# used in debug messages
-sub unit_or_external_element_texi($)
+sub output_unit_texi($)
{
- my $element = shift;
- if (!$element) {
- return "UNDEF ELEMENT";
+ my $output_unit = shift;
+ if (!$output_unit) {
+ return "UNDEF OUTPUT UNIT";
}
- if (!defined($element->{'unit_type'})) {
- return "unit $element without type: ".
- Texinfo::Common::debug_print_element_details($element, 1)
- .' '.Texinfo::Common::debug_print_output_unit($element);
+ if (!defined($output_unit->{'unit_type'})) {
+ # show the output_unit as element, as a possible bug is that
+ # an element was passed in argument instead of an output unit
+ return "unit $output_unit without type: ".
+ Texinfo::Common::debug_print_element_details($output_unit, 1)
+ .' '.Texinfo::Common::debug_print_output_unit($output_unit);
}
- my $command_element = $element->{'unit_command'};
+ my $unit_command = $output_unit->{'unit_command'};
- if ($element->{'unit_type'} eq 'external_node_unit') {
+ if ($output_unit->{'unit_type'} eq 'external_node_unit') {
return Texinfo::Convert::Texinfo::convert_to_texinfo(
- {'contents' => $command_element->{'contents'}});
+ {'contents' => $unit_command->{'contents'}});
}
- if (!$command_element) {
+ if (!$unit_command) {
# happens when there are only nodes and sections are used as elements
- return "No associated command (type $element->{'unit_type'})";
+ return "No associated command (type $output_unit->{'unit_type'})";
}
return Texinfo::Convert::Texinfo::root_heading_command_to_texinfo(
- $command_element);
+ $unit_command);
}
# Used for debugging and in test suite, but not generally useful. Not
# documented in pod section and not exportable as it should not, in
# general, be used.
-# In general would be called with output units, but is more generic
-# to account for other situations.
-sub print_element_directions($)
+sub print_output_unit_directions($)
{
- my $element = shift;
- my $result = 'element: '.unit_or_external_element_texi($element)."\n";
+ my $output_unit = shift;
+ my $result = 'output unit: '.output_unit_texi($output_unit)."\n";
- if ($element->{'directions'}) {
- foreach my $direction (sort(keys(%{$element->{'directions'}}))) {
+ if ($output_unit->{'directions'}) {
+ foreach my $direction (sort(keys(%{$output_unit->{'directions'}}))) {
$result .= " $direction: ".
- unit_or_external_element_texi(
- $element->{'directions'}->{$direction})."\n";
+ output_unit_texi($output_unit->{'directions'}->{$direction})."\n";
}
} else {
$result .= " NO DIRECTION\n";
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index 4dcc80c41c..fa54387a3e 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -510,7 +510,7 @@ prepare_output_units_global_targets (CONVERTER *self,
if (self->global_units_directions[i])
{
OUTPUT_UNIT *global_unit = self->global_units_directions[i];
- char *unit_texi = unit_or_external_element_texi (global_unit);
+ char *unit_texi = output_unit_texi (global_unit);
fprintf (stderr, "%s: %s\n", output_unit_type_names[i],
unit_texi);
free (unit_texi);
@@ -1962,7 +1962,7 @@ html_set_pages_files (CONVERTER *self, OUTPUT_UNIT_LIST
*output_units,
output_unit_file = set_output_unit_file (self, output_unit, filename, 1);
if (self->conf->DEBUG > 0)
fprintf (stderr, "Page %s: %s(%d)\n",
- unit_or_external_element_texi (output_unit),
+ output_unit_texi (output_unit),
output_unit->unit_filename, output_unit_file->counter);
}
diff --git a/tp/Texinfo/XS/main/output_unit.c b/tp/Texinfo/XS/main/output_unit.c
index e5de5b469c..04b2cedbcd 100644
--- a/tp/Texinfo/XS/main/output_unit.c
+++ b/tp/Texinfo/XS/main/output_unit.c
@@ -383,28 +383,28 @@ split_pages (OUTPUT_UNIT_LIST *output_units, char *split)
/* return to be freed by the caller */
char *
-unit_or_external_element_texi (OUTPUT_UNIT *element)
+output_unit_texi (OUTPUT_UNIT *output_unit)
{
- ELEMENT *command_element;
+ ELEMENT *unit_command;
- if (!element)
- return strdup("UNDEF ELEMENT");
+ if (!output_unit)
+ return strdup("UNDEF OUTPUT UNIT");
- command_element = element->unit_command;
+ unit_command = output_unit->unit_command;
- if (element->unit_type == OU_external_node_unit)
- return convert_contents_to_texinfo (command_element);
+ if (output_unit->unit_type == OU_external_node_unit)
+ return convert_contents_to_texinfo (unit_command);
- if (!command_element)
+ if (!unit_command)
{
/* happens when there are only nodes and sections are used as elements */
char *result;
xasprintf (&result, "No associated command (type %s)",
- output_unit_type_names[element->unit_type]);
+ output_unit_type_names[output_unit->unit_type]);
return result;
}
- return root_heading_command_to_texinfo(command_element);
+ return root_heading_command_to_texinfo(unit_command);
}
static OUTPUT_UNIT *
@@ -428,26 +428,24 @@ label_target_unit_element (ELEMENT *label)
/* Used for debugging and in test suite, but not generally useful. Not
documented in pod section and not exportable as it should not, in
- general, be used.
- In general would be called with output units, but is more generic
- to account for other situations. */
+ general, be used. */
char *
-print_element_directions (OUTPUT_UNIT *element)
+print_output_unit_directions (OUTPUT_UNIT *output_unit)
{
TEXT result;
int i;
int with_direction = 0;
text_init (&result);
- text_printf (&result, "element: %s\n",
- unit_or_external_element_texi(element));
+ text_printf (&result, "output unit: %s\n",
+ output_unit_texi(output_unit));
for (i = 0; i < RUD_type_FirstInFileNodeUp+1; i++)
{
- OUTPUT_UNIT *direction = element->directions[i];
+ OUTPUT_UNIT *direction = output_unit->directions[i];
if (direction)
{
text_printf (&result, " $direction: %s\n",
- unit_or_external_element_texi (direction));
+ output_unit_texi (direction));
with_direction++;
}
}
@@ -728,7 +726,8 @@ units_directions (OPTIONS *customization_information,
for (i = 0; i < output_units->number; i++)
{
OUTPUT_UNIT *output_unit = output_units->list[i];
- char *element_directions = print_element_directions (output_unit);
+ char *element_directions
+ = print_output_unit_directions (output_unit);
fprintf (stderr, "Directions: %s\n", element_directions);
free (element_directions);
}
diff --git a/tp/Texinfo/XS/main/output_unit.h b/tp/Texinfo/XS/main/output_unit.h
index 1180cdd066..246490cd6c 100644
--- a/tp/Texinfo/XS/main/output_unit.h
+++ b/tp/Texinfo/XS/main/output_unit.h
@@ -18,7 +18,7 @@ OUTPUT_UNIT *new_output_unit (enum output_unit_type
unit_type);
void add_to_output_unit_list (OUTPUT_UNIT_LIST *list,
OUTPUT_UNIT *output_unit);
-char *unit_or_external_element_texi (OUTPUT_UNIT *element);
+char *output_unit_texi (OUTPUT_UNIT *output_unit);
void units_directions (OPTIONS *customization_information,
LABEL_LIST *identifiers_target,
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index 9a56ab8551..090fee3c21 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -899,13 +899,13 @@ $result_elements{'footnotestyle_separate_late'}[2] =
$result_elements{'footnotes
-$result_directions_text{'footnotestyle_separate_late'} = 'element: @node Top
+$result_directions_text{'footnotestyle_separate_late'} = 'output unit: @node
Top
FastForward: @node chap f
Forward: @node chap f
NodeForward: @node chap f
NodeNext: @node chap f
This: @node Top
-element: @node chap f
+output unit: @node chap f
Back: @node Top
FastBack: @node Top
FastForward: @node chap s
@@ -918,7 +918,7 @@ element: @node chap f
NodeUp: @node Top
This: @node chap f
Up: @node Top
-element: @node chap s
+output unit: @node chap s
Back: @node chap f
FastBack: @node chap f
NodeBack: @node chap f
diff --git a/tp/t/results/html_tests/index_below.pl
b/tp/t/results/html_tests/index_below.pl
index 0cb6854bf7..c9e4490026 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -422,17 +422,17 @@ $result_elements{'index_below'}[2] =
$result_elements{'index_below'}[0]{'directi
-$result_directions_text{'index_below'} = 'element: @top top
+$result_directions_text{'index_below'} = 'output unit: @top top
FastForward: @chapter chap
Forward: @chapter chap
This: @top top
-element: @chapter chap
+output unit: @chapter chap
Back: @top top
FastBack: @top top
Forward: @section sec
This: @chapter chap
Up: @top top
-element: @section sec
+output unit: @section sec
Back: @chapter chap
FastBack: @chapter chap
This: @section sec
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl
b/tp/t/results/html_tests/redirection_same_labels.pl
index c0fbcb2b94..579520016c 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -1613,13 +1613,13 @@ $result_elements{'redirection_same_labels'}[2] =
$result_elements{'redirection_s
-$result_directions_text{'redirection_same_labels'} = 'element: @top the top
+$result_directions_text{'redirection_same_labels'} = 'output unit: @top the top
FastForward: @chapter umlaut
Forward: @chapter umlaut
NodeForward: @chapter umlaut
NodeNext: @chapter umlaut
This: @top the top
-element: @chapter umlaut
+output unit: @chapter umlaut
Back: @top the top
FastBack: @top the top
FastForward: @chapter circumflex
@@ -1632,7 +1632,7 @@ element: @chapter umlaut
NodeUp: @top the top
This: @chapter umlaut
Up: @top the top
-element: @chapter circumflex
+output unit: @chapter circumflex
Back: @chapter umlaut
FastBack: @chapter umlaut
NodeBack: @chapter circumflex
diff --git a/tp/t/results/html_tests/split_html_text.pl
b/tp/t/results/html_tests/split_html_text.pl
index fee5121648..746604cd5e 100644
--- a/tp/t/results/html_tests/split_html_text.pl
+++ b/tp/t/results/html_tests/split_html_text.pl
@@ -486,13 +486,13 @@ $result_elements{'split_html_text'}[1] =
$result_elements{'split_html_text'}[0]{
-$result_directions_text{'split_html_text'} = 'element: @node Top
+$result_directions_text{'split_html_text'} = 'output unit: @node Top
FastForward: @node chap
Forward: @node chap
NodeForward: @node chap
NodeNext: @node chap
This: @node Top
-element: @node chap
+output unit: @node chap
Back: @node Top
FastBack: @node Top
NodeBack: @node Top
diff --git a/tp/t/results/html_tests/transliterated_names_conflicts.pl
b/tp/t/results/html_tests/transliterated_names_conflicts.pl
index 6d1b535d25..6dcd5d630e 100644
--- a/tp/t/results/html_tests/transliterated_names_conflicts.pl
+++ b/tp/t/results/html_tests/transliterated_names_conflicts.pl
@@ -1063,13 +1063,13 @@ $result_elements{'transliterated_names_conflicts'}[2] =
$result_elements{'transl
-$result_directions_text{'transliterated_names_conflicts'} = 'element: @node Top
+$result_directions_text{'transliterated_names_conflicts'} = 'output unit:
@node Top
FastForward: @node Prés
Forward: @node Prés
NodeForward: @node Prés
NodeNext: @node Prés
This: @node Top
-element: @node Prés
+output unit: @node Prés
Back: @node Top
FastBack: @node Top
FastForward: @node Other node
@@ -1082,7 +1082,7 @@ element: @node Prés
NodeUp: @node Top
This: @node Prés
Up: @node Top
-element: @node Other node
+output unit: @node Other node
Back: @node Prés
FastBack: @node Prés
NodeBack: @node Prés
diff --git a/tp/t/results/moresectioning/chapter_sections.pl
b/tp/t/results/moresectioning/chapter_sections.pl
index 41b08101a6..38780f1240 100644
--- a/tp/t/results/moresectioning/chapter_sections.pl
+++ b/tp/t/results/moresectioning/chapter_sections.pl
@@ -918,12 +918,12 @@ $result_elements{'chapter_sections'}[7] =
$result_elements{'chapter_sections'}[0
-$result_directions_text{'chapter_sections'} = 'element: @unnumbered unnumbered
+$result_directions_text{'chapter_sections'} = 'output unit: @unnumbered
unnumbered
FastForward: @chapter First chapter
Forward: @chapter First chapter
Next: @chapter First chapter
This: @unnumbered unnumbered
-element: @chapter First chapter
+output unit: @chapter First chapter
Back: @unnumbered unnumbered
FastBack: @unnumbered unnumbered
FastForward: @chapter Chapter
@@ -931,14 +931,14 @@ element: @chapter First chapter
Next: @chapter Chapter
Prev: @unnumbered unnumbered
This: @chapter First chapter
-element: @section second
+output unit: @section second
Back: @chapter First chapter
FastBack: @chapter First chapter
FastForward: @chapter Chapter
Forward: @chapter Chapter
This: @section second
Up: @chapter First chapter
-element: @chapter Chapter
+output unit: @chapter Chapter
Back: @section second
FastBack: @chapter First chapter
FastForward: @chapter Chapter 2
@@ -946,14 +946,14 @@ element: @chapter Chapter
Next: @chapter Chapter 2
Prev: @chapter First chapter
This: @chapter Chapter
-element: @section Section of chapter
+output unit: @section Section of chapter
Back: @chapter Chapter
FastBack: @chapter Chapter
FastForward: @chapter Chapter 2
Forward: @subsection subsection 1
This: @section Section of chapter
Up: @chapter Chapter
-element: @subsection subsection 1
+output unit: @subsection subsection 1
Back: @section Section of chapter
FastBack: @chapter Chapter
FastForward: @chapter Chapter 2
@@ -961,7 +961,7 @@ element: @subsection subsection 1
Next: @subsection subsection 2
This: @subsection subsection 1
Up: @section Section of chapter
-element: @subsection subsection 2
+output unit: @subsection subsection 2
Back: @subsection subsection 1
FastBack: @chapter Chapter
FastForward: @chapter Chapter 2
@@ -969,7 +969,7 @@ element: @subsection subsection 2
Prev: @subsection subsection 1
This: @subsection subsection 2
Up: @section Section of chapter
-element: @chapter Chapter 2
+output unit: @chapter Chapter 2
Back: @subsection subsection 2
FastBack: @chapter Chapter
Prev: @chapter Chapter
diff --git a/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
b/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
index 3c0eff018a..19fbb5105b 100644
--- a/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
+++ b/tp/t/results/moresectioning/character_and_spaces_in_refs_out.pl
@@ -2508,13 +2508,13 @@ $result_elements{'character_and_spaces_in_refs_out'}[5]
= $result_elements{'char
-$result_directions_text{'character_and_spaces_in_refs_out'} = 'element: @node
Top
+$result_directions_text{'character_and_spaces_in_refs_out'} = 'output unit:
@node Top
FastForward: @node node to avoid DocBook or LaTeX ignored
Forward: @node node to avoid DocBook or LaTeX ignored
NodeForward: @node node to avoid DocBook or LaTeX ignored
NodeNext: @node node to avoid DocBook or LaTeX ignored
This: @node Top
-element: @node node to avoid DocBook or LaTeX ignored
+output unit: @node node to avoid DocBook or LaTeX ignored
Back: @node Top
FastBack: @node Top
FastForward: @node other nodes
@@ -2527,7 +2527,7 @@ element: @node node to avoid DocBook or LaTeX ignored
NodeUp: @node Top
This: @node node to avoid DocBook or LaTeX ignored
Up: @node Top
-element: @node other nodes
+output unit: @node other nodes
Back: @node node to avoid DocBook or LaTeX ignored
FastBack: @node node to avoid DocBook or LaTeX ignored
Forward: @node !_"#$%&\'()*+-.
@@ -2539,7 +2539,7 @@ element: @node other nodes
Prev: @node node to avoid DocBook or LaTeX ignored
This: @node other nodes
Up: @node Top
-element: @node !_"#$%&\'()*+-.
+output unit: @node !_"#$%&\'()*+-.
Back: @node other nodes
FastBack: @node other nodes
Forward: @node /;<=>?[\\]^_`|~
@@ -2549,7 +2549,7 @@ element: @node !_"#$%&\'()*+-.
NodePrev: @node other nodes
NodeUp: @node other nodes
This: @node !_"#$%&\'()*+-.
-element: @node /;<=>?[\\]^_`|~
+output unit: @node /;<=>?[\\]^_`|~
Back: @node !_"#$%&\'()*+-.
FastBack: @node other nodes
Forward: @node local node
@@ -2559,7 +2559,7 @@ element: @node /;<=>?[\\]^_`|~
NodePrev: @node !_"#$%&\'()*+-.
NodeUp: @node other nodes
This: @node /;<=>?[\\]^_`|~
-element: @node local node
+output unit: @node local node
Back: @node /;<=>?[\\]^_`|~
FastBack: @node other nodes
NodeBack: @node /;<=>?[\\]^_`|~
diff --git a/tp/t/results/moresectioning/complex.pl
b/tp/t/results/moresectioning/complex.pl
index 073363e12a..78e058851f 100644
--- a/tp/t/results/moresectioning/complex.pl
+++ b/tp/t/results/moresectioning/complex.pl
@@ -5095,14 +5095,14 @@ $result_elements{'complex'}[12] =
$result_elements{'complex'}[0]{'directions'}{'
-$result_directions_text{'complex'} = 'element: @top
+$result_directions_text{'complex'} = 'output unit: @top
FastForward: @chapter first node chapter
Forward: @chapter first node chapter
NodeForward: @chapter first node chapter
NodeNext: @chapter first node chapter
NodePrev: (dir)
This: @top
-element: @chapter first node chapter
+output unit: @chapter first node chapter
Back: @top
FastBack: @top
FastForward: @chapter second node chapter
@@ -5114,7 +5114,7 @@ element: @chapter first node chapter
NodeUp: @top
This: @chapter first node chapter
Up: @top
-element: @unnumberedsec unnumbered section
+output unit: @unnumberedsec unnumbered section
Back: @chapter first node chapter
FastBack: @chapter first node chapter
FastForward: @chapter second node chapter
@@ -5126,7 +5126,7 @@ element: @unnumberedsec unnumbered section
NodeUp: @chapter first node chapter
This: @unnumberedsec unnumbered section
Up: @chapter first node chapter
-element: @unnumberedsubsec unnumbered subsection
+output unit: @unnumberedsubsec unnumbered subsection
Back: @unnumberedsec unnumbered section
FastBack: @chapter first node chapter
FastForward: @chapter second node chapter
@@ -5138,7 +5138,7 @@ element: @unnumberedsubsec unnumbered subsection
NodeUp: @unnumberedsec unnumbered section
This: @unnumberedsubsec unnumbered subsection
Up: @unnumberedsec unnumbered section
-element: @subsection numbered subsection
+output unit: @subsection numbered subsection
Back: @unnumberedsubsec unnumbered subsection
FastBack: @chapter first node chapter
FastForward: @chapter second node chapter
@@ -5152,7 +5152,7 @@ element: @subsection numbered subsection
Prev: @unnumberedsubsec unnumbered subsection
This: @subsection numbered subsection
Up: @unnumberedsec unnumbered section
-element: @unnumberedsubsec unnumbered subsection2
+output unit: @unnumberedsubsec unnumbered subsection2
Back: @subsection numbered subsection
FastBack: @chapter first node chapter
FastForward: @chapter second node chapter
@@ -5166,7 +5166,7 @@ element: @unnumberedsubsec unnumbered subsection2
Prev: @subsection numbered subsection
This: @unnumberedsubsec unnumbered subsection2
Up: @unnumberedsec unnumbered section
-element: @subsection numbered subsection2
+output unit: @subsection numbered subsection2
Back: @unnumberedsubsec unnumbered subsection2
FastBack: @chapter first node chapter
FastForward: @chapter second node chapter
@@ -5178,7 +5178,7 @@ element: @subsection numbered subsection2
Prev: @unnumberedsubsec unnumbered subsection2
This: @subsection numbered subsection2
Up: @unnumberedsec unnumbered section
-element: @unnumberedsec unnumbered section2
+output unit: @unnumberedsec unnumbered section2
Back: @subsection numbered subsection2
FastBack: @chapter first node chapter
FastForward: @chapter second node chapter
@@ -5192,7 +5192,7 @@ element: @unnumberedsec unnumbered section2
Prev: @unnumberedsec unnumbered section
This: @unnumberedsec unnumbered section2
Up: @chapter first node chapter
-element: @subsection numbered subsection3
+output unit: @subsection numbered subsection3
Back: @unnumberedsec unnumbered section2
FastBack: @chapter first node chapter
FastForward: @chapter second node chapter
@@ -5202,7 +5202,7 @@ element: @subsection numbered subsection3
NodeUp: @unnumberedsec unnumbered section2
This: @subsection numbered subsection3
Up: @unnumberedsec unnumbered section2
-element: @section numbered section
+output unit: @section numbered section
Back: @subsection numbered subsection3
FastBack: @chapter first node chapter
FastForward: @chapter second node chapter
@@ -5213,7 +5213,7 @@ element: @section numbered section
Prev: @unnumberedsec unnumbered section2
This: @section numbered section
Up: @chapter first node chapter
-element: @chapter second node chapter
+output unit: @chapter second node chapter
Back: @section numbered section
FastBack: @chapter first node chapter
FastForward: @unnumbered unnumbered chapter
@@ -5225,7 +5225,7 @@ element: @chapter second node chapter
Prev: @chapter first node chapter
This: @chapter second node chapter
Up: @top
-element: @unnumbered unnumbered chapter
+output unit: @unnumbered unnumbered chapter
Back: @chapter second node chapter
FastBack: @chapter second node chapter
FastForward: @unnumbered unnumbered continuity
@@ -5239,7 +5239,7 @@ element: @unnumbered unnumbered chapter
Prev: @chapter second node chapter
This: @unnumbered unnumbered chapter
Up: @top
-element: @unnumbered unnumbered continuity
+output unit: @unnumbered unnumbered continuity
Back: @unnumbered unnumbered chapter
FastBack: @unnumbered unnumbered chapter
NodeBack: @unnumbered unnumbered chapter
diff --git a/tp/t/results/moresectioning/complex_split_at_node.pl
b/tp/t/results/moresectioning/complex_split_at_node.pl
index a30139bf3d..59afe2851e 100644
--- a/tp/t/results/moresectioning/complex_split_at_node.pl
+++ b/tp/t/results/moresectioning/complex_split_at_node.pl
@@ -5368,14 +5368,14 @@ $result_elements{'complex_split_at_node'}[14] =
$result_elements{'complex_split_
-$result_directions_text{'complex_split_at_node'} = 'element: @node Top
+$result_directions_text{'complex_split_at_node'} = 'output unit: @node Top
FastForward: @node First node
Forward: @node First node
NodeForward: @node First node
NodeNext: @node First node
NodePrev: (dir)
This: @node Top
-element: @node First node
+output unit: @node First node
Back: @node Top
FastBack: @node Top
FastForward: @node Second node
@@ -5387,7 +5387,7 @@ element: @node First node
NodeUp: @node Top
This: @node First node
Up: @node Top
-element: @node unnumbered
+output unit: @node unnumbered
Back: @node First node
FastBack: @node First node
FastForward: @node Second node
@@ -5399,7 +5399,7 @@ element: @node unnumbered
NodeUp: @node First node
This: @node unnumbered
Up: @node First node
-element: @node unnumbered sub
+output unit: @node unnumbered sub
Back: @node unnumbered
FastBack: @node First node
FastForward: @node Second node
@@ -5411,7 +5411,7 @@ element: @node unnumbered sub
NodeUp: @node unnumbered
This: @node unnumbered sub
Up: @node unnumbered
-element: @node numbered sub
+output unit: @node numbered sub
Back: @node unnumbered sub
FastBack: @node First node
FastForward: @node Second node
@@ -5425,7 +5425,7 @@ element: @node numbered sub
Prev: @node unnumbered sub
This: @node numbered sub
Up: @node unnumbered
-element: @node unnumbered sub2
+output unit: @node unnumbered sub2
Back: @node numbered sub
FastBack: @node First node
FastForward: @node Second node
@@ -5439,7 +5439,7 @@ element: @node unnumbered sub2
Prev: @node numbered sub
This: @node unnumbered sub2
Up: @node unnumbered
-element: @node numbered sub2
+output unit: @node numbered sub2
Back: @node unnumbered sub2
FastBack: @node First node
FastForward: @node Second node
@@ -5451,7 +5451,7 @@ element: @node numbered sub2
Prev: @node unnumbered sub2
This: @node numbered sub2
Up: @node unnumbered
-element: @node unnumbered2
+output unit: @node unnumbered2
Back: @node numbered sub2
FastBack: @node First node
FastForward: @node Second node
@@ -5465,7 +5465,7 @@ element: @node unnumbered2
Prev: @node unnumbered
This: @node unnumbered2
Up: @node First node
-element: @node numbered sub3
+output unit: @node numbered sub3
Back: @node unnumbered2
FastBack: @node First node
FastForward: @node Second node
@@ -5475,7 +5475,7 @@ element: @node numbered sub3
NodeUp: @node unnumbered2
This: @node numbered sub3
Up: @node unnumbered2
-element: @node numbered
+output unit: @node numbered
Back: @node numbered sub3
FastBack: @node First node
FastForward: @node Second node
@@ -5486,13 +5486,13 @@ element: @node numbered
Prev: @node unnumbered2
This: @node numbered
Up: @node First node
-element: @node between node
+output unit: @node between node
Back: @node numbered
FastForward: @node Second node
Forward: @node Second node
NodeUp: @node Top
This: @node between node
-element: @node Second node
+output unit: @node Second node
Back: @node between node
FastBack: @node First node
FastForward: @node Third node unnumbered
@@ -5504,7 +5504,7 @@ element: @node Second node
Prev: @node First node
This: @node Second node
Up: @node Top
-element: @node Third node unnumbered
+output unit: @node Third node unnumbered
Back: @node Second node
FastBack: @node Second node
FastForward: @node continuity
@@ -5518,7 +5518,7 @@ element: @node Third node unnumbered
Prev: @node Second node
This: @node Third node unnumbered
Up: @node Top
-element: @node continuity
+output unit: @node continuity
Back: @node Third node unnumbered
FastBack: @node Third node unnumbered
Forward: @node Last node no description
@@ -5530,7 +5530,7 @@ element: @node continuity
Prev: @node Third node unnumbered
This: @node continuity
Up: @node Top
-element: @node Last node no description
+output unit: @node Last node no description
Back: @node continuity
FastBack: @node continuity
NodePrev: @node continuity
diff --git a/tp/t/results/moresectioning/internal_top_node_up.pl
b/tp/t/results/moresectioning/internal_top_node_up.pl
index 185b658d82..9229cc1dc1 100644
--- a/tp/t/results/moresectioning/internal_top_node_up.pl
+++ b/tp/t/results/moresectioning/internal_top_node_up.pl
@@ -514,12 +514,12 @@ $result_elements{'internal_top_node_up'}[1] =
$result_elements{'internal_top_nod
-$result_directions_text{'internal_top_node_up'} = 'element: @node Top
+$result_directions_text{'internal_top_node_up'} = 'output unit: @node Top
Forward: @node chap
NodeForward: @node chap
NodeNext: @node chap
This: @node Top
-element: @node chap
+output unit: @node chap
Back: @node Top
FastBack: @node Top
NodeBack: @node Top
diff --git a/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
b/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
index d8adc9e742..57746a03cd 100644
--- a/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
+++ b/tp/t/results/moresectioning/non_automatic_internal_top_node_up.pl
@@ -789,12 +789,12 @@ $result_elements{'non_automatic_internal_top_node_up'}[1]
= $result_elements{'no
-$result_directions_text{'non_automatic_internal_top_node_up'} = 'element:
@node Top
+$result_directions_text{'non_automatic_internal_top_node_up'} = 'output unit:
@node Top
Forward: @node chap
NodeForward: @node chap
NodeNext: @node chap
This: @node Top
-element: @node chap
+output unit: @node chap
Back: @node Top
FastBack: @node Top
NodeBack: @node Top
diff --git a/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
b/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
index 117b55810e..a99d244684 100644
--- a/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
+++ b/tp/t/results/moresectioning/non_automatic_top_node_up_and_url.pl
@@ -789,12 +789,12 @@ $result_elements{'non_automatic_top_node_up_and_url'}[1]
= $result_elements{'non
-$result_directions_text{'non_automatic_top_node_up_and_url'} = 'element: @node
Top
+$result_directions_text{'non_automatic_top_node_up_and_url'} = 'output unit:
@node Top
Forward: @node chap
NodeForward: @node chap
NodeNext: @node chap
This: @node Top
-element: @node chap
+output unit: @node chap
Back: @node Top
FastBack: @node Top
NodeBack: @node Top
diff --git a/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
b/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
index 8dcacea58f..b8e7e865d6 100644
--- a/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/moresectioning/non_automatic_top_node_up_url.pl
@@ -767,14 +767,14 @@ $result_elements{'non_automatic_top_node_up_url'}[1] =
$result_elements{'non_aut
-$result_directions_text{'non_automatic_top_node_up_url'} = 'element: @node Top
+$result_directions_text{'non_automatic_top_node_up_url'} = 'output unit: @node
Top
Forward: @node chap
NodeForward: @node chap
NodeNext: @node chap
NodePrev: (dir)
NodeUp: (dir)
This: @node Top
-element: @node chap
+output unit: @node chap
Back: @node Top
FastBack: @node Top
NodeBack: @node Top
diff --git a/tp/t/results/moresectioning/sectioning_part_appendix.pl
b/tp/t/results/moresectioning/sectioning_part_appendix.pl
index 4f9b211a8f..b15f822b8a 100644
--- a/tp/t/results/moresectioning/sectioning_part_appendix.pl
+++ b/tp/t/results/moresectioning/sectioning_part_appendix.pl
@@ -1217,47 +1217,47 @@ $result_elements{'sectioning_part_appendix'}[9] =
$result_elements{'sectioning_p
-$result_directions_text{'sectioning_part_appendix'} = 'element: @top top
+$result_directions_text{'sectioning_part_appendix'} = 'output unit: @top top
FastForward: @chapter chapter
Forward: @chapter chapter
Next: @chapter chapter in part
This: @top top
-element: @chapter chapter
+output unit: @chapter chapter
Back: @top top
FastBack: @top top
FastForward: @chapter chapter in part
Forward: @section section
This: @chapter chapter
Up: @top top
-element: @section section
+output unit: @section section
Back: @chapter chapter
FastBack: @chapter chapter
FastForward: @chapter chapter in part
Forward: @subsection subsection
This: @section section
Up: @chapter chapter
-element: @subsection subsection
+output unit: @subsection subsection
Back: @section section
FastBack: @chapter chapter
FastForward: @chapter chapter in part
Forward: @subsubsection subsubsection
This: @subsection subsection
Up: @section section
-element: @subsubsection subsubsection
+output unit: @subsubsection subsubsection
Back: @subsection subsection
FastBack: @chapter chapter
FastForward: @chapter chapter in part
Forward: @chapter chapter in part
This: @subsubsection subsubsection
Up: @subsection subsection
-element: @chapter chapter in part
+output unit: @chapter chapter in part
Back: @subsubsection subsubsection
FastBack: @chapter chapter
FastForward: @chapter second chapter in part
Forward: @chapter second chapter in part
Next: @chapter second chapter in part
This: @chapter chapter in part
-element: @chapter second chapter in part
+output unit: @chapter second chapter in part
Back: @chapter chapter in part
FastBack: @chapter chapter in part
FastForward: @unnumbered unnumbered
@@ -1266,7 +1266,7 @@ element: @chapter second chapter in part
Prev: @chapter chapter in part
This: @chapter second chapter in part
Up: @chapter chapter in part
-element: @unnumbered unnumbered
+output unit: @unnumbered unnumbered
Back: @chapter second chapter in part
FastBack: @chapter second chapter in part
FastForward: @appendix appendix
@@ -1274,13 +1274,13 @@ element: @unnumbered unnumbered
Prev: @chapter second chapter in part
This: @unnumbered unnumbered
Up: @chapter chapter in part
-element: @appendix appendix
+output unit: @appendix appendix
Back: @unnumbered unnumbered
FastBack: @unnumbered unnumbered
Forward: @appendixsec appendixsec
Prev: @chapter chapter in part
This: @appendix appendix
-element: @appendixsec appendixsec
+output unit: @appendixsec appendixsec
Back: @appendix appendix
FastBack: @appendix appendix
This: @appendixsec appendixsec
diff --git a/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
b/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
index 46377d7738..9020e4bb6c 100644
--- a/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
+++ b/tp/t/results/moresectioning/sectioning_part_appendix_no_top.pl
@@ -1088,39 +1088,39 @@ $result_elements{'sectioning_part_appendix_no_top'}[8]
= $result_elements{'secti
-$result_directions_text{'sectioning_part_appendix_no_top'} = 'element:
@chapter chapter
+$result_directions_text{'sectioning_part_appendix_no_top'} = 'output unit:
@chapter chapter
FastForward: @chapter chapter in part
Forward: @section section
This: @chapter chapter
-element: @section section
+output unit: @section section
Back: @chapter chapter
FastBack: @chapter chapter
FastForward: @chapter chapter in part
Forward: @subsection subsection
This: @section section
Up: @chapter chapter
-element: @subsection subsection
+output unit: @subsection subsection
Back: @section section
FastBack: @chapter chapter
FastForward: @chapter chapter in part
Forward: @subsubsection subsubsection
This: @subsection subsection
Up: @section section
-element: @subsubsection subsubsection
+output unit: @subsubsection subsubsection
Back: @subsection subsection
FastBack: @chapter chapter
FastForward: @chapter chapter in part
Forward: @chapter chapter in part
This: @subsubsection subsubsection
Up: @subsection subsection
-element: @chapter chapter in part
+output unit: @chapter chapter in part
Back: @subsubsection subsubsection
FastBack: @chapter chapter
FastForward: @chapter second chapter in part
Forward: @chapter second chapter in part
Next: @chapter second chapter in part
This: @chapter chapter in part
-element: @chapter second chapter in part
+output unit: @chapter second chapter in part
Back: @chapter chapter in part
FastBack: @chapter chapter in part
FastForward: @unnumbered unnumbered
@@ -1129,7 +1129,7 @@ element: @chapter second chapter in part
Prev: @chapter chapter in part
This: @chapter second chapter in part
Up: @chapter chapter in part
-element: @unnumbered unnumbered
+output unit: @unnumbered unnumbered
Back: @chapter second chapter in part
FastBack: @chapter second chapter in part
FastForward: @appendix appendix
@@ -1137,13 +1137,13 @@ element: @unnumbered unnumbered
Prev: @chapter second chapter in part
This: @unnumbered unnumbered
Up: @chapter chapter in part
-element: @appendix appendix
+output unit: @appendix appendix
Back: @unnumbered unnumbered
FastBack: @unnumbered unnumbered
Forward: @appendixsec appendixsec
Prev: @chapter chapter in part
This: @appendix appendix
-element: @appendixsec appendixsec
+output unit: @appendixsec appendixsec
Back: @appendix appendix
FastBack: @appendix appendix
This: @appendixsec appendixsec
diff --git a/tp/t/results/moresectioning/top_chapter_sections.pl
b/tp/t/results/moresectioning/top_chapter_sections.pl
index 9e22f0d09d..78045adc23 100644
--- a/tp/t/results/moresectioning/top_chapter_sections.pl
+++ b/tp/t/results/moresectioning/top_chapter_sections.pl
@@ -1054,11 +1054,11 @@ $result_elements{'top_chapter_sections'}[8] =
$result_elements{'top_chapter_sect
-$result_directions_text{'top_chapter_sections'} = 'element: @top top
+$result_directions_text{'top_chapter_sections'} = 'output unit: @top top
FastForward: @unnumbered unnumbered
Forward: @unnumbered unnumbered
This: @top top
-element: @unnumbered unnumbered
+output unit: @unnumbered unnumbered
Back: @top top
FastBack: @top top
FastForward: @chapter First chapter
@@ -1066,7 +1066,7 @@ element: @unnumbered unnumbered
Next: @chapter First chapter
This: @unnumbered unnumbered
Up: @top top
-element: @chapter First chapter
+output unit: @chapter First chapter
Back: @unnumbered unnumbered
FastBack: @unnumbered unnumbered
FastForward: @chapter Chapter
@@ -1075,14 +1075,14 @@ element: @chapter First chapter
Prev: @unnumbered unnumbered
This: @chapter First chapter
Up: @top top
-element: @section second
+output unit: @section second
Back: @chapter First chapter
FastBack: @chapter First chapter
FastForward: @chapter Chapter
Forward: @chapter Chapter
This: @section second
Up: @chapter First chapter
-element: @chapter Chapter
+output unit: @chapter Chapter
Back: @section second
FastBack: @chapter First chapter
FastForward: @chapter Chapter 2
@@ -1091,14 +1091,14 @@ element: @chapter Chapter
Prev: @chapter First chapter
This: @chapter Chapter
Up: @top top
-element: @section Section of chapter
+output unit: @section Section of chapter
Back: @chapter Chapter
FastBack: @chapter Chapter
FastForward: @chapter Chapter 2
Forward: @subsection subsection 1
This: @section Section of chapter
Up: @chapter Chapter
-element: @subsection subsection 1
+output unit: @subsection subsection 1
Back: @section Section of chapter
FastBack: @chapter Chapter
FastForward: @chapter Chapter 2
@@ -1106,7 +1106,7 @@ element: @subsection subsection 1
Next: @subsection subsection 2
This: @subsection subsection 1
Up: @section Section of chapter
-element: @subsection subsection 2
+output unit: @subsection subsection 2
Back: @subsection subsection 1
FastBack: @chapter Chapter
FastForward: @chapter Chapter 2
@@ -1114,7 +1114,7 @@ element: @subsection subsection 2
Prev: @subsection subsection 1
This: @subsection subsection 2
Up: @section Section of chapter
-element: @chapter Chapter 2
+output unit: @chapter Chapter 2
Back: @subsection subsection 2
FastBack: @chapter Chapter
Prev: @chapter Chapter
diff --git a/tp/t/results/moresectioning/top_node_up_url.pl
b/tp/t/results/moresectioning/top_node_up_url.pl
index 47967429c8..e2700e0b77 100644
--- a/tp/t/results/moresectioning/top_node_up_url.pl
+++ b/tp/t/results/moresectioning/top_node_up_url.pl
@@ -514,12 +514,12 @@ $result_elements{'top_node_up_url'}[1] =
$result_elements{'top_node_up_url'}[0]{
-$result_directions_text{'top_node_up_url'} = 'element: @node Top
+$result_directions_text{'top_node_up_url'} = 'output unit: @node Top
Forward: @node chap
NodeForward: @node chap
NodeNext: @node chap
This: @node Top
-element: @node chap
+output unit: @node chap
Back: @node Top
FastBack: @node Top
NodeBack: @node Top
diff --git a/tp/t/results/sectioning/chapter_before_and_after_part.pl
b/tp/t/results/sectioning/chapter_before_and_after_part.pl
index e3fbb451b3..8e3da1bb93 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -316,11 +316,11 @@ $result_elements{'chapter_before_and_after_part'}[1] =
$result_elements{'chapter
-$result_directions_text{'chapter_before_and_after_part'} = 'element: @chapter
chapter
+$result_directions_text{'chapter_before_and_after_part'} = 'output unit:
@chapter chapter
FastForward: @chapter chapter 2
Forward: @chapter chapter 2
This: @chapter chapter
-element: @chapter chapter 2
+output unit: @chapter chapter 2
Back: @chapter chapter
FastBack: @chapter chapter
This: @chapter chapter 2
diff --git a/tp/t/results/sectioning/chapter_before_part.pl
b/tp/t/results/sectioning/chapter_before_part.pl
index ade212d1d7..969439ed16 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -215,10 +215,10 @@ $result_elements{'chapter_before_part'}[1] =
$result_elements{'chapter_before_pa
-$result_directions_text{'chapter_before_part'} = 'element: @chapter chapter
+$result_directions_text{'chapter_before_part'} = 'output unit: @chapter chapter
Forward: @part part
This: @chapter chapter
-element: @part part
+output unit: @part part
Back: @chapter chapter
This: @part part
';
diff --git a/tp/t/results/sectioning/double_part.pl
b/tp/t/results/sectioning/double_part.pl
index b160d443b6..d6421d95e1 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -933,21 +933,21 @@ $result_elements{'double_part'}[2] =
$result_elements{'double_part'}[0]{'directi
-$result_directions_text{'double_part'} = 'element: @top top
+$result_directions_text{'double_part'} = 'output unit: @top top
FastForward: @chapter chapter after 2 parts
Forward: @part part first
Next: @part part first
NodeForward: @chapter chapter after 2 parts
NodeNext: @chapter chapter after 2 parts
This: @top top
-element: @part part first
+output unit: @part part first
Back: @top top
FastForward: @chapter chapter after 2 parts
Forward: @chapter chapter after 2 parts
Next: @chapter chapter after 2 parts
Prev: @top top
This: @part part first
-element: @chapter chapter after 2 parts
+output unit: @chapter chapter after 2 parts
Back: @part part first
FastBack: @part part first
NodeBack: @top top
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl
b/tp/t/results/sectioning/explicit_node_directions.pl
index b8451b2ec0..2d1fce27c0 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -728,12 +728,12 @@ $result_elements{'explicit_node_directions'}[2] =
$result_elements{'explicit_nod
-$result_directions_text{'explicit_node_directions'} = 'element: @node Top
+$result_directions_text{'explicit_node_directions'} = 'output unit: @node Top
Forward: @node chap node
NodeForward: @node chap node
NodeNext: @node chap node
This: @node Top
-element: @node chap node
+output unit: @node chap node
Back: @node Top
Forward: @node third node
NodeBack: @node Top
@@ -742,7 +742,7 @@ element: @node chap node
NodePrev: @node Top
NodeUp: @node Top
This: @node chap node
-element: @node third node
+output unit: @node third node
Back: @node chap node
NodeBack: @node chap node
NodePrev: @node chap node
diff --git a/tp/t/results/sectioning/lone_Top_node.pl
b/tp/t/results/sectioning/lone_Top_node.pl
index 07b692f419..a0764e4dee 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -417,7 +417,7 @@
$result_elements{'lone_Top_node'}[0]{'unit_command'}{'associated_unit'} = $resul
-$result_directions_text{'lone_Top_node'} = 'element: @chapter chap
+$result_directions_text{'lone_Top_node'} = 'output unit: @chapter chap
NodePrev: @chapter chap
NodeUp: @chapter chap
This: @chapter chap
diff --git a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
index 3c0d7d90e4..5c39736311 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -1060,14 +1060,14 @@ $result_elements{'node_part_chapter_after_chapter'}[2]
= $result_elements{'node_
-$result_directions_text{'node_part_chapter_after_chapter'} = 'element: @top top
+$result_directions_text{'node_part_chapter_after_chapter'} = 'output unit:
@top top
FastForward: @chapter chapter node
Forward: @chapter chapter node
Next: @chapter chapter with part node
NodeForward: @chapter chapter node
NodeNext: @chapter chapter node
This: @top top
-element: @chapter chapter node
+output unit: @chapter chapter node
Back: @top top
FastBack: @top top
FastForward: @chapter chapter with part node
@@ -1079,7 +1079,7 @@ element: @chapter chapter node
NodeUp: @top top
This: @chapter chapter node
Up: @top top
-element: @chapter chapter with part node
+output unit: @chapter chapter with part node
Back: @chapter chapter node
FastBack: @chapter chapter node
NodeBack: @chapter chapter node
diff --git a/tp/t/results/sectioning/node_part_chapter_after_top.pl
b/tp/t/results/sectioning/node_part_chapter_after_top.pl
index 7bd69fd850..9e7780975a 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -687,14 +687,14 @@ $result_elements{'node_part_chapter_after_top'}[1] =
$result_elements{'node_part
-$result_directions_text{'node_part_chapter_after_top'} = 'element: @top top
+$result_directions_text{'node_part_chapter_after_top'} = 'output unit: @top top
FastForward: @chapter chapter
Forward: @chapter chapter
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
This: @top top
-element: @chapter chapter
+output unit: @chapter chapter
Back: @top top
FastBack: @top top
NodeBack: @top top
diff --git a/tp/t/results/sectioning/node_up_external_node.pl
b/tp/t/results/sectioning/node_up_external_node.pl
index 98a780941d..f220f76e35 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -605,12 +605,12 @@ $result_elements{'node_up_external_node'}[1] =
$result_elements{'node_up_externa
-$result_directions_text{'node_up_external_node'} = 'element: @node Top
+$result_directions_text{'node_up_external_node'} = 'output unit: @node Top
Forward: @node chap first
NodeForward: @node chap first
NodeNext: @node chap first
This: @node Top
-element: @node chap first
+output unit: @node chap first
Back: @node Top
NodeBack: @node Top
NodeForward: (manual1)
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
index 1143c4cc47..9929513e35 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
@@ -868,12 +868,12 @@
$result_elements{'nodes_after_top_before_chapter_nodes'}[2] = $result_elements{'
-$result_directions_text{'nodes_after_top_before_chapter_nodes'} = 'element:
@node Top
+$result_directions_text{'nodes_after_top_before_chapter_nodes'} = 'output
unit: @node Top
Forward: @node second node
NodeForward: @node second node
NodeNext: @node second node
This: @node Top
-element: @node second node
+output unit: @node second node
Back: @node Top
Forward: @node third node
NodeBack: @node Top
@@ -882,7 +882,7 @@ element: @node second node
NodePrev: @node Top
NodeUp: @node Top
This: @node second node
-element: @node third node
+output unit: @node third node
Back: @node second node
NodeBack: @node second node
NodePrev: @node second node
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
index f28df23a77..95b3b0d7a9 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_sections.pl
@@ -630,7 +630,7 @@
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'unit_command'}{'
-$result_directions_text{'nodes_after_top_before_chapter_sections'} = 'element:
@chapter chapter
+$result_directions_text{'nodes_after_top_before_chapter_sections'} = 'output
unit: @chapter chapter
NodePrev: @chapter chapter
NodeUp: @chapter chapter
This: @chapter chapter
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
index e14b689fac..e1ed49fe96 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
@@ -868,12 +868,12 @@
$result_elements{'nodes_after_top_before_section_nodes'}[2] = $result_elements{'
-$result_directions_text{'nodes_after_top_before_section_nodes'} = 'element:
@node Top
+$result_directions_text{'nodes_after_top_before_section_nodes'} = 'output
unit: @node Top
Forward: @node chap node
NodeForward: @node chap node
NodeNext: @node chap node
This: @node Top
-element: @node chap node
+output unit: @node chap node
Back: @node Top
Forward: @node third node
NodeBack: @node Top
@@ -882,7 +882,7 @@ element: @node chap node
NodePrev: @node Top
NodeUp: @node Top
This: @node chap node
-element: @node third node
+output unit: @node third node
Back: @node chap node
NodeBack: @node chap node
NodePrev: @node chap node
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
index 5d54fc2414..fe8238c3f3 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_sections.pl
@@ -630,7 +630,7 @@
$result_elements{'nodes_after_top_before_section_sections'}[0]{'unit_command'}{'
-$result_directions_text{'nodes_after_top_before_section_sections'} = 'element:
@subsection subsection
+$result_directions_text{'nodes_after_top_before_section_sections'} = 'output
unit: @subsection subsection
NodePrev: @subsection subsection
NodeUp: @subsection subsection
This: @subsection subsection
diff --git a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
index def8c40965..8ff47003a1 100644
--- a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
+++ b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
@@ -518,12 +518,12 @@
$result_elements{'nodes_no_node_top_explicit_directions'}[1] = $result_elements{
-$result_directions_text{'nodes_no_node_top_explicit_directions'} = 'element:
@node first
+$result_directions_text{'nodes_no_node_top_explicit_directions'} = 'output
unit: @node first
Forward: @node second node
NodeForward: @node second node
NodeUp: (dir)
This: @node first
-element: @node second node
+output unit: @node second node
Back: @node first
NodeBack: @node first
NodePrev: @node first
diff --git a/tp/t/results/sectioning/part_before_chapter.pl
b/tp/t/results/sectioning/part_before_chapter.pl
index 171081407e..51c0e5ecd9 100644
--- a/tp/t/results/sectioning/part_before_chapter.pl
+++ b/tp/t/results/sectioning/part_before_chapter.pl
@@ -183,7 +183,7 @@
$result_elements{'part_before_chapter'}[0]{'unit_command'}{'extra'}{'associated_
-$result_directions_text{'part_before_chapter'} = 'element: @chapter chapter
+$result_directions_text{'part_before_chapter'} = 'output unit: @chapter chapter
This: @chapter chapter
';
diff --git a/tp/t/results/sectioning/part_before_section.pl
b/tp/t/results/sectioning/part_before_section.pl
index b5f58db39a..78c9e9e1bd 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -188,7 +188,7 @@
$result_elements{'part_before_section'}[0]{'unit_command'}{'extra'}{'associated_
-$result_directions_text{'part_before_section'} = 'element: @section section
+$result_directions_text{'part_before_section'} = 'output unit: @section section
This: @section section
';
diff --git a/tp/t/results/sectioning/part_before_top.pl
b/tp/t/results/sectioning/part_before_top.pl
index c8b282a925..a9e0059310 100644
--- a/tp/t/results/sectioning/part_before_top.pl
+++ b/tp/t/results/sectioning/part_before_top.pl
@@ -189,7 +189,7 @@
$result_elements{'part_before_top'}[0]{'unit_command'}{'extra'}{'associated_part
-$result_directions_text{'part_before_top'} = 'element: @top top
+$result_directions_text{'part_before_top'} = 'output unit: @top top
This: @top top
';
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl
b/tp/t/results/sectioning/part_chapter_after_top.pl
index c9bf89341c..9d1bca4cb7 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -681,14 +681,14 @@ $result_elements{'part_chapter_after_top'}[1] =
$result_elements{'part_chapter_a
-$result_directions_text{'part_chapter_after_top'} = 'element: @top top
+$result_directions_text{'part_chapter_after_top'} = 'output unit: @top top
FastForward: @chapter chapter
Forward: @chapter chapter
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
This: @top top
-element: @chapter chapter
+output unit: @chapter chapter
Back: @top top
FastBack: @top top
NodeBack: @top top
diff --git a/tp/t/results/sectioning/part_node_after_top.pl
b/tp/t/results/sectioning/part_node_after_top.pl
index adfa71c8d0..b3e53d39aa 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -583,7 +583,7 @@ $result_elements{'part_node_after_top'}[1] =
$result_elements{'part_node_after_t
-$result_directions_text{'part_node_after_top'} = 'element: @top top
+$result_directions_text{'part_node_after_top'} = 'output unit: @top top
FastForward: @part part
Forward: @part part
Next: @part part
@@ -591,7 +591,7 @@ $result_directions_text{'part_node_after_top'} = 'element:
@top top
NodeForward: @top top
NodeNext: @top top
This: @top top
-element: @part part
+output unit: @part part
Back: @top top
FastBack: @top top
Prev: @top top
diff --git a/tp/t/results/sectioning/part_node_before_top.pl
b/tp/t/results/sectioning/part_node_before_top.pl
index 9072ecab0c..8b07c150a6 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -539,7 +539,7 @@
$result_elements{'part_node_before_top'}[0]{'unit_command'}{'extra'}{'associated
-$result_directions_text{'part_node_before_top'} = 'element: @top top
+$result_directions_text{'part_node_before_top'} = 'output unit: @top top
NodeBack: @top top
NodeForward: @top top
NodeNext: @top top
diff --git a/tp/t/results/sectioning/part_node_chapter_after_top.pl
b/tp/t/results/sectioning/part_node_chapter_after_top.pl
index fc36750b6a..63bd532006 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -924,14 +924,14 @@ $result_elements{'part_node_chapter_after_top'}[1] =
$result_elements{'part_node
-$result_directions_text{'part_node_chapter_after_top'} = 'element: @top top
+$result_directions_text{'part_node_chapter_after_top'} = 'output unit: @top top
FastForward: @chapter chapter
Forward: @chapter chapter
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
This: @top top
-element: @chapter chapter
+output unit: @chapter chapter
Back: @top top
FastBack: @top top
NodeBack: @top top
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index 4e80645698..632e584f92 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -854,14 +854,14 @@ $result_elements{'part_node_chapter_appendix'}[2] =
$result_elements{'part_node_
-$result_directions_text{'part_node_chapter_appendix'} = 'element: @top top
+$result_directions_text{'part_node_chapter_appendix'} = 'output unit: @top top
FastForward: @chapter chapter
Forward: @chapter chapter
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
This: @top top
-element: @chapter chapter
+output unit: @chapter chapter
Back: @top top
FastBack: @top top
FastForward: @appendix Appendix
@@ -870,7 +870,7 @@ element: @chapter chapter
NodePrev: @top top
NodeUp: @top top
This: @chapter chapter
-element: @appendix Appendix
+output unit: @appendix Appendix
Back: @chapter chapter
FastBack: @chapter chapter
Prev: @chapter chapter
diff --git a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
index a8a78364e2..6a2e73e0d5 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -1018,14 +1018,14 @@ $result_elements{'part_node_chapter_node_appendix'}[2]
= $result_elements{'part_
-$result_directions_text{'part_node_chapter_node_appendix'} = 'element: @top top
+$result_directions_text{'part_node_chapter_node_appendix'} = 'output unit:
@top top
FastForward: @chapter chapter
Forward: @chapter chapter
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
This: @top top
-element: @chapter chapter
+output unit: @chapter chapter
Back: @top top
FastBack: @top top
FastForward: @appendix Appendix
@@ -1036,7 +1036,7 @@ element: @chapter chapter
NodePrev: @top top
NodeUp: @top top
This: @chapter chapter
-element: @appendix Appendix
+output unit: @appendix Appendix
Back: @chapter chapter
FastBack: @chapter chapter
NodeBack: @chapter chapter
diff --git a/tp/t/results/sectioning/part_node_node_part_appendix.pl
b/tp/t/results/sectioning/part_node_node_part_appendix.pl
index 8f065dbc69..3ac53264bd 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -1099,14 +1099,14 @@ $result_elements{'part_node_node_part_appendix'}[2] =
$result_elements{'part_nod
-$result_directions_text{'part_node_node_part_appendix'} = 'element: @top top
+$result_directions_text{'part_node_node_part_appendix'} = 'output unit: @top
top
FastForward: @chapter chapter
Forward: @chapter chapter
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
This: @top top
-element: @chapter chapter
+output unit: @chapter chapter
Back: @top top
FastBack: @top top
FastForward: @appendix Appendix
@@ -1117,7 +1117,7 @@ element: @chapter chapter
NodePrev: @top top
NodeUp: @top top
This: @chapter chapter
-element: @appendix Appendix
+output unit: @appendix Appendix
Back: @chapter chapter
FastBack: @chapter chapter
NodeBack: @chapter chapter
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl
b/tp/t/results/sectioning/part_node_part_appendix.pl
index eec7d0fb23..80fb276223 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -925,14 +925,14 @@ $result_elements{'part_node_part_appendix'}[2] =
$result_elements{'part_node_par
-$result_directions_text{'part_node_part_appendix'} = 'element: @top top
+$result_directions_text{'part_node_part_appendix'} = 'output unit: @top top
FastForward: @chapter chapter
Forward: @chapter chapter
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
This: @top top
-element: @chapter chapter
+output unit: @chapter chapter
Back: @top top
FastBack: @top top
FastForward: @appendix Appendix
@@ -941,7 +941,7 @@ element: @chapter chapter
NodePrev: @top top
NodeUp: @top top
This: @chapter chapter
-element: @appendix Appendix
+output unit: @appendix Appendix
Back: @chapter chapter
FastBack: @chapter chapter
This: @appendix Appendix
diff --git a/tp/t/results/sectioning/part_node_part_node_appendix.pl
b/tp/t/results/sectioning/part_node_part_node_appendix.pl
index e889a7d599..f1bbda6191 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -1093,14 +1093,14 @@ $result_elements{'part_node_part_node_appendix'}[2] =
$result_elements{'part_nod
-$result_directions_text{'part_node_part_node_appendix'} = 'element: @top top
+$result_directions_text{'part_node_part_node_appendix'} = 'output unit: @top
top
FastForward: @chapter chapter
Forward: @chapter chapter
Next: @chapter chapter
NodeForward: @chapter chapter
NodeNext: @chapter chapter
This: @top top
-element: @chapter chapter
+output unit: @chapter chapter
Back: @top top
FastBack: @top top
FastForward: @appendix Appendix
@@ -1111,7 +1111,7 @@ element: @chapter chapter
NodePrev: @top top
NodeUp: @top top
This: @chapter chapter
-element: @appendix Appendix
+output unit: @appendix Appendix
Back: @chapter chapter
FastBack: @chapter chapter
NodeBack: @chapter chapter
diff --git a/tp/t/results/sectioning/top_node_part_top.pl
b/tp/t/results/sectioning/top_node_part_top.pl
index 76869803c4..c6111ff620 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -306,7 +306,7 @@
$result_elements{'top_node_part_top'}[0]{'unit_command'}{'extra'}{'associated_pa
-$result_directions_text{'top_node_part_top'} = 'element: @top top
+$result_directions_text{'top_node_part_top'} = 'output unit: @top top
This: @top top
';
diff --git a/tp/t/results/sectioning/top_part_chapter.pl
b/tp/t/results/sectioning/top_part_chapter.pl
index 69b526a389..39eb7466ad 100644
--- a/tp/t/results/sectioning/top_part_chapter.pl
+++ b/tp/t/results/sectioning/top_part_chapter.pl
@@ -292,12 +292,12 @@ $result_elements{'top_part_chapter'}[1] =
$result_elements{'top_part_chapter'}[0
-$result_directions_text{'top_part_chapter'} = 'element: @top top
+$result_directions_text{'top_part_chapter'} = 'output unit: @top top
FastForward: @chapter chapter
Forward: @chapter chapter
Next: @chapter chapter
This: @top top
-element: @chapter chapter
+output unit: @chapter chapter
Back: @top top
FastBack: @top top
This: @chapter chapter
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl
b/tp/t/results/sectioning/top_without_node_nodes.pl
index 0946f0dd75..ac4f94c64c 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -365,7 +365,7 @@
$result_elements{'top_without_node_nodes'}[0]{'unit_command'}{'associated_unit'}
-$result_directions_text{'top_without_node_nodes'} = 'element: @node second
+$result_directions_text{'top_without_node_nodes'} = 'output unit: @node second
NodeUp: (dir)
This: @node second
';
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl
b/tp/t/results/sectioning/top_without_node_sections.pl
index a1e033008a..544ae7e43a 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -479,11 +479,11 @@ $result_elements{'top_without_node_sections'}[1] =
$result_elements{'top_without
-$result_directions_text{'top_without_node_sections'} = 'element: @top top
section
+$result_directions_text{'top_without_node_sections'} = 'output unit: @top top
section
FastForward: @chapter Chapter
Forward: @chapter Chapter
This: @top top section
-element: @chapter Chapter
+output unit: @chapter Chapter
Back: @top top section
FastBack: @top top section
NodeUp: (dir)
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index e6c4b01b57..966d461db9 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -1106,12 +1106,12 @@
$result_elements{'transliterated_split_equivalent_nodes'}[3] = $result_elements{
-$result_directions_text{'transliterated_split_equivalent_nodes'} = 'element:
@node top
+$result_directions_text{'transliterated_split_equivalent_nodes'} = 'output
unit: @node top
Forward: @node @~a
NodeForward: @node @~a
NodeNext: @node @~a
This: @node top
-element: @node @~a
+output unit: @node @~a
Back: @node top
Forward: @node n
NodeBack: @node top
@@ -1120,7 +1120,7 @@ element: @node @~a
NodePrev: @node top
NodeUp: @node top
This: @node @~a
-element: @node n
+output unit: @node n
Back: @node @~a
FastBack: @node @~a
Forward: @node @^a
@@ -1130,7 +1130,7 @@ element: @node n
NodePrev: @node @~a
NodeUp: @node top
This: @node n
-element: @node @^a
+output unit: @node @^a
Back: @node n
FastBack: @node @~a
NodeBack: @node n
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end.pl
b/tp/t/results/sectioning/two_nodes_at_the_end.pl
index 736dd93cc5..1b5762e2b1 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -942,13 +942,13 @@ $result_elements{'two_nodes_at_the_end'}[1] =
$result_elements{'two_nodes_at_the
-$result_directions_text{'two_nodes_at_the_end'} = 'element: @top top
+$result_directions_text{'two_nodes_at_the_end'} = 'output unit: @top top
FastForward: @chapter chapter c1
Forward: @chapter chapter c1
NodeForward: @chapter chapter c1
NodeNext: @chapter chapter c1
This: @top top
-element: @chapter chapter c1
+output unit: @chapter chapter c1
Back: @top top
FastBack: @top top
NodeBack: @top top
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 21f84bd5cf..01f792e2c0 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -1159,14 +1159,14 @@ $result_elements{'two_nodes_between_chapters'}[2] =
$result_elements{'two_nodes_
-$result_directions_text{'two_nodes_between_chapters'} = 'element: @top top
+$result_directions_text{'two_nodes_between_chapters'} = 'output unit: @top top
FastForward: @chapter chapter c1
Forward: @chapter chapter c1
NodeBack: @chapter chapter c1
NodeForward: @chapter chapter c1
NodeNext: @chapter chapter c1
This: @top top
-element: @chapter chapter c1
+output unit: @chapter chapter c1
Back: @top top
FastBack: @top top
FastForward: @chapter chapter c2
@@ -1179,7 +1179,7 @@ element: @chapter chapter c1
NodeUp: @top top
This: @chapter chapter c1
Up: @top top
-element: @chapter chapter c2
+output unit: @chapter chapter c2
Back: @chapter chapter c1
FastBack: @chapter chapter c1
NodePrev: @chapter chapter c1
diff --git a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
index 51d08d3491..b724b809b2 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -409,12 +409,12 @@ $result_elements{'unnumbered_before_node_top_top'}[1] =
$result_elements{'unnumb
-$result_directions_text{'unnumbered_before_node_top_top'} = 'element:
@unnumbered before nodes
+$result_directions_text{'unnumbered_before_node_top_top'} = 'output unit:
@unnumbered before nodes
FastForward: @top top section
Forward: @top top section
Next: @top top section
This: @unnumbered before nodes
-element: @top top section
+output unit: @top top section
Back: @unnumbered before nodes
FastBack: @unnumbered before nodes
Prev: @unnumbered before nodes
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index 2673faa036..cc4170d2ed 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -234,7 +234,7 @@
$result_elements{'unnumbered_before_top_node'}[0]{'unit_command'}{'associated_un
-$result_directions_text{'unnumbered_before_top_node'} = 'element: @unnumbered
before nodes
+$result_directions_text{'unnumbered_before_top_node'} = 'output unit:
@unnumbered before nodes
This: @unnumbered before nodes
';
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
index 3116d420f8..1f85ffa6b2 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -702,13 +702,13 @@ $result_elements{'unnumbered_top_without_node_nodes'}[1]
= $result_elements{'unn
-$result_directions_text{'unnumbered_top_without_node_nodes'} = 'element: @node
a node
+$result_directions_text{'unnumbered_top_without_node_nodes'} = 'output unit:
@node a node
FastBack: @node a node
FastForward: @node a node
Forward: @node second
NodeUp: (dir)
This: @node a node
-element: @node second
+output unit: @node second
Back: @node a node
NodeUp: (dir)
Prev: @node a node
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index 6a65b68272..1c3e83d4f4 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -833,13 +833,13 @@
$result_elements{'unnumbered_top_without_node_sections'}[2] = $result_elements{'
-$result_directions_text{'unnumbered_top_without_node_sections'} = 'element:
@unnumbered unnumbered
+$result_directions_text{'unnumbered_top_without_node_sections'} = 'output
unit: @unnumbered unnumbered
FastForward: @top top section
Forward: @top top section
Next: @top top section
NodeUp: (dir)
This: @unnumbered unnumbered
-element: @top top section
+output unit: @top top section
Back: @unnumbered unnumbered
FastBack: @unnumbered unnumbered
FastForward: @chapter Chapter
@@ -847,7 +847,7 @@ element: @top top section
Next: @chapter Chapter
Prev: @unnumbered unnumbered
This: @top top section
-element: @chapter Chapter
+output unit: @chapter Chapter
Back: @top top section
FastBack: @top top section
NodeUp: (dir)
diff --git a/tp/t/results/xml_tests/top_node_and_bye.pl
b/tp/t/results/xml_tests/top_node_and_bye.pl
index 031013a548..f92a12d403 100644
--- a/tp/t/results/xml_tests/top_node_and_bye.pl
+++ b/tp/t/results/xml_tests/top_node_and_bye.pl
@@ -124,7 +124,7 @@
$result_elements{'top_node_and_bye'}[0]{'directions'}{'This'} = $result_elements
-$result_directions_text{'top_node_and_bye'} = 'element: No associated command
(type unit)
+$result_directions_text{'top_node_and_bye'} = 'output unit: No associated
command (type unit)
This: No associated command (type unit)
';
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index c9c04fa44f..5eeb4ca79f 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -1309,7 +1309,7 @@ sub test($$)
$directions_text = '';
foreach my $output_unit (@$output_units) {
$directions_text .=
- Texinfo::Structuring::print_element_directions($output_unit);
+ Texinfo::Structuring::print_output_unit_directions($output_unit);
}
}
if ($split_pages) {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Structuring.pm (output_unit_texi) (print_output_unit_directions), tp/Texinfo/XS/main/output_unit.c (output_unit_texi, print_output_unit_directions): rename print_element_directions as print_output_unit_directions and unit_or_external_element_texi as output_unit_texi. Update callers.,
Patrice Dumas <=