[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/In...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/In... |
|
Date: |
Sat, 19 Feb 2011 18:04:41 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/02/19 18:04:41
Modified files:
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: Info.pm
tp/t : 22xtable.t 57invalid_nestings.t info_tests.t
tp/t/results/coverage: formats_only_title_comments.pl
formats_only_titles.pl item_container.pl
tp/t/results/invalid_nestings: block_not_matching.pl
formats_not_closed_in_example.pl
itemx_in_itemize_enumerate_in_table.pl
table_not_closed_in_menu_comment.pl
table_not_closed_in_menu_description.pl
tp/t/results/itemize: accent_argument.pl
headitem_itemx_in_itemize.pl
itemize_and_empty_lines.pl
not_closed_item.pl not_closed_itemize.pl
tp/t/results/plaintext_tests: long_uref_after_item.pl
tp/t/results/xtable: accent_on_table_line.pl
invalid_command_and_brace_in_table.pl
no_arg_brace_command_on_table_line.pl
Added files:
tp/t/results/info_tests: top_node_normalization.pl
tp/t/results/xtable: no_argument_for_table.pl
Log message:
Normalize Top node as a node name.
More systematic treatement of @-commands as format command argument.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.200&r2=1.201
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/22xtable.t?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/57invalid_nestings.t?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/info_tests.t?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/formats_only_title_comments.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/formats_only_titles.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/top_node_normalization.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/accent_argument.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/headitem_itemx_in_itemize.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/itemize_and_empty_lines.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/not_closed_item.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/not_closed_itemize.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/long_uref_after_item.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/accent_on_table_line.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/invalid_command_and_brace_in_table.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/no_argument_for_table.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -b -r1.200 -r1.201
--- Texinfo/Parser.pm 19 Feb 2011 13:35:07 -0000 1.200
+++ Texinfo/Parser.pm 19 Feb 2011 18:04:39 -0000 1.201
@@ -2179,26 +2179,55 @@
}
}
$current->{'extra'}->{'enumerate_specification'} = $spec;
- } elsif ($current->{'cmdname'} eq 'itemize'
- and !$current->{'extra'}->{'block_command_line_contents'}) {
- $current->{'extra'}->{'block_command_line_contents'} = [
- [ { 'cmdname' => 'bullet',
- 'type' => 'command_as_argument',
- 'parent' => $current }
- ]
- ];
} elsif ($item_line_commands{$current->{'cmdname'}}) {
- if ($current->{'extra'}
- and $current->{'extra'}->{'command_as_argument'}
- and
!$brace_commands{$current->{'extra'}->{'command_as_argument'}->{'cmdname'}}
+ if (!$current->{'extra'}
+ or !$current->{'extra'}->{'command_as_argument'}) {
+ $self->line_error(sprintf($self->__("%s requires an argument: the
formatter for %citem"),
+ $current->{'cmdname'}, ord('@')),
$line_nr);
+ } elsif
(!$brace_commands{$current->{'extra'}->{'command_as_argument'}->{'cmdname'}}
and
!$self->{'definfoenclose'}->{$current->{'extra'}->{'command_as_argument'}->{'cmdname'}})
{
$self->line_error (sprintf($self->
__("Command address@hidden not accepting argument in brace should
not be on address@hidden line"),
$current->{'extra'}->{'command_as_argument'}->{'cmdname'},
$current->{'cmdname'}),
$line_nr);
+ delete $current->{'extra'}->{'command_as_argument'};
}
}
+ if ($current->{'extra'}
+ and $current->{'extra'}->{'command_as_argument'}
+ and
$accent_commands{$current->{'extra'}->{'command_as_argument'}->{'cmdname'}}
+ and ($current->{'cmdname'} eq 'itemize'
+ or $item_line_commands{$current->{'cmdname'}})) {
+ $self->line_warn (sprintf($self->
+ __("Accent command address@hidden' not allowed as address@hidden
argument"),
+ $current->{'extra'}->{'command_as_argument'}->{'cmdname'},
+ $current->{'cmdname'}),
+ $line_nr);
+ delete $current->{'extra'}->{'command_as_argument'};
+ delete $current->{'extra'}->{'block_command_line_contents'};
+ }
+ if (!$current->{'extra'}->{'block_command_line_contents'}
+ and $current->{'cmdname'} eq 'itemize') {
+ $current->{'extra'}->{'block_command_line_contents'} = [
+ [ { 'cmdname' => 'bullet',
+ 'type' => 'command_as_argument',
+ 'parent' => $current }
+ ]
+ ];
+ $current->{'extra'}->{'command_as_argument'} =
+ $current->{'extra'}->{'block_command_line_contents'}->[0]->[0];
+ } elsif ($item_line_commands{$current->{'cmdname'}} and
+ ! $current->{'extra'}->{'command_as_argument'}) {
+ $current->{'extra'}->{'block_command_line_contents'} = [
+ [ { 'cmdname' => 'asis',
+ 'type' => 'command_as_argument',
+ 'parent' => $current }
+ ]
+ ];
+ $current->{'extra'}->{'command_as_argument'} =
+ $current->{'extra'}->{'block_command_line_contents'}->[0]->[0];
+ }
push @{$current->{'contents'}}, { 'type' => 'before_item',
'contents' => [], 'parent', $current };
$current = $current->{'contents'}->[-1];
@@ -2817,17 +2846,10 @@
and $current->{'parent'}->{'contents'}->[0]->{'text'}
=~ /^[^\S\n]*/))) {
delete $current->{'contents'};
- if ($accent_commands{$current->{'cmdname'}}) {
- $self->line_warn (sprintf($self->
- __("Accent command address@hidden' not allowed as address@hidden
argument"),
- $current->{'cmdname'},
$current->{'parent'}->{'parent'}->{'cmdname'}),
- $line_nr);
- } else {
print STDERR "FOR PARENT
address@hidden>{'parent'}->{'parent'}->{'cmdname'} command_as_argument
$current->{'cmdname'}\n" if ($self->{'DEBUG'});
$current->{'type'} = 'command_as_argument' if
(!$current->{'type'});
$current->{'parent'}->{'parent'}->{'extra'}->{'command_as_argument'}
= $current;
- }
$current = $current->{'parent'};
# now accent commands
} elsif ($accent_commands{$current->{'cmdname'}}) {
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- Texinfo/Convert/Info.pm 19 Feb 2011 12:21:49 -0000 1.28
+++ Texinfo/Convert/Info.pm 19 Feb 2011 18:04:39 -0000 1.29
@@ -223,8 +223,8 @@
next unless ($label->{'root'});
my $prefix = 'Ref';
$prefix = 'Node' if ($label->{'root'}->{'cmdname'} eq 'node');
- my ($label_text) = $self->convert_line({'type' => 'code',
- 'contents' => $label->{'root'}->{'extra'}->{'node_content'}});
+ my $label_text = _normalize_top_node($self->convert_line({'type' =>
'code',
+ 'contents' => $label->{'root'}->{'extra'}->{'node_content'}}));
$tag_text .= "$prefix: $label_text\x{7F}$label->{'bytes'}\n";
}
$tag_text .= "\x{1F}\nEnd Tag Table\n";
@@ -431,6 +431,14 @@
return $result;
}
+sub _normalize_top_node($)
+{
+ my $node = shift;
+ if ($node =~ /^top$/i) {
+ return 'Top';
+ }
+ return $node;
+}
my @directions = ('Next', 'Prev', 'Up');
sub _node($$)
@@ -453,8 +461,9 @@
my $node_begin = "\x{1F}\nFile: $output_filename, Node: ";
$result .= $node_begin;
$self->_add_text_count($node_begin);
- $result .= $self->convert_line({'type' => 'code',
- 'contents' => $node->{'extra'}->{'node_content'}});
+ my $node_text = _normalize_top_node($self->convert_line({'type' => 'code',
+ 'contents' => $node->{'extra'}->{'node_content'}}));
+ $result .= $node_text;
foreach my $direction(@directions) {
if ($node->{'node_'.lc($direction)}) {
my $node_direction = $node->{'node_'.lc($direction)};
Index: t/22xtable.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/22xtable.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/22xtable.t 10 Feb 2011 22:05:07 -0000 1.5
+++ t/22xtable.t 19 Feb 2011 18:04:40 -0000 1.6
@@ -46,7 +46,7 @@
@end table
'],
['invalid_command_and_brace_in_table',
-'@table
+'@table @asis
{ @itemTop,, title
long title}
Item line
@@ -65,6 +65,12 @@
'@table @bullet
@item item
@end table
+'],
+['no_argument_for_table',
+'@table
address@hidden item
+In item.
address@hidden table
']
);
Index: t/57invalid_nestings.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/57invalid_nestings.t,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/57invalid_nestings.t 15 Feb 2011 23:11:51 -0000 1.12
+++ t/57invalid_nestings.t 19 Feb 2011 18:04:40 -0000 1.13
@@ -78,7 +78,7 @@
Text
@end deftypefun
address@hidden
address@hidden @asis
@item item
line
@end vtable
@@ -180,7 +180,7 @@
['formats_not_closed_in_example',
'@example
address@hidden @minus
address@hidden @asis
@item item
table line
@@ -242,7 +242,7 @@
'],
['table_not_closed_in_menu_description',
'@menu
-* (gcc):: text @table @minus
+* (gcc):: text @table @asis
@item item
table line
@end menu
@@ -251,7 +251,7 @@
'@menu
* (manual):: desc
address@hidden @bullet
address@hidden @asis
@item item
comment
* (manual2)::
Index: t/info_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/info_tests.t,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/info_tests.t 19 Feb 2011 12:21:49 -0000 1.15
+++ t/info_tests.t 19 Feb 2011 18:04:40 -0000 1.16
@@ -242,6 +242,15 @@
@node Top
'],
+['top_node_normalization',
+'@node ToP
+
address@hidden @xref{tOP}.
+
address@hidden
+* tOP::
address@hidden menu
+'],
#Â since there is no split in the test suite, there is no split tested
#Â here, in fact.
['split_no_copying',
Index: t/results/coverage/formats_only_title_comments.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/formats_only_title_comments.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/coverage/formats_only_title_comments.pl 15 Feb 2011 21:40:32
-0000 1.1
+++ t/results/coverage/formats_only_title_comments.pl 19 Feb 2011 18:04:40
-0000 1.2
@@ -52,7 +52,8 @@
'type' => 'command_as_argument'
}
]
- ]
+ ],
+ 'command_as_argument' => {}
},
'line_nr' => {
'file_name' => '',
@@ -427,6 +428,7 @@
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1];
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'formats_only_title_comments'}{'contents'}[0];
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'formats_only_title_comments'}{'contents'}[0];
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'parent'} =
$result_trees{'formats_only_title_comments'};
$result_trees{'formats_only_title_comments'}{'contents'}[1]{'parent'} =
$result_trees{'formats_only_title_comments'};
$result_trees{'formats_only_title_comments'}{'contents'}[2]{'parent'} =
$result_trees{'formats_only_title_comments'};
Index: t/results/coverage/formats_only_titles.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/formats_only_titles.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/coverage/formats_only_titles.pl 15 Feb 2011 21:40:33 -0000
1.1
+++ t/results/coverage/formats_only_titles.pl 19 Feb 2011 18:04:40 -0000
1.2
@@ -40,7 +40,8 @@
'type' => 'command_as_argument'
}
]
- ]
+ ],
+ 'command_as_argument' => {}
},
'line_nr' => {
'file_name' => '',
@@ -347,6 +348,7 @@
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[1];
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'formats_only_titles'}{'contents'}[0];
$result_trees{'formats_only_titles'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'formats_only_titles'}{'contents'}[0];
+$result_trees{'formats_only_titles'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_titles'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'formats_only_titles'}{'contents'}[0]{'parent'} =
$result_trees{'formats_only_titles'};
$result_trees{'formats_only_titles'}{'contents'}[1]{'parent'} =
$result_trees{'formats_only_titles'};
$result_trees{'formats_only_titles'}{'contents'}[2]{'parent'} =
$result_trees{'formats_only_titles'};
Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/coverage/item_container.pl 15 Feb 2011 21:40:33 -0000
1.28
+++ t/results/coverage/item_container.pl 19 Feb 2011 18:04:40 -0000
1.29
@@ -223,7 +223,8 @@
'type' => 'command_as_argument'
}
]
- ]
+ ],
+ 'command_as_argument' => {}
},
'line_nr' => {
'file_name' => '',
@@ -275,6 +276,7 @@
$result_trees{'item_container'}{'contents'}[7]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'item_container'}{'contents'}[7]{'contents'}[2];
$result_trees{'item_container'}{'contents'}[7]{'contents'}[2]{'parent'} =
$result_trees{'item_container'}{'contents'}[7];
$result_trees{'item_container'}{'contents'}[7]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'item_container'}{'contents'}[7];
+$result_trees{'item_container'}{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'item_container'}{'contents'}[7]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'item_container'}{'contents'}[7]{'parent'} =
$result_trees{'item_container'};
$result_trees{'item_container'}{'contents'}[8]{'parent'} =
$result_trees{'item_container'};
Index: t/results/invalid_nestings/block_not_matching.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/invalid_nestings/block_not_matching.pl 15 Feb 2011 21:40:39
-0000 1.21
+++ t/results/invalid_nestings/block_not_matching.pl 19 Feb 2011 18:04:40
-0000 1.22
@@ -165,20 +165,33 @@
'type' => 'empty_line'
},
{
- 'cmdname' => 'table',
+ 'args' => [
+ {
'contents' => [
{
'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
- 'contents' => [],
+ 'cmdname' => 'asis',
'parent' => {},
- 'type' => 'before_item'
+ 'type' => 'command_as_argument'
},
{
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
'args' => [
{
'contents' => [
@@ -222,6 +235,14 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'command_as_argument' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 9,
@@ -542,16 +563,20 @@
$result_trees{'block_not_matching'}{'contents'}[3]{'parent'} =
$result_trees{'block_not_matching'};
$result_trees{'block_not_matching'}{'contents'}[4]{'parent'} =
$result_trees{'block_not_matching'};
$result_trees{'block_not_matching'}{'contents'}[5]{'parent'} =
$result_trees{'block_not_matching'};
+$result_trees{'block_not_matching'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'args'}[0];
+$result_trees{'block_not_matching'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'args'}[0];
+$result_trees{'block_not_matching'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'args'}[0];
+$result_trees{'block_not_matching'}{'contents'}[6]{'args'}[0]{'parent'} =
$result_trees{'block_not_matching'}{'contents'}[6];
+$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[0]{'args'}[0];
+$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[0]{'args'}[0];
+$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[0]{'args'}[0];
+$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[0];
+$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'block_not_matching'}{'contents'}[6];
+$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[1];
$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[1]{'parent'} =
$result_trees{'block_not_matching'}{'contents'}[6];
-$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[2]{'args'}[0];
-$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[2]{'args'}[0];
-$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[2]{'args'}[0];
-$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[2];
-$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[2]{'extra'}{'misc_content'}[0]
=
$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[2]{'parent'} =
$result_trees{'block_not_matching'}{'contents'}[6];
-$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[3];
-$result_trees{'block_not_matching'}{'contents'}[6]{'contents'}[3]{'parent'} =
$result_trees{'block_not_matching'}{'contents'}[6];
+$result_trees{'block_not_matching'}{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'block_not_matching'}{'contents'}[6]{'args'}[0]{'contents'}[1];
+$result_trees{'block_not_matching'}{'contents'}[6]{'extra'}{'command_as_argument'}
= $result_trees{'block_not_matching'}{'contents'}[6]{'args'}[0]{'contents'}[1];
$result_trees{'block_not_matching'}{'contents'}[6]{'parent'} =
$result_trees{'block_not_matching'};
$result_trees{'block_not_matching'}{'contents'}[7]{'parent'} =
$result_trees{'block_not_matching'};
$result_trees{'block_not_matching'}{'contents'}[8]{'parent'} =
$result_trees{'block_not_matching'};
@@ -607,7 +632,7 @@
Text
@end deffn
address@hidden
address@hidden @asis
@item item
line
@end table
Index: t/results/invalid_nestings/formats_not_closed_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/invalid_nestings/formats_not_closed_in_example.pl 15 Feb 2011
21:40:39 -0000 1.18
+++ t/results/invalid_nestings/formats_not_closed_in_example.pl 19 Feb 2011
18:04:40 -0000 1.19
@@ -35,7 +35,7 @@
'type' => 'empty_spaces_after_command'
},
{
- 'cmdname' => 'minus',
+ 'cmdname' => 'asis',
'parent' => {},
'type' => 'command_as_argument'
},
@@ -272,7 +272,7 @@
$result_texis{'formats_not_closed_in_example'} = '@example
address@hidden @minus
address@hidden @asis
@item item
table line
@@ -299,15 +299,6 @@
$result_errors{'formats_not_closed_in_example'} = [
{
- 'error_line' => ':3: Command @minus not accepting argument in brace should
not be on @table line
-',
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => '',
- 'text' => 'Command @minus not accepting argument in brace should not be on
@table line',
- 'type' => 'error'
- },
- {
'error_line' => ':13: address@hidden' expected `enumerate\', but saw
`example\'
',
'file_name' => '',
Index: t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 15 Feb
2011 21:40:39 -0000 1.17
+++ t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 19 Feb
2011 18:04:40 -0000 1.18
@@ -121,7 +121,8 @@
'type' => 'command_as_argument'
}
]
- ]
+ ],
+ 'command_as_argument' => {}
},
'line_nr' => {
'file_name' => '',
@@ -240,6 +241,7 @@
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[3];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[3];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[5]{'parent'}
= $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0];
Index: t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 15 Feb
2011 21:40:41 -0000 1.18
+++ t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 19 Feb
2011 18:04:40 -0000 1.19
@@ -83,7 +83,7 @@
'type' => 'empty_spaces_after_command'
},
{
- 'cmdname' => 'bullet',
+ 'cmdname' => 'asis',
'parent' => {},
'type' => 'command_as_argument'
},
@@ -218,7 +218,7 @@
$result_texis{'table_not_closed_in_menu_comment'} = '@menu
* (manual):: desc
address@hidden @bullet
address@hidden @asis
@item item
comment
* (manual2)::
@@ -253,15 +253,6 @@
'type' => 'error continuation'
},
{
- 'error_line' => ':4: Command @bullet not accepting argument in brace
should not be on @table line
-',
- 'file_name' => '',
- 'line_nr' => 4,
- 'macro' => '',
- 'text' => 'Command @bullet not accepting argument in brace should not be
on @table line',
- 'type' => 'error'
- },
- {
'error_line' => ':8: address@hidden' expected `table\', but saw `menu\'
',
'file_name' => '',
Index: t/results/invalid_nestings/table_not_closed_in_menu_description.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/invalid_nestings/table_not_closed_in_menu_description.pl 15 Feb
2011 21:40:41 -0000 1.17
+++ t/results/invalid_nestings/table_not_closed_in_menu_description.pl 19 Feb
2011 18:04:40 -0000 1.18
@@ -51,7 +51,7 @@
'type' => 'empty_spaces_after_command'
},
{
- 'cmdname' => 'minus',
+ 'cmdname' => 'asis',
'parent' => {},
'type' => 'command_as_argument'
},
@@ -185,7 +185,7 @@
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[1]{'parent'}
= $result_trees{'table_not_closed_in_menu_description'};
$result_texis{'table_not_closed_in_menu_description'} = '@menu
-* (gcc):: text @table @minus
+* (gcc):: text @table @asis
@item item
table line
@end address@hidden menu
@@ -225,15 +225,6 @@
'type' => 'warning'
},
{
- 'error_line' => ':2: Command @minus not accepting argument in brace should
not be on @table line
-',
- 'file_name' => '',
- 'line_nr' => 2,
- 'macro' => '',
- 'text' => 'Command @minus not accepting argument in brace should not be on
@table line',
- 'type' => 'error'
- },
- {
'error_line' => ':5: address@hidden' expected `table\', but saw `menu\'
',
'file_name' => '',
Index: t/results/itemize/accent_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/accent_argument.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/itemize/accent_argument.pl 15 Feb 2011 21:40:41 -0000
1.23
+++ t/results/itemize/accent_argument.pl 19 Feb 2011 18:04:40 -0000
1.24
@@ -15,7 +15,8 @@
},
{
'cmdname' => '~',
- 'parent' => {}
+ 'parent' => {},
+ 'type' => 'command_as_argument'
},
{
'args' => [
@@ -65,9 +66,14 @@
'extra' => {
'block_command_line_contents' => [
[
- {}
- ]
+ {
+ 'cmdname' => 'bullet',
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ }
]
+ ],
+ 'command_as_argument' => {}
},
'line_nr' => {
'file_name' => '',
@@ -99,7 +105,8 @@
},
{
'cmdname' => '~',
- 'parent' => {}
+ 'parent' => {},
+ 'type' => 'command_as_argument'
},
{
'parent' => {},
@@ -143,9 +150,14 @@
'extra' => {
'block_command_line_contents' => [
[
- {}
- ]
+ {
+ 'cmdname' => 'bullet',
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ }
]
+ ],
+ 'command_as_argument' => {}
},
'line_nr' => {
'file_name' => '',
@@ -172,7 +184,8 @@
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0];
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'accent_argument'}{'contents'}[0];
-$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0];
+$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'accent_argument'}{'contents'}[0]{'parent'} =
$result_trees{'accent_argument'};
$result_trees{'accent_argument'}{'contents'}[1]{'parent'} =
$result_trees{'accent_argument'};
$result_trees{'accent_argument'}{'contents'}[2]{'parent'} =
$result_trees{'accent_argument'};
@@ -184,7 +197,8 @@
$result_trees{'accent_argument'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'accent_argument'}{'contents'}[3]{'contents'}[0]{'contents'}[1];
$result_trees{'accent_argument'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[3]{'contents'}[0];
$result_trees{'accent_argument'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'accent_argument'}{'contents'}[3];
-$result_trees{'accent_argument'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'accent_argument'}{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'accent_argument'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[3];
+$result_trees{'accent_argument'}{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_argument'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'accent_argument'}{'contents'}[3]{'parent'} =
$result_trees{'accent_argument'};
$result_trees{'accent_argument'}{'contents'}[4]{'parent'} =
$result_trees{'accent_argument'};
@@ -226,9 +240,9 @@
-$result_converted{'plaintext'}->{'accent_argument'} = ' item
+$result_converted{'plaintext'}->{'accent_argument'} = ' * item
- item
+ * item
';
1;
Index: t/results/itemize/headitem_itemx_in_itemize.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/itemize/headitem_itemx_in_itemize.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/itemize/headitem_itemx_in_itemize.pl 15 Feb 2011 21:40:41
-0000 1.12
+++ t/results/itemize/headitem_itemx_in_itemize.pl 19 Feb 2011 18:04:40
-0000 1.13
@@ -85,7 +85,8 @@
'type' => 'command_as_argument'
}
]
- ]
+ ],
+ 'command_as_argument' => {}
},
'line_nr' => {
'file_name' => '',
@@ -116,6 +117,7 @@
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
+$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'parent'} =
$result_trees{'headitem_itemx_in_itemize'};
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[1]{'parent'} =
$result_trees{'headitem_itemx_in_itemize'};
Index: t/results/itemize/itemize_and_empty_lines.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/itemize/itemize_and_empty_lines.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/itemize/itemize_and_empty_lines.pl 15 Feb 2011 21:40:42
-0000 1.2
+++ t/results/itemize/itemize_and_empty_lines.pl 19 Feb 2011 18:04:40
-0000 1.3
@@ -630,7 +630,8 @@
'type' => 'command_as_argument'
}
]
- ]
+ ],
+ 'command_as_argument' => {}
},
'line_nr' => {
'file_name' => '',
@@ -1181,6 +1182,7 @@
$result_trees{'itemize_and_empty_lines'}{'contents'}[3]{'contents'}[7]{'contents'}[3]{'parent'}
= $result_trees{'itemize_and_empty_lines'}{'contents'}[3]{'contents'}[7];
$result_trees{'itemize_and_empty_lines'}{'contents'}[3]{'contents'}[7]{'parent'}
= $result_trees{'itemize_and_empty_lines'}{'contents'}[3];
$result_trees{'itemize_and_empty_lines'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'itemize_and_empty_lines'}{'contents'}[3];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'itemize_and_empty_lines'}{'contents'}[3]{'parent'} =
$result_trees{'itemize_and_empty_lines'};
$result_trees{'itemize_and_empty_lines'}{'contents'}[4]{'parent'} =
$result_trees{'itemize_and_empty_lines'};
$result_trees{'itemize_and_empty_lines'}{'contents'}[5]{'parent'} =
$result_trees{'itemize_and_empty_lines'};
Index: t/results/itemize/not_closed_item.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/not_closed_item.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/itemize/not_closed_item.pl 15 Feb 2011 21:40:42 -0000
1.12
+++ t/results/itemize/not_closed_item.pl 19 Feb 2011 18:04:40 -0000
1.13
@@ -53,7 +53,8 @@
'type' => 'command_as_argument'
}
]
- ]
+ ],
+ 'command_as_argument' => {}
},
'line_nr' => {
'file_name' => '',
@@ -72,6 +73,7 @@
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[2];
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'not_closed_item'}{'contents'}[0];
$result_trees{'not_closed_item'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'not_closed_item'}{'contents'}[0];
+$result_trees{'not_closed_item'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'not_closed_item'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'not_closed_item'}{'contents'}[0]{'parent'} =
$result_trees{'not_closed_item'};
$result_texis{'not_closed_item'} = '@itemize
Index: t/results/itemize/not_closed_itemize.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/not_closed_itemize.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/itemize/not_closed_itemize.pl 15 Feb 2011 21:40:42 -0000
1.11
+++ t/results/itemize/not_closed_itemize.pl 19 Feb 2011 18:04:40 -0000
1.12
@@ -28,7 +28,8 @@
'type' => 'command_as_argument'
}
]
- ]
+ ],
+ 'command_as_argument' => {}
},
'line_nr' => {
'file_name' => '',
@@ -43,6 +44,7 @@
$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'not_closed_itemize'}{'contents'}[0];
$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'not_closed_itemize'}{'contents'}[0];
$result_trees{'not_closed_itemize'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'not_closed_itemize'}{'contents'}[0];
+$result_trees{'not_closed_itemize'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'not_closed_itemize'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'not_closed_itemize'}{'contents'}[0]{'parent'} =
$result_trees{'not_closed_itemize'};
$result_texis{'not_closed_itemize'} = '@itemize
Index: t/results/plaintext_tests/long_uref_after_item.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/long_uref_after_item.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/long_uref_after_item.pl 19 Feb 2011 11:33:24
-0000 1.1
+++ t/results/plaintext_tests/long_uref_after_item.pl 19 Feb 2011 18:04:40
-0000 1.2
@@ -83,7 +83,8 @@
'type' => 'command_as_argument'
}
]
- ]
+ ],
+ 'command_as_argument' => {}
},
'line_nr' => {
'file_name' => '',
@@ -112,6 +113,7 @@
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[2];
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'long_uref_after_item'}{'contents'}[0];
$result_trees{'long_uref_after_item'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'long_uref_after_item'}{'contents'}[0];
+$result_trees{'long_uref_after_item'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'long_uref_after_item'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'long_uref_after_item'}{'contents'}[0]{'parent'} =
$result_trees{'long_uref_after_item'};
$result_trees{'long_uref_after_item'}{'contents'}[1]{'parent'} =
$result_trees{'long_uref_after_item'};
Index: t/results/xtable/accent_on_table_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/accent_on_table_line.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/xtable/accent_on_table_line.pl 19 Feb 2011 02:26:42 -0000
1.4
+++ t/results/xtable/accent_on_table_line.pl 19 Feb 2011 18:04:40 -0000
1.5
@@ -15,7 +15,8 @@
},
{
'cmdname' => '~',
- 'parent' => {}
+ 'parent' => {},
+ 'type' => 'command_as_argument'
},
{
'parent' => {},
@@ -121,9 +122,14 @@
'extra' => {
'block_command_line_contents' => [
[
- {}
- ]
+ {
+ 'cmdname' => 'asis',
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ }
]
+ ],
+ 'command_as_argument' => {}
},
'line_nr' => {
'file_name' => '',
@@ -161,7 +167,8 @@
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'misc_content'}[1]
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'accent_on_table_line'}{'contents'}[0];
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'accent_on_table_line'}{'contents'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'accent_on_table_line'}{'contents'}[0]{'parent'} =
$result_trees{'accent_on_table_line'};
$result_trees{'accent_on_table_line'}{'contents'}[1]{'parent'} =
$result_trees{'accent_on_table_line'};
Index: t/results/xtable/invalid_command_and_brace_in_table.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/invalid_command_and_brace_in_table.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/xtable/invalid_command_and_brace_in_table.pl 15 Feb 2011
21:40:48 -0000 1.9
+++ t/results/xtable/invalid_command_and_brace_in_table.pl 19 Feb 2011
18:04:40 -0000 1.10
@@ -5,14 +5,32 @@
$result_trees{'invalid_command_and_brace_in_table'} = {
'contents' => [
{
- 'cmdname' => 'table',
+ 'args' => [
+ {
'contents' => [
{
'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'cmdname' => 'asis',
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ },
+ {
+ 'parent' => {},
'text' => '
',
- 'type' => 'empty_line_after_command'
- },
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
@@ -45,6 +63,14 @@
'type' => 'before_item'
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'command_as_argument' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
@@ -61,17 +87,22 @@
],
'type' => 'text_root'
};
+$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'args'}[0];
+$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'args'}[0];
+$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'args'}[0];
+$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0];
+$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0];
+$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0];
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0];
-$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[1];
-$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[1];
-$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0];
+$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'parent'} =
$result_trees{'invalid_command_and_brace_in_table'};
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[1]{'parent'} =
$result_trees{'invalid_command_and_brace_in_table'};
-$result_texis{'invalid_command_and_brace_in_table'} = '@table
+$result_texis{'invalid_command_and_brace_in_table'} = '@table @asis
,, title
long title
Item line
Index: t/results/xtable/no_arg_brace_command_on_table_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/xtable/no_arg_brace_command_on_table_line.pl 15 Feb 2011
21:40:48 -0000 1.3
+++ t/results/xtable/no_arg_brace_command_on_table_line.pl 19 Feb 2011
18:04:40 -0000 1.4
@@ -67,7 +67,11 @@
'extra' => {
'block_command_line_contents' => [
[
- {}
+ {
+ 'cmdname' => 'asis',
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ }
]
],
'command_as_argument' => {}
@@ -98,8 +102,8 @@
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0];
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0];
-$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0];
+$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'parent'} =
$result_trees{'no_arg_brace_command_on_table_line'};
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[1]{'parent'} =
$result_trees{'no_arg_brace_command_on_table_line'};
Index: t/results/info_tests/top_node_normalization.pl
===================================================================
RCS file: t/results/info_tests/top_node_normalization.pl
diff -N t/results/info_tests/top_node_normalization.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/info_tests/top_node_normalization.pl 19 Feb 2011 18:04:40
-0000 1.1
@@ -0,0 +1,354 @@
+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_trees{'top_node_normalization'} = {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'text_root'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ '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'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'TOP'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'xref',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'node_argument' => {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '. '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'tOP'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'xref',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'node_argument' => {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'menu',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => '* ',
+ 'type' => 'menu_entry_leading_text'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'tOP'
+ }
+ ],
+ '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' => 'Top'
+ }
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'menu_entry'
+ }
+ ],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
+ ],
+ '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{'top_node_normalization'}{'contents'}[0]{'parent'} =
$result_trees{'top_node_normalization'};
+$result_trees{'top_node_normalization'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1]{'args'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1]{'args'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1]{'args'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'top_node_normalization'}{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'line_nr'}
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[1]{'parent'}
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[2]{'parent'}
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[3];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[3]{'parent'}
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'top_node_normalization'}{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'top_node_normalization'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
=
$result_trees{'top_node_normalization'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'top_node_normalization'}{'contents'}[1]{'parent'} =
$result_trees{'top_node_normalization'};
+
+$result_texis{'top_node_normalization'} = '@node ToP
+
address@hidden @xref{tOP}.
+
address@hidden
+* tOP::
address@hidden menu
+';
+
+
+$result_texts{'top_node_normalization'} = '
+. .
+
+* tOP::
+';
+
+$result_sectioning{'top_node_normalization'} = {};
+
+$result_nodes{'top_node_normalization'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'menu_child' => {},
+ 'menus' => [
+ {
+ 'cmdname' => 'menu'
+ }
+ ],
+ 'node_next' => {},
+ 'node_prev' => {},
+ 'node_up' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'dir'
+ }
+ ]
+ }
+ }
+};
+$result_nodes{'top_node_normalization'}{'menu_child'} =
$result_nodes{'top_node_normalization'};
+$result_nodes{'top_node_normalization'}{'node_next'} =
$result_nodes{'top_node_normalization'};
+$result_nodes{'top_node_normalization'}{'node_prev'} =
$result_nodes{'top_node_normalization'};
+
+$result_menus{'top_node_normalization'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'menu_child' => {},
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'Top' => 1
+ }
+};
+$result_menus{'top_node_normalization'}{'menu_child'} =
$result_menus{'top_node_normalization'};
+$result_menus{'top_node_normalization'}{'menu_up'} =
$result_menus{'top_node_normalization'};
+
+$result_errors{'top_node_normalization'} = [
+ {
+ 'error_line' => ':1: warning: For `ToP\', up in menu `ToP\' and up
`(dir)\' don\'t match
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'For `ToP\', up in menu `ToP\' and up `(dir)\' don\'t match',
+ 'type' => 'warning'
+ }
+];
+
+
+
+$result_converted{'info'}->{'top_node_normalization'} = 'This is , produced by
makeinfo version 4.13 from .
+
+
+File: , Node: Top, Next: ToP, Prev: ToP, Up: (dir)
+
+*Note TOP::. *Note tOP::.
+
+* Menu:
+
+* tOP::
+
+
+Tag Table:
+Node: Top52
+
+End Tag Table
+';
+
+1;
Index: t/results/xtable/no_argument_for_table.pl
===================================================================
RCS file: t/results/xtable/no_argument_for_table.pl
diff -N t/results/xtable/no_argument_for_table.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/xtable/no_argument_for_table.pl 19 Feb 2011 18:04:40 -0000
1.1
@@ -0,0 +1,132 @@
+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_trees{'no_argument_for_table'} = {
+ 'contents' => [
+ {
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'item'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'misc_content' => [
+ {}
+ ]
+ },
+ 'parent' => {}
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'In item.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {
+ 'cmdname' => 'asis',
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ }
+ ]
+ ],
+ 'command_as_argument' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'no_argument_for_table'}{'contents'}[0];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'no_argument_for_table'}{'contents'}[0];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'extra'}{'misc_content'}[0]
=
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'no_argument_for_table'}{'contents'}[0];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[3];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'no_argument_for_table'}{'contents'}[0];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'no_argument_for_table'}{'contents'}[0];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'no_argument_for_table'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'parent'} =
$result_trees{'no_argument_for_table'};
+$result_trees{'no_argument_for_table'}{'contents'}[1]{'parent'} =
$result_trees{'no_argument_for_table'};
+
+$result_texis{'no_argument_for_table'} = '@table
address@hidden item
+In item.
address@hidden table
+';
+
+
+$result_texts{'no_argument_for_table'} = 'item
+In item.
+';
+
+$result_errors{'no_argument_for_table'} = [
+ {
+ 'error_line' => ':1: table requires an argument: the formatter for @item
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'table requires an argument: the formatter for @item',
+ 'type' => 'error'
+ }
+];
+
+
+1;
- texinfo/tp Texinfo/Parser.pm Texinfo/Convert/In...,
Patrice Dumas <=