[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Parser.pm t/19def.t t/r...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Parser.pm t/19def.t t/r... |
|
Date: |
Sun, 17 Apr 2011 06:27:10 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/04/17 06:27:10
Modified files:
tp : TODO
tp/Texinfo : Parser.pm
tp/t : 19def.t
tp/t/results/coverage: def.pl
tp/t/results/def: empty_def_arguments.pl
inter_item_commands_in_def.pl
space_in_def_for_index.pl
wrong_braces_simple.pl
wrong_braces_with_end_of_lines.pl
tp/t/results/indices: empty_index_entry.pl
Added files:
tp/t/results/def: leading_space_in_def_arg.pl
Log message:
Mark leading spaces in bracketed in def lines or multitable line as
leading argument spaces.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.243&r2=1.244
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/19def.t?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_arguments.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/inter_item_commands_in_def.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/space_in_def_for_index.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_simple.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_with_end_of_lines.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/leading_space_in_def_arg.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/empty_index_entry.pl?cvsroot=texinfo&r1=1.3&r2=1.4
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- TODO 6 Apr 2011 23:48:52 -0000 1.120
+++ TODO 17 Apr 2011 06:27:08 -0000 1.121
@@ -140,11 +140,6 @@
determined by the module used (Plaintext.pm or info.pm). No idea whether
it is right or wrong.
-With something like
address@hidden { category}
-the space is stripped everywhere but in sorting. Should be stripped in
-sorting too.
-
tests/indices/index_entry_in_footnote_separated_info the node of index
entry is Top, it should be the node created especially for the footnote
and the lines count should also be adjusted.
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -b -r1.243 -r1.244
--- Texinfo/Parser.pm 16 Apr 2011 18:08:49 -0000 1.243
+++ Texinfo/Parser.pm 17 Apr 2011 06:27:09 -0000 1.244
@@ -1890,8 +1890,8 @@
# $current is the command element.
# $content holds the actual content.
# for index entries and v|ftable items, it is the index entry content,
-# for def, it is the parsed arguments. The actual content should be
-# constructed based on the definition line arguments.
+# for def, it is the parsed arguments, based on the definition line
+# arguments.
sub _enter_index_entry($$$$$)
{
my $self = shift;
@@ -1920,6 +1920,7 @@
$self->line_error (sprintf($self->__("Entry for index `%s' outside of any
node"),
$index_name), $line_nr);
}
+ #print STDERR "INDEX ENTRY address@hidden>{'cmdname'}
$index_name($number)\n";
push @{$self->{'index_entries'}->{$index_name}}, $index_entry;
$current->{'extra'}->{'index_entry'} = $index_entry;
}
@@ -3870,17 +3871,26 @@
.(defined($current->{'parent'}->{'remaining_args'}) ?
"remaining: $current->{'parent'}->{'remaining_args'}, " : '')
.($current->{'type'} ? "type: $current->{'type'}" : '')."\n"
if ($self->{'DEBUG'});
- } elsif (($current->{'parent'}
+ } elsif ($current->{'parent'}
and (($current->{'parent'}->{'cmdname'}
and $current->{'parent'}->{'cmdname'} eq
'multitable')
or ($current->{'parent'}->{'type'}
- and $current->{'parent'}->{'type'} eq
'def_line')))
- or $self->{'context_stack'}->[-1] eq 'math') {
+ and $current->{'parent'}->{'type'} eq
'def_line'))) {
+ push @{$current->{'contents'}},
+ { 'type' => 'bracketed', 'contents' => [],
+ 'parent' => $current };
+ $current = $current->{'contents'}->[-1];
+ push @{$current->{'contents'}},
+ {'type' => 'empty_spaces_before_argument',
+ 'text' => '' };
+ print STDERR "BRACKETED in def/multitable\n" if ($self->{'DEBUG'});
+
+ } elsif ($self->{'context_stack'}->[-1] eq 'math') {
push @{$current->{'contents'}},
{ 'type' => 'bracketed', 'contents' => [],
'parent' => $current };
$current = $current->{'contents'}->[-1];
- print STDERR "BRACKETED\n" if ($self->{'DEBUG'});
+ print STDERR "BRACKETED in math\n" if ($self->{'DEBUG'});
} else {
$self->line_error (sprintf($self->__("Misplaced %c"),
ord('{')), $line_nr);
Index: t/19def.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/19def.t,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/19def.t 15 Mar 2011 20:29:12 -0000 1.15
+++ t/19def.t 17 Apr 2011 06:27:09 -0000 1.16
@@ -92,6 +92,9 @@
@deffnx empty deffnx
@end deffn
'],
+['leading_space_in_def_arg',
+'@deffn category { name} arg
+'],
['defx_after_comment',
'@deffn fset @var{i} a g
@c comment
Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/results/coverage/def.pl 16 Apr 2011 18:08:49 -0000 1.37
+++ t/results/coverage/def.pl 17 Apr 2011 06:27:09 -0000 1.38
@@ -744,8 +744,12 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
- 'text' => ' log trap1'
+ 'text' => 'log trap1'
}
],
'parent' => {},
@@ -1930,7 +1934,7 @@
$result_trees{'def'}{'contents'}[5]{'contents'}[2]{'parent'} =
$result_trees{'def'}{'contents'}[5];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
-$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
Index: t/results/def/empty_def_arguments.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_def_arguments.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/def/empty_def_arguments.pl 6 Mar 2011 14:44:02 -0000
1.19
+++ t/results/def/empty_def_arguments.pl 17 Apr 2011 06:27:09 -0000
1.20
@@ -423,8 +423,8 @@
{
'contents' => [
{
- 'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
}
],
'parent' => {},
@@ -730,7 +730,6 @@
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6];
Index: t/results/def/inter_item_commands_in_def.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/inter_item_commands_in_def.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/def/inter_item_commands_in_def.pl 16 Apr 2011 18:08:49 -0000
1.2
+++ t/results/def/inter_item_commands_in_def.pl 17 Apr 2011 06:27:09 -0000
1.3
@@ -154,8 +154,12 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
- 'text' => ' log trap1'
+ 'text' => 'log trap1'
}
],
'parent' => {},
@@ -545,7 +549,7 @@
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'inter_item_commands_in_def'}{'contents'}[0];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[3]{'args'}[0];
Index: t/results/def/space_in_def_for_index.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/space_in_def_for_index.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/def/space_in_def_for_index.pl 6 Mar 2011 14:44:02 -0000
1.3
+++ t/results/def/space_in_def_for_index.pl 17 Apr 2011 06:27:09 -0000
1.4
@@ -58,8 +58,12 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
- 'text' => ' Category '
+ 'text' => 'Category '
}
],
'parent' => {},
@@ -72,8 +76,12 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
- 'text' => ' name '
+ 'text' => 'name '
}
],
'parent' => {},
@@ -86,8 +94,12 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
- 'text' => ' argument '
+ 'text' => 'argument '
}
],
'parent' => {},
@@ -170,7 +182,7 @@
'index_at_command' => 'deffn',
'index_name' => 'fn',
'index_prefix' => 'f',
- 'key' => ' name ',
+ 'key' => 'name ',
'node' => {},
'number' => 1
},
@@ -410,13 +422,13 @@
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'space_in_def_for_index'}{'contents'}[1];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'space_in_def_for_index'}{'contents'}[1];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -479,7 +491,7 @@
$result_texts{'space_in_def_for_index'} = '
- Category name argument argument2...
+Category name argument argument2...
AAA1 AAA2 arg3
';
@@ -524,8 +536,8 @@
[index ]
* Menu:
-* name : Top. (line 3)
* AAA2: Top. (line 4)
+* name : Top. (line 3)
Index: t/results/def/wrong_braces_simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/wrong_braces_simple.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/def/wrong_braces_simple.pl 6 Mar 2011 14:44:02 -0000
1.18
+++ t/results/def/wrong_braces_simple.pl 17 Apr 2011 06:27:10 -0000
1.19
@@ -352,9 +352,9 @@
{
'contents' => [
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_spaces_before_argument'
}
],
'parent' => {},
@@ -534,8 +534,12 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
- 'text' => ' and after
+ 'text' => 'and after
'
}
],
@@ -1041,9 +1045,9 @@
{
'contents' => [
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_spaces_before_argument'
}
],
'parent' => {},
@@ -1172,8 +1176,12 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
- 'text' => ' and after
+ 'text' => 'and after
'
}
],
@@ -1374,7 +1382,6 @@
$result_trees{'wrong_braces_simple'}{'contents'}[3]{'parent'} =
$result_trees{'wrong_braces_simple'};
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0];
-$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'contents'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
@@ -1395,7 +1402,7 @@
$result_trees{'wrong_braces_simple'}{'contents'}[5]{'parent'} =
$result_trees{'wrong_braces_simple'};
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0];
-$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'contents'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
@@ -1440,7 +1447,6 @@
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[2]{'parent'} =
$result_trees{'wrong_braces_simple'}{'contents'}[8];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0];
-$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_args'}[10][1]{'contents'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'};
@@ -1452,7 +1458,7 @@
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'parent'} =
$result_trees{'wrong_braces_simple'}{'contents'}[8];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0];
-$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_args'}[10][1]{'contents'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'};
@@ -1497,14 +1503,12 @@
truc machin bidule chose and after
truc machin bidule chose and
-
truc machin bidule chose and and after
a b c d e
truc machin bidule chose and
truc machin bidule chose and after
-truc machin bidule chose and
-truc machin bidule chose and and after
+truc machin bidule chose and truc machin bidule chose and and after
';
$result_errors{'wrong_braces_simple'} = [
Index: t/results/def/wrong_braces_with_end_of_lines.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/wrong_braces_with_end_of_lines.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/def/wrong_braces_with_end_of_lines.pl 16 Apr 2011 18:08:49
-0000 1.18
+++ t/results/def/wrong_braces_with_end_of_lines.pl 17 Apr 2011 06:27:10
-0000 1.19
@@ -25,8 +25,12 @@
{
'contents' => [
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
'parent' => {},
- 'text' => ' more args
+ 'text' => 'more args
'
}
],
@@ -368,7 +372,7 @@
};
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0];
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
Index: t/results/indices/empty_index_entry.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/empty_index_entry.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/indices/empty_index_entry.pl 6 Mar 2011 14:44:03 -0000
1.3
+++ t/results/indices/empty_index_entry.pl 17 Apr 2011 06:27:10 -0000
1.4
@@ -67,8 +67,8 @@
{
'contents' => [
{
- 'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
}
],
'parent' => {},
@@ -123,7 +123,7 @@
'index_at_command' => 'deffn',
'index_name' => 'fn',
'index_prefix' => 'f',
- 'key' => ' ',
+ 'key' => '',
'node' => {},
'number' => 1
},
@@ -255,7 +255,6 @@
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
Index: t/results/def/leading_space_in_def_arg.pl
===================================================================
RCS file: t/results/def/leading_space_in_def_arg.pl
diff -N t/results/def/leading_space_in_def_arg.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/def/leading_space_in_def_arg.pl 17 Apr 2011 06:27:09 -0000
1.1
@@ -0,0 +1,166 @@
+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);
+
+use utf8;
+
+$result_trees{'leading_space_in_def_arg'} = {
+ 'contents' => [
+ {
+ 'cmdname' => 'deffn',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'category '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'name'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'bracketed'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' arg
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'extra' => {
+ 'def_args' => [
+ [
+ 'category',
+ {
+ 'text' => 'category'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'name',
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'bracketed_def_content'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'arg',
+ {
+ 'text' => 'arg'
+ }
+ ]
+ ],
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'index_at_command' => 'deffn',
+ 'index_name' => 'fn',
+ 'index_prefix' => 'f',
+ 'number' => 1
+ },
+ 'original_def_cmdname' => 'deffn'
+ },
+ 'parent' => {},
+ 'type' => 'def_line'
+ }
+ ],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'leading_space_in_def_arg'}{'contents'}[0];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'parent'} =
$result_trees{'leading_space_in_def_arg'};
+
+$result_texis{'leading_space_in_def_arg'} = '@deffn category { name} arg
address@hidden deffn
+';
+
+
+$result_texts{'leading_space_in_def_arg'} = 'category name arg
+';
+
+$result_errors{'leading_space_in_def_arg'} = [
+ {
+ 'error_line' => ':1: Entry for index `fn\' outside of any node
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'Entry for index `fn\' outside of any node',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':1: No matching address@hidden deffn\'
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'No matching address@hidden deffn\'',
+ 'type' => 'error'
+ }
+];
+
+
+
+$result_converted{'plaintext'}->{'leading_space_in_def_arg'} = ' -- category:
name arg
+';
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Parser.pm t/19def.t t/r...,
Patrice Dumas <=