[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8359] @itemx is always a line command
From: |
gavinsmith0123 |
Subject: |
[8359] @itemx is always a line command |
Date: |
Sat, 20 Oct 2018 15:27:25 -0400 (EDT) |
Revision: 8359
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8359
Author: gavin
Date: 2018-10-20 15:27:24 -0400 (Sat, 20 Oct 2018)
Log Message:
-----------
@itemx is always a line command
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Common.pm
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
trunk/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
trunk/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
trunk/tp/t/results/itemize/headitem_itemx_in_itemize.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-10-20 18:01:40 UTC (rev 8358)
+++ trunk/ChangeLog 2018-10-20 19:27:24 UTC (rev 8359)
@@ -1,5 +1,14 @@
2018-10-20 Gavin Smith <address@hidden>
+ * tp/Texinfo/Common.pm (%other_commands): Remove 'itemx'.
+ @itemx is always a line command.
+ * tp/Texinfo/Parser.pm (_parse_texi) <misc commands>:
+ Only @item can sometimes be an 'other' command', not @itemx.
+ Error message for incorrectly nested @item or @itemx.
+ (_end_line): Add a check for an undefined value.
+
+2018-10-20 Gavin Smith <address@hidden>
+
* tp/Texinfo/Common.pm (%line_commands): Add all the sectioning,
index and def commands.
* tp/Texinfo/Parser.pm (%misc_commands): Remove.
Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm 2018-10-20 18:01:40 UTC (rev 8358)
+++ trunk/tp/Texinfo/Common.pm 2018-10-20 19:27:24 UTC (rev 8359)
@@ -393,7 +393,7 @@
# The number is an indication of the number of arguments of
# the command.
#
-# Beware that @item and @itemx may be 'line' commands or 'other' commands
+# Beware that @item may be a 'line' command or an 'other' command
# depending on the context.
our %line_commands = (
'node' => 'line', # special arg
@@ -513,7 +513,6 @@
'indent' => 'skipspace',
'headitem' => 'skipspace',
'item' => 'skipspace', # or line, depending on the context
- 'itemx' => 'skipspace', # or line, depending on the context
'tab' => 'skipspace',
# only valid in heading or footing
'thischapter' => 'noarg',
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2018-10-20 18:01:40 UTC (rev 8358)
+++ trunk/tp/Texinfo/Parser.pm 2018-10-20 19:27:24 UTC (rev 8359)
@@ -2922,6 +2922,7 @@
my $command = $current->{'cmdname'};
my $end_command;
print STDERR "MISC END address@hidden" if ($self->{'DEBUG'});
+
if ($self->{'line_commands'}->{$command} =~ /^\d$/) {
my $args = _parse_line_command_args($self, $current, $line_nr);
$current->{'extra'}->{'misc_args'} = $args if (defined($args));
@@ -3109,6 +3110,7 @@
$current->{'extra'}->{'missing_argument'} = 1;
} else {
if (($command eq 'item' or $command eq 'itemx')
+ and $current->{'parent'}->{'cmdname'}
and $self->{'command_index'}->{$current->{'parent'}->{'cmdname'}})
{
_enter_index_entry($self, $current->{'parent'}->{'cmdname'},
$command, $current,
@@ -4097,13 +4099,8 @@
$current = _end_preformatted($self, $current, $line_nr);
}
- my $line_arg = 0;
-
- if ($command eq 'item' or $command eq 'itemx') {
- $line_arg = 1 if _item_line_parent($current);
- }
-
- if (!$line_arg and defined($other_commands{$command})) {
+ if (defined($other_commands{$command})
+ and ($command ne 'item' or !_item_line_parent($current))) {
# noarg skipspace
my $arg_spec = $other_commands{$command};
my $misc;
@@ -4125,8 +4122,8 @@
$current = _begin_preformatted($self, $current)
if ($close_preformatted_commands{$command});
} else {
- if ($command eq 'item' or $command eq 'itemx'
- or $command eq 'headitem' or $command eq 'tab') {
+ if ($command eq 'item'
+ or $command eq 'headitem' or $command eq 'tab') {
my $parent;
# @itemize or @enumerate
if ($parent = _item_container_parent($current)) {
@@ -4244,7 +4241,7 @@
$line_nr, $misc);
}
# line commands
- } elsif ($line_arg or defined($self->{'line_commands'}->{$command})) {
+ } elsif (defined($self->{'line_commands'}->{$command})) {
if ($root_commands{$command} or $command eq 'bye') {
$current = _close_commands($self, $current, $line_nr, undef,
$command);
@@ -4369,12 +4366,19 @@
# $arg_spec is text, line or a number
# @item or @itemx in @table
if ($command eq 'item' or $command eq 'itemx') {
+ my $parent;
print STDERR "ITEM_LINE\n" if ($self->{'DEBUG'});
- $current = _item_line_parent($current);
- _gather_previous_item($self, $current, $command, $line_nr);
+ if ($parent = _item_line_parent($current)) {
+ $current = $parent;
+ _gather_previous_item($self, $current, $command, $line_nr);
+ } else {
+ $self->line_error (sprintf(__(
+ "address@hidden outside of table or list"), $command),
$line_nr);
+ $current = _begin_preformatted($self, $current);
+ }
$misc = { 'cmdname' => $command, 'parent' => $current };
push @{$current->{'contents'}}, $misc;
- $misc->{'line_nr'} = $line_nr if (defined($misc));
+ $misc->{'line_nr'} = $line_nr;
} else {
$misc = { 'cmdname' => $command, 'parent' => $current,
'line_nr' => $line_nr };
Modified: trunk/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
2018-10-20 18:01:40 UTC (rev 8358)
+++ trunk/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
2018-10-20 19:27:24 UTC (rev 8359)
@@ -8,20 +8,32 @@
$result_trees{'item_tab_outside_of_table_lists'} = {
'contents' => [
{
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'itemx outside.'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
'parent' => {},
- 'text' => 'itemx outside.
-'
+ 'type' => 'misc_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'cmdname' => 'itemx',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -63,18 +75,18 @@
],
'type' => 'text_root'
};
+$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'item_tab_outside_of_table_lists'}{'contents'}[0]{'args'}[0];
+$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'item_tab_outside_of_table_lists'}{'contents'}[0];
$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[0]{'parent'} =
$result_trees{'item_tab_outside_of_table_lists'};
-$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'item_tab_outside_of_table_lists'}{'contents'}[1];
$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[1]{'parent'} =
$result_trees{'item_tab_outside_of_table_lists'};
+$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'item_tab_outside_of_table_lists'}{'contents'}[2];
+$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'item_tab_outside_of_table_lists'}{'contents'}[2];
$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[2]{'parent'} =
$result_trees{'item_tab_outside_of_table_lists'};
-$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'item_tab_outside_of_table_lists'}{'contents'}[3];
-$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'item_tab_outside_of_table_lists'}{'contents'}[3];
$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[3]{'parent'} =
$result_trees{'item_tab_outside_of_table_lists'};
+$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'item_tab_outside_of_table_lists'}{'contents'}[4];
$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[4]{'parent'} =
$result_trees{'item_tab_outside_of_table_lists'};
-$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'item_tab_outside_of_table_lists'}{'contents'}[5];
-$result_trees{'item_tab_outside_of_table_lists'}{'contents'}[5]{'parent'} =
$result_trees{'item_tab_outside_of_table_lists'};
-$result_texis{'item_tab_outside_of_table_lists'} = ' itemx outside.
+$result_texis{'item_tab_outside_of_table_lists'} = '@itemx itemx outside.
headitem outside.
someitem outside.
tab outside
Modified:
trunk/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
2018-10-20 18:01:40 UTC (rev 8358)
+++ trunk/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
2018-10-20 19:27:24 UTC (rev 8359)
@@ -111,20 +111,32 @@
{
'contents' => [
{
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in nested itemize itemx'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
'parent' => {},
- 'text' => 'in nested itemize itemx
-'
+ 'type' => 'misc_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'cmdname' => 'itemx',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'parent' => {},
@@ -193,20 +205,32 @@
{
'contents' => [
{
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in nested enumerate itemx'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
'parent' => {},
- 'text' => 'in nested enumerate itemx
-'
+ 'type' => 'misc_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'cmdname' => 'itemx',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'parent' => {},
@@ -322,9 +346,9 @@
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
@@ -335,9 +359,9 @@
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1];
-$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[2];
@@ -360,11 +384,11 @@
In item, nested itemize
@itemize
- in nested itemize itemx
address@hidden in nested itemize itemx
@end itemize
@enumerate
- in nested enumerate itemx
address@hidden in nested enumerate itemx
@end enumerate
@end table
@@ -382,12 +406,12 @@
$result_errors{'itemx_in_itemize_enumerate_in_table'} = [
{
- 'error_line' => ':6: @itemx not meaningful inside address@hidden' block
+ 'error_line' => ':6: @itemx outside of table or list
',
'file_name' => '',
'line_nr' => 6,
'macro' => '',
- 'text' => '@itemx not meaningful inside address@hidden' block',
+ 'text' => '@itemx outside of table or list',
'type' => 'error'
},
{
@@ -400,12 +424,12 @@
'type' => 'warning'
},
{
- 'error_line' => ':10: @itemx not meaningful inside address@hidden' block
+ 'error_line' => ':10: @itemx outside of table or list
',
'file_name' => '',
'line_nr' => 10,
'macro' => '',
- 'text' => '@itemx not meaningful inside address@hidden' block',
+ 'text' => '@itemx outside of table or list',
'type' => 'error'
},
{
Modified: trunk/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
===================================================================
--- trunk/tp/t/results/itemize/headitem_itemx_in_enumerate.pl 2018-10-20
18:01:40 UTC (rev 8358)
+++ trunk/tp/t/results/itemize/headitem_itemx_in_enumerate.pl 2018-10-20
19:27:24 UTC (rev 8359)
@@ -34,20 +34,32 @@
'type' => 'paragraph'
},
{
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'itemx enumerate'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
'parent' => {},
- 'text' => 'itemx enumerate
-'
+ 'type' => 'misc_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'cmdname' => 'itemx',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -126,12 +138,12 @@
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0];
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1];
+$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1];
-$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1];
+$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1];
-$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
-$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1];
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0];
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[2];
@@ -141,7 +153,7 @@
$result_texis{'headitem_itemx_in_enumerate'} = '@enumerate
@item item enumerate
- itemx enumerate
address@hidden itemx enumerate
headitem enumerate
@end enumerate
';
@@ -154,12 +166,12 @@
$result_errors{'headitem_itemx_in_enumerate'} = [
{
- 'error_line' => ':3: @itemx not meaningful inside address@hidden' block
+ 'error_line' => ':3: @itemx outside of table or list
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => '@itemx not meaningful inside address@hidden' block',
+ 'text' => '@itemx outside of table or list',
'type' => 'error'
},
{
Modified: trunk/tp/t/results/itemize/headitem_itemx_in_itemize.pl
===================================================================
--- trunk/tp/t/results/itemize/headitem_itemx_in_itemize.pl 2018-10-20
18:01:40 UTC (rev 8358)
+++ trunk/tp/t/results/itemize/headitem_itemx_in_itemize.pl 2018-10-20
19:27:24 UTC (rev 8359)
@@ -42,20 +42,32 @@
'type' => 'paragraph'
},
{
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'contents' => [
+ 'args' => [
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'itemx'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
'parent' => {},
- 'text' => 'itemx
-'
+ 'type' => 'misc_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'cmdname' => 'itemx',
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -135,12 +147,12 @@
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1];
+$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1];
-$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1];
+$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1];
-$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
-$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2];
@@ -151,7 +163,7 @@
$result_texis{'headitem_itemx_in_itemize'} = '@itemize
@item item
- itemx
address@hidden itemx
headitem
@end itemize
';
@@ -164,12 +176,12 @@
$result_errors{'headitem_itemx_in_itemize'} = [
{
- 'error_line' => ':3: @itemx not meaningful inside address@hidden' block
+ 'error_line' => ':3: @itemx outside of table or list
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => '@itemx not meaningful inside address@hidden' block',
+ 'text' => '@itemx outside of table or list',
'type' => 'error'
},
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8359] @itemx is always a line command,
gavinsmith0123 <=