[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (gather_previous_item
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (gather_previous_item), * tp/Texindo/XS/parsetexi/element_types.txt: Rename 'table_item' to 'table_definition'. |
|
Date: |
Fri, 25 Nov 2022 18:39:56 -0500 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 6778a5efd1 * tp/Texinfo/ParserNonXS.pm (gather_previous_item), *
tp/Texindo/XS/parsetexi/element_types.txt: Rename 'table_item' to
'table_definition'.
6778a5efd1 is described below
commit 6778a5efd1e26eb4297fbcc524c089753a9a4a47
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Fri Nov 25 23:39:46 2022 +0000
* tp/Texinfo/ParserNonXS.pm (gather_previous_item),
* tp/Texindo/XS/parsetexi/element_types.txt:
Rename 'table_item' to 'table_definition'.
---
ChangeLog | 8 +++++++-
tp/Texinfo/Common.pm | 18 ++++++++--------
tp/Texinfo/Convert/DocBook.pm | 2 +-
tp/Texinfo/Convert/HTML.pm | 8 +++++---
tp/Texinfo/Convert/TexinfoMarkup.pm | 2 +-
tp/Texinfo/ParserNonXS.pm | 12 +++++------
tp/Texinfo/XS/parsetexi/element_types.c | 2 +-
tp/Texinfo/XS/parsetexi/element_types.h | 2 +-
tp/Texinfo/XS/parsetexi/element_types.txt | 2 +-
tp/Texinfo/XS/parsetexi/multitable.c | 10 ++++-----
tp/t/results/converters_tests/complex_nestings.pl | 2 +-
.../email_table_command_as_argument.pl | 2 +-
tp/t/results/converters_tests/line_breaks.pl | 2 +-
.../table_in_display_in_example.pl | 2 +-
.../table_in_example_in_display.pl | 2 +-
tp/t/results/coverage/preformatted.pl | 2 +-
tp/t/results/coverage/symbol_after_block.pl | 4 ++--
tp/t/results/coverage/table.pl | 4 ++--
tp/t/results/float/complex_float.pl | 6 +++---
tp/t/results/indices/ftable_vtable.pl | 4 ++--
tp/t/results/info_tests/test_index.pl | 4 ++--
.../results/invalid_nestings/block_not_matching.pl | 4 ++--
tp/t/results/invalid_nestings/center.pl | 2 +-
.../formats_not_closed_in_example.pl | 2 +-
tp/t/results/invalid_nestings/in_table.pl | 8 ++++----
tp/t/results/invalid_nestings/item_in_ref.pl | 2 +-
.../itemx_in_itemize_enumerate_in_table.pl | 2 +-
.../section_in_nested_block_commands.pl | 2 +-
tp/t/results/invalid_nestings/section_in_table.pl | 2 +-
.../style_not_closed_in_table_line.pl | 2 +-
tp/t/results/invalid_nestings/table_in_code.pl | 2 +-
.../table_not_closed_in_menu_comment.pl | 2 +-
.../table_not_closed_in_menu_description.pl | 2 +-
.../results/invalid_nestings/table_on_item_line.pl | 4 ++--
tp/t/results/itemize/table_in_itemize.pl | 4 ++--
.../menu/block_commands_in_menu_description.pl | 2 +-
tp/t/results/menu/formats_in_menu.pl | 2 +-
tp/t/results/misc_commands/footnote_in_center.pl | 2 +-
tp/t/results/paragraph/commands_in_flushright.pl | 2 +-
.../plaintext_tests/tab_in_table_in_example.pl | 2 +-
.../plaintext_tests/xref_quote_long_item.pl | 2 +-
tp/t/results/value/set_on_item_line.pl | 6 +++---
tp/t/results/xml_tests/image_inline_or_not.pl | 2 +-
tp/t/results/xtable/block_commands_in_table.pl | 18 ++++++++--------
.../results/xtable/definfoenclose_on_table_line.pl | 2 +-
.../results/xtable/inter_item_commands_in_table.pl | 12 +++++------
.../inter_item_commands_in_table_in_example.pl | 2 +-
tp/t/results/xtable/long_item.pl | 2 +-
tp/t/results/xtable/no_argument_for_table.pl | 2 +-
tp/t/results/xtable/table_nested.pl | 24 +++++++++++-----------
50 files changed, 115 insertions(+), 107 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f34bc5642c..4f622459bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2022-11-22 Gavin Smith <gavinsmith0123@gmail.com>
+2022-11-25 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/ParserNonXS.pm (gather_previous_item),
+ * tp/Texindo/XS/parsetexi/element_types.txt:
+ Rename 'table_item' to 'table_definition'.
+
+2022-11-25 Gavin Smith <gavinsmith0123@gmail.com>
* tp/Texinfo/ParserNonXS.pm (_gather_previous_item),
* tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item).
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 607b61d5ca..f819f35434 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -2181,7 +2181,7 @@ sub _relate_index_entry_to_table_entry($)
{
my $current = shift; # table_entry
- my ($table_term, $table_item, $item);
+ my ($table_term, $table_definition, $item);
if ($current->{'contents'}
and $current->{'contents'}->[0]
@@ -2191,8 +2191,8 @@ sub _relate_index_entry_to_table_entry($)
if ($current->{'contents'}
and $current->{'contents'}->[1]
- and $current->{'contents'}->[1]->{'type'} eq 'table_item') {
- $table_item = $current->{'contents'}->[1];
+ and $current->{'contents'}->[1]->{'type'} eq 'table_definition') {
+ $table_definition = $current->{'contents'}->[1];
}
if ($table_term->{'contents'}
@@ -2202,13 +2202,13 @@ sub _relate_index_entry_to_table_entry($)
$item = $table_term->{'contents'}->[0];
}
- return if !$table_term or !$table_item or !$item;
+ return if !$table_term or !$table_definition or !$item;
- if ($table_item->{'contents'}
- and $table_item->{'contents'}->[0]
- and $table_item->{'contents'}->[0]->{'type'}
- and $table_item->{'contents'}->[0]->{'type'} eq 'index_entry_command') {
- my $index_command = shift @{$table_item->{'contents'}};
+ if ($table_definition->{'contents'}
+ and $table_definition->{'contents'}->[0]
+ and $table_definition->{'contents'}->[0]->{'type'}
+ and $table_definition->{'contents'}->[0]->{'type'} eq
'index_entry_command') {
+ my $index_command = shift @{$table_definition->{'contents'}};
delete $index_command->{'parent'};
$item->{'extra'}->{'index_entry'}
= $index_command->{'extra'}->{'index_entry'};
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 18a611cef4..31fda20baa 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -236,7 +236,7 @@ foreach my $type (
my %type_elements = (
'paragraph' => 'para',
- 'table_item' => 'listitem',
+ 'table_definition' => 'listitem',
'table_entry' => 'varlistentry',
'row' => 'row',
'multitable_head' => 'thead',
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index e4310d1cf5..4c34299852 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -6721,7 +6721,7 @@ foreach my $command (keys(%def_commands)) {
$default_commands_conversion{$command} = \&_convert_def_command;
}
-sub _convert_table_item_type($$$$)
+sub _convert_table_definition_type($$$$)
{
my $self = shift;
my $type = shift;
@@ -6734,8 +6734,10 @@ sub _convert_table_item_type($$$$)
}
}
-$default_types_conversion{'table_item'} = \&_convert_table_item_type;
-$default_types_conversion{'inter_item'} = \&_convert_table_item_type;
+$default_types_conversion{'table_definition'}
+ = \&_convert_table_definition_type;
+$default_types_conversion{'inter_item'}
+ = \&_convert_table_definition_type;
sub _contents_shortcontents_in_title($)
{
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index ca1805dc46..91af563621 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -246,7 +246,7 @@ my %type_elements = (
'menu_entry_description' => 'menudescription',
'menu_entry_name' => 'menutitle',
'preamble_before_beginning' => 'preamblebeforebeginning',
- 'table_item' => 'tableitem',
+ 'table_definition' => 'tableitem',
'table_entry' => 'tableentry',
'table_term' => 'tableterm',
'row' => 'row',
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index e05754f448..0995e4a9ee 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1540,7 +1540,7 @@ sub _check_no_text($)
return $after_paragraph;
}
-# put everything after the last @item/@itemx in a table_item type container
+# put everything after the last @item/@itemx in a table_definition type
container
# and distinguish table_term and table_entry.
sub _gather_previous_item($$;$$)
{
@@ -1561,11 +1561,11 @@ sub _gather_previous_item($$;$$)
if ($next_command and $next_command eq 'itemx') {
$type = 'inter_item';
} else {
- $type = 'table_item';
+ $type = 'table_definition';
}
# remove everything that is not an @item/@itemx or before_item to
- # put it in the table_item/inter_item
+ # put it in the table_definition/inter_item
my $contents_count = scalar(@{$current->{'contents'}});
my $item_idx;
for (my $i = $contents_count - 1; $i >= 0; $i--) {
@@ -1586,7 +1586,7 @@ sub _gather_previous_item($$;$$)
$child->{'parent'} = $table_after_terms;
}
- if ($type eq 'table_item') {
+ if ($type eq 'table_definition') {
# setup a table_entry
my $table_entry = {'type' => 'table_entry',
'parent' => $current,
@@ -7339,14 +7339,14 @@ or C<@html>.
=item table_term
-=item table_item
+=item table_definition
=item inter_item
Those containers appear in C<@table>, C<@ftable> and C<@vtable>.
A I<table_entry> container contains an entire row of the table.
It contains a I<table_term> container, which holds all the C<@item> and
-C<@itemx> lines. This is followed by a I<table_item> container, which
+C<@itemx> lines. This is followed by a I<table_definition> container, which
holds the content that is to go into the second column of the table.
If there is any content before an C<@itemx> (normally only comments,
diff --git a/tp/Texinfo/XS/parsetexi/element_types.c
b/tp/Texinfo/XS/parsetexi/element_types.c
index b44af2f192..480276f6c3 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.c
+++ b/tp/Texinfo/XS/parsetexi/element_types.c
@@ -46,7 +46,7 @@ char *element_type_names[] = {
"before_item",
"table_entry",
"table_term",
-"table_item",
+"table_definition",
"inter_item",
"def_line",
"def_item",
diff --git a/tp/Texinfo/XS/parsetexi/element_types.h
b/tp/Texinfo/XS/parsetexi/element_types.h
index 38857aee94..8518cff6e1 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.h
+++ b/tp/Texinfo/XS/parsetexi/element_types.h
@@ -49,7 +49,7 @@ ET_macro_arg,
ET_before_item,
ET_table_entry,
ET_table_term,
-ET_table_item,
+ET_table_definition,
ET_inter_item,
ET_def_line,
ET_def_item,
diff --git a/tp/Texinfo/XS/parsetexi/element_types.txt
b/tp/Texinfo/XS/parsetexi/element_types.txt
index b7e18a43a1..8921fda521 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.txt
+++ b/tp/Texinfo/XS/parsetexi/element_types.txt
@@ -69,7 +69,7 @@ macro_arg
before_item
table_entry
table_term
-table_item
+table_definition
inter_item
def_line
def_item
diff --git a/tp/Texinfo/XS/parsetexi/multitable.c
b/tp/Texinfo/XS/parsetexi/multitable.c
index 7f98377f15..442a28d2cc 100644
--- a/tp/Texinfo/XS/parsetexi/multitable.c
+++ b/tp/Texinfo/XS/parsetexi/multitable.c
@@ -52,7 +52,7 @@ item_multitable_parent (ELEMENT *current)
}
/* Put the contents of a @table row in a ET_table_entry container, containing
- a ET_table_term element and a ET_table_item element. The elements of
+ a ET_table_term element and a ET_table_definition element. The elements of
this row currently occur the end of the contents of CURRENT as immediate
children.
@@ -74,11 +74,11 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
return;
}
- type = next_command != CM_itemx ? ET_table_item : ET_inter_item;
+ type = next_command != CM_itemx ? ET_table_definition : ET_inter_item;
gathered = new_element (type);
/* Starting from the end, collect everything that is not a ET_item
- or ET_itemx and put it into the ET_table_item. */
+ or ET_itemx and put it into the ET_table_definition. */
contents_count = current->contents.number;
for (i = 0; i < contents_count; i++)
{
@@ -94,13 +94,13 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
speed is an issue then we could move all the elements at once instead
of calling insert_into_contents multiple times. */
- if (type == ET_table_item)
+ if (type == ET_table_definition)
{
ELEMENT *table_entry = new_element (ET_table_entry);
ELEMENT *table_term = new_element (ET_table_term);
add_to_element_contents (table_entry, table_term);
- /* We previously collected elements into a ET_table_item. Now
+ /* We previously collected elements into a ET_table_definition. Now
do the same for ET_table_term. */
contents_count = current->contents.number;
for (i = 0; i < contents_count; i++)
diff --git a/tp/t/results/converters_tests/complex_nestings.pl
b/tp/t/results/converters_tests/complex_nestings.pl
index 423106d197..38a4d5eb95 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -874,7 +874,7 @@ $result_trees{'complex_nestings'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/converters_tests/email_table_command_as_argument.pl
b/tp/t/results/converters_tests/email_table_command_as_argument.pl
index 814e4988f3..598bde49db 100644
--- a/tp/t/results/converters_tests/email_table_command_as_argument.pl
+++ b/tp/t/results/converters_tests/email_table_command_as_argument.pl
@@ -82,7 +82,7 @@ $result_trees{'email_table_command_as_argument'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/converters_tests/line_breaks.pl
b/tp/t/results/converters_tests/line_breaks.pl
index 097b49a1d3..954407e5a2 100644
--- a/tp/t/results/converters_tests/line_breaks.pl
+++ b/tp/t/results/converters_tests/line_breaks.pl
@@ -285,7 +285,7 @@ $result_trees{'line_breaks'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/converters_tests/table_in_display_in_example.pl
b/tp/t/results/converters_tests/table_in_display_in_example.pl
index fc8550b76d..82d7907d06 100644
--- a/tp/t/results/converters_tests/table_in_display_in_example.pl
+++ b/tp/t/results/converters_tests/table_in_display_in_example.pl
@@ -100,7 +100,7 @@ $result_trees{'table_in_display_in_example'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/converters_tests/table_in_example_in_display.pl
b/tp/t/results/converters_tests/table_in_example_in_display.pl
index 1054d11f34..e2e7340fe9 100644
--- a/tp/t/results/converters_tests/table_in_example_in_display.pl
+++ b/tp/t/results/converters_tests/table_in_example_in_display.pl
@@ -100,7 +100,7 @@ $result_trees{'table_in_example_in_display'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/coverage/preformatted.pl
b/tp/t/results/coverage/preformatted.pl
index edf478b08d..54f0d5f8b4 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -181,7 +181,7 @@ $result_trees{'preformatted'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/coverage/symbol_after_block.pl
b/tp/t/results/coverage/symbol_after_block.pl
index a00d5b4f40..92a5abb5f6 100644
--- a/tp/t/results/coverage/symbol_after_block.pl
+++ b/tp/t/results/coverage/symbol_after_block.pl
@@ -349,7 +349,7 @@ $result_trees{'symbol_after_block'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -467,7 +467,7 @@ $result_trees{'symbol_after_block'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 1745aae46d..47ff774556 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -111,7 +111,7 @@ $result_trees{'table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -430,7 +430,7 @@ $result_trees{'table'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/float/complex_float.pl
b/tp/t/results/float/complex_float.pl
index c6de49b228..9985d3de62 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -441,7 +441,7 @@ $result_trees{'complex_float'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -1103,7 +1103,7 @@ $result_trees{'complex_float'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -2437,7 +2437,7 @@ $result_trees{'complex_float'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/indices/ftable_vtable.pl
b/tp/t/results/indices/ftable_vtable.pl
index 14cbd58568..62a7468db5 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -168,7 +168,7 @@ $result_trees{'ftable_vtable'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -401,7 +401,7 @@ $result_trees{'ftable_vtable'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/info_tests/test_index.pl
b/tp/t/results/info_tests/test_index.pl
index 103840dee9..5b2d0fb9e8 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -664,7 +664,7 @@ $result_trees{'test_index'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -762,7 +762,7 @@ $result_trees{'test_index'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/invalid_nestings/block_not_matching.pl
b/tp/t/results/invalid_nestings/block_not_matching.pl
index 300539eaa1..075cdfeff9 100644
--- a/tp/t/results/invalid_nestings/block_not_matching.pl
+++ b/tp/t/results/invalid_nestings/block_not_matching.pl
@@ -229,7 +229,7 @@ $result_trees{'block_not_matching'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -338,7 +338,7 @@ $result_trees{'block_not_matching'} = {
}
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/invalid_nestings/center.pl
b/tp/t/results/invalid_nestings/center.pl
index 265bfd2eb8..d9eb58d96b 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -651,7 +651,7 @@ $result_trees{'center'} = {
}
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
index f5cd105168..4118e73ab1 100644
--- a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
+++ b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
@@ -201,7 +201,7 @@ $result_trees{'formats_not_closed_in_example'} = {
}
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/invalid_nestings/in_table.pl
b/tp/t/results/invalid_nestings/in_table.pl
index 6e8969904a..12bdc5537c 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -302,7 +302,7 @@ $result_trees{'in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -377,7 +377,7 @@ $result_trees{'in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -685,7 +685,7 @@ $result_trees{'in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -803,7 +803,7 @@ $result_trees{'in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/invalid_nestings/item_in_ref.pl
b/tp/t/results/invalid_nestings/item_in_ref.pl
index d141e9bb89..628407e322 100644
--- a/tp/t/results/invalid_nestings/item_in_ref.pl
+++ b/tp/t/results/invalid_nestings/item_in_ref.pl
@@ -119,7 +119,7 @@ $result_trees{'item_in_ref'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git
a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
index dbf04238ec..249cc06a60 100644
--- a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
+++ b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
@@ -257,7 +257,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
index 83a7e7adfa..6fde339c0d 100644
--- a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
+++ b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
@@ -119,7 +119,7 @@ $result_trees{'section_in_nested_block_commands'} = {
}
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/invalid_nestings/section_in_table.pl
b/tp/t/results/invalid_nestings/section_in_table.pl
index 71c871dc4c..206fbf6aaa 100644
--- a/tp/t/results/invalid_nestings/section_in_table.pl
+++ b/tp/t/results/invalid_nestings/section_in_table.pl
@@ -72,7 +72,7 @@ $result_trees{'section_in_table'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
index 7b149b6a6d..9cb85e258a 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
@@ -97,7 +97,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/invalid_nestings/table_in_code.pl
b/tp/t/results/invalid_nestings/table_in_code.pl
index 4f1a9a99ac..0730abd655 100644
--- a/tp/t/results/invalid_nestings/table_in_code.pl
+++ b/tp/t/results/invalid_nestings/table_in_code.pl
@@ -104,7 +104,7 @@ $result_trees{'table_in_code'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
index e0f143384a..69dd0b844e 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
@@ -158,7 +158,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git
a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
index ba909fb74e..b382a69a4c 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
@@ -122,7 +122,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/invalid_nestings/table_on_item_line.pl
b/tp/t/results/invalid_nestings/table_on_item_line.pl
index 921f6160a8..3506b11ef8 100644
--- a/tp/t/results/invalid_nestings/table_on_item_line.pl
+++ b/tp/t/results/invalid_nestings/table_on_item_line.pl
@@ -106,7 +106,7 @@ $result_trees{'table_on_item_line'} = {
'type' => 'spaces_before_paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -162,7 +162,7 @@ $result_trees{'table_on_item_line'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/itemize/table_in_itemize.pl
b/tp/t/results/itemize/table_in_itemize.pl
index 67883a7d24..0644a77f65 100644
--- a/tp/t/results/itemize/table_in_itemize.pl
+++ b/tp/t/results/itemize/table_in_itemize.pl
@@ -147,7 +147,7 @@ $result_trees{'table_in_itemize'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -210,7 +210,7 @@ $result_trees{'table_in_itemize'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl
b/tp/t/results/menu/block_commands_in_menu_description.pl
index 765235cd34..6608ec5def 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -312,7 +312,7 @@ $result_trees{'block_commands_in_menu_description'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/menu/formats_in_menu.pl
b/tp/t/results/menu/formats_in_menu.pl
index e5bbb662cc..ca5daa57b3 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -146,7 +146,7 @@ $result_trees{'formats_in_menu'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl
b/tp/t/results/misc_commands/footnote_in_center.pl
index 3cf8b0f09a..3ffcbc6568 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -117,7 +117,7 @@ $result_trees{'footnote_in_center'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl
b/tp/t/results/paragraph/commands_in_flushright.pl
index acc601b06d..99c6f6c194 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -374,7 +374,7 @@ $result_trees{'commands_in_flushright'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
index 1a46499db3..816de6c9e4 100644
--- a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
@@ -119,7 +119,7 @@ $result_trees{'tab_in_table_in_example'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/plaintext_tests/xref_quote_long_item.pl
b/tp/t/results/plaintext_tests/xref_quote_long_item.pl
index 25e8da8d31..afee61337b 100644
--- a/tp/t/results/plaintext_tests/xref_quote_long_item.pl
+++ b/tp/t/results/plaintext_tests/xref_quote_long_item.pl
@@ -196,7 +196,7 @@ $result_trees{'xref_quote_long_item'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/value/set_on_item_line.pl
b/tp/t/results/value/set_on_item_line.pl
index 658fee3407..fe8871f019 100644
--- a/tp/t/results/value/set_on_item_line.pl
+++ b/tp/t/results/value/set_on_item_line.pl
@@ -99,7 +99,7 @@ $result_trees{'set_on_item_line'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -352,7 +352,7 @@ $result_trees{'set_on_item_line'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -420,7 +420,7 @@ $result_trees{'set_on_item_line'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/xml_tests/image_inline_or_not.pl
b/tp/t/results/xml_tests/image_inline_or_not.pl
index 687e5fc023..2e03a9cebc 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -607,7 +607,7 @@ $result_trees{'image_inline_or_not'} = {
'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/xtable/block_commands_in_table.pl
b/tp/t/results/xtable/block_commands_in_table.pl
index ea7931da1e..0fc8911fb0 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -173,7 +173,7 @@ $result_trees{'block_commands_in_table'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -278,7 +278,7 @@ $result_trees{'block_commands_in_table'} = {
}
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -332,7 +332,7 @@ $result_trees{'block_commands_in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -433,7 +433,7 @@ $result_trees{'block_commands_in_table'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -534,7 +534,7 @@ $result_trees{'block_commands_in_table'} = {
}
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -771,7 +771,7 @@ $result_trees{'block_commands_in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -957,7 +957,7 @@ $result_trees{'block_commands_in_table'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -1084,7 +1084,7 @@ $result_trees{'block_commands_in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -1133,7 +1133,7 @@ $result_trees{'block_commands_in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/xtable/definfoenclose_on_table_line.pl
b/tp/t/results/xtable/definfoenclose_on_table_line.pl
index fae06e35ec..9198a28936 100644
--- a/tp/t/results/xtable/definfoenclose_on_table_line.pl
+++ b/tp/t/results/xtable/definfoenclose_on_table_line.pl
@@ -147,7 +147,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index 93641dd467..7c61505192 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -251,7 +251,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -443,7 +443,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -691,7 +691,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -836,7 +836,7 @@ $result_trees{'inter_item_commands_in_table'} = {
}
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -1015,7 +1015,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -1352,7 +1352,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
index 60a17aafe4..f14b14f671 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
@@ -238,7 +238,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/xtable/long_item.pl b/tp/t/results/xtable/long_item.pl
index de13f31412..184eaf062c 100644
--- a/tp/t/results/xtable/long_item.pl
+++ b/tp/t/results/xtable/long_item.pl
@@ -106,7 +106,7 @@ $result_trees{'long_item'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/xtable/no_argument_for_table.pl
b/tp/t/results/xtable/no_argument_for_table.pl
index a9eaddd168..29a3929112 100644
--- a/tp/t/results/xtable/no_argument_for_table.pl
+++ b/tp/t/results/xtable/no_argument_for_table.pl
@@ -69,7 +69,7 @@ $result_trees{'no_argument_for_table'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
diff --git a/tp/t/results/xtable/table_nested.pl
b/tp/t/results/xtable/table_nested.pl
index 1bf692a2e6..d32ab20b68 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -316,7 +316,7 @@ $result_trees{'table_nested'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -388,7 +388,7 @@ $result_trees{'table_nested'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -563,7 +563,7 @@ $result_trees{'table_nested'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -612,7 +612,7 @@ $result_trees{'table_nested'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -856,7 +856,7 @@ $result_trees{'table_nested'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -928,7 +928,7 @@ $result_trees{'table_nested'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -1103,7 +1103,7 @@ $result_trees{'table_nested'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -1152,7 +1152,7 @@ $result_trees{'table_nested'} = {
'type' => 'preformatted'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -1408,7 +1408,7 @@ $result_trees{'table_nested'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -1480,7 +1480,7 @@ $result_trees{'table_nested'} = {
'type' => 'empty_line'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -1655,7 +1655,7 @@ $result_trees{'table_nested'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
@@ -1704,7 +1704,7 @@ $result_trees{'table_nested'} = {
'type' => 'paragraph'
}
],
- 'type' => 'table_item'
+ 'type' => 'table_definition'
}
],
'type' => 'table_entry'
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/ParserNonXS.pm (gather_previous_item), * tp/Texindo/XS/parsetexi/element_types.txt: Rename 'table_item' to 'table_definition'.,
Gavin D. Smith <=