[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8162] comment_at_end extra value
From: |
gavinsmith0123 |
Subject: |
[8162] comment_at_end extra value |
Date: |
Tue, 11 Sep 2018 16:49:04 -0400 (EDT) |
Revision: 8162
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8162
Author: gavin
Date: 2018-09-11 16:49:04 -0400 (Tue, 11 Sep 2018)
Log Message:
-----------
comment_at_end extra value
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Convert/Converter.pm
trunk/tp/Texinfo/Convert/DocBook.pm
trunk/tp/Texinfo/Convert/Texinfo.pm
trunk/tp/Texinfo/Convert/TexinfoXML.pm
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/alias/simple.pl
trunk/tp/t/results/columnfractions/empty_comment.pl
trunk/tp/t/results/columnfractions/good_comment.pl
trunk/tp/t/results/columnfractions/good_space_comment.pl
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
trunk/tp/t/results/converters_tests/index_entry_in_preformatted.pl
trunk/tp/t/results/coverage/comment_on_cartouche_line.pl
trunk/tp/t/results/coverage/comment_on_group_line.pl
trunk/tp/t/results/coverage/formats_only_title_comments.pl
trunk/tp/t/results/coverage/table.pl
trunk/tp/t/results/coverage/table_command_comment.pl
trunk/tp/t/results/float/comment_space_comand_in_float.pl
trunk/tp/t/results/include/include_setfilename_on_setfilename_line.pl
trunk/tp/t/results/indices/encoding_index_latin1.pl
trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
trunk/tp/t/results/indices/encoding_index_utf8.pl
trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
trunk/tp/t/results/invalid_nestings/center.pl
trunk/tp/t/results/invalid_nestings/in_table.pl
trunk/tp/t/results/invalid_nestings/on_block_command_line.pl
trunk/tp/t/results/invalid_nestings/on_index_entry_line.pl
trunk/tp/t/results/invalid_nestings/on_itemize_line.pl
trunk/tp/t/results/invalid_nestings/on_node_line.pl
trunk/tp/t/results/invalid_nestings/on_section_line.pl
trunk/tp/t/results/invalid_nestings/on_subheading_line.pl
trunk/tp/t/results/itemize/accent_argument.pl
trunk/tp/t/results/itemize/comment_first_on_enumerate_line.pl
trunk/tp/t/results/itemize/comment_first_on_itemize_line.pl
trunk/tp/t/results/itemize/enumerate_argument.pl
trunk/tp/t/results/itemize/enumerate_argument_item.pl
trunk/tp/t/results/menu/comment_on_menu_line.pl
trunk/tp/t/results/misc_commands/bad_documentlanguage.pl
trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl
trunk/tp/t/results/misc_commands/setfilename.pl
trunk/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
trunk/tp/t/results/quotation/comment_on_quotation_line.pl
trunk/tp/t/results/quotation/only_comment_on_quotation_line.pl
trunk/tp/t/results/raw/misc_raw_comments.pl
trunk/tp/t/results/sectioning/empty_nodes_with_commands.pl
trunk/tp/t/results/sectioning/empty_ref_arg.pl
trunk/tp/t/results/sectioning/node.pl
trunk/tp/t/results/sectioning/setfilename_on_top_and_after_node.pl
trunk/tp/t/results/value/set_in_item_missing_line.pl
trunk/tp/t/results/value/set_on_item_line.pl
trunk/tp/t/results/xml_tests/comments_end_lines.pl
trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
trunk/tp/t/results/xml_tests/comments_on_misc_command_line.pl
trunk/tp/t/results/xml_tests/raw_and_comments.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/ChangeLog 2018-09-11 20:49:04 UTC (rev 8162)
@@ -1,3 +1,23 @@
+2018-09-11 Gavin Smith <address@hidden>
+
+ * tp/Texinfo/Parser.pm (_isolate_last_space): If @c or @comment
+ is the last in the line, remove it from the 'args' and store it
+ as 'comment_at_end' extra value.
+
+ * tp/Texinfo/Convert/TexinfoXML.pm ():
+ (_end_line_spaces): Do not handle the case of a comment being in
+ the 'args'.
+ (_convert) <@item or @itemx in @table>: Check for and output a
+ comment.
+
+ * tp/Texinfo/Convert/Converter.pm (_end_line_or_comment)
+ (_tree_without_comment, _convert_argument_and_end_line):
+ Meaning of arguments changed. Check for a comment in the new
+ location. Callers updated.
+
+ * tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi):
+ Check for and output a comment.
+
2018-09-09 Gavin Smith <address@hidden>
* tp/Texinfo/Parser.pm (_end_line) <@multitable>:
Modified: trunk/tp/Texinfo/Convert/Converter.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Converter.pm 2018-09-09 16:03:26 UTC (rev
8161)
+++ trunk/tp/Texinfo/Convert/Converter.pm 2018-09-11 20:49:04 UTC (rev
8162)
@@ -1026,16 +1026,19 @@
sub _end_line_or_comment($$)
{
my $self = shift;
- my $contents_possible_comment = shift;
+ my $root = shift;
+
my $end_line;
- if ($contents_possible_comment
- and $contents_possible_comment->[-1]->{'cmdname'}
- and ($contents_possible_comment->[-1]->{'cmdname'} eq 'c'
- or $contents_possible_comment->[-1]->{'cmdname'} eq 'comment')) {
- $end_line = $self->convert_tree($contents_possible_comment->[-1]);
- } elsif ($contents_possible_comment
- and $contents_possible_comment->[-1]->{'text'}) {
- my $text = $contents_possible_comment->[-1]->{'text'};
+
+ my $comment = $root->{'extra'}->{'comment_at_end'}
+ if $root->{'extra'};
+
+ if ($comment) {
+ $end_line = $self->convert_tree($comment);
+ } elsif ($root->{'args'}->[-1]->{'contents'}
+ and $root->{'args'}->[-1]->{'contents'}->[-1]
+ and $root->{'args'}->[-1]->{'contents'}->[-1]->{'text'}) {
+ my $text = $root->{'args'}->[-1]->{'contents'}->[-1]->{'text'};
if (chomp($text)) {
$end_line = "\n";
} else {
@@ -1049,25 +1052,13 @@
sub _tree_without_comment($)
{
- my $contents_possible_comment = shift;
- my $comment;
- my $tree;
+ my $root = shift;
- if ($contents_possible_comment->{'contents'}
- and $contents_possible_comment->{'contents'}->[-1]->{'cmdname'}
- and ($contents_possible_comment->{'contents'}->[-1]->{'cmdname'} eq 'c'
- or $contents_possible_comment->{'contents'}->[-1]->{'cmdname'} eq
'comment')) {
- my @contents = @{$contents_possible_comment->{'contents'}};
- $comment = pop @contents;
- $tree = {'contents' => address@hidden;
- # FIXME why this selection, and not everything?
- foreach my $key ('extra', 'type', 'cmdname', 'parent', 'line_nr') {
- $tree->{$key} = $contents_possible_comment->{$key}
- if (exists($contents_possible_comment->{$key}));
- }
- } else {
- $tree = $contents_possible_comment;
- }
+ my $comment = $root->{'extra'}->{'comment_at_end'}
+ if $root->{'extra'};
+
+ my $tree = $root->{'args'}->[-1];
+
return ($comment, $tree);
}
Modified: trunk/tp/Texinfo/Convert/DocBook.pm
===================================================================
--- trunk/tp/Texinfo/Convert/DocBook.pm 2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/Texinfo/Convert/DocBook.pm 2018-09-11 20:49:04 UTC (rev 8162)
@@ -595,7 +595,7 @@
} elsif ($root->{'type'} and $root->{'type'} eq 'index_entry_command') {
my $end_line;
if ($root->{'args'}->[0]) {
- $end_line =
$self->_end_line_or_comment($root->{'args'}->[0]->{'contents'});
+ $end_line = $self->_end_line_or_comment($root);
if ($self->{'document_context'}->[-1]->{'in_preformatted'}) {
chomp($end_line);
}
@@ -657,8 +657,7 @@
}
$result .= "<$command${attribute}>\n";
if ($root->{'args'} and $root->{'args'}->[0]) {
- my ($arg, $end_line)
- = $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+ my ($arg, $end_line) =
$self->_convert_argument_and_end_line($root);
$result .= "<title>$arg</title>$end_line";
chomp ($result);
$result .= "\n";
@@ -668,8 +667,7 @@
}
} elsif ($Texinfo::Common::sectioning_commands{$root->{'cmdname'}}) {
if ($root->{'args'} and $root->{'args'}->[0]) {
- my ($arg, $end_line)
- = $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+ my ($arg, $end_line) =
$self->_convert_argument_and_end_line($root);
$result .=
"<bridgehead
renderas=\"$docbook_sections{$root->{'cmdname'}}\">$arg</bridgehead>$end_line";
chomp ($result);
@@ -681,7 +679,7 @@
my $attribute = '';
if (defined($command)) {
my ($arg, $end_line)
- = $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+ = $self->_convert_argument_and_end_line($root);
if ($command eq '') {
$result .= "$arg$end_line";
} else {
Modified: trunk/tp/Texinfo/Convert/Texinfo.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Texinfo.pm 2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/Texinfo/Convert/Texinfo.pm 2018-09-11 20:49:04 UTC (rev 8162)
@@ -222,6 +222,8 @@
if $cmd->{'extra'} and $cmd->{'extra'}->{'spaces_before_argument'};
}
$result .= '{'.$cmd->{'type'}.'}' if ($cmdname eq 'value');
+ $result .= convert($cmd->{'extra'}->{'comment_at_end'}, $fix)
+ if $cmd->{'extra'} and $cmd->{'extra'}->{'comment_at_end'};
return $result;
}
Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm 2018-09-09 16:03:26 UTC (rev
8161)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm 2018-09-11 20:49:04 UTC (rev
8162)
@@ -611,21 +611,15 @@
my $type = shift;
my $end_spaces = undef;
- if ($root->{'args'}->[-1]->{'contents'}) {
- my $index = -1;
- if ($root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'}
- and ($root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'} eq 'c'
- or $root->{'args'}->[-1]->{'contents'}->[-1]->{'cmdname'} eq
'comment')) {
- $index = -2;
- }
- if ($root->{'args'}->[-1]->{'contents'}->[$index]
- and $root->{'args'}->[-1]->{'contents'}->[$index]->{'type'}
- and $root->{'args'}->[-1]->{'contents'}->[$index]->{'type'} eq $type
- and defined($root->{'args'}->[-1]->{'contents'}->[$index]->{'text'})
- and $root->{'args'}->[-1]->{'contents'}->[$index]->{'text'} !~ /\S/) {
- $end_spaces = $root->{'args'}->[-1]->{'contents'}->[$index]->{'text'};
- chomp $end_spaces;
- }
+ if ($root->{'args'}->[-1]
+ and $root->{'args'}->[-1]->{'contents'}
+ and $root->{'args'}->[-1]->{'contents'}->[-1]
+ and $root->{'args'}->[-1]->{'contents'}->[-1]->{'type'}
+ and $root->{'args'}->[-1]->{'contents'}->[-1]->{'type'} eq $type
+ and defined($root->{'args'}->[-1]->{'contents'}->[-1]->{'text'})
+ and $root->{'args'}->[-1]->{'contents'}->[-1]->{'text'} !~ /\S/) {
+ $end_spaces = $root->{'args'}->[-1]->{'contents'}->[-1]->{'text'};
+ chomp $end_spaces;
}
return $end_spaces;
}
@@ -820,6 +814,9 @@
if (defined($in_monospace_not_normal));
$result .= $self->_convert($root->{'args'}->[0]);
+ if ($root->{'extra'} and $root->{'extra'}->{'comment_at_end'}) {
+ $result .= $self->_convert($root->{'extra'}->{'comment_at_end'});
+ }
pop @{$self->{'document_context'}->[-1]->{'monospace'}}
if (defined($in_monospace_not_normal));
chomp ($result);
@@ -854,7 +851,7 @@
push @$attribute, _leading_spaces($root);
my $end_line;
if ($root->{'args'}->[0]) {
- $end_line =
$self->_end_line_or_comment($root->{'args'}->[0]->{'contents'});
+ $end_line = $self->_end_line_or_comment($root);
} else {
# May that happen?
$end_line = '';
@@ -873,8 +870,7 @@
$root->{'extra'}->{'text_arg'});
}
}
- my ($arg, $end_line)
- = $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+ my ($arg, $end_line) = $self->_convert_argument_and_end_line($root);
push @$attribute, _leading_spaces($root);
return $self->open_element($command, $attribute).$arg
.$self->close_element($command).${end_line};
@@ -938,7 +934,7 @@
my $end_line;
if ($root->{'args'}->[0]) {
$end_line
- =
$self->_end_line_or_comment($root->{'args'}->[-1]->{'contents'});
+ = $self->_end_line_or_comment($root);
} else {
$end_line = "\n";
}
@@ -962,8 +958,7 @@
}
if ($root->{'args'} and $root->{'args'}->[0]) {
- my ($arg, $end_line)
- = $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+ my ($arg, $end_line) =
$self->_convert_argument_and_end_line($root);
$result .= $self->open_element('sectiontitle').$arg
.$self->close_element('sectiontitle')
.$closed_section_element.$end_line;
@@ -977,8 +972,7 @@
and defined($root->{'extra'}->{'type'}->{'normalized'})) {
unshift @$attribute, ('type',
$root->{'extra'}->{'type'}->{'normalized'});
}
- my ($arg, $end_line)
- = $self->_convert_argument_and_end_line($root->{'args'}->[0]);
+ my ($arg, $end_line) = $self->_convert_argument_and_end_line($root);
return $self->open_element($command, ${attribute}).$arg
.$self->close_element($command).$end_line;
}
@@ -1086,9 +1080,8 @@
}
my $end_line;
if ($root->{'args'}->[0]) {
- $end_line = $self->_end_line_or_comment(
- $root->{'args'}->[0]->{'contents'});
- push @$attribute, $self->_texinfo_line($root->{'args'}->[0]);
+ $end_line = $self->_end_line_or_comment($root);
+ push @$attribute, $self->_texinfo_line($root);
} else {
$end_line = "\n";
}
@@ -1327,7 +1320,7 @@
if ($arg_index+1 eq scalar(@{$root->{'args'}})) {
# last argument
($arg, $end_line)
- =
$self->_convert_argument_and_end_line($root->{'args'}->[$arg_index]);
+ = $self->_convert_argument_and_end_line($root);
} else {
$arg = $self->_convert($root->{'args'}->[$arg_index]);
}
@@ -1415,8 +1408,7 @@
$first_proto = 0;
}
$result .= $self->close_element('columnprototypes');
- $contents_possible_comment
- = $root->{'args'}->[-1]->{'contents'};
+ $contents_possible_comment = $root;
} elsif ($root->{'extra'}
and $root->{'extra'}->{'columnfractions'}) {
my $cmd;
@@ -1427,7 +1419,7 @@
last;
}
}
- my $attribute = [$self->_texinfo_line($cmd->{'args'}->[0])];
+ my $attribute = [$self->_texinfo_line($cmd)];
$result .= $self->open_element('columnfractions', $attribute);
foreach my $fraction
(@{$root->{'extra'}->{'columnfractions'}}) {
$result .= $self->open_element('columnfraction',
@@ -1435,11 +1427,7 @@
.$self->close_element('columnfraction');
}
$result .= $self->close_element('columnfractions');
- $contents_possible_comment
- =
$root->{'args'}->[-1]->{'contents'}->[-1]->{'args'}->[-1]->{'contents'}
- if ($root->{'args'}->[-1]->{'contents'}
- and $root->{'args'}->[-1]->{'contents'}->[-1]->{'args'}
- and
$root->{'args'}->[-1]->{'contents'}->[-1]->{'args'}->[-1]->{'contents'});
+ $contents_possible_comment = $cmd;
} else { # bogus multitable
$result .= "\n";
}
@@ -1454,8 +1442,7 @@
#print STDERR "NOT xtable: $root->{'cmdname'}\n"
# if
(!$Texinfo::Common::item_line_commands{$root->{'cmdname'}});
}
- $contents_possible_comment = $root->{'args'}->[-1]->{'contents'}
- if ($root->{'args'}->[-1]->{'contents'});
+ $contents_possible_comment = $root;
}
$end_line .=
$self->_end_line_or_comment($contents_possible_comment);
}
@@ -1610,9 +1597,8 @@
my $end_spaces = _end_line_spaces($end_command, 'spaces_at_end');
$end_line .= $end_spaces if (defined($end_spaces));
$end_line
- .=
$self->_end_line_or_comment($end_command->{'args'}->[0]->{'contents'})
- if ($end_command->{'args'}->[0]
- and $end_command->{'args'}->[0]->{'contents'});
+ .= $self->_end_line_or_comment($end_command)
+ if ($end_command->{'args'});
} else {
#$end_line = "\n";
}
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/Texinfo/Parser.pm 2018-09-11 20:49:04 UTC (rev 8162)
@@ -2188,43 +2188,40 @@
my $end_spaces;
$type = 'spaces_at_end' if (!defined($type));
- if ($current->{'contents'} and @{$current->{'contents'}}) {
- my $index = -1;
- # we ignore space before a misc command that is last on line.
- # This is primarily to tag spaces before comments, but this will
- # also tag and, in most converter lead to removal of spaces
- # before any misc command, which is not really problematic as
- # in most cases, if it is not a comment, we are in an invalid
- # nesting of misc command on another @-command line.
- $index = -2
- if (scalar(@{$current->{'contents'}}) > 1
- and $current->{'contents'}->[-1]->{'cmdname'}
- and
$self->{'misc_commands'}->{$current->{'contents'}->[-1]->{'cmdname'}});
+ return if (!$current->{'contents'} or address@hidden>{'contents'}});
- if (defined($current->{'contents'}->[$index]->{'text'})
- and !$current->{'contents'}->[$index]->{'type'}
- and $current->{'contents'}->[$index]->{'text'} =~ /\s+$/) {
- if ($current->{'contents'}->[$index]->{'text'} !~ /\S/) {
- if ($index == -1 and $current->{'type'} eq 'brace_command_arg') {
- $end_spaces = $current->{'contents'}->[$index]->{'text'};
- pop @{$current->{'contents'}};
- $current->{'extra'}->{'spaces_after_argument'} = $end_spaces;
- } else {
- $current->{'contents'}->[$index]->{'type'} = $type;
- }
+ # Store a final comment command in the 'extra' hash.
+ if (scalar(@{$current->{'contents'}}) >= 1
+ and $current->{'contents'}->[-1]->{'cmdname'}
+ and ($current->{'contents'}->[-1]->{'cmdname'} eq 'c'
+ or $current->{'contents'}->[-1]->{'cmdname'} eq 'comment')) {
+ $current->{'parent'}->{'extra'}->{'comment_at_end'}
+ = pop @{$current->{'contents'}};
+ }
+
+ return if (address@hidden>{'contents'}});
+
+ if (defined($current->{'contents'}->[-1]->{'text'})
+ and !$current->{'contents'}->[-1]->{'type'}
+ and $current->{'contents'}->[-1]->{'text'} =~ /\s+$/) {
+ if ($current->{'contents'}->[-1]->{'text'} !~ /\S/) {
+ if ($current->{'type'} eq 'brace_command_arg') {
+ $end_spaces = $current->{'contents'}->[-1]->{'text'};
+ pop @{$current->{'contents'}};
+ $current->{'extra'}->{'spaces_after_argument'} = $end_spaces;
} else {
- $current->{'contents'}->[$index]->{'text'} =~ s/(\s+)$//;
- $end_spaces = $1;
- my $new_spaces = { 'text' => $end_spaces, 'parent' => $current,
- 'type' => $type };
- if ($index == -1 and $current->{'type'} eq 'brace_command_arg') {
- $current->{'extra'}->{'spaces_after_argument'} = $end_spaces;
- } elsif ($index == -1) {
- push @{$current->{'contents'}}, $new_spaces;
- } else {
- splice (@{$current->{'contents'}}, $index+1, 0, $new_spaces);
- }
+ $current->{'contents'}->[-1]->{'type'} = $type;
}
+ } else {
+ $current->{'contents'}->[-1]->{'text'} =~ s/(\s+)$//;
+ $end_spaces = $1;
+ my $new_spaces = { 'text' => $end_spaces, 'parent' => $current,
+ 'type' => $type };
+ if ($current->{'type'} eq 'brace_command_arg') {
+ $current->{'extra'}->{'spaces_after_argument'} = $end_spaces;
+ } else {
+ push @{$current->{'contents'}}, $new_spaces;
+ }
}
}
}
Modified: trunk/tp/t/results/alias/simple.pl
===================================================================
--- trunk/tp/t/results/alias/simple.pl 2018-09-09 16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/alias/simple.pl 2018-09-11 20:49:04 UTC (rev 8162)
@@ -59,24 +59,6 @@
'parent' => {},
'text' => ' ',
'type' => 'spaces_at_end'
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => ' comment
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' comment
-'
- ]
- },
- 'parent' => {}
}
],
'parent' => {},
@@ -85,6 +67,24 @@
],
'cmdname' => 'alias',
'extra' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => ' comment
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment
+'
+ ]
+ },
+ 'parent' => {}
+ },
'misc_args' => [
'o-theralias',
'verb'
@@ -198,9 +198,9 @@
$result_trees{'simple'}{'contents'}[1]{'parent'} = $result_trees{'simple'};
$result_trees{'simple'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'simple'}{'contents'}[2]{'args'}[0];
$result_trees{'simple'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'simple'}{'contents'}[2]{'args'}[0];
-$result_trees{'simple'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'simple'}{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'simple'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} =
$result_trees{'simple'}{'contents'}[2]{'args'}[0];
$result_trees{'simple'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'simple'}{'contents'}[2];
+$result_trees{'simple'}{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
= $result_trees{'simple'}{'contents'}[2]{'extra'}{'comment_at_end'};
+$result_trees{'simple'}{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'} =
$result_trees{'simple'}{'contents'}[2]{'args'}[0];
$result_trees{'simple'}{'contents'}[2]{'parent'} = $result_trees{'simple'};
$result_trees{'simple'}{'contents'}[3]{'parent'} = $result_trees{'simple'};
$result_trees{'simple'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'simple'}{'contents'}[4];
Modified: trunk/tp/t/results/columnfractions/empty_comment.pl
===================================================================
--- trunk/tp/t/results/columnfractions/empty_comment.pl 2018-09-09 16:03:26 UTC
(rev 8161)
+++ trunk/tp/t/results/columnfractions/empty_comment.pl 2018-09-11 20:49:04 UTC
(rev 8162)
@@ -14,26 +14,7 @@
{
'args' => [
{
- 'contents' => [
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- '
-'
- ]
- },
- 'parent' => {}
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'misc_line_arg'
}
@@ -40,6 +21,24 @@
],
'cmdname' => 'columnfractions',
'extra' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ '
+'
+ ]
+ },
+ 'parent' => {}
+ },
'missing_argument' => 1,
'spaces_before_argument' => ' '
},
@@ -95,9 +94,9 @@
],
'type' => 'text_root'
};
-$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
=
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
=
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_comment'}{'contents'}[0]{'args'}[0];
$result_trees{'empty_comment'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'empty_comment'}{'contents'}[0];
$result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0];
Modified: trunk/tp/t/results/columnfractions/good_comment.pl
===================================================================
--- trunk/tp/t/results/columnfractions/good_comment.pl 2018-09-09 16:03:26 UTC
(rev 8161)
+++ trunk/tp/t/results/columnfractions/good_comment.pl 2018-09-11 20:49:04 UTC
(rev 8162)
@@ -18,24 +18,6 @@
{
'parent' => {},
'text' => '0.4 .6 5.'
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => ' comment
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' comment
-'
- ]
- },
- 'parent' => {}
}
],
'parent' => {},
@@ -44,6 +26,24 @@
],
'cmdname' => 'columnfractions',
'extra' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => ' comment
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment
+'
+ ]
+ },
+ 'parent' => {}
+ },
'misc_args' => [
'0.4',
'.6',
@@ -105,9 +105,9 @@
'type' => 'text_root'
};
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
=
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
=
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'good_comment'}{'contents'}[0]{'args'}[0];
$result_trees{'good_comment'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'good_comment'}{'contents'}[0];
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0];
Modified: trunk/tp/t/results/columnfractions/good_space_comment.pl
===================================================================
--- trunk/tp/t/results/columnfractions/good_space_comment.pl 2018-09-09
16:03:26 UTC (rev 8161)
+++ trunk/tp/t/results/columnfractions/good_space_comment.pl 2018-09-11
20:49:04 UTC (rev 8162)
@@ -23,24 +23,6 @@
'parent' => {},
'text' => ' ',
'type' => 'spaces_at_end'
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => ' space comment
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' space comment
-'
- ]
- },
- 'parent' => {}
}
],
'parent' => {},
@@ -49,6 +31,24 @@
],
'cmdname' => 'columnfractions',
'extra' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => ' space comment
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' space comment
+'
+ ]
+ },
+ 'parent' => {}
+ },
'misc_args' => [
'0',
'1'
@@ -110,9 +110,9 @@
};
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
=
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'};
+$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
=
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0];
$result_trees{'good_space_comment'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'good_space_comment'}{'contents'}[0];
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0];
Modified:
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
===================================================================
---
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
2018-09-09 16:03:26 UTC (rev 8161)
+++
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
2018-09-11 20:49:04 UTC (rev 8162)
@@ -213,10 +213,10 @@
*note ≥ ≤ →::
*note ª º ★ £ ⊣ ¿ ®:: *note ⇒ ° a b a sunny day å:: *note Å æ œ Æ Œ ø
-Ø ß ł Ł Ð ð Þ þ:: *note ä ẽ î â à é ç ē e̊ e̋ ę:: *note ė ĕ e̲ ẹ ě j
-ee͡:: *note ı Ḕ Ḉ:: *note “ ” ‘ ’ „ ‚:: *note « » « » ‹ ›:: *note `` ''
---- -- ` ':: *note AAA (fff) AAA BBB:: *note CCC (rrr) CCC DDD:: *note
-the someone <address@hidden> <address@hidden>:: *note [f--ile1] [image
src="f--ile.png" alt="alt" text="Image description\"\"\\."