[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/Texinfo/XS/parsetexi/multitable.c (gather_previous_item): Reparent trailing index commands from before_item to table_term. |
|
Date: |
Sat, 26 Nov 2022 15:13:52 -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 7136df0504 * tp/Texinfo/ParserNonXS.pm (gather_previous_item), *
tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item): Reparent trailing
index commands from before_item to table_term.
7136df0504 is described below
commit 7136df0504dbc52de69827a53ae7cde52fd0bd74
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Nov 26 20:12:08 2022 +0000
* tp/Texinfo/ParserNonXS.pm (gather_previous_item),
* tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item):
Reparent trailing index commands from before_item to table_term.
---
ChangeLog | 6 +
tp/Texinfo/ParserNonXS.pm | 18 ++
tp/Texinfo/XS/parsetexi/multitable.c | 15 ++
.../results/xtable/inter_item_commands_in_table.pl | 274 ++++++++++-----------
.../res_latex/inter_item_commands_in_table.tex | 6 +-
.../indices_in_begin_tables_lists.html | 12 +-
.../indices_in_begin_tables_lists.tex | 6 +-
.../indices_in_begin_tables_lists.tex | 6 +-
8 files changed, 189 insertions(+), 154 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f9df033721..dfe6bc7abd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-11-26 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/ParserNonXS.pm (gather_previous_item),
+ * tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item):
+ Reparent trailing index commands from before_item to table_term.
+
2022-11-26 Gavin Smith <gavinsmith0123@gmail.com>
Remove relate_index_entries_to_table_entries_in_tree
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 881a8fdca5..eb2060cd2c 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1603,6 +1603,7 @@ sub _gather_previous_item($$;$$)
}
if ($type eq 'table_definition') {
+ my $before_item;
# setup a table_entry
my $table_entry = {'type' => 'table_entry',
'parent' => $current,
@@ -1621,6 +1622,9 @@ sub _gather_previous_item($$;$$)
and ($current->{'contents'}->[$i]->{'type'} eq 'before_item'
# reached the previous table entry
or $current->{'contents'}->[$i]->{'type'} eq 'table_entry')) {
+ if ($current->{'contents'}->[$i]->{'type'} eq 'before_item') {
+ $before_item = $current->{'contents'}->[$i];
+ }
$splice_idx3 = $i + 1;
last;
}
@@ -1634,6 +1638,20 @@ sub _gather_previous_item($$;$$)
for my $child (@{$new_contents}) {
$child->{'parent'} = $table_term;
}
+ if (defined($before_item)) {
+ # reparent any trailing index entries in the before_item to the
+ # beginning of table term
+ while ($before_item->{'contents'}->[-1]
+ and $before_item->{'contents'}->[-1]->{'type'}
+ and $before_item->{'contents'}->[-1]->{'type'}
+ eq 'index_entry_command') {
+ my $element = pop @{$before_item->{'contents'}};
+ unshift @{$table_term->{'contents'}}, $element;
+ }
+ if (scalar(@{$before_item->{'contents'}}) == 0) {
+ delete $before_item->{'contents'};
+ }
+ }
if (scalar(@{$table_after_terms->{'contents'}})) {
push @{$table_entry->{'contents'}}, $table_after_terms;
$table_after_terms->{'parent'} = $table_entry;
diff --git a/tp/Texinfo/XS/parsetexi/multitable.c
b/tp/Texinfo/XS/parsetexi/multitable.c
index 6575af83fc..b3ea5675d8 100644
--- a/tp/Texinfo/XS/parsetexi/multitable.c
+++ b/tp/Texinfo/XS/parsetexi/multitable.c
@@ -121,6 +121,7 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
if (type == ET_table_definition)
{
+ ELEMENT *before_item = 0;
ELEMENT *table_entry = new_element (ET_table_entry);
ELEMENT *table_term = new_element (ET_table_term);
add_to_element_contents (table_entry, table_term);
@@ -133,6 +134,8 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
if (e->type == ET_before_item
|| e->type == ET_table_entry)
{
+ if (e->type == ET_before_item)
+ before_item = e;
splice_idx3 = i + 1;
break;
}
@@ -145,6 +148,18 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
for (i = 0; i < table_term->contents.number; i++)
contents_child_by_index(table_term, i)->parent = table_term;
remove_slice_from_contents (current, splice_idx3, splice_idx);
+ if (before_item)
+ {
+ /* Reparent any trailing index entries in the before_item to the
+ beginning of table term. */
+ while (before_item->contents.number > 0
+ && last_contents_child(before_item)->type
+ == ET_index_entry_command)
+ {
+ ELEMENT *e = pop_element_from_contents (before_item);
+ insert_into_contents (table_term, e, 0);
+ }
+ }
if (table_after_terms->contents.number > 0)
add_to_element_contents (table_entry, table_after_terms);
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 e96a38dea9..7a9a83591a 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -2119,46 +2119,6 @@ $result_trees{'inter_item_commands_in_table'} = {
'text' => '
',
'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'cindex after line'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'cindex',
- 'extra' => {
- 'index_entry' => {
- 'content_normalized' => [],
- 'entry_content' => [],
- 'entry_element' => {},
- 'entry_node' => {},
- 'entry_number' => 9,
- 'in_code' => 0,
- 'index_at_command' => 'cindex',
- 'index_ignore_chars' => {},
- 'index_name' => 'cp',
- 'index_type_command' => 'cindex'
- }
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 84,
- 'macro' => ''
- },
- 'type' => 'index_entry_command'
}
],
'type' => 'before_item'
@@ -2167,6 +2127,46 @@ $result_trees{'inter_item_commands_in_table'} = {
'contents' => [
{
'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cindex after line'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 9,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 84,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
{
'args' => [
{
@@ -2324,94 +2324,94 @@ $result_trees{'inter_item_commands_in_table'} = {
'
]
}
- },
+ }
+ ],
+ 'type' => 'before_item'
+ },
+ {
+ 'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => 'second'
+ 'contents' => [
+ {
+ 'text' => 'second'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 11,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
'info' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'cindex',
- 'extra' => {
- 'index_entry' => {
- 'content_normalized' => [],
- 'entry_content' => [],
- 'entry_element' => {},
- 'entry_node' => {},
- 'entry_number' => 11,
- 'in_code' => 0,
- 'index_at_command' => 'cindex',
- 'index_ignore_chars' => {},
- 'index_name' => 'cp',
- 'index_type_command' => 'cindex'
- }
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 91,
- 'macro' => ''
- },
- 'type' => 'index_entry_command'
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 91,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'text' => 'third'
+ 'contents' => [
+ {
+ 'text' => 'third'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 12,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
'info' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'cindex',
- 'extra' => {
- 'index_entry' => {
- 'content_normalized' => [],
- 'entry_content' => [],
- 'entry_element' => {},
- 'entry_node' => {},
- 'entry_number' => 12,
- 'in_code' => 0,
- 'index_at_command' => 'cindex',
- 'index_ignore_chars' => {},
- 'index_name' => 'cp',
- 'index_type_command' => 'cindex'
- }
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 92,
- 'macro' => ''
- },
- 'type' => 'index_entry_command'
- }
- ],
- 'type' => 'before_item'
- },
- {
- 'contents' => [
- {
- 'contents' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 92,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
{
'args' => [
{
@@ -2590,23 +2590,23 @@
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'co
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'args'}[0]{'contents'}[0];
$result_texis{'inter_item_commands_in_table'} = '@node Top
@@ -3042,18 +3042,16 @@
$result_converted{'html_text'}->{'inter_item_commands_in_table'} = '<div class="
</dl>
<dl class="table">
-<dd>
-<a class="index-entry-id" id="index-cindex-after-line"></a>
-</dd>
-<dt>‘<samp class="samp">asamp--bb2</samp>’</dt>
+<dt><a class="index-entry-id" id="index-cindex-after-line"></a>
+‘<samp class="samp">asamp--bb2</samp>’</dt>
</dl>
<dl class="table">
<dd><a class="index-entry-id" id="index-cindex-first"></a>
-<a class="index-entry-id" id="index-second"></a>
-<a class="index-entry-id" id="index-third"></a>
</dd>
-<dt>‘<samp class="samp">asamp--bb2</samp>’</dt>
+<dt><a class="index-entry-id" id="index-second"></a>
+<a class="index-entry-id" id="index-third"></a>
+‘<samp class="samp">asamp--bb2</samp>’</dt>
</dl>
@@ -3146,16 +3144,16 @@
$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<node name="Top" s
<table commandarg="samp" spaces=" " endspaces=" ">
<beforefirstitem>
-<cindex index="cp" spaces=" "><indexterm index="cp" number="9">cindex after
line</indexterm></cindex>
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="samp">asamp--bb2</itemformat></item>
+</beforefirstitem><tableentry><tableterm><cindex index="cp" spaces="
"><indexterm index="cp" number="9">cindex after line</indexterm></cindex>
+<item spaces=" "><itemformat command="samp">asamp--bb2</itemformat></item>
</tableterm></tableentry></table>
<table commandarg="samp" spaces=" " endspaces=" ">
<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp"
number="10">cindex first</indexterm></cindex>
<!-- c commant -->
-<cindex index="cp" spaces=" "><indexterm index="cp"
number="11">second</indexterm></cindex>
+</beforefirstitem><tableentry><tableterm><cindex index="cp" spaces="
"><indexterm index="cp" number="11">second</indexterm></cindex>
<cindex index="cp" spaces=" "><indexterm index="cp"
number="12">third</indexterm></cindex>
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="samp">asamp--bb2</itemformat></item>
+<item spaces=" "><itemformat command="samp">asamp--bb2</itemformat></item>
</tableterm></tableentry></table>
diff --git
a/tp/t/results/xtable/inter_item_commands_in_table/res_latex/inter_item_commands_in_table.tex
b/tp/t/results/xtable/inter_item_commands_in_table/res_latex/inter_item_commands_in_table.tex
index fd434b822d..124c1e94d1 100644
---
a/tp/t/results/xtable/inter_item_commands_in_table/res_latex/inter_item_commands_in_table.tex
+++
b/tp/t/results/xtable/inter_item_commands_in_table/res_latex/inter_item_commands_in_table.tex
@@ -154,17 +154,17 @@ Texte before first item samp.
\end{description}
\begin{description}
-\item[]
-\index[cp]{cindex after line@cindex after line}%
+
\item[{\parbox[b]{\linewidth}{%
+\index[cp]{cindex after line@cindex after line}%
\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
\end{description}
\begin{description}
\item[] \index[cp]{cindex first@cindex first}%
+\item[{\parbox[b]{\linewidth}{%
\index[cp]{second@second}%
\index[cp]{third@third}%
-\item[{\parbox[b]{\linewidth}{%
\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
\end{description}
diff --git
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
index f25ebbae16..63f5080b68 100644
---
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
+++
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
@@ -187,18 +187,16 @@ enum
</dl>
<dl class="table">
-<dd>
-<a class="index-entry-id" id="index-cindex-after-line"></a>
-</dd>
-<dt>‘<samp class="samp">asamp--bb2</samp>’</dt>
+<dt><a class="index-entry-id" id="index-cindex-after-line"></a>
+‘<samp class="samp">asamp--bb2</samp>’</dt>
</dl>
<dl class="table">
<dd><a class="index-entry-id" id="index-cindex-first"></a>
-<a class="index-entry-id" id="index-second"></a>
-<a class="index-entry-id" id="index-third"></a>
</dd>
-<dt>‘<samp class="samp">asamp--bb2</samp>’</dt>
+<dt><a class="index-entry-id" id="index-second"></a>
+<a class="index-entry-id" id="index-third"></a>
+‘<samp class="samp">asamp--bb2</samp>’</dt>
</dl>
<hr>
diff --git
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
index 76f5713471..b6de16877a 100644
---
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
+++
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
@@ -201,17 +201,17 @@ Texte before first item samp.
\end{description}
\begin{description}
-\item[]
-\index[cp]{cindex after line@cindex after line}%
+
\item[{\parbox[b]{\linewidth}{%
+\index[cp]{cindex after line@cindex after line}%
\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
\end{description}
\begin{description}
\item[] \index[cp]{cindex first@cindex first}%
+\item[{\parbox[b]{\linewidth}{%
\index[cp]{second@second}%
\index[cp]{third@third}%
-\item[{\parbox[b]{\linewidth}{%
\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
\end{description}
diff --git
a/tp/tests/indices/res_parser_info/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
b/tp/tests/indices/res_parser_info/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
index 76f5713471..b6de16877a 100644
---
a/tp/tests/indices/res_parser_info/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
+++
b/tp/tests/indices/res_parser_info/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
@@ -201,17 +201,17 @@ Texte before first item samp.
\end{description}
\begin{description}
-\item[]
-\index[cp]{cindex after line@cindex after line}%
+
\item[{\parbox[b]{\linewidth}{%
+\index[cp]{cindex after line@cindex after line}%
\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
\end{description}
\begin{description}
\item[] \index[cp]{cindex first@cindex first}%
+\item[{\parbox[b]{\linewidth}{%
\index[cp]{second@second}%
\index[cp]{third@third}%
-\item[{\parbox[b]{\linewidth}{%
\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
\end{description}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/ParserNonXS.pm (gather_previous_item), * tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item): Reparent trailing index commands from before_item to table_term.,
Gavin D. Smith <=