[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Structuring.pm Texinfo/Conve...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Structuring.pm Texinfo/Conve... |
|
Date: |
Thu, 12 Jul 2012 18:09:20 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/07/12 18:09:19
Modified files:
tp/Texinfo : Structuring.pm
tp/Texinfo/Convert: Plaintext.pm
tp/t : 30sectioning.t
tp/t/results/converters_tests: ref_in_sectioning.pl
tp/t/results/info_tests: top_node_normalization.pl
tp/t/results/invalid_nestings: ref_in_ref.pl
tp/t/results/sectioning: double_top.pl double_top_in_menu.pl
equivalent_nodes.pl ref_to_top.pl
top_node_no_menu_direction.pl
tp/tests/sectioning/res_parser/equivalent_nodes:
equivalent_nodes.2
tp/tests/sectioning/res_parser/equivalent_nodes_no_node:
equivalent_nodes.2
tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes:
equivalent_nodes.2
tp/tests/sectioning/res_parser_html/equivalent_nodes:
equivalent_nodes.2
tp/tests/sectioning/res_parser_html/equivalent_nodes_no_node:
equivalent_nodes.2
tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes:
equivalent_nodes.2
Added files:
tp/t/results/sectioning: equivalent_labels.pl
Log message:
Improve different expansion messages by adding the original command
name.
Remove a check in Info that is now redundant with the warnings on
texinfo
code.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.131&r2=1.132
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.213&r2=1.214
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/30sectioning.t?cvsroot=texinfo&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/top_node_normalization.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/ref_in_ref.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_top.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_top_in_menu.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/equivalent_nodes.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/ref_to_top.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/top_node_no_menu_direction.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/equivalent_labels.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes/equivalent_nodes.2?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_no_node/equivalent_nodes.2?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes/equivalent_nodes.2?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes_no_node/equivalent_nodes.2?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2?cvsroot=texinfo&r1=1.2&r2=1.3
Patches:
Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- Texinfo/Structuring.pm 10 Jul 2012 21:36:20 -0000 1.131
+++ Texinfo/Structuring.pm 12 Jul 2012 18:09:18 -0000 1.132
@@ -577,9 +577,10 @@
if (! $self->{'novalidate'} and !
_check_node_same_texinfo_code($menu_node,
$menu_content->{'extra'}->{'menu_entry_node'})) {
$self->line_warn(sprintf($self->
- __("Menu entry node name `%s' different from main name
`%s'"),
+ __("Menu entry node name `%s' different from %s name
`%s'"),
Texinfo::Parser::_node_extra_to_texi(
$menu_content->{'extra'}->{'menu_entry_node'}),
+ $menu_node->{'cmdname'},
Texinfo::Parser::_node_extra_to_texi($menu_node->{'extra'})),
$menu_content->{'line_nr'});
}
@@ -730,18 +731,21 @@
}
} else {
if ($self->{'labels'}->{$node_direction->{'normalized'}}) {
- $node->{'node_'.$direction}
+ my $node_target
= $self->{'labels'}->{$node_direction->{'normalized'}};
+ $node->{'node_'.$direction} = $node_target;
+
if (! $self->{'novalidate'} and ! _check_node_same_texinfo_code(
- $self->{'labels'}->{$node_direction->{'normalized'}},
- $node_direction)) {
+ $node_target, $node_direction)) {
+
$self->line_warn(sprintf($self->
- __("Node direction %s `%s' different from main name `%s'"),
+ __("Node direction %s `%s' different from %s name `%s'"),
$direction_texts{$direction},
Texinfo::Parser::_node_extra_to_texi(
$node_direction),
+ $node_target->{'cmdname'},
Texinfo::Parser::_node_extra_to_texi(
- $self->{'labels'}->{$node_direction->{'normalized'}}->{'extra'})),
+ $node_target->{'extra'})),
$node->{'line_nr'});
}
} else {
@@ -1278,18 +1282,19 @@
$ref->{'extra'}->{'node_argument'})),
$ref->{'line_nr'})
} else {
- $ref->{'extra'}->{'label'}
+ my $node_target
= $labels->{$ref->{'extra'}->{'node_argument'}->{'normalized'}};
+ $ref->{'extra'}->{'label'} = $node_target;
if (! $self->{'novalidate'} and ! _check_node_same_texinfo_code(
- $labels->{$ref->{'extra'}->{'node_argument'}->{'normalized'}},
- $ref->{'extra'}->{'node_argument'})) {
+ $node_target, $ref->{'extra'}->{'node_argument'})) {
$self->line_warn(sprintf($self->
- __("address@hidden reference `%s' different from main name `%s'"),
+ __("address@hidden to `%s', different from %s name `%s'"),
$ref->{'cmdname'},
Texinfo::Parser::_node_extra_to_texi(
$ref->{'extra'}->{'node_argument'}),
+ $node_target->{'cmdname'},
Texinfo::Parser::_node_extra_to_texi(
- $labels->{$ref->{'extra'}->{'node_argument'}->{'normalized'}}->{'extra'})),
+ $node_target->{'extra'})),
$ref->{'line_nr'});
}
}
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -b -r1.213 -r1.214
--- Texinfo/Convert/Plaintext.pm 8 Jul 2012 08:25:05 -0000 1.213
+++ Texinfo/Convert/Plaintext.pm 12 Jul 2012 18:09:18 -0000 1.214
@@ -2577,41 +2577,6 @@
}
foreach my $arg (@{$root->{'args'}}) {
if ($arg->{'type'} eq 'menu_entry_node') {
- if ($menu_entry_internal_node) {
- if ($self->get_conf('DEBUG')) {
- print STDERR "\n ------------- BEGIN ignored 2 node formatting
for error report -------------\n";
- }
- # check that after space collapse the info reader will find the
- # node. But always expand what the user provided for the
- # menu entry, to keep the user defined spacing.
- my $saved_error_nrs = $self->{'error_nrs'};
- my $saved_error_errors_warnings = $self->{'errors_warnings'};
- $self->{'errors_warnings'} = [];
- push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0};
- my $internal_node = Texinfo::Common::normalize_top_node_name(
- $self->convert_line({'type' => 'code',
- 'contents'
- => $menu_entry_internal_node->{'extra'}->{'node_content'}}));
- my $menu_node = Texinfo::Common::normalize_top_node_name(
- $self->convert_line({'type' => 'code',
- 'contents'
- => $arg->{'contents'}}));
- $self->{'error_nrs'} = $saved_error_nrs;
- $self->{'errors_warnings'} = $saved_error_errors_warnings;
- # trailing spaces for node in menu are not very predictable.
- # therefore they are ignored, and they are ignored in both
- # case, in case there where protected spaces at the end of a node.
- $internal_node =~ s/\s*$//;
- $menu_node =~ s/\s*$//;
- if ($internal_node ne $menu_node) {
- $self->line_warn(sprintf($self->__("Node expansion `%s' in menu
differs from normal node expansion `%s'"),
- $menu_node, $internal_node), $root->{'line_nr'});
- }
- pop @{$self->{'count_context'}};
- if ($self->get_conf('DEBUG')) {
- print STDERR " ------------- END ignored 2 node formatting for
error report -------------\n\n";
- }
- }
$result .= $self->_convert({'type' => 'code',
'contents' => $arg->{'contents'}});
} else {
Index: t/30sectioning.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/30sectioning.t,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- t/30sectioning.t 3 Mar 2012 11:33:59 -0000 1.79
+++ t/30sectioning.t 12 Jul 2012 18:09:18 -0000 1.80
@@ -611,6 +611,20 @@
@xref{node}.
'],
+['equivalent_labels',
+'@node Top
+
address@hidden@samp{anch}}.
+
address@hidden truc, floa
+In float
address@hidden float
+
address@hidden
+* anch::
+* @code{floa}::
address@hidden menu
+'],
['anchor_in_footnote',
$anchor_in_footnote_text
],
Index: t/results/converters_tests/ref_in_sectioning.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/ref_in_sectioning.pl 10 Jul 2012 21:36:20
-0000 1.4
+++ t/results/converters_tests/ref_in_sectioning.pl 12 Jul 2012 18:09:18
-0000 1.5
@@ -2928,12 +2928,12 @@
$result_errors{'ref_in_sectioning'} = [
{
- 'error_line' => ':19: warning: @ref reference address@hidden' different
from main name `node\'
+ 'error_line' => ':19: warning: @ref to address@hidden', different from
node name `node\'
',
'file_name' => '',
'line_nr' => 19,
'macro' => '',
- 'text' => '@ref reference address@hidden' different from main name
`node\'',
+ 'text' => '@ref to address@hidden', different from node name `node\'',
'type' => 'warning'
}
];
Index: t/results/info_tests/top_node_normalization.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/top_node_normalization.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/info_tests/top_node_normalization.pl 10 Jul 2012 21:36:20
-0000 1.15
+++ t/results/info_tests/top_node_normalization.pl 12 Jul 2012 18:09:18
-0000 1.16
@@ -403,30 +403,30 @@
$result_errors{'top_node_normalization'} = [
{
- 'error_line' => ':3: warning: @xref reference `TOP\' different from main
name `ToP\'
+ 'error_line' => ':3: warning: @xref to `TOP\', different from node name
`ToP\'
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => '@xref reference `TOP\' different from main name `ToP\'',
+ 'text' => '@xref to `TOP\', different from node name `ToP\'',
'type' => 'warning'
},
{
- 'error_line' => ':3: warning: @xref reference `tOP\' different from main
name `ToP\'
+ 'error_line' => ':3: warning: @xref to `tOP\', different from node name
`ToP\'
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => '@xref reference `tOP\' different from main name `ToP\'',
+ 'text' => '@xref to `tOP\', different from node name `ToP\'',
'type' => 'warning'
},
{
- 'error_line' => ':6: warning: Menu entry node name `tOP\' different from
main name `ToP\'
+ 'error_line' => ':6: warning: Menu entry node name `tOP\' different from
node name `ToP\'
',
'file_name' => '',
'line_nr' => 6,
'macro' => '',
- 'text' => 'Menu entry node name `tOP\' different from main name `ToP\'',
+ 'text' => 'Menu entry node name `tOP\' different from node name `ToP\'',
'type' => 'warning'
},
{
Index: t/results/invalid_nestings/ref_in_ref.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/invalid_nestings/ref_in_ref.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/invalid_nestings/ref_in_ref.pl 10 Jul 2012 21:36:20 -0000
1.7
+++ t/results/invalid_nestings/ref_in_ref.pl 12 Jul 2012 18:09:18 -0000
1.8
@@ -203,12 +203,12 @@
'type' => 'warning'
},
{
- 'error_line' => ':2: warning: @ref reference address@hidden' different
from main name `Top\'
+ 'error_line' => ':2: warning: @ref to address@hidden', different from node
name `Top\'
',
'file_name' => '',
'line_nr' => 2,
'macro' => '',
- 'text' => '@ref reference address@hidden' different from main name `Top\'',
+ 'text' => '@ref to address@hidden', different from node name `Top\'',
'type' => 'warning'
}
];
Index: t/results/sectioning/double_top.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/double_top.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/sectioning/double_top.pl 10 Jul 2012 21:36:21 -0000 1.23
+++ t/results/sectioning/double_top.pl 12 Jul 2012 18:09:18 -0000 1.24
@@ -325,12 +325,12 @@
'type' => 'error continuation'
},
{
- 'error_line' => ':1: warning: Node direction Next `top\' different from
main name `ToP\'
+ 'error_line' => ':1: warning: Node direction Next `top\' different from
node name `ToP\'
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'Node direction Next `top\' different from main name `ToP\'',
+ 'text' => 'Node direction Next `top\' different from node name `ToP\'',
'type' => 'warning'
}
];
Index: t/results/sectioning/double_top_in_menu.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/double_top_in_menu.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/double_top_in_menu.pl 10 Jul 2012 21:36:21 -0000
1.14
+++ t/results/sectioning/double_top_in_menu.pl 12 Jul 2012 18:09:19 -0000
1.15
@@ -532,30 +532,30 @@
'type' => 'error continuation'
},
{
- 'error_line' => ':5: warning: Menu entry node name `top\' different from
main name `ToP\'
+ 'error_line' => ':5: warning: Menu entry node name `top\' different from
node name `ToP\'
',
'file_name' => '',
'line_nr' => 5,
'macro' => '',
- 'text' => 'Menu entry node name `top\' different from main name `ToP\'',
+ 'text' => 'Menu entry node name `top\' different from node name `ToP\'',
'type' => 'warning'
},
{
- 'error_line' => ':6: warning: Menu entry node name `TOP\' different from
main name `ToP\'
+ 'error_line' => ':6: warning: Menu entry node name `TOP\' different from
node name `ToP\'
',
'file_name' => '',
'line_nr' => 6,
'macro' => '',
- 'text' => 'Menu entry node name `TOP\' different from main name `ToP\'',
+ 'text' => 'Menu entry node name `TOP\' different from node name `ToP\'',
'type' => 'warning'
},
{
- 'error_line' => ':1: warning: Node direction Next `top\' different from
main name `ToP\'
+ 'error_line' => ':1: warning: Node direction Next `top\' different from
node name `ToP\'
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'Node direction Next `top\' different from main name `ToP\'',
+ 'text' => 'Node direction Next `top\' different from node name `ToP\'',
'type' => 'warning'
}
];
Index: t/results/sectioning/equivalent_nodes.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/equivalent_nodes.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/sectioning/equivalent_nodes.pl 10 Jul 2012 21:36:21 -0000
1.17
+++ t/results/sectioning/equivalent_nodes.pl 12 Jul 2012 18:09:19 -0000
1.18
@@ -496,30 +496,30 @@
$result_errors{'equivalent_nodes'} = [
{
- 'error_line' => ':9: warning: @xref reference `node\' different from main
name address@hidden'
+ 'error_line' => ':9: warning: @xref to `node\', different from node name
address@hidden'
',
'file_name' => '',
'line_nr' => 9,
'macro' => '',
- 'text' => '@xref reference `node\' different from main name
address@hidden'',
+ 'text' => '@xref to `node\', different from node name address@hidden'',
'type' => 'warning'
},
{
- 'error_line' => ':4: warning: Menu entry node name address@hidden'
different from main name address@hidden'
+ 'error_line' => ':4: warning: Menu entry node name address@hidden'
different from node name address@hidden'
',
'file_name' => '',
'line_nr' => 4,
'macro' => '',
- 'text' => 'Menu entry node name address@hidden' different from main name
address@hidden'',
+ 'text' => 'Menu entry node name address@hidden' different from node name
address@hidden'',
'type' => 'warning'
},
{
- 'error_line' => ':1: warning: Node direction Next address@hidden'
different from main name address@hidden'
+ 'error_line' => ':1: warning: Node direction Next address@hidden'
different from node name address@hidden'
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'Node direction Next address@hidden' different from main name
address@hidden'',
+ 'text' => 'Node direction Next address@hidden' different from node name
address@hidden'',
'type' => 'warning'
}
];
@@ -548,19 +548,6 @@
End Tag Table
';
-$result_converted_errors{'info'}->{'equivalent_nodes'} = [
- {
- 'file_name' => '',
- 'error_line' => ':4: warning: Node expansion `*node*\' in menu differs
from normal node expansion `\'node\'\'
-',
- 'text' => 'Node expansion `*node*\' in menu differs from normal node
expansion `\'node\'\'',
- 'type' => 'warning',
- 'macro' => '',
- 'line_nr' => 4
- }
-];
-
-
$result_converted{'html'}->{'equivalent_nodes'} = '<!DOCTYPE html PUBLIC
"-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: t/results/sectioning/ref_to_top.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/ref_to_top.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/sectioning/ref_to_top.pl 10 Jul 2012 21:36:21 -0000 1.3
+++ t/results/sectioning/ref_to_top.pl 12 Jul 2012 18:09:19 -0000 1.4
@@ -261,12 +261,12 @@
$result_errors{'ref_to_top'} = [
{
- 'error_line' => ':5: warning: @xref reference `TOP\' different from main
name `ToP\'
+ 'error_line' => ':5: warning: @xref to `TOP\', different from node name
`ToP\'
',
'file_name' => '',
'line_nr' => 5,
'macro' => '',
- 'text' => '@xref reference `TOP\' different from main name `ToP\'',
+ 'text' => '@xref to `TOP\', different from node name `ToP\'',
'type' => 'warning'
}
];
Index: t/results/sectioning/top_node_no_menu_direction.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/top_node_no_menu_direction.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/sectioning/top_node_no_menu_direction.pl 10 Jul 2012 21:36:21
-0000 1.18
+++ t/results/sectioning/top_node_no_menu_direction.pl 12 Jul 2012 18:09:19
-0000 1.19
@@ -492,12 +492,12 @@
$result_errors{'top_node_no_menu_direction'} = [
{
- 'error_line' => ':5: warning: Menu entry node name `TOP\' different from
main name `Top\'
+ 'error_line' => ':5: warning: Menu entry node name `TOP\' different from
node name `Top\'
',
'file_name' => '',
'line_nr' => 5,
'macro' => '',
- 'text' => 'Menu entry node name `TOP\' different from main name `Top\'',
+ 'text' => 'Menu entry node name `TOP\' different from node name `Top\'',
'type' => 'warning'
},
{
@@ -510,21 +510,21 @@
'type' => 'warning'
},
{
- 'error_line' => ':8: warning: Node direction Prev `top\' different from
main name `Top\'
+ 'error_line' => ':8: warning: Node direction Prev `top\' different from
node name `Top\'
',
'file_name' => '',
'line_nr' => 8,
'macro' => '',
- 'text' => 'Node direction Prev `top\' different from main name `Top\'',
+ 'text' => 'Node direction Prev `top\' different from node name `Top\'',
'type' => 'warning'
},
{
- 'error_line' => ':8: warning: Node direction Up `TOP\' different from main
name `Top\'
+ 'error_line' => ':8: warning: Node direction Up `TOP\' different from node
name `Top\'
',
'file_name' => '',
'line_nr' => 8,
'macro' => '',
- 'text' => 'Node direction Up `TOP\' different from main name `Top\'',
+ 'text' => 'Node direction Up `TOP\' different from node name `Top\'',
'type' => 'warning'
}
];
Index: tests/sectioning/res_parser/equivalent_nodes/equivalent_nodes.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes/equivalent_nodes.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/sectioning/res_parser/equivalent_nodes/equivalent_nodes.2 10 Jul
2012 21:36:23 -0000 1.2
+++ tests/sectioning/res_parser/equivalent_nodes/equivalent_nodes.2 12 Jul
2012 18:09:19 -0000 1.3
@@ -1,9 +1,9 @@
equivalent_nodes.texi:17: @float address@hidden' previously defined
equivalent_nodes.texi:15: here is the previous definition as @node
-equivalent_nodes.texi:25: warning: @ref reference address@hidden' different
from main name `node'
-equivalent_nodes.texi:12: warning: Menu entry node name address@hidden'
different from main name `node'
+equivalent_nodes.texi:25: warning: @ref to address@hidden', different from
node name `node'
+equivalent_nodes.texi:12: warning: Menu entry node name address@hidden'
different from node name `node'
equivalent_nodes.texi:5: warning: unreferenced node `before top'
-equivalent_nodes.texi:5: warning: Node direction Next address@hidden'
different from main name `node'
+equivalent_nodes.texi:5: warning: Node direction Next address@hidden'
different from node name `node'
equivalent_nodes-noderename.cnf:8: no node to be renamed
equivalent_nodes-noderename.cnf:10: nodes without a new name at the end of file
warning: Must specify a title with a title command or @top
Index: tests/sectioning/res_parser/equivalent_nodes_no_node/equivalent_nodes.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_no_node/equivalent_nodes.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/sectioning/res_parser/equivalent_nodes_no_node/equivalent_nodes.2
10 Jul 2012 21:36:23 -0000 1.2
+++ tests/sectioning/res_parser/equivalent_nodes_no_node/equivalent_nodes.2
12 Jul 2012 18:09:19 -0000 1.3
@@ -1,9 +1,9 @@
equivalent_nodes.texi:17: @float address@hidden' previously defined
equivalent_nodes.texi:15: here is the previous definition as @node
-equivalent_nodes.texi:25: warning: @ref reference address@hidden' different
from main name `node'
-equivalent_nodes.texi:12: warning: Menu entry node name address@hidden'
different from main name `node'
+equivalent_nodes.texi:25: warning: @ref to address@hidden', different from
node name `node'
+equivalent_nodes.texi:12: warning: Menu entry node name address@hidden'
different from node name `node'
equivalent_nodes.texi:5: warning: unreferenced node `before top'
-equivalent_nodes.texi:5: warning: Node direction Next address@hidden'
different from main name `node'
+equivalent_nodes.texi:5: warning: Node direction Next address@hidden'
different from node name `node'
equivalent_nodes-noderename.cnf:8: no node to be renamed
equivalent_nodes-noderename.cnf:10: nodes without a new name at the end of file
warning: Must specify a title with a title command or @top
Index:
tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
10 Jul 2012 21:36:24 -0000 1.2
+++
tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
12 Jul 2012 18:09:19 -0000 1.3
@@ -1,9 +1,9 @@
equivalent_nodes.texi:17: @float address@hidden' previously defined
equivalent_nodes.texi:15: here is the previous definition as @node
-equivalent_nodes.texi:25: warning: @ref reference address@hidden' different
from main name `node'
-equivalent_nodes.texi:12: warning: Menu entry node name address@hidden'
different from main name `node'
+equivalent_nodes.texi:25: warning: @ref to address@hidden', different from
node name `node'
+equivalent_nodes.texi:12: warning: Menu entry node name address@hidden'
different from node name `node'
equivalent_nodes.texi:5: warning: unreferenced node `before top'
-equivalent_nodes.texi:5: warning: Node direction Next address@hidden'
different from main name `node'
+equivalent_nodes.texi:5: warning: Node direction Next address@hidden'
different from node name `node'
equivalent_nodes-noderename.cnf:8: no node to be renamed
equivalent_nodes-noderename.cnf:10: nodes without a new name at the end of file
warning: Must specify a title with a title command or @top
Index: tests/sectioning/res_parser_html/equivalent_nodes/equivalent_nodes.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes/equivalent_nodes.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/sectioning/res_parser_html/equivalent_nodes/equivalent_nodes.2
10 Jul 2012 21:36:24 -0000 1.2
+++ tests/sectioning/res_parser_html/equivalent_nodes/equivalent_nodes.2
12 Jul 2012 18:09:19 -0000 1.3
@@ -1,9 +1,9 @@
equivalent_nodes.texi:17: @float address@hidden' previously defined
equivalent_nodes.texi:15: here is the previous definition as @node
-equivalent_nodes.texi:25: warning: @ref reference address@hidden' different
from main name `node'
-equivalent_nodes.texi:12: warning: Menu entry node name address@hidden'
different from main name `node'
+equivalent_nodes.texi:25: warning: @ref to address@hidden', different from
node name `node'
+equivalent_nodes.texi:12: warning: Menu entry node name address@hidden'
different from node name `node'
equivalent_nodes.texi:5: warning: unreferenced node `before top'
-equivalent_nodes.texi:5: warning: Node direction Next address@hidden'
different from main name `node'
+equivalent_nodes.texi:5: warning: Node direction Next address@hidden'
different from node name `node'
equivalent_nodes-noderename.cnf:8: no node to be renamed
equivalent_nodes-noderename.cnf:10: nodes without a new name at the end of file
warning: Must specify a title with a title command or @top
Index:
tests/sectioning/res_parser_html/equivalent_nodes_no_node/equivalent_nodes.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes_no_node/equivalent_nodes.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
tests/sectioning/res_parser_html/equivalent_nodes_no_node/equivalent_nodes.2
10 Jul 2012 21:36:24 -0000 1.2
+++
tests/sectioning/res_parser_html/equivalent_nodes_no_node/equivalent_nodes.2
12 Jul 2012 18:09:19 -0000 1.3
@@ -1,9 +1,9 @@
equivalent_nodes.texi:17: @float address@hidden' previously defined
equivalent_nodes.texi:15: here is the previous definition as @node
-equivalent_nodes.texi:25: warning: @ref reference address@hidden' different
from main name `node'
-equivalent_nodes.texi:12: warning: Menu entry node name address@hidden'
different from main name `node'
+equivalent_nodes.texi:25: warning: @ref to address@hidden', different from
node name `node'
+equivalent_nodes.texi:12: warning: Menu entry node name address@hidden'
different from node name `node'
equivalent_nodes.texi:5: warning: unreferenced node `before top'
-equivalent_nodes.texi:5: warning: Node direction Next address@hidden'
different from main name `node'
+equivalent_nodes.texi:5: warning: Node direction Next address@hidden'
different from node name `node'
equivalent_nodes-noderename.cnf:8: no node to be renamed
equivalent_nodes-noderename.cnf:10: nodes without a new name at the end of file
warning: Must specify a title with a title command or @top
Index:
tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
10 Jul 2012 21:36:24 -0000 1.2
+++
tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
12 Jul 2012 18:09:19 -0000 1.3
@@ -1,9 +1,9 @@
equivalent_nodes.texi:17: @float address@hidden' previously defined
equivalent_nodes.texi:15: here is the previous definition as @node
-equivalent_nodes.texi:25: warning: @ref reference address@hidden' different
from main name `node'
-equivalent_nodes.texi:12: warning: Menu entry node name address@hidden'
different from main name `node'
+equivalent_nodes.texi:25: warning: @ref to address@hidden', different from
node name `node'
+equivalent_nodes.texi:12: warning: Menu entry node name address@hidden'
different from node name `node'
equivalent_nodes.texi:5: warning: unreferenced node `before top'
-equivalent_nodes.texi:5: warning: Node direction Next address@hidden'
different from main name `node'
+equivalent_nodes.texi:5: warning: Node direction Next address@hidden'
different from node name `node'
equivalent_nodes-noderename.cnf:8: no node to be renamed
equivalent_nodes-noderename.cnf:10: nodes without a new name at the end of file
warning: Must specify a title with a title command or @top
Index: t/results/sectioning/equivalent_labels.pl
===================================================================
RCS file: t/results/sectioning/equivalent_labels.pl
diff -N t/results/sectioning/equivalent_labels.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/sectioning/equivalent_labels.pl 12 Jul 2012 18:09:19 -0000
1.1
@@ -0,0 +1,827 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'equivalent_labels'} = {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'text_root'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'anch'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'samp',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'anchor',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'anch'
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'truc'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'floa'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'float',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'In float
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'float'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'float',
+ 'text_arg' => 'float'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ],
+ [
+ {}
+ ]
+ ],
+ 'end_command' => {},
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'floa',
+ 'type' => {
+ 'content' => [
+ {}
+ ],
+ 'normalized' => 'truc'
+ }
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'number' => 1,
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'menu',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => '* ',
+ 'type' => 'menu_entry_leading_text'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'anch'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_node'
+ },
+ {
+ 'parent' => {},
+ 'text' => '::',
+ 'type' => 'menu_entry_separator'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_description'
+ }
+ ],
+ 'extra' => {
+ 'menu_entry_description' => {},
+ 'menu_entry_node' => {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'anch'
+ }
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'menu_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => '* ',
+ 'type' => 'menu_entry_leading_text'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'floa'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_node'
+ },
+ {
+ 'parent' => {},
+ 'text' => '::',
+ 'type' => 'menu_entry_separator'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_description'
+ }
+ ],
+ 'extra' => {
+ 'menu_entry_description' => {},
+ 'menu_entry_node' => {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'floa'
+ }
+ },
+ 'line_nr' => {},
+ 'parent' => {},
+ 'type' => 'menu_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'menu'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'menu',
+ 'text_arg' => 'menu'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'equivalent_labels'}{'contents'}[0]{'parent'} =
$result_trees{'equivalent_labels'};
+$result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'equivalent_labels'}{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'equivalent_labels'}{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'equivalent_labels'}{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'line_nr'} =
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'equivalent_labels'}{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[2];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'equivalent_labels'}{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'equivalent_labels'}{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'extra'}{'block_command_line_contents'}[1][0]
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'extra'}{'end_command'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'extra'}{'node_content'}[0]
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'equivalent_labels'}{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'equivalent_labels'}{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[1]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[2]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[3]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[3];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[3]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[3];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[1]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[1]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[2]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[3];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[3]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'extra'}{'menu_entry_description'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[3];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[1]{'contents'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'line_nr'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3]{'args'}[0];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3]{'parent'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'extra'}{'end_command'}
=
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[3];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'equivalent_labels'}{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'extra'}{'node_content'}[0]
= $result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'equivalent_labels'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
= $result_trees{'equivalent_labels'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'equivalent_labels'}{'contents'}[1]{'parent'} =
$result_trees{'equivalent_labels'};
+
+$result_texis{'equivalent_labels'} = '@node Top
+
address@hidden@samp{anch}}.
+
address@hidden truc, floa
+In float
address@hidden float
+
address@hidden
+* anch::
+* @code{floa}::
address@hidden menu
+';
+
+
+$result_texts{'equivalent_labels'} = '
+.
+
+truc, floa
+In float
+
+* anch::
+* floa::
+';
+
+$result_sectioning{'equivalent_labels'} = {};
+
+$result_nodes{'equivalent_labels'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'menu_child' => {
+ 'cmdname' => 'anchor',
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {
+ 'cmdname' => 'samp'
+ }
+ ]
+ ],
+ 'normalized' => 'anch'
+ },
+ 'node_prev' => {}
+ },
+ 'menus' => [
+ {
+ 'cmdname' => 'menu',
+ 'extra' => {
+ 'end_command' => {
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'menu',
+ 'text_arg' => 'menu'
+ }
+ }
+ }
+ }
+ ],
+ 'node_next' => {},
+ 'node_up' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'dir'
+ }
+ ],
+ 'top_node_up' => {}
+ },
+ 'type' => 'top_node_up'
+ }
+};
+$result_nodes{'equivalent_labels'}{'menu_child'}{'node_prev'} =
$result_nodes{'equivalent_labels'};
+$result_nodes{'equivalent_labels'}{'menus'}[0]{'extra'}{'end_command'}{'extra'}{'command'}
= $result_nodes{'equivalent_labels'}{'menus'}[0];
+$result_nodes{'equivalent_labels'}{'node_next'} =
$result_nodes{'equivalent_labels'}{'menu_child'};
+$result_nodes{'equivalent_labels'}{'node_up'}{'extra'}{'top_node_up'} =
$result_nodes{'equivalent_labels'};
+
+$result_menus{'equivalent_labels'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'menu_child' => {
+ 'cmdname' => 'anchor',
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {
+ 'cmdname' => 'samp'
+ }
+ ]
+ ],
+ 'normalized' => 'anch'
+ },
+ 'menu_next' => {
+ 'cmdname' => 'float',
+ 'extra' => {
+ 'end_command' => {
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'float',
+ 'text_arg' => 'float'
+ }
+ },
+ 'normalized' => 'floa',
+ 'type' => {
+ 'content' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'normalized' => 'truc'
+ }
+ },
+ 'menu_prev' => {},
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'Top' => 1
+ },
+ 'number' => 1
+ },
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'Top' => 1
+ }
+ }
+};
+$result_menus{'equivalent_labels'}{'menu_child'}{'menu_next'}{'extra'}{'end_command'}{'extra'}{'command'}
= $result_menus{'equivalent_labels'}{'menu_child'}{'menu_next'};
+$result_menus{'equivalent_labels'}{'menu_child'}{'menu_next'}{'menu_prev'} =
$result_menus{'equivalent_labels'}{'menu_child'};
+$result_menus{'equivalent_labels'}{'menu_child'}{'menu_next'}{'menu_up'} =
$result_menus{'equivalent_labels'};
+$result_menus{'equivalent_labels'}{'menu_child'}{'menu_up'} =
$result_menus{'equivalent_labels'};
+
+$result_errors{'equivalent_labels'} = [
+ {
+ 'error_line' => ':10: warning: Menu entry node name `anch\' different from
anchor name address@hidden'
+',
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => '',
+ 'text' => 'Menu entry node name `anch\' different from anchor name
address@hidden'',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => ':11: warning: Menu entry node name address@hidden'
different from float name `floa\'
+',
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => '',
+ 'text' => 'Menu entry node name address@hidden' different from float name
`floa\'',
+ 'type' => 'warning'
+ }
+];
+
+
+$result_floats{'equivalent_labels'} = {
+ 'truc' => [
+ {
+ 'cmdname' => 'float',
+ 'extra' => {
+ 'end_command' => {
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'float',
+ 'text_arg' => 'float'
+ }
+ },
+ 'normalized' => 'floa',
+ 'type' => {
+ 'content' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'normalized' => 'truc'
+ }
+ },
+ 'number' => 1
+ }
+ ]
+};
+$result_floats{'equivalent_labels'}{'truc'}[0]{'extra'}{'end_command'}{'extra'}{'command'}
= $result_floats{'equivalent_labels'}{'truc'}[0];
+
+
+
+$result_converted{'info'}->{'equivalent_labels'} = 'This is , produced by tp
version from .
+
+
+File: , Node: Top, Next: \'anch\', Up: (dir)
+
+.
+
+In float
+
+truc 1
+
+* Menu:
+
+* anch::
+* \'floa\'::
+
+
+Tag Table:
+Node: Top41
+Ref: \'anch\'90
+Ref: floa93
+
+End Tag Table
+';
+
+
+$result_converted{'html'}->{'equivalent_labels'} = '<!DOCTYPE html PUBLIC
"-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<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="Generator" content="tp">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link href="#Top" rel="start" title="Top">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nocodebreak {white-space:pre}
+span.nolinebreak {white-space:pre}
+span.roman {font-family:serif; font-weight:normal}
+span.sansserif {font-family:sans-serif; font-weight:normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+<a name="Top"></a>
+<h1 class="node-heading">Top</h1>
+
+<a name="anch"></a><p>.
+</p>
+<div class="float"><a name="floa"></a>
+<p>In float
+</p></div><p><strong>truc 1
+</strong></p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">• <a href="#anch"
accesskey="1">anch</a>:</td><td> </td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">• <a href="#floa"
accesskey="2"><code>floa</code></a>:</td><td> </td><td align="left"
valign="top">
+</td></tr>
+</table>
+<hr>
+
+
+
+</body>
+</html>
+';
+
+$result_converted_errors{'html'}->{'equivalent_labels'} = [
+ {
+ 'error_line' => 'warning: Must specify a title with a title command or @top
+',
+ 'text' => 'Must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Structuring.pm Texinfo/Conve...,
Patrice Dumas <=