[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Gather tree information when closing incorrectly
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Gather tree information when closing incorrectly nested block command line |
|
Date: |
Sun, 04 Dec 2022 16:44:18 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new f79e77a2b7 Gather tree information when closing incorrectly nested
block command line
f79e77a2b7 is described below
commit f79e77a2b7ea3c40529fff1c718fd1cc94db991f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Dec 4 22:44:09 2022 +0100
Gather tree information when closing incorrectly nested block command line
* tp/Texinfo/ParserNonXS.pm (_close_current, _end_line_starting_block)
(_end_line), tp/Texinfo/XS/parsetexi/close.c (close_current): when
closing block_line_arg in close_current, use the same code as when
closing at end of line, such as to gather all the information in the
tree.
---
ChangeLog | 10 +
tp/Texinfo/ParserNonXS.pm | 433 +++++++++++----------
tp/Texinfo/XS/parsetexi/close.c | 7 +-
tp/Texinfo/XS/parsetexi/parser.h | 1 +
.../coverage/group_beginning_and_end_on_line.pl | 5 +-
.../quotation_beginning_and_end_on_line.pl | 9 +-
tp/t/results/raw/beginning_and_end_on_line.pl | 18 +-
7 files changed, 259 insertions(+), 224 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7d488e990c..f1d357c190 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-12-04 Patrice Dumas <pertusus@free.fr>
+
+ Gather tree information when closing incorrectly nested block command
line
+
+ * tp/Texinfo/ParserNonXS.pm (_close_current, _end_line_starting_block)
+ (_end_line), tp/Texinfo/XS/parsetexi/close.c (close_current): when
+ closing block_line_arg in close_current, use the same code as when
+ closing at end of line, such as to gather all the information in the
+ tree.
+
2022-12-04 Gavin Smith <gavinsmith0123@gmail.com>
* tp/tests/coverage,
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 69775312a2..49b6a92221 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1950,7 +1950,7 @@ sub _close_current($$$;$$)
# we close the command too.
_end_line_misc_line($self, $current, $source_info);
} elsif ($current->{'type'} eq 'block_line_arg') {
- $self->_pop_context(['ct_line'], $source_info, $current);
+ _end_line_starting_block($self, $current, $source_info);
}
# empty types, not closed or associated to a command that is not closed
delete $current->{'contents'}
@@ -3342,6 +3342,226 @@ sub _end_line_def_line($$$)
return $current;
}
+sub _end_line_starting_block($$$)
+{
+ my $self = shift;
+ my $current = shift;
+ my $source_info = shift;
+
+ my $empty_text;
+ $self->_pop_context(['ct_line'], $source_info, $current,
+ 'in block_line_arg');
+ # @multitable args
+ if ($current->{'parent'}->{'cmdname'}
+ and $current->{'parent'}->{'cmdname'} eq 'multitable') {
+ # parse the prototypes and put them in a special arg
+ my @prototype_row;
+ foreach my $content (@{$current->{'contents'}}) {
+ if ($content->{'type'} and $content->{'type'} eq 'bracketed') {
+ # TODO the 'extra' information in $content is not copied over,
+ # at least leading/trailing spaces (something else?).
+ my $bracketed_prototype
+ = { 'type' => 'bracketed_multitable_prototype' };
+ $bracketed_prototype->{'contents'} = $content->{'contents'}
+ if ($content->{'contents'});
+ push @prototype_row, $bracketed_prototype;
+ } elsif ($content->{'text'}) {
+ # TODO: this should be a warning or an error - all prototypes
+ # on a @multitable line should be in braces, as documented in the
+ # Texinfo manual.
+ if ($content->{'text'} =~ /\S/) {
+ foreach my $prototype (split /\s+/, $content->{'text'}) {
+ push @prototype_row, { 'text' => $prototype,
+ 'type' => 'row_prototype' }
+ unless ($prototype eq '');
+ }
+ }
+ } else {
+ if (!$content->{'cmdname'}
+ or ($content->{'cmdname'} ne 'c'
+ and $content->{'cmdname'} ne 'comment')) {
+ $self->_command_warn($current, $source_info,
+ __("unexpected argument on \@%s line: %s"),
+ $current->{'parent'}->{'cmdname'},
+ Texinfo::Convert::Texinfo::convert_to_texinfo($content));
+ }
+ }
+ }
+ my $multitable = $current->{'parent'};
+ #$multitable->{'extra'} = {} if (!$multitable->{'extra'});
+ $multitable->{'extra'}->{'max_columns'} = scalar(@prototype_row);
+ if (!scalar(@prototype_row)) {
+ $self->_command_warn($multitable, $source_info,
+ __("empty multitable"));
+ }
+ $multitable->{'extra'}->{'prototypes'} = \@prototype_row;
+ }
+ _isolate_last_space($self, $current);
+ $current = $current->{'parent'};
+ delete $current->{'remaining_args'};
+
+ # @float args
+ if ($current->{'cmdname'} and $current->{'cmdname'} eq 'float') {
+ $current->{'source_info'} = $source_info;
+ my $type = '';
+ my $float_label;
+ if ($current->{'args'} and $current->{'args'}->[1]) {
+ $float_label = _parse_node_manual($current->{'args'}->[1]);
+ _check_internal_node($self, $float_label, $source_info);
+ }
+ _register_label($self->{'targets'}, $current, $float_label);
+ _parse_float_type($current);
+ $type = $current->{'extra'}->{'type'}->{'normalized'};
+ push @{$self->{'floats'}->{$type}}, $current;
+ $current->{'extra'}->{'float_section'} = $self->{'current_section'}
+ if (defined($self->{'current_section'}));
+ }
+
+ # all the commands with @item
+ if ($current->{'cmdname'}
+ and $blockitem_commands{$current->{'cmdname'}}) {
+ if ($current->{'cmdname'} eq 'enumerate') {
+ my $spec = '1';
+ if ($current->{'args'} and $current->{'args'}->[0]
+ and $current->{'args'}->[0]->{'contents'}
+ and @{$current->{'args'}->[0]->{'contents'}}) {
+ if (scalar(@{$current->{'args'}->[0]->{'contents'}}) > 1) {
+ $self->_command_error($current, $source_info,
+ __("superfluous argument to \@%s"),
+ $current->{'cmdname'});
+ }
+ my $arg = $current->{'args'}->[0]->{'contents'}->[0];
+ if (!defined($arg->{'text'})
+ or $arg->{'text'} !~ /^(([[:digit:]]+)|([[:alpha:]]+))$/) {
+ $self->_command_error($current, $source_info,
+ __("bad argument to \@%s"),
+ $current->{'cmdname'});
+ } else {
+ $spec = $arg->{'text'};
+ }
+ }
+ #$current->{'extra'} = {} if (!$current->{'extra'});
+ $current->{'extra'}->{'enumerate_specification'} = $spec;
+ } elsif ($block_commands{$current->{'cmdname'}} eq 'item_line') {
+ if (!$current->{'extra'}
+ or !$current->{'extra'}->{'command_as_argument'}) {
+ $self->_command_error($current, $source_info,
+ __("%s requires an argument: the formatter for %citem"),
+ $current->{'cmdname'}, ord('@'));
+ } elsif ($self->{'brace_commands'}->{
+ $current->{'extra'}->{'command_as_argument'}->{'cmdname'}} eq 'noarg') {
+ $self->_command_error($current, $source_info,
+ __("command \@%s not accepting argument in brace should not be on
\@%s line"),
+ $current->{'extra'}->{'command_as_argument'}->{'cmdname'},
+ $current->{'cmdname'});
+ delete $current->{'extra'}->{'command_as_argument'};
+ if (scalar(keys(%{$current->{'extra'}})) == 0) {
+ delete $current->{'extra'};
+ }
+ }
+ } elsif ($current->{'cmdname'} eq 'itemize'
+ and $current->{'extra'}
+ and $current->{'extra'}->{'command_as_argument'}) {
+ # This code checks that the command_as_argument of the @itemize
+ # is alone on the line, otherwise it is not a command_as_argument.
+ my @args = @{$current->{'args'}->[0]->{'contents'}};
+ while (@args) {
+ my $arg = shift @args;
+ last if ($arg eq $current->{'extra'}->{'command_as_argument'});
+ }
+ while (@args) {
+ my $arg = shift @args;
+ if (!(($arg->{'cmdname'}
+ and ($arg->{'cmdname'} eq 'c'
+ or $arg->{'cmdname'} eq 'comment'))
+ or (defined($arg->{'text'}) and $arg->{'text'} !~ /\S/))) {
+ delete $current->{'extra'}->{'command_as_argument'}->{'type'};
+ delete $current->{'extra'}->{'command_as_argument'};
+ if (scalar(keys(%{$current->{'extra'}})) == 0) {
+ delete $current->{'extra'};
+ }
+ last;
+ }
+ }
+ }
+ if ($current->{'extra'}
+ and $current->{'extra'}->{'command_as_argument'}
+ and
$accent_commands{$current->{'extra'}->{'command_as_argument'}->{'cmdname'}}
+ and ($current->{'cmdname'} eq 'itemize'
+ or ($block_commands{$current->{'cmdname'}}
+ and $block_commands{$current->{'cmdname'}} eq 'item_line'))) {
+ # this can only happen to an accent command with brace, if without
+ # brace it is not set as command_as_argument to begin with.
+ $self->_command_warn($current, $source_info,
+ __("accent command `\@%s' not allowed as \@%s argument"),
+ $current->{'extra'}->{'command_as_argument'}->{'cmdname'},
+ $current->{'cmdname'});
+ delete $current->{'extra'}->{'command_as_argument'};
+ if (scalar(keys(%{$current->{'extra'}})) == 0) {
+ delete $current->{'extra'};
+ }
+ }
+ if ($current->{'cmdname'} eq 'itemize') {
+ if ((!$current->{'args'}
+ or !$current->{'args'}->[0]
+ or !$current->{'args'}->[0]->{'contents'}
+ or !@{$current->{'args'}->[0]->{'contents'}})) {
+ my $block_line_arg;
+ if ($current->{'args'} and $current->{'args'}->[-1]
+ and $current->{'args'}->[-1]->{'type'}
+ and $current->{'args'}->[-1]->{'type'} eq 'block_line_arg') {
+ $block_line_arg = $current->{'args'}->[-1];
+ } else {
+ $block_line_arg = { 'type' => 'block_line_arg',
+ 'parent' => $current,
+ 'contents' => [] };
+ unshift @{$current->{'args'}}, $block_line_arg;
+ }
+ my $inserted = { 'cmdname' => 'bullet',
+ 'type' => 'command_as_argument_inserted',
+ 'parent' => $block_line_arg };
+ unshift @{$block_line_arg->{'contents'}}, $inserted;
+ #$current->{'extra'} = {} if (!$current->{'extra'});
+ $current->{'extra'}->{'command_as_argument'} = $inserted;
+ }
+ } elsif ($block_commands{$current->{'cmdname'}}
+ and $block_commands{$current->{'cmdname'}} eq 'item_line') {
+ #$current->{'extra'} = {} if (!$current->{'extra'});
+ if (!$current->{'extra'}->{'command_as_argument'}) {
+ my $inserted = { 'cmdname' => 'asis',
+ 'type' => 'command_as_argument_inserted',
+ 'parent' => $current };
+ unshift @{$current->{'args'}}, $inserted;
+ $current->{'extra'}->{'command_as_argument'} = $inserted;
+ }
+ }
+ push @{$current->{'contents'}}, { 'type' => 'before_item',
+ 'parent', $current };
+ $current = $current->{'contents'}->[-1];
+ }
+ if ($current->{'cmdname'}
+ and $block_commands{$current->{'cmdname'}} eq 'menu') {
+ push @{$current->{'contents'}}, {'type' => 'menu_comment',
+ 'parent' => $current,
+ 'contents' => [] };
+ $current = $current->{'contents'}->[-1];
+ print STDERR "MENU_COMMENT OPEN\n" if ($self->{'DEBUG'});
+ }
+ if ($current->{'cmdname'}
+ and $block_commands{$current->{'cmdname'}} eq 'format_raw'
+ and $self->{'expanded_formats_hash'}->{$current->{'cmdname'}}) {
+ push @{$current->{'contents'}},
+ { 'type' => 'rawpreformatted',
+ 'parent' => $current };
+ $current = $current->{'contents'}->[-1];
+ }
+ $current = _begin_preformatted($self, $current)
+ unless ($current->{'cmdname'}
+ and $block_commands{$current->{'cmdname'}} eq 'raw');
+
+ return $current;
+}
+
# close constructs and do stuff at end of line (or end of the document)
sub _end_line($$$);
sub _end_line($$$)
@@ -3505,216 +3725,7 @@ sub _end_line($$$)
# other block command lines
} elsif ($current->{'type'}
and $current->{'type'} eq 'block_line_arg') {
- my $empty_text;
- $self->_pop_context(['ct_line'], $source_info, $current,
- 'in block_line_arg');
- # @multitable args
- if ($current->{'parent'}->{'cmdname'}
- and $current->{'parent'}->{'cmdname'} eq 'multitable') {
- # parse the prototypes and put them in a special arg
- my @prototype_row;
- foreach my $content (@{$current->{'contents'}}) {
- if ($content->{'type'} and $content->{'type'} eq 'bracketed') {
- # TODO the 'extra' information in $content is not copied over,
- # at least leading/trailing spaces (something else?).
- my $bracketed_prototype
- = { 'type' => 'bracketed_multitable_prototype' };
- $bracketed_prototype->{'contents'} = $content->{'contents'}
- if ($content->{'contents'});
- push @prototype_row, $bracketed_prototype;
- } elsif ($content->{'text'}) {
- # TODO: this should be a warning or an error - all prototypes
- # on a @multitable line should be in braces, as documented in the
- # Texinfo manual.
- if ($content->{'text'} =~ /\S/) {
- foreach my $prototype (split /\s+/, $content->{'text'}) {
- push @prototype_row, { 'text' => $prototype,
- 'type' => 'row_prototype' }
- unless ($prototype eq '');
- }
- }
- } else {
- if (!$content->{'cmdname'}
- or ($content->{'cmdname'} ne 'c'
- and $content->{'cmdname'} ne 'comment')) {
- $self->_command_warn($current, $source_info,
- __("unexpected argument on \@%s line: %s"),
- $current->{'parent'}->{'cmdname'},
- Texinfo::Convert::Texinfo::convert_to_texinfo($content));
- }
- }
- }
- my $multitable = $current->{'parent'};
- #$multitable->{'extra'} = {} if (!$multitable->{'extra'});
- $multitable->{'extra'}->{'max_columns'} = scalar(@prototype_row);
- if (!scalar(@prototype_row)) {
- $self->_command_warn($multitable, $source_info,
- __("empty multitable"));
- }
- $multitable->{'extra'}->{'prototypes'} = \@prototype_row;
- }
- _isolate_last_space($self, $current);
- $current = $current->{'parent'};
- delete $current->{'remaining_args'};
-
- # @float args
- if ($current->{'cmdname'} and $current->{'cmdname'} eq 'float') {
- $current->{'source_info'} = $source_info;
- my $type = '';
- my $float_label;
- if ($current->{'args'} and $current->{'args'}->[1]) {
- $float_label = _parse_node_manual($current->{'args'}->[1]);
- _check_internal_node($self, $float_label, $source_info);
- }
- _register_label($self->{'targets'}, $current, $float_label);
- _parse_float_type($current);
- $type = $current->{'extra'}->{'type'}->{'normalized'};
- push @{$self->{'floats'}->{$type}}, $current;
- $current->{'extra'}->{'float_section'} = $self->{'current_section'}
- if (defined($self->{'current_section'}));
- }
-
- # all the commands with @item
- if ($current->{'cmdname'}
- and $blockitem_commands{$current->{'cmdname'}}) {
- if ($current->{'cmdname'} eq 'enumerate') {
- my $spec = '1';
- if ($current->{'args'} and $current->{'args'}->[0]
- and $current->{'args'}->[0]->{'contents'}
- and @{$current->{'args'}->[0]->{'contents'}}) {
- if (scalar(@{$current->{'args'}->[0]->{'contents'}}) > 1) {
- $self->_command_error($current, $source_info,
- __("superfluous argument to \@%s"),
- $current->{'cmdname'});
- }
- my $arg = $current->{'args'}->[0]->{'contents'}->[0];
- if (!defined($arg->{'text'})
- or $arg->{'text'} !~ /^(([[:digit:]]+)|([[:alpha:]]+))$/) {
- $self->_command_error($current, $source_info,
- __("bad argument to \@%s"),
- $current->{'cmdname'});
- } else {
- $spec = $arg->{'text'};
- }
- }
- #$current->{'extra'} = {} if (!$current->{'extra'});
- $current->{'extra'}->{'enumerate_specification'} = $spec;
- } elsif ($block_commands{$current->{'cmdname'}} eq 'item_line') {
- if (!$current->{'extra'}
- or !$current->{'extra'}->{'command_as_argument'}) {
- $self->_command_error($current, $source_info,
- __("%s requires an argument: the formatter for %citem"),
- $current->{'cmdname'}, ord('@'));
- } elsif ($self->{'brace_commands'}->{
- $current->{'extra'}->{'command_as_argument'}->{'cmdname'}} eq 'noarg') {
- $self->_command_error($current, $source_info,
- __("command \@%s not accepting argument in brace should not be
on \@%s line"),
- $current->{'extra'}->{'command_as_argument'}->{'cmdname'},
- $current->{'cmdname'});
- delete $current->{'extra'}->{'command_as_argument'};
- if (scalar(keys(%{$current->{'extra'}})) == 0) {
- delete $current->{'extra'};
- }
- }
- } elsif ($current->{'cmdname'} eq 'itemize'
- and $current->{'extra'}
- and $current->{'extra'}->{'command_as_argument'}) {
- # This code checks that the command_as_argument of the @itemize
- # is alone on the line, otherwise it is not a command_as_argument.
- my @args = @{$current->{'args'}->[0]->{'contents'}};
- while (@args) {
- my $arg = shift @args;
- last if ($arg eq $current->{'extra'}->{'command_as_argument'});
- }
- while (@args) {
- my $arg = shift @args;
- if (!(($arg->{'cmdname'}
- and ($arg->{'cmdname'} eq 'c'
- or $arg->{'cmdname'} eq 'comment'))
- or (defined($arg->{'text'}) and $arg->{'text'} !~ /\S/))) {
- delete $current->{'extra'}->{'command_as_argument'}->{'type'};
- delete $current->{'extra'}->{'command_as_argument'};
- if (scalar(keys(%{$current->{'extra'}})) == 0) {
- delete $current->{'extra'};
- }
- last;
- }
- }
- }
- if ($current->{'extra'}
- and $current->{'extra'}->{'command_as_argument'}
- and
$accent_commands{$current->{'extra'}->{'command_as_argument'}->{'cmdname'}}
- and ($current->{'cmdname'} eq 'itemize'
- or ($block_commands{$current->{'cmdname'}}
- and $block_commands{$current->{'cmdname'}} eq
'item_line'))) {
- # this can only happen to an accent command with brace, if without
- # brace it is not set as command_as_argument to begin with.
- $self->_command_warn($current, $source_info,
- __("accent command `\@%s' not allowed as \@%s argument"),
- $current->{'extra'}->{'command_as_argument'}->{'cmdname'},
- $current->{'cmdname'});
- delete $current->{'extra'}->{'command_as_argument'};
- if (scalar(keys(%{$current->{'extra'}})) == 0) {
- delete $current->{'extra'};
- }
- }
- if ($current->{'cmdname'} eq 'itemize') {
- if ((!$current->{'args'}
- or !$current->{'args'}->[0]
- or !$current->{'args'}->[0]->{'contents'}
- or !@{$current->{'args'}->[0]->{'contents'}})) {
- my $block_line_arg;
- if ($current->{'args'} and $current->{'args'}->[-1]
- and $current->{'args'}->[-1]->{'type'}
- and $current->{'args'}->[-1]->{'type'} eq 'block_line_arg') {
- $block_line_arg = $current->{'args'}->[-1];
- } else {
- $block_line_arg = { 'type' => 'block_line_arg',
- 'parent' => $current,
- 'contents' => [] };
- unshift @{$current->{'args'}}, $block_line_arg;
- }
- my $inserted = { 'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted',
- 'parent' => $block_line_arg };
- unshift @{$block_line_arg->{'contents'}}, $inserted;
- #$current->{'extra'} = {} if (!$current->{'extra'});
- $current->{'extra'}->{'command_as_argument'} = $inserted;
- }
- } elsif ($block_commands{$current->{'cmdname'}}
- and $block_commands{$current->{'cmdname'}} eq 'item_line') {
- #$current->{'extra'} = {} if (!$current->{'extra'});
- if (!$current->{'extra'}->{'command_as_argument'}) {
- my $inserted = { 'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted',
- 'parent' => $current };
- unshift @{$current->{'args'}}, $inserted;
- $current->{'extra'}->{'command_as_argument'} = $inserted;
- }
- }
- push @{$current->{'contents'}}, { 'type' => 'before_item',
- 'parent', $current };
- $current = $current->{'contents'}->[-1];
- }
- if ($current->{'cmdname'}
- and $block_commands{$current->{'cmdname'}} eq 'menu') {
- push @{$current->{'contents'}}, {'type' => 'menu_comment',
- 'parent' => $current,
- 'contents' => [] };
- $current = $current->{'contents'}->[-1];
- print STDERR "MENU_COMMENT OPEN\n" if ($self->{'DEBUG'});
- }
- if ($current->{'cmdname'}
- and $block_commands{$current->{'cmdname'}} eq 'format_raw'
- and $self->{'expanded_formats_hash'}->{$current->{'cmdname'}}) {
- push @{$current->{'contents'}},
- { 'type' => 'rawpreformatted',
- 'parent' => $current };
- $current = $current->{'contents'}->[-1];
- }
- $current = _begin_preformatted($self, $current)
- unless ($current->{'cmdname'}
- and $block_commands{$current->{'cmdname'}} eq 'raw');
+ $current = _end_line_starting_block($self, $current, $source_info);
# misc command line arguments
# Never go here if skipline/noarg/...
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index f385db34aa..141fe2672a 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -379,12 +379,7 @@ close_current (ELEMENT *current,
}
else
{
- c = pop_context ();
- if (c != ct_line)
- {
- /* error */
- fatal ("line context expected");
- }
+ end_line_starting_block (current);
}
current = current->parent;
break;
diff --git a/tp/Texinfo/XS/parsetexi/parser.h b/tp/Texinfo/XS/parsetexi/parser.h
index fd316a693f..8c16f127e9 100644
--- a/tp/Texinfo/XS/parsetexi/parser.h
+++ b/tp/Texinfo/XS/parsetexi/parser.h
@@ -121,6 +121,7 @@ NODE_SPEC_EXTRA *parse_node_manual (ELEMENT *node);
ELEMENT *end_line (ELEMENT *current);
ELEMENT *end_line_def_line (ELEMENT *current);
ELEMENT *end_line_misc_line (ELEMENT *current);
+ELEMENT *end_line_starting_block (ELEMENT *current);
ELEMENT *parse_special_misc_command (char *line, enum command_id cmd,
int *has_commment);
int check_node_label (NODE_SPEC_EXTRA *nse, enum command_id cmd);
diff --git a/tp/t/results/coverage/group_beginning_and_end_on_line.pl
b/tp/t/results/coverage/group_beginning_and_end_on_line.pl
index 9eb3b56a3b..608acf3792 100644
--- a/tp/t/results/coverage/group_beginning_and_end_on_line.pl
+++ b/tp/t/results/coverage/group_beginning_and_end_on_line.pl
@@ -14,9 +14,12 @@ $result_trees{'group_beginning_and_end_on_line'} = {
{
'contents' => [
{
- 'text' => 'within '
+ 'text' => 'within'
}
],
+ 'info' => {
+ 'spaces_after_argument' => ' '
+ },
'type' => 'block_line_arg'
}
],
diff --git a/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
b/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
index 6354cbfb8f..078750e095 100644
--- a/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
+++ b/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
@@ -14,9 +14,12 @@ $result_trees{'quotation_beginning_and_end_on_line'} = {
{
'contents' => [
{
- 'text' => 'in quotation '
+ 'text' => 'in quotation'
}
],
+ 'info' => {
+ 'spaces_after_argument' => ' '
+ },
'type' => 'block_line_arg'
}
],
@@ -71,7 +74,7 @@ $result_texis{'quotation_beginning_and_end_on_line'} =
'@quotation in quotation
';
-$result_texts{'quotation_beginning_and_end_on_line'} = 'in quotation
+$result_texts{'quotation_beginning_and_end_on_line'} = 'in quotation
';
$result_errors{'quotation_beginning_and_end_on_line'} = [
@@ -91,7 +94,7 @@ $result_floats{'quotation_beginning_and_end_on_line'} = {};
-$result_converted{'plaintext'}->{'quotation_beginning_and_end_on_line'} = '
in quotation : ';
+$result_converted{'plaintext'}->{'quotation_beginning_and_end_on_line'} = '
in quotation: ';
$result_converted{'html_text'}->{'quotation_beginning_and_end_on_line'} =
'<blockquote class="quotation">
diff --git a/tp/t/results/raw/beginning_and_end_on_line.pl
b/tp/t/results/raw/beginning_and_end_on_line.pl
index 03b5d0cf1b..1a7aa09fee 100644
--- a/tp/t/results/raw/beginning_and_end_on_line.pl
+++ b/tp/t/results/raw/beginning_and_end_on_line.pl
@@ -19,14 +19,20 @@ $result_trees{'beginning_and_end_on_line'} = {
{
'contents' => [
{
- 'text' => 'in tex '
+ 'text' => 'in tex'
}
],
+ 'info' => {
+ 'spaces_after_argument' => ' '
+ },
'type' => 'block_line_arg'
}
],
'cmdname' => 'tex',
'contents' => [
+ {
+ 'type' => 'rawpreformatted'
+ },
{
'args' => [
{
@@ -75,9 +81,12 @@ $result_trees{'beginning_and_end_on_line'} = {
{
'contents' => [
{
- 'text' => 'in verbatim '
+ 'text' => 'in verbatim'
}
],
+ 'info' => {
+ 'spaces_after_argument' => ' '
+ },
'type' => 'block_line_arg'
}
],
@@ -131,9 +140,12 @@ $result_trees{'beginning_and_end_on_line'} = {
{
'contents' => [
{
- 'text' => 'in html '
+ 'text' => 'in html'
}
],
+ 'info' => {
+ 'spaces_after_argument' => ' '
+ },
'type' => 'block_line_arg'
}
],
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Gather tree information when closing incorrectly nested block command line,
Patrice Dumas <=
- Prev by Date:
branch master updated: * util/texinfo.dtd: allow mixing *caption within float contents. Fix email spaces attributes.
- Next by Date:
branch master updated: * tp/t/57invalid_nestings.t: add tests of section command interrupting block command lines that requires gathering tree information, section_on_multitable_line, section_on_float_line, section_on_enumerate_line, section_on_xtable_line, and section_on_itemize_line.
- Previous by thread:
branch master updated: * util/texinfo.dtd: allow mixing *caption within float contents. Fix email spaces attributes.
- Next by thread:
branch master updated: * tp/t/57invalid_nestings.t: add tests of section command interrupting block command lines that requires gathering tree information, section_on_multitable_line, section_on_float_line, section_on_enumerate_line, section_on_xtable_line, and section_on_itemize_line.
- Index(es):