[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Parser.pm t/results/ali...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Parser.pm t/results/ali... |
|
Date: |
Sun, 17 Oct 2010 17:16:59 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/10/17 17:16:58
Modified files:
tp : TODO
tp/Texinfo : Parser.pm
tp/t/results/alias: simple.pl
tp/t/results/columnfractions: empty.pl empty_comment.pl good.pl
good_comment.pl
good_space_comment.pl
not_fraction.pl
something_before_columnfractions.pl
wrong_command.pl
tp/t/results/coverage: block_commands.pl def.pl
item_container.pl multitable.pl
preformatted.pl table.pl
table_command_comment.pl
tp/t/results/itemize: accent_argument.pl w_argument.pl
tp/t/results/macro: macro_in_brace_command.pl
macro_in_ifset_end_in_arg.pl
tp/t/results/value: bad_syntax.pl
Log message:
Detect better empty spaces after commands.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/alias/simple.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/empty.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/empty_comment.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/good.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/good_comment.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/good_space_comment.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/not_fraction.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/something_before_columnfractions.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/columnfractions/wrong_command.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/block_commands.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table_command_comment.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/accent_argument.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/w_argument.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_brace_command.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_ifset_end_in_arg.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/bad_syntax.pl?cvsroot=texinfo&r1=1.9&r2=1.10
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- TODO 17 Oct 2010 16:08:34 -0000 1.20
+++ TODO 17 Oct 2010 17:16:58 -0000 1.21
@@ -25,9 +25,6 @@
t/results/macro/macro_in_misc_commands.pl
some spaces are not counted as empty_spaces_after_command.
address@hidden/float argument leading spaces should be in
-empty_spaces_after_command.
-
@c in menu lines (and maybe at other places) should be replaced by
\n and not eat the end of line.
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- Texinfo/Parser.pm 17 Oct 2010 16:08:34 -0000 1.76
+++ Texinfo/Parser.pm 17 Oct 2010 17:16:58 -0000 1.77
@@ -439,12 +439,18 @@
delete $begin_line_commands{$misc_not_begin_line};
}
+my %block_arg_commands;
foreach my $block_command (keys(%block_commands)) {
$begin_line_commands{$block_command} = 1;
$default_no_paragraph_commands{$block_command} = 1;
$close_paragraph_commands{$block_command} = 1
unless ($block_commands{$block_command} eq 'raw' or
$block_commands{$block_command} eq 'conditional');
+ $block_arg_commands{$block_command} = 1
+ if ($block_command eq 'multitable'
+ or $def_commands{$block_command}
+ or ($block_commands{$block_command}
+ and $block_commands{$block_command} =~ /^\d+$/));
}
$close_paragraph_commands{'verbatim'} = 1;
@@ -1319,22 +1325,18 @@
}
$multitable->{'special'}->{'prototypes'} = address@hidden;
- # don't consider empty argument of block @-commands as arguments,
- # but instead consider them as empty_line_after_command
- } elsif (@{$current->{'parent'}->{'args'}} == 1
- and @{$current->{'contents'}} == 1
- and defined $current->{'contents'}->[0]->{'text'}
- and $current->{'contents'}->[0]->{'text'} !~ /\S/) {
- $empty_text = $current->{'contents'}->[0];
}
$current = $current->{'parent'};
- if (defined($empty_text)) {
+ # don't consider empty argument of block @-commands as argument,
+ # reparent them as contents
+ if ($current->{'args'}->[0]->{'contents'}->[0]
+ and $current->{'args'}->[0]->{'contents'}->[0]->{'type'}
+ and $current->{'args'}->[0]->{'contents'}->[0]->{'type'} eq
'empty_line_after_command')
+ {
+ my $empty_text = $current->{'args'}->[0]->{'contents'}->[0];
+ $empty_text->{'parent'} = $current;
+ unshift @{$current->{'contents'}}, $empty_text;
delete $current->{'args'};
- if ($empty_text->{'text'} ne '') {
- push @{$current->{'contents'}}, { 'type' => 'empty_line_after_command',
- 'text' => $empty_text->{'text'},
- 'parent' => $current };
- }
}
if ($current->{'cmdname'}
and $block_item_commands{$current->{'cmdname'}}) {
@@ -2157,17 +2159,14 @@
'contents' => [] };
}
$current = $current->{'contents'}->[-1];
- my $arg_number = $block_commands{$command}
- if ($block_commands{$command}
- and $block_commands{$command} =~ /^\d+$/);
- if ($arg_number
- or $command eq 'multitable'
- or $def_commands{$command}) {
+ if ($block_arg_commands{$command}) {
$current->{'args'} = [ {
'type' => 'block_line_arg',
'contents' => [],
'parent' => $current } ];
- $current->{'remaining_args'} = $arg_number -1 if ($arg_number);
+
+ $current->{'remaining_args'} = $block_commands{$command} -1
+ if ($block_commands{$command} =~ /^\d+$/);
$current = $current->{'args'}->[-1];
} else {
push @{$self->{'context_stack'}}, 'preformatted'
@@ -2181,8 +2180,8 @@
print STDERR "MENU_COMMENT OPEN\n" if ($self->{'debug'});
}
- $line = _start_empty_line_after_command($line, $current);
}
+ $line = _start_empty_line_after_command($line, $current);
}
} elsif (defined($brace_commands{$command})
or defined($self->{'definfoenclose'}->{$command})) {
@@ -2223,6 +2222,7 @@
if ($separator eq '@') {
_line_error ($self, $self->__("Unexpected \@"), $line_nr);
} elsif ($separator eq '{') {
+ _abort_empty_line ($self, $current);
if ($current->{'cmdname'}
and (defined($brace_commands{$current->{'cmdname'}})
or $self->{'definfoenclose'}->{$current->{'cmdname'}})) {
@@ -2263,6 +2263,7 @@
}
} elsif ($separator eq '}') {
+ _abort_empty_line ($self, $current);
#print STDERR "GGGGG". _print_current ($current);
if ($current->{'type'} and ($current->{'type'} eq 'bracketed')) {
$current = $current->{'parent'};
@@ -2275,7 +2276,6 @@
}
# first is the arg.
print STDERR "CLOSING address@hidden>{'parent'}->{'cmdname'}\n"
if ($self->{'debug'});
- _abort_empty_line ($self, $current);
$current = $current->{'parent'}->{'parent'};
# footnote caption closing
} elsif ($context_brace_commands{$self->{'context_stack'}->[-1]}) {
@@ -2295,8 +2295,8 @@
}
} elsif ($separator eq ','
and $current->{'parent'}->{'remaining_args'}) {
- my $type = $current->{'type'};
_abort_empty_line ($self, $current);
+ my $type = $current->{'type'};
$current = $current->{'parent'};
$current->{'remaining_args'}--;
push @{$current->{'args'}},
Index: t/results/alias/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/alias/simple.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/alias/simple.pl 17 Oct 2010 10:50:45 -0000 1.9
+++ t/results/alias/simple.pl 17 Oct 2010 17:16:58 -0000 1.10
@@ -167,7 +167,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'cmdname' => 'code',
Index: t/results/columnfractions/empty.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/columnfractions/empty.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/columnfractions/empty.pl 17 Oct 2010 10:50:45 -0000 1.10
+++ t/results/columnfractions/empty.pl 17 Oct 2010 17:16:58 -0000 1.11
@@ -8,7 +8,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'args' => [
Index: t/results/columnfractions/empty_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/columnfractions/empty_comment.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/columnfractions/empty_comment.pl 17 Oct 2010 10:50:45 -0000
1.10
+++ t/results/columnfractions/empty_comment.pl 17 Oct 2010 17:16:58 -0000
1.11
@@ -8,7 +8,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'args' => [
Index: t/results/columnfractions/good.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/columnfractions/good.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/columnfractions/good.pl 17 Oct 2010 10:50:45 -0000 1.10
+++ t/results/columnfractions/good.pl 17 Oct 2010 17:16:58 -0000 1.11
@@ -8,7 +8,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'args' => [
Index: t/results/columnfractions/good_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/columnfractions/good_comment.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/columnfractions/good_comment.pl 17 Oct 2010 10:50:45 -0000
1.10
+++ t/results/columnfractions/good_comment.pl 17 Oct 2010 17:16:58 -0000
1.11
@@ -8,7 +8,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'args' => [
Index: t/results/columnfractions/good_space_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/columnfractions/good_space_comment.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/columnfractions/good_space_comment.pl 17 Oct 2010 10:50:45
-0000 1.10
+++ t/results/columnfractions/good_space_comment.pl 17 Oct 2010 17:16:58
-0000 1.11
@@ -8,7 +8,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'args' => [
Index: t/results/columnfractions/not_fraction.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/columnfractions/not_fraction.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/columnfractions/not_fraction.pl 17 Oct 2010 10:50:45 -0000
1.10
+++ t/results/columnfractions/not_fraction.pl 17 Oct 2010 17:16:58 -0000
1.11
@@ -8,7 +8,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'args' => [
Index: t/results/columnfractions/something_before_columnfractions.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/columnfractions/something_before_columnfractions.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/columnfractions/something_before_columnfractions.pl 17 Oct
2010 16:08:34 -0000 1.1
+++ t/results/columnfractions/something_before_columnfractions.pl 17 Oct
2010 17:16:58 -0000 1.2
@@ -8,7 +8,12 @@
'contents' => [
{
'parent' => {},
- 'text' => ' aaa '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'aaa '
},
{
'args' => [
@@ -64,10 +69,11 @@
]
};
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0];
-$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0];
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0];
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'something_before_columnfractions'}{'contents'}[0];
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'something_before_columnfractions'}{'contents'}[0];
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'parent'} =
$result_trees{'something_before_columnfractions'};
Index: t/results/columnfractions/wrong_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/columnfractions/wrong_command.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/columnfractions/wrong_command.pl 17 Oct 2010 10:50:45 -0000
1.11
+++ t/results/columnfractions/wrong_command.pl 17 Oct 2010 17:16:58 -0000
1.12
@@ -8,7 +8,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'args' => [
Index: t/results/coverage/block_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/block_commands.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/coverage/block_commands.pl 17 Oct 2010 10:50:46 -0000
1.8
+++ t/results/coverage/block_commands.pl 17 Oct 2010 17:16:58 -0000
1.9
@@ -49,7 +49,12 @@
'contents' => [
{
'parent' => {},
- 'text' => ' warning
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'warning
'
}
],
@@ -92,7 +97,12 @@
'contents' => [
{
'parent' => {},
- 'text' => ' a float'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'a float'
}
],
'parent' => {},
@@ -204,6 +214,7 @@
$result_trees{'block_commands'}{'contents'}[2]{'parent'} =
$result_trees{'block_commands'};
$result_trees{'block_commands'}{'contents'}[3]{'parent'} =
$result_trees{'block_commands'};
$result_trees{'block_commands'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'block_commands'}{'contents'}[4]{'args'}[0];
+$result_trees{'block_commands'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'block_commands'}{'contents'}[4]{'args'}[0];
$result_trees{'block_commands'}{'contents'}[4]{'args'}[0]{'parent'} =
$result_trees{'block_commands'}{'contents'}[4];
$result_trees{'block_commands'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'block_commands'}{'contents'}[4]{'contents'}[0];
$result_trees{'block_commands'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'block_commands'}{'contents'}[4];
@@ -211,6 +222,7 @@
$result_trees{'block_commands'}{'contents'}[5]{'parent'} =
$result_trees{'block_commands'};
$result_trees{'block_commands'}{'contents'}[6]{'parent'} =
$result_trees{'block_commands'};
$result_trees{'block_commands'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[0];
+$result_trees{'block_commands'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[0];
$result_trees{'block_commands'}{'contents'}[7]{'args'}[0]{'parent'} =
$result_trees{'block_commands'}{'contents'}[7];
$result_trees{'block_commands'}{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[1];
$result_trees{'block_commands'}{'contents'}[7]{'args'}[1]{'parent'} =
$result_trees{'block_commands'}{'contents'}[7];
@@ -252,7 +264,7 @@
$result_texts{'block_commands'} = '
in group
- warning
+warning
in quotation
Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/coverage/def.pl 17 Oct 2010 10:50:46 -0000 1.9
+++ t/results/coverage/def.pl 17 Oct 2010 17:16:58 -0000 1.10
@@ -17,7 +17,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'contents' => [
@@ -77,7 +78,12 @@
'contents' => [
{
'parent' => {},
- 'text' => ' cate--gory de--ffn_name ar--guments more args
'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'cate--gory de--ffn_name ar--guments more args '
},
{
'cmdname' => '*',
@@ -131,7 +137,12 @@
'contents' => [
{
'parent' => {},
- 'text' => ' fset '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'fset '
},
{
'args' => [
@@ -171,7 +182,7 @@
{
'parent' => {},
'text' => ' ',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_spaces_after_command'
},
{
'contents' => [
@@ -461,11 +472,6 @@
{
'contents' => [
{
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- },
- {
'contents' => [],
'parent' => {},
'type' => 'bracketed'
@@ -489,11 +495,6 @@
{
'contents' => [
{
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- },
- {
'contents' => [],
'parent' => {},
'type' => 'bracketed'
@@ -531,11 +532,6 @@
{
'contents' => [
{
- 'parent' => {},
- 'text' => '',
- 'type' => 'empty_line_after_command'
- },
- {
'contents' => [
{
'parent' => {},
@@ -566,7 +562,7 @@
{
'parent' => {},
'text' => ' ',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_spaces_after_command'
},
{
'contents' => [
@@ -618,7 +614,7 @@
{
'parent' => {},
'text' => ' ',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_spaces_after_command'
},
{
'contents' => [
@@ -668,7 +664,7 @@
{
'parent' => {},
'text' => ' ',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_spaces_after_command'
},
{
'contents' => [
@@ -724,6 +720,7 @@
$result_trees{'def'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'def'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'def'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'def'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'def'}{'contents'}[4]{'contents'}[0]{'args'}[0];
+$result_trees{'def'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'def'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'def'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'def'}{'contents'}[4]{'contents'}[0];
$result_trees{'def'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'def'}{'contents'}[4];
$result_trees{'def'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'def'}{'contents'}[4]{'contents'}[1];
@@ -732,10 +729,11 @@
$result_trees{'def'}{'contents'}[5]{'parent'} = $result_trees{'def'};
$result_trees{'def'}{'contents'}[6]{'parent'} = $result_trees{'def'};
$result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0];
-$result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0];
+$result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0];
+$result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0];
$result_trees{'def'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'def'}{'contents'}[7]{'contents'}[0];
$result_trees{'def'}{'contents'}[7]{'contents'}[0]{'parent'} =
$result_trees{'def'}{'contents'}[7];
$result_trees{'def'}{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[1]{'args'}[0];
@@ -795,21 +793,18 @@
$result_trees{'def'}{'contents'}[7]{'contents'}[6]{'parent'} =
$result_trees{'def'}{'contents'}[7];
$result_trees{'def'}{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[7]{'args'}[0];
$result_trees{'def'}{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[7]{'args'}[0];
-$result_trees{'def'}{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[7]{'args'}[0];
$result_trees{'def'}{'contents'}[7]{'contents'}[7]{'args'}[0]{'parent'} =
$result_trees{'def'}{'contents'}[7]{'contents'}[7];
$result_trees{'def'}{'contents'}[7]{'contents'}[7]{'parent'} =
$result_trees{'def'}{'contents'}[7];
$result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0];
$result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0];
+$result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
$result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[3];
$result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0];
-$result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[4]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0];
$result_trees{'def'}{'contents'}[7]{'contents'}[8]{'args'}[0]{'parent'} =
$result_trees{'def'}{'contents'}[7]{'contents'}[8];
$result_trees{'def'}{'contents'}[7]{'contents'}[8]{'parent'} =
$result_trees{'def'}{'contents'}[7];
+$result_trees{'def'}{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0];
$result_trees{'def'}{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[9]{'args'}[0];
-$result_trees{'def'}{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[1];
$result_trees{'def'}{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[9]{'args'}[0];
-$result_trees{'def'}{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[9]{'args'}[0];
$result_trees{'def'}{'contents'}[7]{'contents'}[9]{'args'}[0]{'parent'} =
$result_trees{'def'}{'contents'}[7]{'contents'}[9];
$result_trees{'def'}{'contents'}[7]{'contents'}[9]{'parent'} =
$result_trees{'def'}{'contents'}[7];
$result_trees{'def'}{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[7]{'contents'}[10]{'args'}[0];
Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/coverage/item_container.pl 17 Oct 2010 10:50:46 -0000
1.8
+++ t/results/coverage/item_container.pl 17 Oct 2010 17:16:58 -0000
1.9
@@ -14,7 +14,12 @@
'contents' => [
{
'parent' => {},
- 'text' => ' +
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '+
'
}
],
@@ -73,7 +78,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'cmdname' => 'bullet',
@@ -138,6 +144,7 @@
};
$result_trees{'item_container'}{'contents'}[0]{'parent'} =
$result_trees{'item_container'};
$result_trees{'item_container'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'item_container'}{'contents'}[1]{'args'}[0];
+$result_trees{'item_container'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'item_container'}{'contents'}[1]{'args'}[0];
$result_trees{'item_container'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'item_container'}{'contents'}[1];
$result_trees{'item_container'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'item_container'}{'contents'}[1];
$result_trees{'item_container'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'item_container'}{'contents'}[1]{'contents'}[1];
Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/coverage/multitable.pl 17 Oct 2010 10:50:46 -0000 1.9
+++ t/results/coverage/multitable.pl 17 Oct 2010 17:16:58 -0000 1.10
@@ -14,7 +14,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'args' => [
@@ -301,7 +302,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'contents' => [
Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/coverage/preformatted.pl 17 Oct 2010 10:50:46 -0000 1.8
+++ t/results/coverage/preformatted.pl 17 Oct 2010 17:16:58 -0000 1.9
@@ -63,7 +63,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'cmdname' => 'code',
Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage/table.pl 17 Oct 2010 10:50:46 -0000 1.7
+++ t/results/coverage/table.pl 17 Oct 2010 17:16:58 -0000 1.8
@@ -14,7 +14,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'cmdname' => 'asis',
@@ -121,7 +122,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'cmdname' => 'samp',
Index: t/results/coverage/table_command_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/table_command_comment.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/coverage/table_command_comment.pl 17 Oct 2010 10:50:46 -0000
1.6
+++ t/results/coverage/table_command_comment.pl 17 Oct 2010 17:16:58 -0000
1.7
@@ -8,7 +8,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'cmdname' => 'code',
Index: t/results/itemize/accent_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/accent_argument.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/itemize/accent_argument.pl 17 Oct 2010 10:50:46 -0000
1.7
+++ t/results/itemize/accent_argument.pl 17 Oct 2010 17:16:58 -0000
1.8
@@ -8,7 +8,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'cmdname' => '~',
@@ -83,7 +84,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'cmdname' => '~',
Index: t/results/itemize/w_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/w_argument.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/itemize/w_argument.pl 17 Oct 2010 10:50:46 -0000 1.7
+++ t/results/itemize/w_argument.pl 17 Oct 2010 17:16:58 -0000 1.8
@@ -8,7 +8,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'args' => [
Index: t/results/macro/macro_in_brace_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_brace_command.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/macro/macro_in_brace_command.pl 17 Oct 2010 10:50:46 -0000
1.8
+++ t/results/macro/macro_in_brace_command.pl 17 Oct 2010 17:16:58 -0000
1.9
@@ -82,7 +82,8 @@
'contents' => [
{
'parent' => {},
- 'text' => ' '
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'cmdname' => 'bullet',
Index: t/results/macro/macro_in_ifset_end_in_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_ifset_end_in_arg.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/macro/macro_in_ifset_end_in_arg.pl 17 Oct 2010 10:50:46
-0000 1.8
+++ t/results/macro/macro_in_ifset_end_in_arg.pl 17 Oct 2010 17:16:58
-0000 1.9
@@ -50,8 +50,7 @@
{
'parent' => {},
'text' => '
-',
- 'type' => 'empty_line'
+'
},
{
'contents' => [
Index: t/results/value/bad_syntax.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/bad_syntax.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/value/bad_syntax.pl 17 Oct 2010 10:50:48 -0000 1.9
+++ t/results/value/bad_syntax.pl 17 Oct 2010 17:16:58 -0000 1.10
@@ -43,8 +43,7 @@
{
'parent' => {},
'text' => '
-',
- 'type' => 'empty_line'
+'
},
{
'contents' => [
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Parser.pm t/results/ali...,
Patrice Dumas <=