[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Makefile.am (test_files), tp/Makefile.tres,
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/30sectioning.t, tp/t/96moresectioning.t: inline equivalent_nodes.texi in tp/t/30sectioning.t, renaming the corresponding test as equivalent_nodes_defined_linked. Remove equivalent_nodes.texi and the tests in tp/t/96moresectioning.t. |
|
Date: |
Sun, 01 Jan 2023 17:03:12 -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 c78c88952f * tp/Makefile.am (test_files), tp/Makefile.tres,
tp/t/30sectioning.t, tp/t/96moresectioning.t: inline equivalent_nodes.texi in
tp/t/30sectioning.t, renaming the corresponding test as
equivalent_nodes_defined_linked. Remove equivalent_nodes.texi and the tests in
tp/t/96moresectioning.t.
c78c88952f is described below
commit c78c88952f0bfaa758ff4869fe357ae78c13aeea
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jan 1 23:02:49 2023 +0100
* tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/30sectioning.t,
tp/t/96moresectioning.t: inline equivalent_nodes.texi in
tp/t/30sectioning.t, renaming the corresponding test as
equivalent_nodes_defined_linked. Remove equivalent_nodes.texi and
the tests in tp/t/96moresectioning.t.
---
ChangeLog | 8 +
tp/Makefile.am | 1 -
tp/Makefile.tres | 5 +-
tp/t/30sectioning.t | 39 +-
tp/t/96moresectioning.t | 10 -
tp/t/input_files/equivalent_nodes.texi | 28 -
.../res_html/equivalent_nodes.html | 210 -----
.../moresectioning/equivalent_nodes_no_node.pl | 909 ---------------------
.../res_html/equivalent_nodes.html | 56 --
.../equivalent_nodes_defined_linked.pl} | 498 +++++------
10 files changed, 225 insertions(+), 1539 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dcb2780810..6b88b96c9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-01-01 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/30sectioning.t,
+ tp/t/96moresectioning.t: inline equivalent_nodes.texi in
+ tp/t/30sectioning.t, renaming the corresponding test as
+ equivalent_nodes_defined_linked. Remove equivalent_nodes.texi and
+ the tests in tp/t/96moresectioning.t.
+
2023-01-01 Patrice Dumas <pertusus@free.fr>
* tp/t/input_files/equivalent_nodes.texi: do not use a node before Top
diff --git a/tp/Makefile.am b/tp/Makefile.am
index f14ffea369..7301c64e1d 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -203,7 +203,6 @@ test_files = \
t/input_files/empty_lines_at_beginning_no_setfilename_no_element.texi \
t/input_files/encoding_index_latin1.texi \
t/input_files/encoding_index_utf8.texi \
- t/input_files/equivalent_nodes.texi \
t/input_files/float_copying.texi \
t/input_files/formatting.texi \
t/input_files/glossary.texi \
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 22cba49695..7b085dd2b7 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -1548,10 +1548,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/misc_commands/vskip.pl \
t/results/morecoverage/formatting_fr.pl \
t/results/morecoverage/texi_formatting.pl \
- t/results/moresectioning/equivalent_nodes.pl \
- t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html \
- t/results/moresectioning/equivalent_nodes_no_node.pl \
-
t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
\
t/results/moresectioning/more_sections_than_nodes.pl \
t/results/moresectioning/more_sections_than_nodes/res_html/more_sections_than_nodes.html
\
t/results/moresectioning/node_footnote_end.pl \
@@ -1876,6 +1872,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/empty_top_node_up.pl \
t/results/sectioning/equivalent_labels.pl \
t/results/sectioning/equivalent_nodes.pl \
+ t/results/sectioning/equivalent_nodes_defined_linked.pl \
t/results/sectioning/explicit_node_directions.pl \
t/results/sectioning/external_node_in_menu.pl \
t/results/sectioning/hole_in_sectioning.pl \
diff --git a/tp/t/30sectioning.t b/tp/t/30sectioning.t
index e2b0790959..fe971e7192 100644
--- a/tp/t/30sectioning.t
+++ b/tp/t/30sectioning.t
@@ -696,6 +696,20 @@ undef, {'test_file' =>
'reference_to_only_special_spaces_node.texi',
@xref{TOP}.
'],
+['equivalent_labels',
+'@node Top
+
+@anchor{@samp{anch}}.
+
+@float truc, floa
+In float
+@end float
+
+@menu
+* anch::
+* @code{floa}::
+@end menu
+'],
['equivalent_nodes',
'@node Top, @emph{node}
@@ -707,20 +721,25 @@ undef, {'test_file' =>
'reference_to_only_special_spaces_node.texi',
@xref{node}.
'],
-['equivalent_labels',
-'@node Top
+['equivalent_nodes_defined_linked',
+'@node Top, @asis{node}
-@anchor{@samp{anch}}.
+@menu
+* @strong{node}::
+@end menu
-@float truc, floa
-In float
+@node node
+
+@float Figure, @samp{node}
+A figure
@end float
-@menu
-* anch::
-* @code{floa}::
-@end menu
-'],
+@listoffloats Figure
+
+Ref to node @ref{node}.
+
+Ref to @@samp@{node@} @ref{@samp{node}}.
+', {}, {'FORMAT_MENU' => 'menu'}],
['anchor_in_footnote',
$anchor_in_footnote_text
],
diff --git a/tp/t/96moresectioning.t b/tp/t/96moresectioning.t
index 2c518d8943..a18201c7eb 100644
--- a/tp/t/96moresectioning.t
+++ b/tp/t/96moresectioning.t
@@ -30,16 +30,6 @@ my @test_cases = (
{'test_file' => 'node_footnote.texi'},
{'footnotestyle' => 'separate'}
],
-['equivalent_nodes',
- undef,
- {'test_file' => 'equivalent_nodes.texi'},
- {'USE_NODES' => 1}
-],
-['equivalent_nodes_no_node',
- undef,
- {'test_file' => 'equivalent_nodes.texi'},
- {}
-],
['nodes_after_top_before_chapter',
undef,
{'test_file' => 'nodes_after_top_before_chapter.texi'},
diff --git a/tp/t/input_files/equivalent_nodes.texi
b/tp/t/input_files/equivalent_nodes.texi
deleted file mode 100644
index feabb05881..0000000000
--- a/tp/t/input_files/equivalent_nodes.texi
+++ /dev/null
@@ -1,28 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-
-@c test equivalent nodes
-
-@node Top
-
-Equivalent nodes in node line and in menu.
-
-@menu
-* @strong{node}::
-* other node::
-@end menu
-
-@node node
-
-@float Figure, @samp{node}
-A figure
-@end float
-
-@listoffloats Figure
-
-Ref to node @ref{node}.
-
-Ref to @@samp@{node@} @ref{@samp{node}}.
-
-@node other node,, @asis{node}
-
-@bye
diff --git
a/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
b/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
deleted file mode 100644
index 7012d694cf..0000000000
---
a/tp/t/results/moresectioning/equivalent_nodes/res_html/equivalent_nodes.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
-
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
-td.name-direction-about {text-align:center}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-
-<a class="node-id" id="Top"></a><table class="nav-panel" cellpadding="1"
cellspacing="1" border="0">
-<tr><td>[ < ]</td>
-<td>[<a href="#node" title="Next section in reading order"> > </a>]</td>
-<td> </td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="node">Top</h1>
-
-<p>Equivalent nodes in node line and in menu.
-</p>
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">• <a href="#node"><strong
class="strong">node</strong></a></td><td> </td><td
class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">• <a href="#other-node">other
node</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-</table>
-
-<hr style="height: 6px;">
-<a class="node-id" id="node"></a><table class="nav-panel" cellpadding="1"
cellspacing="1" border="0">
-<tr><td>[ << ]</td>
-<td>[<a href="#Top" title="Previous section in reading order"> < </a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
-<td>[<a href="#other-node" title="Next section in reading order"> >
</a>]</td>
-<td>[ >> ]</td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h3 class="node">node</h3>
-
-<div class="float">
-<p>A figure
-</p><div class="type-number-float"><p><strong
class="strong">Figure</strong></p></div></div>
-<dl class="listoffloats">
-</dl>
-
-<p>Ref to node <a class="ref" href="#node">node</a>.
-</p>
-<p>Ref to @samp{node} <a class="ref" href="#node">node</a>.
-</p>
-<hr>
-<a class="node-id" id="other-node"></a><table class="nav-panel"
cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ << ]</td>
-<td>[<a href="#node" title="Previous section in reading order"> < </a>]</td>
-<td>[ Up ]</td>
-<td>[ > ]</td>
-<td>[ >> ]</td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h3 class="node">other node</h3>
-
-<hr style="height: 6px;">
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="about-heading">About This Document</h1>
-
-<p>
- This document was generated on <em class="emph">a sunny day</em>.
-</p>
-<p>
- The buttons in the navigation panels have the following meaning:
-</p>
-<table border="1">
- <tr>
- <th> Button </th>
- <th> Name </th>
- <th> Go to </th>
- <th> From 1.2.3 go to</th>
- </tr>
- <tr>
- <td class="button-direction-about"> [ << ] </td>
- <td class="name-direction-about">FastBack</td>
- <td>Beginning of this chapter or previous chapter</td>
- <td>1</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ < ] </td>
- <td class="name-direction-about">Back</td>
- <td>Previous section in reading order</td>
- <td>1.2.2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ Up ] </td>
- <td class="name-direction-about">Up</td>
- <td>Up section</td>
- <td>1.2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ > ] </td>
- <td class="name-direction-about">Forward</td>
- <td>Next section in reading order</td>
- <td>1.2.4</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ >> ] </td>
- <td class="name-direction-about">FastForward</td>
- <td>Next chapter</td>
- <td>2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Top] </td>
- <td class="name-direction-about">Top</td>
- <td>Cover (top) of document</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Contents] </td>
- <td class="name-direction-about">Contents</td>
- <td>Table of contents</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Index] </td>
- <td class="name-direction-about">Index</td>
- <td>Index</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ ? ] </td>
- <td class="name-direction-about">About</td>
- <td>About (help)</td>
- <td> </td>
- </tr>
-</table>
-
-<p>
- where the <strong class="strong"> Example </strong> assumes that the current
position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of
a document of the following structure:
-</p>
-
-<ul>
- <li> 1. Section One
- <ul>
- <li>1.1 Subsection One-One
- <ul>
- <li>...</li>
- </ul>
- </li>
- <li>1.2 Subsection One-Two
- <ul>
- <li>1.2.1 Subsubsection One-Two-One</li>
- <li>1.2.2 Subsubsection One-Two-Two</li>
- <li>1.2.3 Subsubsection One-Two-Three
- <strong><== Current Position </strong></li>
- <li>1.2.4 Subsubsection One-Two-Four</li>
- </ul>
- </li>
- <li>1.3 Subsection One-Three
- <ul>
- <li>...</li>
- </ul>
- </li>
- <li>1.4 Subsection One-Four</li>
- </ul>
- </li>
-</ul>
-</div><hr>
-<p>
- <span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em>.</span>
-</p>
-
-
-</body>
-</html>
diff --git a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
deleted file mode 100644
index 214f548882..0000000000
--- a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
+++ /dev/null
@@ -1,909 +0,0 @@
-use vars qw(%result_texis %result_texts %result_trees %result_errors
- %result_indices %result_sectioning %result_nodes %result_menus
- %result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text %result_indices_sort_strings);
-
-use utf8;
-
-$result_trees{'equivalent_nodes_no_node'} = {
- 'contents' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'text' => ' test equivalent nodes
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' test equivalent nodes
-'
- ]
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
- 'type' => 'before_node_section'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'text' => 'Equivalent nodes in node line and in menu.
-'
- }
- ],
- 'type' => 'paragraph'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'menu',
- 'contents' => [
- {
- 'args' => [
- {
- 'text' => '* ',
- 'type' => 'menu_entry_leading_text'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'node'
- }
- ],
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'strong',
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 10,
- 'macro' => ''
- }
- }
- ],
- 'type' => 'menu_entry_node'
- },
- {
- 'text' => '::',
- 'type' => 'menu_entry_separator'
- },
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '
-'
- }
- ],
- 'type' => 'preformatted'
- }
- ],
- 'type' => 'menu_entry_description'
- }
- ],
- 'extra' => {
- 'menu_entry_description' => {},
- 'menu_entry_node' => {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'node'
- }
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 10,
- 'macro' => ''
- },
- 'type' => 'menu_entry'
- },
- {
- 'args' => [
- {
- 'text' => '* ',
- 'type' => 'menu_entry_leading_text'
- },
- {
- 'contents' => [
- {
- 'text' => 'other node'
- }
- ],
- 'type' => 'menu_entry_node'
- },
- {
- 'text' => '::',
- 'type' => 'menu_entry_separator'
- },
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '
-'
- }
- ],
- 'type' => 'preformatted'
- }
- ],
- 'type' => 'menu_entry_description'
- }
- ],
- 'extra' => {
- 'menu_entry_description' => {},
- 'menu_entry_node' => {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'other-node'
- }
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 11,
- 'macro' => ''
- },
- 'type' => 'menu_entry'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'menu'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'text_arg' => 'menu'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 12,
- 'macro' => ''
- }
- }
- ],
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 9,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'Top'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 5,
- 'macro' => ''
- }
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'node'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Figure'
- }
- ],
- 'type' => 'block_line_arg'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'node'
- }
- ],
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 16,
- 'macro' => ''
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-',
- 'spaces_before_argument' => ' '
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'float',
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'A figure
-'
- }
- ],
- 'type' => 'paragraph'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'float'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'text_arg' => 'float'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 18,
- 'macro' => ''
- }
- }
- ],
- 'extra' => {
- 'type' => {
- 'content' => [
- {}
- ],
- 'normalized' => 'Figure'
- }
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 16,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Figure'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'listoffloats',
- 'extra' => {
- 'type' => {
- 'content' => [
- {}
- ],
- 'normalized' => 'Figure'
- }
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 20,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'text' => 'Ref to node '
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'node'
- }
- ],
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'ref',
- 'extra' => {
- 'label' => {},
- 'node_argument' => {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'node'
- }
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 22,
- 'macro' => ''
- }
- },
- {
- 'text' => '.
-'
- }
- ],
- 'type' => 'paragraph'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'text' => 'Ref to '
- },
- {
- 'cmdname' => '@'
- },
- {
- 'text' => 'samp'
- },
- {
- 'cmdname' => '{'
- },
- {
- 'text' => 'node'
- },
- {
- 'cmdname' => '}'
- },
- {
- 'text' => ' '
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'node'
- }
- ],
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 24,
- 'macro' => ''
- }
- }
- ],
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'ref',
- 'extra' => {
- 'label' => {},
- 'node_argument' => {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'node'
- }
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 24,
- 'macro' => ''
- }
- },
- {
- 'text' => '.
-'
- }
- ],
- 'type' => 'paragraph'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'node'
- }
- ],
- 'normalized' => 'node'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 14,
- 'macro' => ''
- }
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'other node'
- }
- ],
- 'type' => 'line_arg'
- },
- {
- 'type' => 'line_arg'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'node'
- }
- ],
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'asis',
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 26,
- 'macro' => ''
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-',
- 'spaces_before_argument' => ' '
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'other-node'
- },
- undef,
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'node'
- }
- ],
- 'normalized' => 'other-node'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 26,
- 'macro' => ''
- }
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
- }
- ],
- 'type' => 'document_root'
-};
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[3];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[3];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}
= $result_trees{'equivalent_nodes_no_node'}{'contents'}[2];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'label'}
= $result_trees{'equivalent_nodes_no_node'}{'contents'}[2];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'node_argument'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-
-$result_texis{'equivalent_nodes_no_node'} = '\\input texinfo @c -*-texinfo-*-
-
-@c test equivalent nodes
-
-@node Top
-
-Equivalent nodes in node line and in menu.
-
-@menu
-* @strong{node}::
-* other node::
-@end menu
-
-@node node
-
-@float Figure, @samp{node}
-A figure
-@end float
-
-@listoffloats Figure
-
-Ref to node @ref{node}.
-
-Ref to @@samp@{node@} @ref{@samp{node}}.
-
-@node other node,, @asis{node}
-
-@bye
-';
-
-
-$result_texts{'equivalent_nodes_no_node'} = '
-
-Equivalent nodes in node line and in menu.
-
-* node::
-* other node::
-
-
-Figure, node
-A figure
-
-
-Ref to node node.
-
-Ref to @samp{node} node.
-
-
-';
-
-$result_nodes{'equivalent_nodes_no_node'} = {
- 'cmdname' => 'node',
- 'extra' => {
- 'menus' => [
- {
- 'cmdname' => 'menu'
- }
- ],
- 'normalized' => 'Top'
- },
- 'info' => {},
- 'structure' => {
- 'menu_child' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'node'
- },
- 'info' => {},
- 'structure' => {
- 'node_next' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'other-node'
- },
- 'info' => {},
- 'structure' => {
- 'node_prev' => {}
- }
- },
- 'node_prev' => {},
- 'node_up' => {}
- }
- },
- 'node_next' => {}
- }
-};
-$result_nodes{'equivalent_nodes_no_node'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'equivalent_nodes_no_node'}{'structure'}{'menu_child'};
-$result_nodes{'equivalent_nodes_no_node'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'equivalent_nodes_no_node'};
-$result_nodes{'equivalent_nodes_no_node'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'equivalent_nodes_no_node'};
-$result_nodes{'equivalent_nodes_no_node'}{'structure'}{'node_next'} =
$result_nodes{'equivalent_nodes_no_node'}{'structure'}{'menu_child'};
-
-$result_menus{'equivalent_nodes_no_node'} = {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'Top'
- },
- 'info' => {},
- 'structure' => {
- 'menu_child' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'node'
- },
- 'info' => {},
- 'structure' => {
- 'menu_next' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'other-node'
- },
- 'info' => {},
- 'structure' => {
- 'menu_prev' => {},
- 'menu_up' => {},
- 'menu_up_hash' => {
- 'Top' => 1
- }
- }
- },
- 'menu_up' => {},
- 'menu_up_hash' => {
- 'Top' => 1
- }
- }
- }
- }
-};
-$result_menus{'equivalent_nodes_no_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
= $result_menus{'equivalent_nodes_no_node'}{'structure'}{'menu_child'};
-$result_menus{'equivalent_nodes_no_node'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'equivalent_nodes_no_node'};
-$result_menus{'equivalent_nodes_no_node'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'equivalent_nodes_no_node'};
-
-$result_errors{'equivalent_nodes_no_node'} = [
- {
- 'error_line' => '@float `@samp{node}\' previously defined
-',
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 16,
- 'macro' => '',
- 'text' => '@float `@samp{node}\' previously defined',
- 'type' => 'error'
- },
- {
- 'error_line' => 'here is the previous definition as @node
-',
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 14,
- 'macro' => '',
- 'text' => 'here is the previous definition as @node',
- 'type' => 'error'
- },
- {
- 'error_line' => 'warning: @ref to `@samp{node}\', different from node name
`node\'
-',
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 24,
- 'macro' => '',
- 'text' => '@ref to `@samp{node}\', different from node name `node\'',
- 'type' => 'warning'
- },
- {
- 'error_line' => 'warning: @menu entry node name `@strong{node}\' different
from node name `node\'
-',
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 10,
- 'macro' => '',
- 'text' => '@menu entry node name `@strong{node}\' different from node name
`node\'',
- 'type' => 'warning'
- },
- {
- 'error_line' => 'warning: Prev pointer `@asis{node}\' (for node `other
node\') different from node name `node\'
-',
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 26,
- 'macro' => '',
- 'text' => 'Prev pointer `@asis{node}\' (for node `other node\') different
from node name `node\'',
- 'type' => 'warning'
- }
-];
-
-
-$result_floats{'equivalent_nodes_no_node'} = {
- 'Figure' => [
- {
- 'cmdname' => 'float',
- 'extra' => {
- 'type' => {
- 'content' => [
- {
- 'text' => 'Figure'
- }
- ],
- 'normalized' => 'Figure'
- }
- },
- 'info' => {}
- }
- ]
-};
-
-
-$result_converted_errors{'file_html'}->{'equivalent_nodes_no_node'} = [
- {
- 'error_line' => 'warning: must specify a title with a title command or @top
-',
- 'file_name' => 'equivalent_nodes.texi',
- 'text' => 'must specify a title with a title command or @top',
- 'type' => 'warning'
- }
-];
-
-
-1;
diff --git
a/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
b/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
deleted file mode 100644
index a0b9a08186..0000000000
---
a/tp/t/results/moresectioning/equivalent_nodes_no_node/res_html/equivalent_nodes.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
-
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-
-<a class="node" id="Top"></a>
-<p>Equivalent nodes in node line and in menu.
-</p>
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination">• <a href="#node"><strong
class="strong">node</strong></a></td><td> </td><td
class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination">• <a href="#other-node">other
node</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-</table>
-
-<a class="node" id="node"></a>
-<div class="float">
-<p>A figure
-</p><div class="type-number-float"><p><strong
class="strong">Figure</strong></p></div></div>
-<dl class="listoffloats">
-</dl>
-
-<p>Ref to node <a class="ref" href="#node">node</a>.
-</p>
-<p>Ref to @samp{node} <a class="ref" href="#node">node</a>.
-</p>
-<a class="node" id="other-node"></a>
-<hr>
-<p>
- <span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em>.</span>
-</p>
-
-
-</body>
-</html>
diff --git a/tp/t/results/moresectioning/equivalent_nodes.pl
b/tp/t/results/sectioning/equivalent_nodes_defined_linked.pl
similarity index 55%
rename from tp/t/results/moresectioning/equivalent_nodes.pl
rename to tp/t/results/sectioning/equivalent_nodes_defined_linked.pl
index 7f1e9647ce..a3cccdedbe 100644
--- a/tp/t/results/moresectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes_defined_linked.pl
@@ -5,65 +5,46 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'equivalent_nodes'} = {
+$result_trees{'equivalent_nodes_defined_linked'} = {
'contents' => [
{
- 'contents' => [
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
{
'contents' => [
{
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
+ 'text' => 'Top'
}
],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'line_arg'
},
{
'contents' => [
{
'args' => [
{
- 'text' => ' test equivalent nodes
-',
- 'type' => 'misc_arg'
+ 'contents' => [
+ {
+ 'text' => 'node'
+ }
+ ],
+ 'type' => 'brace_command_arg'
}
],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' test equivalent nodes
-'
- ]
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
}
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
- 'type' => 'before_node_section'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
}
],
'info' => {
'spaces_after_argument' => '
-'
+',
+ 'spaces_before_argument' => ' '
},
'type' => 'line_arg'
}
@@ -72,20 +53,6 @@ $result_trees{'equivalent_nodes'} = {
'contents' => [
{
'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'text' => 'Equivalent nodes in node line and in menu.
-'
- }
- ],
- 'type' => 'paragraph'
- },
- {
- 'text' => '
',
'type' => 'empty_line'
},
@@ -122,8 +89,8 @@ $result_trees{'equivalent_nodes'} = {
],
'cmdname' => 'strong',
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 10,
+ 'file_name' => '',
+ 'line_nr' => 4,
'macro' => ''
}
}
@@ -159,57 +126,8 @@ $result_trees{'equivalent_nodes'} = {
}
},
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 10,
- 'macro' => ''
- },
- 'type' => 'menu_entry'
- },
- {
- 'args' => [
- {
- 'text' => '* ',
- 'type' => 'menu_entry_leading_text'
- },
- {
- 'contents' => [
- {
- 'text' => 'other node'
- }
- ],
- 'type' => 'menu_entry_node'
- },
- {
- 'text' => '::',
- 'type' => 'menu_entry_separator'
- },
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '
-'
- }
- ],
- 'type' => 'preformatted'
- }
- ],
- 'type' => 'menu_entry_description'
- }
- ],
- 'extra' => {
- 'menu_entry_description' => {},
- 'menu_entry_node' => {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'other-node'
- }
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 11,
+ 'file_name' => '',
+ 'line_nr' => 4,
'macro' => ''
},
'type' => 'menu_entry'
@@ -237,15 +155,15 @@ $result_trees{'equivalent_nodes'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 12,
+ 'file_name' => '',
+ 'line_nr' => 5,
'macro' => ''
}
}
],
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 9,
+ 'file_name' => '',
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -265,6 +183,12 @@ $result_trees{'equivalent_nodes'} = {
{}
],
'normalized' => 'Top'
+ },
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'node'
}
],
'normalized' => 'Top'
@@ -273,8 +197,8 @@ $result_trees{'equivalent_nodes'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 5,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -325,8 +249,8 @@ $result_trees{'equivalent_nodes'} = {
],
'cmdname' => 'samp',
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 16,
+ 'file_name' => '',
+ 'line_nr' => 9,
'macro' => ''
}
}
@@ -373,8 +297,8 @@ $result_trees{'equivalent_nodes'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 18,
+ 'file_name' => '',
+ 'line_nr' => 11,
'macro' => ''
}
}
@@ -391,8 +315,8 @@ $result_trees{'equivalent_nodes'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 16,
+ 'file_name' => '',
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -429,8 +353,8 @@ $result_trees{'equivalent_nodes'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 20,
+ 'file_name' => '',
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -466,8 +390,8 @@ $result_trees{'equivalent_nodes'} = {
}
},
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 22,
+ 'file_name' => '',
+ 'line_nr' => 15,
'macro' => ''
}
},
@@ -523,8 +447,8 @@ $result_trees{'equivalent_nodes'} = {
],
'cmdname' => 'samp',
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 24,
+ 'file_name' => '',
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -543,8 +467,8 @@ $result_trees{'equivalent_nodes'} = {
}
},
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 24,
+ 'file_name' => '',
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -554,11 +478,6 @@ $result_trees{'equivalent_nodes'} = {
}
],
'type' => 'paragraph'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
}
],
'extra' => {
@@ -579,133 +498,32 @@ $result_trees{'equivalent_nodes'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 14,
+ 'file_name' => '',
+ 'line_nr' => 7,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'other node'
- }
- ],
- 'type' => 'line_arg'
- },
- {
- 'type' => 'line_arg'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'node'
- }
- ],
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'asis',
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 26,
- 'macro' => ''
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-',
- 'spaces_before_argument' => ' '
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'other-node'
- },
- undef,
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'node'
- }
- ],
- 'normalized' => 'other-node'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 26,
- 'macro' => ''
- }
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
}
],
'type' => 'document_root'
};
-$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[3];
-$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[3];
-$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[3]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}
= $result_trees{'equivalent_nodes'}{'contents'}[2];
-$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'label'}
= $result_trees{'equivalent_nodes'}{'contents'}[2];
-$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'node_argument'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0] =
$result_trees{'equivalent_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'equivalent_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0] =
$result_trees{'equivalent_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'equivalent_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'equivalent_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
= $result_trees{'equivalent_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-
-$result_texis{'equivalent_nodes'} = '\\input texinfo @c -*-texinfo-*-
-
-@c test equivalent nodes
-
-@node Top
-
-Equivalent nodes in node line and in menu.
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
=
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[3]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'label'}
= $result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'node_argument'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'label'}
= $result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'node_argument'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'equivalent_nodes_defined_linked'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+
+$result_texis{'equivalent_nodes_defined_linked'} = '@node Top, @asis{node}
@menu
* @strong{node}::
-* other node::
@end menu
@node node
@@ -719,19 +537,11 @@ A figure
Ref to node @ref{node}.
Ref to @@samp@{node@} @ref{@samp{node}}.
-
-@node other node,, @asis{node}
-
-@bye
';
-$result_texts{'equivalent_nodes'} = '
-
-Equivalent nodes in node line and in menu.
-
+$result_texts{'equivalent_nodes_defined_linked'} = '
* node::
-* other node::
Figure, node
@@ -741,11 +551,9 @@ A figure
Ref to node node.
Ref to @samp{node} node.
-
-
';
-$result_nodes{'equivalent_nodes'} = {
+$result_nodes{'equivalent_nodes_defined_linked'} = {
'cmdname' => 'node',
'extra' => {
'menus' => [
@@ -764,29 +572,16 @@ $result_nodes{'equivalent_nodes'} = {
},
'info' => {},
'structure' => {
- 'node_next' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'other-node'
- },
- 'info' => {},
- 'structure' => {
- 'node_prev' => {}
- }
- },
- 'node_prev' => {},
'node_up' => {}
}
},
'node_next' => {}
}
};
-$result_nodes{'equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'equivalent_nodes'}{'structure'}{'menu_child'};
-$result_nodes{'equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'equivalent_nodes'};
-$result_nodes{'equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'equivalent_nodes'};
-$result_nodes{'equivalent_nodes'}{'structure'}{'node_next'} =
$result_nodes{'equivalent_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'equivalent_nodes_defined_linked'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'equivalent_nodes_defined_linked'};
+$result_nodes{'equivalent_nodes_defined_linked'}{'structure'}{'node_next'} =
$result_nodes{'equivalent_nodes_defined_linked'}{'structure'}{'menu_child'};
-$result_menus{'equivalent_nodes'} = {
+$result_menus{'equivalent_nodes_defined_linked'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
@@ -800,20 +595,6 @@ $result_menus{'equivalent_nodes'} = {
},
'info' => {},
'structure' => {
- 'menu_next' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'other-node'
- },
- 'info' => {},
- 'structure' => {
- 'menu_prev' => {},
- 'menu_up' => {},
- 'menu_up_hash' => {
- 'Top' => 1
- }
- }
- },
'menu_up' => {},
'menu_up_hash' => {
'Top' => 1
@@ -822,16 +603,14 @@ $result_menus{'equivalent_nodes'} = {
}
}
};
-$result_menus{'equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
= $result_menus{'equivalent_nodes'}{'structure'}{'menu_child'};
-$result_menus{'equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'equivalent_nodes'};
-$result_menus{'equivalent_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'equivalent_nodes'};
+$result_menus{'equivalent_nodes_defined_linked'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'equivalent_nodes_defined_linked'};
-$result_errors{'equivalent_nodes'} = [
+$result_errors{'equivalent_nodes_defined_linked'} = [
{
'error_line' => '@float `@samp{node}\' previously defined
',
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 16,
+ 'file_name' => '',
+ 'line_nr' => 9,
'macro' => '',
'text' => '@float `@samp{node}\' previously defined',
'type' => 'error'
@@ -839,8 +618,8 @@ $result_errors{'equivalent_nodes'} = [
{
'error_line' => 'here is the previous definition as @node
',
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 14,
+ 'file_name' => '',
+ 'line_nr' => 7,
'macro' => '',
'text' => 'here is the previous definition as @node',
'type' => 'error'
@@ -848,8 +627,8 @@ $result_errors{'equivalent_nodes'} = [
{
'error_line' => 'warning: @ref to `@samp{node}\', different from node name
`node\'
',
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 24,
+ 'file_name' => '',
+ 'line_nr' => 17,
'macro' => '',
'text' => '@ref to `@samp{node}\', different from node name `node\'',
'type' => 'warning'
@@ -857,25 +636,25 @@ $result_errors{'equivalent_nodes'} = [
{
'error_line' => 'warning: @menu entry node name `@strong{node}\' different
from node name `node\'
',
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 10,
+ 'file_name' => '',
+ 'line_nr' => 4,
'macro' => '',
'text' => '@menu entry node name `@strong{node}\' different from node name
`node\'',
'type' => 'warning'
},
{
- 'error_line' => 'warning: Prev pointer `@asis{node}\' (for node `other
node\') different from node name `node\'
+ 'error_line' => 'warning: Next pointer `@asis{node}\' (for node `Top\')
different from node name `node\'
',
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 26,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => '',
- 'text' => 'Prev pointer `@asis{node}\' (for node `other node\') different
from node name `node\'',
+ 'text' => 'Next pointer `@asis{node}\' (for node `Top\') different from
node name `node\'',
'type' => 'warning'
}
];
-$result_floats{'equivalent_nodes'} = {
+$result_floats{'equivalent_nodes_defined_linked'} = {
'Figure' => [
{
'cmdname' => 'float',
@@ -889,17 +668,114 @@ $result_floats{'equivalent_nodes'} = {
'normalized' => 'Figure'
}
},
- 'info' => {}
+ 'info' => {},
+ 'structure' => {}
}
]
};
-$result_converted_errors{'file_html'}->{'equivalent_nodes'} = [
+
+$result_converted{'info'}->{'equivalent_nodes_defined_linked'} = 'This is ,
produced from .
+
+
+File: , Node: Top, Next: node, Up: (dir)
+
+* Menu:
+
+* *node*::
+
+
+File: , Node: node, Up: Top
+
+A figure
+
+Figure
+* Menu:
+
+* Figure: ‘node’.
+
+ Ref to node *note node::.
+
+ Ref to @samp{node} *note node::.
+
+
+Tag Table:
+Node: Top27
+Node: node95
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
+';
+
+
+$result_converted{'html'}->{'equivalent_nodes_defined_linked'} = '<!DOCTYPE
html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<style type="text/css">
+<!--
+td.menu-entry-description {vertical-align: top}
+td.menu-entry-destination {vertical-align: top}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<a class="node-id" id="Top"></a><div class="nav-panel">
+<p>
+Next: <a href="#node" accesskey="n" rel="next">node</a> </p>
+</div>
+<h1 class="node">Top</h1>
+
+<table class="menu" border="0" cellspacing="0">
+<tr><td class="menu-entry-destination">• <a href="#node"
accesskey="1"><strong
class="strong">node</strong></a>:</td><td> </td><td
class="menu-entry-description">
+</td></tr>
+</table>
+
+<hr>
+<a class="node-id" id="node"></a><div class="nav-panel">
+<p>
+Up: <a href="#Top" accesskey="u" rel="up">Top</a> </p>
+</div>
+<h4 class="node">node</h4>
+
+<div class="float">
+<p>A figure
+</p><div class="type-number-float"><p><strong
class="strong">Figure</strong></p></div></div>
+<dl class="listoffloats">
+</dl>
+
+<p>Ref to node <a class="ref" href="#node">node</a>.
+</p>
+<p>Ref to @samp{node} <a class="ref" href="#node">node</a>.
+</p>
+
+
+</body>
+</html>
+';
+
+$result_converted_errors{'html'}->{'equivalent_nodes_defined_linked'} = [
{
'error_line' => 'warning: must specify a title with a title command or @top
',
- 'file_name' => 'equivalent_nodes.texi',
'text' => 'must specify a title with a title command or @top',
'type' => 'warning'
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/30sectioning.t, tp/t/96moresectioning.t: inline equivalent_nodes.texi in tp/t/30sectioning.t, renaming the corresponding test as equivalent_nodes_defined_linked. Remove equivalent_nodes.texi and the tests in tp/t/96moresectioning.t.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/t/input_files/equivalent_nodes.texi: do not use a node before Top for this test, but, more simply a regular node.
- Next by Date:
branch master updated: * tp/Makefile.tres, tp/t/96moresectioning.t: do not use the texi2html style for node_footnote.texi related tests, instead set only the relevant customization variables. Add a test with node_footnote.texi, split at node with separate footnotestyle.
- Previous by thread:
branch master updated: * tp/t/input_files/equivalent_nodes.texi: do not use a node before Top for this test, but, more simply a regular node.
- Next by thread:
branch master updated: * tp/Makefile.tres, tp/t/96moresectioning.t: do not use the texi2html style for node_footnote.texi related tests, instead set only the relevant customization variables. Add a test with node_footnote.texi, split at node with separate footnotestyle.
- Index(es):