[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5273] * Texinfo/Parser.pm: form-feed in paragraph stops the cur
|
From: |
Patrice Dumas |
|
Subject: |
[5273] * Texinfo/Parser.pm: form-feed in paragraph stops the current paragraph. |
|
Date: |
Tue, 06 Aug 2013 17:09:31 +0000 |
Revision: 5273
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5273
Author: pertusus
Date: 2013-08-06 17:09:29 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
* Texinfo/Parser.pm: form-feed in paragraph stops the current paragraph.
For that consider \f to be a separator.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/03coverage_braces.t
trunk/tp/t/results/macro/form_feeds.pl
Added Paths:
-----------
trunk/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2013-08-04 19:10:22 UTC (rev 5272)
+++ trunk/ChangeLog 2013-08-06 17:09:29 UTC (rev 5273)
@@ -1,3 +1,8 @@
+2013-08-06 Patrice Dumas <address@hidden>
+
+ * Texinfo/Parser.pm: form-feed in paragraph stops the current paragraph.
+ For that consider \f to be a separator.
+
2013-08-04 Patrice Dumas <address@hidden>
* Texinfo/Parser.pm: keep form-feed in macro arguments.
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2013-08-04 19:10:22 UTC (rev 5272)
+++ trunk/tp/Texinfo/Parser.pm 2013-08-06 17:09:29 UTC (rev 5273)
@@ -1147,6 +1147,8 @@
my $current = shift;
my $line_nr = shift;
+ # !$current->{'type'} is true for @-commands. In fact it is unclear
+ # that there may be cases of !$current->{'type'} and !$current->{'cmdname'}
if ((!$current->{'type'} or $type_with_paragraph{$current->{'type'}})
and !$no_paragraph_contexts{$self->{'context_stack'}->[-1]}) {
if (!defined($current->{'contents'})) {
@@ -2042,7 +2044,7 @@
}
}
}
- if ($args_total == 0 and $arguments->[0] =~ /\S/) {
+ if ($args_total == 0 and $arguments->[0] =~ /[\S\f]/) {
$self->line_error(sprintf($self->__(
"macro `%s' declared without argument called with an
argument"),
$name), $line_nr);
@@ -2739,12 +2741,12 @@
while (@{$menu_entry->{'args'}}) {
my $arg = shift @{$menu_entry->{'args'}};
if (defined($arg->{'text'})) {
- $current = _merge_text ($self, $current, $arg->{'text'});
+ $current = _merge_text($self, $current, $arg->{'text'});
} else {
while (@{$arg->{'contents'}}) {
my $content = shift @{$arg->{'contents'}};
if (defined($content->{'text'})) {
- $current = _merge_text ($self, $current,
+ $current = _merge_text($self, $current,
$content->{'text'});
$content = undef;
} else {
@@ -3007,7 +3009,7 @@
}
}
# This code checks that the command_as_argument of the @itemize
- # is alone on the line, otherwise it is not an command_as_argument.
+ # is alone on the line, otherwise it is not a command_as_argument.
if ($current->{'extra'}
and $current->{'extra'}->{'command_as_argument'}
and $current->{'cmdname'} eq 'itemize') {
@@ -4870,7 +4872,7 @@
$command), $line_nr);
}
- } elsif ($line =~ s/^([{}@,:\t.])//) {
+ } elsif ($line =~ s/^([{}@,:\t.\f])//) {
my $separator = $1;
print STDERR "SEPARATOR: $separator\n" if ($self->{'DEBUG'});
if ($separator eq '@') {
@@ -4927,7 +4929,7 @@
}
}
push @{$self->{'context_stack'}}, $command;
- $line =~ s/([^\S\n]*)//;
+ $line =~ s/([^\S\f\n]*)//;
$current->{'type'} = 'brace_command_context';
push @{$current->{'contents'}}, { 'type' =>
'empty_spaces_before_argument',
'text' => $1,
@@ -5263,11 +5265,22 @@
push @{$current->{'args'}}, { 'type' => 'menu_entry_separator',
'text' => $separator,
'parent' => $current };
+ } elsif ($separator eq "\f" and $current->{'type'}
+ and $current->{'type'} eq 'paragraph') {
+ # form feed stops and restart a paragraph.
+ $current = $self->_end_paragraph($current);
+ push @{$current->{'contents'}}, {'text' => $separator,
+ 'type' => 'empty_line',
+ 'parent' => $current };
+ push @{$current->{'contents'}}, { 'type' => 'empty_line',
+ 'text' => '',
+ 'parent' => $current };
+
} else {
$current = _merge_text($self, $current, $separator);
}
# Misc text except end of line
- } elsif ($line =~ s/^([^{}@,:\t.\n]+)//) {
+ } elsif ($line =~ s/^([^{}@,:\t.\n\f]+)//) {
my $new_text = $1;
$current = _merge_text($self, $current, $new_text);
# end of line
Modified: trunk/tp/t/03coverage_braces.t
===================================================================
--- trunk/tp/t/03coverage_braces.t 2013-08-04 19:10:22 UTC (rev 5272)
+++ trunk/tp/t/03coverage_braces.t 2013-08-06 17:09:29 UTC (rev 5273)
@@ -239,6 +239,10 @@
'@footnotestyle separate
'.$two_footnotes_in_nodes_text,
, {'test_formats' => ['html', 'info']} ],
+['form_feed_in_brace_commands',
+'@option{ aa} @anchor{aa} something @email{ aaa, address@hidden
+ f1 } @footnote{ gg jj}.
+']
);
my @test_invalid = (
Added: trunk/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
(rev 0)
+++ trunk/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
2013-08-06 17:09:29 UTC (rev 5273)
@@ -0,0 +1,330 @@
+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_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'form_feed_in_brace_commands'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' aa'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'option',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'aa'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'anchor',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'aa',
+ 'spaces_before_argument' => {
+ 'text' => '',
+ 'type' => 'empty_spaces_before_argument'
+ }
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'text' => '',
+ 'type' => 'empty_spaces_after_close_brace'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'something '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'aaa'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'fff'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ],
+ [
+ {}
+ ]
+ ],
+ 'spaces_before_argument' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'f1 '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'footnote',
+ 'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'gg'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'jj'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'footnote',
+ 'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'line_nr'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'parent'} =
$result_trees{'form_feed_in_brace_commands'};
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[1]{'parent'} =
$result_trees{'form_feed_in_brace_commands'};
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[2];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[1];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[1];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'line_nr'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[2];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'extra'}{'spaces_before_argument'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'line_nr'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[2];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[3]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[2];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[1];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'extra'}{'spaces_before_argument'}
=
$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[4]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[2];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'contents'}[5]{'parent'}
= $result_trees{'form_feed_in_brace_commands'}{'contents'}[2];
+$result_trees{'form_feed_in_brace_commands'}{'contents'}[2]{'parent'} =
$result_trees{'form_feed_in_brace_commands'};
+
+$result_texis{'form_feed_in_brace_commands'} = '@option{ aa} @anchor{aa}
something @email{ aaa, address@hidden
+ f1 } @footnote{ gg jj}.
+';
+
+
+$result_texts{'form_feed_in_brace_commands'} = ' aa something fff .
+';
+
+$result_errors{'form_feed_in_brace_commands'} = [];
+
+
+
+$result_converted{'plaintext'}->{'form_feed_in_brace_commands'} = '\' aa\'
+
+ something fff <aaa>(1) (2).
+
+ ---------- Footnotes ----------
+
+ (1) f1
+
+ (2) gg
+
+ jj
+
+';
+
+
+$result_converted{'html_text'}->{'form_feed_in_brace_commands'} = '<p><samp>
aa</samp> <a name="aa"></a></p> <p>something <a href="mailto:aaa";>fff</a><a
name="DOCF1" href="#FOOT1"><sup>1</sup></a> <a name="DOCF2"
href="#FOOT2"><sup>2</sup></a>.
+</p><div class="footnote">
+<hr>
+<h4 class="footnotes-heading">Footnotes</h4>
+
+<h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
+<p>f1 </p>
+<h3><a name="FOOT2" href="#DOCF2">(2)</a></h3>
+<p>gg</p> <p>jj</p>
+</div>
+';
+
+1;
Modified: trunk/tp/t/results/macro/form_feeds.pl
===================================================================
--- trunk/tp/t/results/macro/form_feeds.pl 2013-08-04 19:10:22 UTC (rev
5272)
+++ trunk/tp/t/results/macro/form_feeds.pl 2013-08-06 17:09:29 UTC (rev
5273)
@@ -135,7 +135,67 @@
'contents' => [
{
'parent' => {},
- 'text' => 'f arg1 n arg2
+ 'text' => 'f '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_line'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'arg1'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_line'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'n '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_line'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'arg2
'
}
],
@@ -152,7 +212,27 @@
'contents' => [
{
'parent' => {},
- 'text' => 'g a'
+ 'text' => 'g '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_line'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'a'
},
{
'cmdname' => '{',
@@ -198,11 +278,27 @@
$result_trees{'form_feeds'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[6];
$result_trees{'form_feeds'}{'contents'}[6]{'parent'} =
$result_trees{'form_feeds'};
$result_trees{'form_feeds'}{'contents'}[7]{'parent'} =
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[8]{'contents'}[0]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[8];
-$result_trees{'form_feeds'}{'contents'}[8]{'contents'}[1]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[8];
-$result_trees{'form_feeds'}{'contents'}[8]{'contents'}[2]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[8];
$result_trees{'form_feeds'}{'contents'}[8]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[9]{'contents'}[0]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[9];
$result_trees{'form_feeds'}{'contents'}[9]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[10]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[11]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[12]{'contents'}[0]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[12];
+$result_trees{'form_feeds'}{'contents'}[12]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[13]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[14]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[15]{'contents'}[0]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[15];
+$result_trees{'form_feeds'}{'contents'}[15]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[16]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[17]{'contents'}[0]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[17];
+$result_trees{'form_feeds'}{'contents'}[17]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[18]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[19]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[20]{'contents'}[0]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[20];
+$result_trees{'form_feeds'}{'contents'}[20]{'contents'}[1]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[20];
+$result_trees{'form_feeds'}{'contents'}[20]{'contents'}[2]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[20];
+$result_trees{'form_feeds'}{'contents'}[20]{'parent'} =
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[21]{'parent'} =
$result_trees{'form_feeds'};
$result_texis{'form_feeds'} = '@macro mymacro{a, b}
f \\a\\ n \\b\\
@@ -221,9 +317,9 @@
$result_texts{'form_feeds'} = '
-f arg1 n arg2
+f arg1 n arg2
-g a{rgline v
+g a{rgline v
';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5273] * Texinfo/Parser.pm: form-feed in paragraph stops the current paragraph.,
Patrice Dumas <=