[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Parser.pm Texinfo/Conve...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Parser.pm Texinfo/Conve... |
|
Date: |
Fri, 28 Jan 2011 23:54:31 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/01/28 23:54:31
Modified files:
tp : TODO
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: Plaintext.pm Text.pm
tp/t : 02coverage.t
tp/t/results/coverage_braces: end_line_in_anchor.pl
tp/t/results/float: complex_float.pl
tp/t/results/sectioning: double_node_anchor_float.pl
tp/t/results/test_count: flushright.pl multitable.pl
Added files:
tp/t/results/coverage: hyphenation.pl
Log message:
Flag spaces and ignore spaces that should be ignored after brace
commands
like @anchor, @hyphenation and @caption.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.179&r2=1.180
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/02coverage.t?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/hyphenation.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/end_line_in_anchor.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/flushright.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/multitable.pl?cvsroot=texinfo&r1=1.2&r2=1.3
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- TODO 23 Jan 2011 21:18:26 -0000 1.67
+++ TODO 28 Jan 2011 23:54:29 -0000 1.68
@@ -21,6 +21,9 @@
-> replace acronym_like with the already formatted text and
explanation with convert(explanation).
+t/results/coverage/hyphenation.pl
+$result_converted{'plaintext'}->{'hyphenation'} should only be one line, not 2.
+
Test end_line_count in Texinfo/Convert/ containers.
Following should be an error:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -b -r1.179 -r1.180
--- Texinfo/Parser.pm 23 Jan 2011 21:18:26 -0000 1.179
+++ Texinfo/Parser.pm 28 Jan 2011 23:54:30 -0000 1.180
@@ -374,6 +374,11 @@
$type_with_paragraph{$type} = 1;
}
+my %command_ignore_space_after;
+foreach my $command ('anchor', 'hyphenation', 'caption', 'shortcaption') {
+ $command_ignore_space_after{$command} = 1;
+}
+
my %global_multiple_commands;
foreach my $global_multiple_command ('author', 'documentlanguage',
'subtitle', 'contents', 'shortcontents', 'summarycontents',
@@ -1153,7 +1158,8 @@
if ($current->{'contents'} and @{$current->{'contents'}}
and $current->{'contents'}->[-1]->{'type'}
and ($current->{'contents'}->[-1]->{'type'} eq 'empty_line_after_command'
- or $current->{'contents'}->[-1]->{'type'} eq
'empty_spaces_before_argument')) {
+ or $current->{'contents'}->[-1]->{'type'} eq
'empty_spaces_before_argument'
+ or $current->{'contents'}->[-1]->{'type'} eq
'empty_spaces_after_close_brace')) {
$no_merge_with_following_text = 1;
}
if (_abort_empty_line ($self, $current, $leading_spaces)) {
@@ -1405,7 +1411,8 @@
and $current->{'contents'}->[-1]->{'type'}
and ($current->{'contents'}->[-1]->{'type'} eq 'empty_line'
or $current->{'contents'}->[-1]->{'type'} eq
'empty_spaces_before_argument'
- or $current->{'contents'}->[-1]->{'type'} eq
'empty_line_after_command')) {
+ or $current->{'contents'}->[-1]->{'type'} eq
'empty_line_after_command'
+ or $current->{'contents'}->[-1]->{'type'} eq
'empty_spaces_after_close_brace')) {
print STDERR "ABORT EMPTY additional text $additional_text, current
$current->{'contents'}->[-1]->{'text'}|)\n" if ($self->{'DEBUG'});
$current->{'contents'}->[-1]->{'text'} .= $additional_text;
if ($current->{'contents'}->[-1]->{'text'} eq '') {
@@ -3467,6 +3474,11 @@
$parsed_anchor, $line_nr);
}
}
+ if
($command_ignore_space_after{$current->{'parent'}->{'cmdname'}}) {
+ push @{$current->{'parent'}->{'parent'}->{'contents'}},
+ {'type' => 'empty_spaces_after_close_brace',
+ 'text' => '' };
+ }
$current = $current->{'parent'}->{'parent'};
# footnote caption closing, when there is a paragraph inside.
} elsif ($context_brace_commands{$self->{'context_stack'}->[-1]}) {
@@ -3622,7 +3634,8 @@
if ($contents->[0] and $contents->[0]->{'type'}
and ($contents->[0]->{'type'} eq 'empty_line_after_command'
or $contents->[0]->{'type'} eq 'empty_spaces_after_command'
- or $contents->[0]->{'type'} eq 'empty_spaces_before_argument'));
+ or $contents->[0]->{'type'} eq 'empty_spaces_before_argument'
+ or $contents->[0]->{'type'} eq 'empty_spaces_after_close_brace'));
while (@$contents and (($contents->[-1]->{'cmdname'}
and ($contents->[-1]->{'cmdname'} eq 'c'
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- Texinfo/Convert/Plaintext.pm 28 Jan 2011 22:33:30 -0000 1.57
+++ Texinfo/Convert/Plaintext.pm 28 Jan 2011 23:54:30 -0000 1.58
@@ -185,7 +185,8 @@
my %ignored_types;
foreach my $type ('empty_line_after_command', 'preamble',
'empty_spaces_after_command', 'spaces_at_end',
- 'empty_spaces_before_argument', 'empty_spaces_before_paragraph') {
+ 'empty_spaces_before_argument', 'empty_spaces_before_paragraph',
+ 'empty_spaces_after_close_brace') {
$ignored_types{$type} = 1;
}
Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- Texinfo/Convert/Text.pm 15 Jan 2011 11:57:02 -0000 1.30
+++ Texinfo/Convert/Text.pm 28 Jan 2011 23:54:30 -0000 1.31
@@ -558,7 +558,8 @@
my %ignored_types;
foreach my $type ('empty_line_after_command', 'preamble',
'empty_spaces_after_command', 'spaces_at_end',
- 'empty_spaces_before_argument', 'empty_spaces_before_paragraph') {
+ 'empty_spaces_before_argument', 'empty_spaces_before_paragraph',
+ 'empty_spaces_after_close_brace') {
$ignored_types{$type} = 1;
}
Index: t/02coverage.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/02coverage.t,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/02coverage.t 23 Jan 2011 21:18:26 -0000 1.31
+++ t/02coverage.t 28 Jan 2011 23:54:30 -0000 1.32
@@ -30,6 +30,11 @@
@\
'],
+['hyphenation',
+'
address@hidden }
+
+'],
['block_commands','
@group
in group
Index: t/results/coverage_braces/end_line_in_anchor.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/end_line_in_anchor.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage_braces/end_line_in_anchor.pl 7 Dec 2010 20:34:28
-0000 1.2
+++ t/results/coverage_braces/end_line_in_anchor.pl 28 Jan 2011 23:54:30
-0000 1.3
@@ -47,9 +47,9 @@
'parent' => {}
},
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_spaces_after_close_brace'
}
],
'parent' => {},
@@ -66,7 +66,6 @@
$result_trees{'end_line_in_anchor'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'end_line_in_anchor'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'end_line_in_anchor'}{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}[1]
=
$result_trees{'end_line_in_anchor'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'end_line_in_anchor'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'end_line_in_anchor'}{'contents'}[0];
-$result_trees{'end_line_in_anchor'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'end_line_in_anchor'}{'contents'}[0];
$result_trees{'end_line_in_anchor'}{'contents'}[0]{'parent'} =
$result_trees{'end_line_in_anchor'};
$result_texis{'end_line_in_anchor'} = '@anchor{an
@@ -74,8 +73,7 @@
';
-$result_texts{'end_line_in_anchor'} = '
-';
+$result_texts{'end_line_in_anchor'} = '';
$result_errors{'end_line_in_anchor'} = [];
Index: t/results/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/float/complex_float.pl 9 Jan 2011 22:02:34 -0000 1.1
+++ t/results/float/complex_float.pl 28 Jan 2011 23:54:30 -0000 1.2
@@ -1014,9 +1014,9 @@
'parent' => {}
},
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_spaces_after_close_brace'
}
],
'parent' => {},
@@ -2853,9 +2853,9 @@
'parent' => {}
},
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_spaces_after_close_brace'
}
],
'parent' => {},
@@ -3490,7 +3490,6 @@
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[5];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[5];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[7];
@@ -3814,7 +3813,6 @@
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[18]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[18];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[18];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[18]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[19]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[20]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[20];
Index: t/results/sectioning/double_node_anchor_float.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/double_node_anchor_float.pl 19 Dec 2010 17:25:10
-0000 1.14
+++ t/results/sectioning/double_node_anchor_float.pl 28 Jan 2011 23:54:31
-0000 1.15
@@ -125,9 +125,9 @@
'parent' => {}
},
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_spaces_after_close_brace'
}
],
'parent' => {},
@@ -175,9 +175,9 @@
'parent' => {}
},
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_spaces_after_close_brace'
}
],
'parent' => {},
@@ -551,7 +551,6 @@
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[1];
-$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[2];
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[2];
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -559,7 +558,6 @@
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[3];
-$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[3];
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[3]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[2];
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'contents'}[4]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[2];
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[2]{'args'}[0]{'contents'}[1];
@@ -646,8 +644,6 @@
-
-
';
$result_sectioning{'double_node_anchor_float'} = {};
Index: t/results/test_count/flushright.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/flushright.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/test_count/flushright.pl 28 Jan 2011 07:24:41 -0000 1.2
+++ t/results/test_count/flushright.pl 28 Jan 2011 23:54:31 -0000 1.3
@@ -64,8 +64,12 @@
'parent' => {}
},
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_close_brace'
+ },
+ {
'parent' => {},
- 'text' => ' ada
+ 'text' => 'ada
'
},
{
@@ -106,8 +110,12 @@
'parent' => {}
},
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_close_brace'
+ },
+ {
'parent' => {},
- 'text' => ' and '
+ 'text' => 'and '
},
{
'args' => [
@@ -139,8 +147,12 @@
'parent' => {}
},
{
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_close_brace'
+ },
+ {
'parent' => {},
- 'text' => ' dsdbf
+ 'text' => 'dsdbf
'
}
],
@@ -211,9 +223,9 @@
'parent' => {}
},
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_spaces_after_close_brace'
}
],
'parent' => {},
@@ -263,21 +275,21 @@
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
-$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[3]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
-$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'args'}[0];
-$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[4];
-$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'extra'}{'node_content'}[0]
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
+$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'args'}[0];
+$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5];
+$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'extra'}{'node_content'}[0]
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
-$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'args'}[0];
-$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[6];
-$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'extra'}{'node_content'}[0]
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'line_nr'}
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[4]{'line_nr'};
-$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[6]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[7]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
+$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'args'}[0];
+$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8];
+$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'extra'}{'node_content'}[0]
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'line_nr'}
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[5]{'line_nr'};
+$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[8]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
+$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'contents'}[10]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[2];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'flushright'}{'contents'}[1];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'flushright'}{'contents'}[1];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[4];
@@ -289,7 +301,6 @@
$result_trees{'flushright'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'flushright'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[6];
-$result_trees{'flushright'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[6];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'flushright'}{'contents'}[1];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[7]{'parent'} =
$result_trees{'flushright'}{'contents'}[1];
$result_trees{'flushright'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'parent'}
= $result_trees{'flushright'}{'contents'}[1]{'contents'}[8];
@@ -322,7 +333,6 @@
sqdd
-
new para.
';
@@ -345,52 +355,58 @@
[8] (6,0) @anchor
[8] (6,0)
locations (1) l 0 b 6
- [9] (6,0) :text
- [9] (11,1)
- [10] (11,1) :text
- [10] (21,1)
- [11] (21,1) @anchor
+ [9] (6,0) :empty_spaces_after_close_brace:text
+ [9] (6,0)
+ [10] (6,0) :text
+ [10] (11,1)
+ [11] (11,1) :text
[11] (21,1)
+ [12] (21,1) @anchor
+ [12] (21,1)
locations (2) l 1 b 21
- [12] (21,1) :text
- [12] (25,1)
- [13] (25,1) @anchor
- [13] (25,1)
+ [13] (21,1) :empty_spaces_after_close_brace:text
+ [13] (21,1)
+ [14] (21,1) :text
+ [14] (25,1)
+ [15] (25,1) @anchor
+ [15] (25,1)
locations (3) l 1 b 25
- [14] (25,1) :text
- [14] (32,2)
+ [16] (25,1) :empty_spaces_after_close_brace:text
+ [16] (25,1)
+ [17] (25,1) :text
+ [17] (32,2)
[6] (143,3)
locations (1) l 1 b 68 (2) l 2 b 134 (3) l 2 b 138
- [15] (143,3) :empty_line:text
- [15] (144,4)
- [16] (144,4) :paragraph
- [17] (0,0) :text
- [17] (4,1)
- [18] (4,1) :text
- [18] (9,2)
- [16] (286,6)
- [19] (286,6) :empty_line:text
- [19] (287,7)
- [20] (287,7) :paragraph
- [21] (0,0) @anchor
- [21] (0,0)
+ [18] (143,3) :empty_line:text
+ [18] (144,4)
+ [19] (144,4) :paragraph
+ [20] (0,0) :text
+ [20] (4,1)
+ [21] (4,1) :text
+ [21] (9,2)
+ [19] (286,6)
+ [22] (286,6) :empty_line:text
+ [22] (287,7)
+ [23] (287,7) :paragraph
+ [24] (0,0) @anchor
+ [24] (0,0)
locations (4) l 0 b 0
- [22] (0,0) :text
- [22] (1,1)
- [20] (288,8)
+ [25] (0,0) :empty_spaces_after_close_brace:text
+ [25] (0,0)
+ [23] (287,7)
locations (4) l 7 b 287
- [23] (288,8) :empty_line:text
- [23] (289,9)
- [24] (289,9) :paragraph
- [25] (0,0) :text
- [25] (10,1)
- [24] (360,10)
- [26] (360,10) :empty_line:text
- [26] (361,11)
- [3] (361,11)
- [27] (361,11) :empty_line_after_command:text
- [27] (361,11)
- [1] (361,11)
+ [26] (287,7) :empty_line:text
+ [26] (288,8)
+ [27] (288,8) :paragraph
+ [28] (0,0) :text
+ [28] (10,1)
+ [27] (359,9)
+ [29] (359,9) :empty_line:text
+ [29] (360,10)
+ [3] (360,10)
+ [30] (360,10) :empty_line_after_command:text
+ [30] (360,10)
+ [1] (360,10)
aaa bb ada
dad sff sd and dsdbf
@@ -399,7 +415,6 @@
sqdd
-
new para.
';
Index: t/results/test_count/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/multitable.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/test_count/multitable.pl 28 Jan 2011 07:24:41 -0000 1.2
+++ t/results/test_count/multitable.pl 28 Jan 2011 23:54:31 -0000 1.3
@@ -148,9 +148,9 @@
'parent' => {}
},
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_spaces_after_close_brace'
}
],
'parent' => {},
@@ -254,9 +254,9 @@
'parent' => {}
},
{
- 'parent' => {},
'text' => '
-'
+',
+ 'type' => 'empty_spaces_after_close_brace'
}
],
'parent' => {},
@@ -331,7 +331,6 @@
$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[1]{'contents'}[1];
$result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
@@ -347,7 +346,6 @@
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[1]{'contents'}[2];
$result_trees{'multitable'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'multitable'}{'contents'}[1];
@@ -370,9 +368,7 @@
$result_texts{'multitable'} = '
-aaa bb
-ccc
-
+aaa bb ccc
';
$result_errors{'multitable'} = [];
@@ -415,7 +411,7 @@
[20] (2,0) @anchor
[20] (2,0)
locations (1) l 0 b 2
- [21] (2,0) :text
+ [21] (2,0) :empty_spaces_after_close_brace:text
[21] (2,0)
[18] (3,1)
[16] (1,1)
@@ -441,7 +437,7 @@
[32] (0,0) @anchor
[32] (0,0)
locations (2) l 0 b 0
- [33] (0,0) :text
+ [33] (0,0) :empty_spaces_after_close_brace:text
[33] (0,0)
[31] (0,0)
[29] (17,2)
Index: t/results/coverage/hyphenation.pl
===================================================================
RCS file: t/results/coverage/hyphenation.pl
diff -N t/results/coverage/hyphenation.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/coverage/hyphenation.pl 28 Jan 2011 23:54:30 -0000 1.1
@@ -0,0 +1,75 @@
+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{'hyphenation'} = {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'some-where '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'hyphenation',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_spaces_after_close_brace'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'hyphenation'}{'contents'}[0]{'parent'} =
$result_trees{'hyphenation'};
+$result_trees{'hyphenation'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'hyphenation'}{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'hyphenation'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'hyphenation'}{'contents'}[1]{'contents'}[0];
+$result_trees{'hyphenation'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'hyphenation'}{'contents'}[1];
+$result_trees{'hyphenation'}{'contents'}[1]{'parent'} =
$result_trees{'hyphenation'};
+$result_trees{'hyphenation'}{'contents'}[2]{'parent'} =
$result_trees{'hyphenation'};
+
+$result_texis{'hyphenation'} = '
address@hidden }
+
+';
+
+
+$result_texts{'hyphenation'} = '
+
+';
+
+$result_errors{'hyphenation'} = [];
+
+
+
+$result_converted{'plaintext'}->{'hyphenation'} = '
+
+';
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Parser.pm Texinfo/Conve...,
Patrice Dumas <=