[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Report.pm Texinfo/Convert/Pl...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Report.pm Texinfo/Convert/Pl... |
|
Date: |
Tue, 01 Mar 2011 00:16:36 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/03/01 00:16:35
Modified files:
tp/Texinfo : Report.pm
tp/Texinfo/Convert: Plaintext.pm
tp/t : 30sectioning.t
tp/t/results/info_tests: top_node_normalization.pl
tp/t/results/sectioning: at_commands_in_refs.pl
character_and_spaces_in_refs.pl
equivalent_nodes.pl space_in_node.pl
top_node_no_menu_direction.pl
Log message:
Keep user formatting in menu entry node and warn for node with a
different
formatting (because of different at-commands).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Report.pm?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/30sectioning.t?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/top_node_normalization.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/equivalent_nodes.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/space_in_node.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/top_node_no_menu_direction.pl?cvsroot=texinfo&r1=1.1&r2=1.2
Patches:
Index: Texinfo/Report.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Report.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Texinfo/Report.pm 23 Jan 2011 21:18:26 -0000 1.5
+++ Texinfo/Report.pm 1 Mar 2011 00:16:34 -0000 1.6
@@ -139,6 +139,4 @@
$self->{'error_nrs'}++;
}
-
-
1;
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- Texinfo/Convert/Plaintext.pm 28 Feb 2011 22:00:16 -0000 1.102
+++ Texinfo/Convert/Plaintext.pm 1 Mar 2011 00:16:34 -0000 1.103
@@ -2162,19 +2162,42 @@
and !$root->{'extra'}->{'menu_entry_node'}->{'manual_content'}
and $self->{'labels'}
and
$self->{'labels'}->{$root->{'extra'}->{'menu_entry_node'}->{'normalized'}}) {
- $menu_entry_internal_node =
$self->{'labels'}->{$root->{'extra'}->{'menu_entry_node'}->{'normalized'}};
+ $menu_entry_internal_node
+ =
$self->{'labels'}->{$root->{'extra'}->{'menu_entry_node'}->{'normalized'}};
}
foreach my $arg (@{$root->{'args'}}) {
if ($arg->{'type'} eq 'menu_entry_node') {
- #Â if it is an internal ref, get the real node target name
- my $node_contents;
if ($menu_entry_internal_node) {
- $node_contents =
$menu_entry_internal_node->{'extra'}->{'node_content'};
- } else {
- $node_contents = $arg->{'contents'};
+ #Â 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::Convert::Info::_normalize_top_node(
+ $self->convert_line({'type' => 'code',
+ 'contents'
+ => $menu_entry_internal_node->{'extra'}->{'node_content'}}));
+ my $menu_node = Texinfo::Convert::Info::_normalize_top_node(
+ $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'}};
}
$result .= $self->_convert({'type' => 'code',
- 'contents' => $node_contents});
+ 'contents' => $arg->{'contents'}});
} else {
$result .= $self->_convert($arg);
}
Index: t/30sectioning.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/30sectioning.t,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/30sectioning.t 28 Feb 2011 22:00:17 -0000 1.30
+++ t/30sectioning.t 1 Mar 2011 00:16:34 -0000 1.31
@@ -710,6 +710,22 @@
['section_in_unnumbered_info',
$section_in_unnumbered_text
],
+['space_in_node',
+'
address@hidden Top
+
address@hidden
+* Chap first here::
+* Test title :Test title.
+* Last with spaces ::
address@hidden menu
+
address@hidden Chap first here
+
address@hidden Test title
+
address@hidden Last with spaces
+'],
);
my @test_cases = (
@@ -725,19 +741,6 @@
@node arg1 @comma{} arg2, @,cedilla, @strong{comma in strong,} @c comma , end
'],
-['space_in_node',
-'
address@hidden Top
-
address@hidden
-* Chap first here::
-* Test title :Test title.
address@hidden menu
-
address@hidden Chap first here
-
address@hidden Test title
-'],
['empty_nodes_with_commands',
'
@node @c comment
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/info_tests/top_node_normalization.pl 27 Feb 2011 17:28:58
-0000 1.4
+++ t/results/info_tests/top_node_normalization.pl 1 Mar 2011 00:16:35
-0000 1.5
@@ -346,7 +346,7 @@
* Menu:
-* ToP::
+* tOP::
Tag Table:
Index: t/results/sectioning/at_commands_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/sectioning/at_commands_in_refs.pl 27 Feb 2011 17:28:58 -0000
1.32
+++ t/results/sectioning/at_commands_in_refs.pl 1 Mar 2011 00:16:35 -0000
1.33
@@ -19745,31 +19745,31 @@
Tag Table:
Node: Top52
-Node: { }823
+Node: { }819
Node: !
-. . ? @902
-Node: LaTeX TeX * , (C) ... ...1023
-Node: == error--> Euro ! ==> -1189
-Node: >= <= ->1348
-Node: a o -!- # -| ? (R)1468
-Node: => o a b aa1595
-Node: AA ae oe AE OE /o /O ss /l /L D d TH th1739
-Node: a" e~ i^ a^ a` e\' c, e= e* e\'\' e;1954
-Node: e. e( e_ .e e< j ee[2166
-Node: `` \'\' ` \' ,, ,2329
-Node: << >> << >> < >2462
-Node: `` \'\' --- --2589
-Node: AAA (fff) AAA BBB2705
-Node: CCC (rrr) CCC DDD2841
-Node: the someone <address@hidden> <address@hidden>3014
-Node: [image src="f--ile.png" alt="alt" text="[Image
description\\"\\"\\\\.]" ]3307
-Node: @ {} . 3640
-Node: `cite asis\' in @w b in r SC *str* t VAR "dfn" i3840
-Node: `env\' `code\' `option\' `samp\' `command\' `file\' `C-x <ESC>\'4102
-Node: 8.27in4382
-Node: sansserif slanted4530
-Node: <indicateurl>4656
-Node: `http://somewhere_aaa\' text (url) ls4804
+. . ? @898
+Node: LaTeX TeX * , (C) ... ...1019
+Node: == error--> Euro ! ==> -1185
+Node: >= <= ->1344
+Node: a o -!- # -| ? (R)1464
+Node: => o a b aa1591
+Node: AA ae oe AE OE /o /O ss /l /L D d TH th1735
+Node: a" e~ i^ a^ a` e\' c, e= e* e\'\' e;1950
+Node: e. e( e_ .e e< j ee[2162
+Node: `` \'\' ` \' ,, ,2325
+Node: << >> << >> < >2458
+Node: `` \'\' --- --2585
+Node: AAA (fff) AAA BBB2701
+Node: CCC (rrr) CCC DDD2837
+Node: the someone <address@hidden> <address@hidden>3010
+Node: [image src="f--ile.png" alt="alt" text="[Image
description\\"\\"\\\\.]" ]3303
+Node: @ {} . 3636
+Node: `cite asis\' in @w b in r SC *str* t VAR "dfn" i3836
+Node: `env\' `code\' `option\' `samp\' `command\' `file\' `C-x <ESC>\'4098
+Node: 8.27in4378
+Node: sansserif slanted4526
+Node: <indicateurl>4652
+Node: `http://somewhere_aaa\' text (url) ls4800
End Tag Table
';
@@ -19777,12 +19777,12 @@
$result_converted_errors{'info'}->{'at_commands_in_refs'} = [
{
'file_name' => '',
- 'error_line' => ':81: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':21: warning: Cannot find @image file `f--ile1.txt\'
',
'text' => 'Cannot find @image file `f--ile1.txt\'',
'type' => 'warning',
'macro' => '',
- 'line_nr' => 81
+ 'line_nr' => 21
},
{
'file_name' => '',
Index: t/results/sectioning/character_and_spaces_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/sectioning/character_and_spaces_in_refs.pl 27 Feb 2011
17:28:58 -0000 1.31
+++ t/results/sectioning/character_and_spaces_in_refs.pl 1 Mar 2011
00:16:35 -0000 1.32
@@ -1972,9 +1972,9 @@
Tag Table:
Node: Top52
Node: other nodes467
-Node: !_"#$%&\'()*+-.650
-Node: /;<=>?[\\]^_`|~744
-Node: local node837
+Node: !_"#$%&\'()*+-.648
+Node: /;<=>?[\\]^_`|~742
+Node: local node835
End Tag Table
';
Index: t/results/sectioning/equivalent_nodes.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/equivalent_nodes.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/sectioning/equivalent_nodes.pl 27 Feb 2011 17:28:58 -0000
1.1
+++ t/results/sectioning/equivalent_nodes.pl 1 Mar 2011 00:16:35 -0000
1.2
@@ -426,7 +426,7 @@
* Menu:
-* `node\'::
+* *node*::
File: , Node: `node\', Up: Top
@@ -441,4 +441,17 @@
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
+ }
+];
+
+
1;
Index: t/results/sectioning/space_in_node.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/space_in_node.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/sectioning/space_in_node.pl 15 Feb 2011 21:40:48 -0000
1.7
+++ t/results/sectioning/space_in_node.pl 1 Mar 2011 00:16:35 -0000
1.8
@@ -171,6 +171,62 @@
},
'parent' => {},
'type' => 'menu_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => '* ',
+ 'type' => 'menu_entry_leading_text'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Last with spaces'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'space_at_end_menu_node'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_node'
+ },
+ {
+ 'parent' => {},
+ 'text' => '::',
+ 'type' => 'menu_entry_separator'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'menu_entry_description'
+ }
+ ],
+ 'extra' => {
+ 'menu_entry_node' => {
+ 'node_content' => [
+ {},
+ {}
+ ],
+ 'normalized' => 'Last-with-spaces'
+ }
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'menu_entry'
}
],
'line_nr' => {
@@ -259,7 +315,7 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 10,
'macro' => ''
},
'parent' => {}
@@ -289,7 +345,14 @@
}
],
'cmdname' => 'node',
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
'extra' => {
'node_content' => [
{}
@@ -304,7 +367,52 @@
},
'line_nr' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 12,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'Last with spaces'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [],
+ 'normalized' => 'Last-with-spaces'
+ }
+ ],
+ 'normalized' => 'Last-with-spaces'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
'macro' => ''
},
'parent' => {}
@@ -339,6 +447,16 @@
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[5]{'parent'}
= $result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0];
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'parent'}
= $result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[2]{'parent'}
= $result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
= $result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[1]
=
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1];
+$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1];
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'space_in_node'}{'contents'}[1];
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'space_in_node'}{'contents'}[1];
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'space_in_node'}{'contents'}[1];
@@ -357,9 +475,17 @@
$result_trees{'space_in_node'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'space_in_node'}{'contents'}[3]{'args'}[0];
$result_trees{'space_in_node'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'space_in_node'}{'contents'}[3]{'args'}[0];
$result_trees{'space_in_node'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'space_in_node'}{'contents'}[3];
+$result_trees{'space_in_node'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'space_in_node'}{'contents'}[3];
$result_trees{'space_in_node'}{'contents'}[3]{'extra'}{'node_content'}[0] =
$result_trees{'space_in_node'}{'contents'}[3]{'args'}[0]{'contents'}[1];
$result_trees{'space_in_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}
= $result_trees{'space_in_node'}{'contents'}[3]{'extra'}{'node_content'};
$result_trees{'space_in_node'}{'contents'}[3]{'parent'} =
$result_trees{'space_in_node'};
+$result_trees{'space_in_node'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'space_in_node'}{'contents'}[4]{'args'}[0];
+$result_trees{'space_in_node'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'space_in_node'}{'contents'}[4]{'args'}[0];
+$result_trees{'space_in_node'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'space_in_node'}{'contents'}[4]{'args'}[0];
+$result_trees{'space_in_node'}{'contents'}[4]{'args'}[0]{'parent'} =
$result_trees{'space_in_node'}{'contents'}[4];
+$result_trees{'space_in_node'}{'contents'}[4]{'extra'}{'node_content'}[0] =
$result_trees{'space_in_node'}{'contents'}[4]{'args'}[0]{'contents'}[1];
+$result_trees{'space_in_node'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}
= $result_trees{'space_in_node'}{'contents'}[4]{'extra'}{'node_content'};
+$result_trees{'space_in_node'}{'contents'}[4]{'parent'} =
$result_trees{'space_in_node'};
$result_texis{'space_in_node'} = '
@node Top
@@ -367,11 +493,14 @@
@menu
* Chap first here::
* Test title :Test title.
+* Last with spaces ::
@end menu
@node Chap first here
@node Test title
+
address@hidden Last with spaces
';
@@ -379,6 +508,8 @@
* Chap first here::
* Test title :Test title.
+* Last with spaces ::
+
';
@@ -400,6 +531,14 @@
'extra' => {
'normalized' => 'Test-title'
},
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Last-with-spaces'
+ },
+ 'node_prev' => {},
+ 'node_up' => {}
+ },
'node_prev' => {},
'node_up' => {}
},
@@ -422,6 +561,8 @@
}
}
};
+$result_nodes{'space_in_node'}{'menu_child'}{'node_next'}{'node_next'}{'node_prev'}
= $result_nodes{'space_in_node'}{'menu_child'}{'node_next'};
+$result_nodes{'space_in_node'}{'menu_child'}{'node_next'}{'node_next'}{'node_up'}
= $result_nodes{'space_in_node'};
$result_nodes{'space_in_node'}{'menu_child'}{'node_next'}{'node_prev'} =
$result_nodes{'space_in_node'}{'menu_child'};
$result_nodes{'space_in_node'}{'menu_child'}{'node_next'}{'node_up'} =
$result_nodes{'space_in_node'};
$result_nodes{'space_in_node'}{'menu_child'}{'node_prev'} =
$result_nodes{'space_in_node'};
@@ -443,6 +584,17 @@
'extra' => {
'normalized' => 'Test-title'
},
+ 'menu_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Last-with-spaces'
+ },
+ 'menu_prev' => {},
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'Top' => 1
+ }
+ },
'menu_prev' => {},
'menu_up' => {},
'menu_up_hash' => {
@@ -455,6 +607,8 @@
}
}
};
+$result_menus{'space_in_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
= $result_menus{'space_in_node'}{'menu_child'}{'menu_next'};
+$result_menus{'space_in_node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
= $result_menus{'space_in_node'};
$result_menus{'space_in_node'}{'menu_child'}{'menu_next'}{'menu_prev'} =
$result_menus{'space_in_node'}{'menu_child'};
$result_menus{'space_in_node'}{'menu_child'}{'menu_next'}{'menu_up'} =
$result_menus{'space_in_node'};
$result_menus{'space_in_node'}{'menu_child'}{'menu_up'} =
$result_menus{'space_in_node'};
@@ -462,4 +616,36 @@
$result_errors{'space_in_node'} = [];
+
+$result_converted{'info'}->{'space_in_node'} = 'This is , produced by makeinfo
version 4.13 from .
+
+
+File: , Node: Top, Next: Chap first here, Up: (dir)
+
+* Menu:
+
+* Chap first here::
+* Test title :Test title.
+* Last with spaces ::
+
+
+File: , Node: Chap first here, Next: Test title, Prev: Top, Up: Top
+
+
+File: , Node: Test title, Next: Last with spaces, Prev: Chap first here,
Up: Top
+
+
+File: , Node: Last with spaces, Prev: Test title, Up: Top
+
+
+
+Tag Table:
+Node: Top52
+Node: Chap first here203
+Node: Test title278
+Node: Last with spaces366
+
+End Tag Table
+';
+
1;
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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/sectioning/top_node_no_menu_direction.pl 27 Feb 2011 21:51:30
-0000 1.1
+++ t/results/sectioning/top_node_no_menu_direction.pl 1 Mar 2011 00:16:35
-0000 1.2
@@ -421,7 +421,7 @@
* Menu:
* second node::
-* Top:: myself
+* TOP:: myself
File: , Node: second node, Prev: Top, Up: Top
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Report.pm Texinfo/Convert/Pl...,
Patrice Dumas <=