[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (_gather_previous_ite
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (_gather_previous_item), tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item): Reparent trailing comments from before_item to table_term. |
|
Date: |
Sun, 27 Nov 2022 08:10:06 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new ac42187e6e * tp/Texinfo/ParserNonXS.pm (_gather_previous_item),
tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item): Reparent trailing
comments from before_item to table_term.
ac42187e6e is described below
commit ac42187e6e9c7953dd9b0ae0d17336ec6624a999
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Nov 27 14:09:56 2022 +0100
* tp/Texinfo/ParserNonXS.pm (_gather_previous_item),
tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item):
Reparent trailing comments from before_item to table_term.
---
ChangeLog | 6 +
tp/Texinfo/ParserNonXS.pm | 11 +-
tp/Texinfo/XS/parsetexi/multitable.c | 7 +-
.../xtable/comment_and_itemx_before_item.pl | 41 +-
.../results/xtable/inter_item_commands_in_table.pl | 431 ++++++++++-----------
.../res_latex/inter_item_commands_in_table.tex | 6 +-
.../indices_in_begin_tables_lists.html | 15 +-
.../indices_in_begin_tables_lists.tex | 6 +-
.../indices_in_begin_tables_lists.tex | 6 +-
.../res_parser/formatting_docbook/formatting.xml | 36 +-
.../res_parser/formatting_xml/formatting.xml | 36 +-
11 files changed, 292 insertions(+), 309 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 90bee06c3b..04ead51cf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-11-27 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_gather_previous_item),
+ tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item):
+ Reparent trailing comments from before_item to table_term.
+
2022-11-27 Gavin Smith <gavinsmith0123@gmail.com>
* tp/tests/coverage_macro.texi: Readd removed content. From
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 2cff37fea4..19b851c752 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1642,9 +1642,14 @@ sub _gather_previous_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') {
+ and (($before_item->{'contents'}->[-1]->{'type'}
+ and $before_item->{'contents'}->[-1]->{'type'}
+ eq 'index_entry_command')
+ or ($before_item->{'contents'}->[-1]->{'cmdname'}
+ and ($before_item->{'contents'}->[-1]->{'cmdname'}
+ eq 'c'
+ or $before_item->{'contents'}->[-1]->{'cmdname'}
+ eq 'comment')))) {
my $element = pop @{$before_item->{'contents'}};
unshift @{$table_term->{'contents'}}, $element;
}
diff --git a/tp/Texinfo/XS/parsetexi/multitable.c
b/tp/Texinfo/XS/parsetexi/multitable.c
index ca1dd19b06..70f5f4af66 100644
--- a/tp/Texinfo/XS/parsetexi/multitable.c
+++ b/tp/Texinfo/XS/parsetexi/multitable.c
@@ -153,8 +153,11 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
/* 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)
+ && (last_contents_child(before_item)->type
+ == ET_index_entry_command
+ || last_contents_child(before_item)->cmd == CM_c
+ || last_contents_child(before_item)->cmd
+ == CM_comment))
{
ELEMENT *e = pop_element_from_contents (before_item);
insert_into_contents (table_term, e, 0);
diff --git a/tp/t/results/xtable/comment_and_itemx_before_item.pl
b/tp/t/results/xtable/comment_and_itemx_before_item.pl
index eb8e274d46..3871ce1acc 100644
--- a/tp/t/results/xtable/comment_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/comment_and_itemx_before_item.pl
@@ -35,28 +35,23 @@ $result_trees{'comment_and_itemx_before_item'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment
+ 'args' => [
+ {
+ 'text' => ' comment
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' comment
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment
'
- ]
- }
- }
- ],
- 'type' => 'before_item'
- },
- {
- 'contents' => [
- {
- 'contents' => [
+ ]
+ }
+ },
{
'args' => [
{
@@ -175,14 +170,14 @@
$result_converted{'html_text'}->{'comment_and_itemx_before_item'} = '<dl class="
$result_converted{'xml'}->{'comment_and_itemx_before_item'} = '<table
commandarg="code" spaces=" " endspaces=" ">
-<beforefirstitem><!-- c comment -->
-</beforefirstitem><tableentry><tableterm><itemx spaces=" "><itemformat
command="code">in itemx</itemformat></itemx>
+<tableentry><tableterm><!-- c comment -->
+<itemx spaces=" "><itemformat command="code">in itemx</itemformat></itemx>
</tableterm></tableentry></table>
';
-$result_converted{'docbook'}->{'comment_and_itemx_before_item'} =
'<variablelist><!-- comment -->
-<varlistentry><term><term><literal>in itemx</literal>
+$result_converted{'docbook'}->{'comment_and_itemx_before_item'} =
'<variablelist><varlistentry><term><!-- comment -->
+<term><literal>in itemx</literal>
</term></varlistentry></variablelist>';
1;
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 d11e0a1a58..a53d44b6c2 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -175,28 +175,23 @@ $result_trees{'inter_item_commands_in_table'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment in table
+ 'args' => [
+ {
+ 'text' => ' comment in table
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' comment in table
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment in table
'
- ]
- }
- }
- ],
- 'type' => 'before_item'
- },
- {
- 'contents' => [
- {
- 'contents' => [
+ ]
+ }
+ },
{
'args' => [
{
@@ -1129,68 +1124,63 @@ $result_trees{'inter_item_commands_in_table'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => 'cindex in table'
+ 'contents' => [
+ {
+ 'text' => 'cindex in table'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 3,
+ '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' => 3,
- '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' => 44,
- 'macro' => ''
- },
- 'type' => 'index_entry_command'
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 44,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
{
- 'text' => ' comment in table
+ 'args' => [
+ {
+ 'text' => ' comment in table
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' comment in table
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' comment in table
'
- ]
- }
- }
- ],
- 'type' => 'before_item'
- },
- {
- 'contents' => [
- {
- 'contents' => [
+ ]
+ }
+ },
{
'args' => [
{
@@ -1466,68 +1456,63 @@ $result_trees{'inter_item_commands_in_table'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => 'samp cindex in table'
+ 'contents' => [
+ {
+ 'text' => 'samp cindex in table'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 5,
+ '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' => 5,
- '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' => 57,
- 'macro' => ''
- },
- 'type' => 'index_entry_command'
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 57,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
{
- 'text' => ' samp comment in table
+ 'args' => [
+ {
+ 'text' => ' samp comment in table
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' samp comment in table
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' samp comment in table
'
- ]
- }
- }
- ],
- 'type' => 'before_item'
- },
- {
- 'contents' => [
- {
- 'contents' => [
+ ]
+ }
+ },
{
'args' => [
{
@@ -2270,68 +2255,63 @@ $result_trees{'inter_item_commands_in_table'} = {
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => 'cindex first'
+ 'contents' => [
+ {
+ 'text' => 'cindex first'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 10,
+ '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' => 10,
- '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' => 89,
- 'macro' => ''
- },
- 'type' => 'index_entry_command'
- },
- {
- 'args' => [
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 89,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
{
- 'text' => ' commant
+ 'args' => [
+ {
+ 'text' => ' commant
',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' commant
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'extra' => {
+ 'misc_args' => [
+ ' commant
'
- ]
- }
- }
- ],
- 'type' => 'before_item'
- },
- {
- 'contents' => [
- {
- 'contents' => [
+ ]
+ }
+ },
{
'args' => [
{
@@ -2512,10 +2492,10 @@
$result_trees{'inter_item_commands_in_table'}{'contents'}[1]{'extra'}{'node_cont
$result_trees{'inter_item_commands_in_table'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'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'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'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'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
@@ -2560,20 +2540,20 @@
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'con
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[2];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'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'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'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'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'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'}[9]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'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'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'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'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'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'}[13]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
@@ -2595,18 +2575,18 @@
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'co
$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'}[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]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'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'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'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'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'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]{'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
@@ -2997,9 +2977,8 @@
$result_converted{'html_text'}->{'inter_item_commands_in_table'} = '<div class="
</dl>
<dl class="table">
-<dd><a class="index-entry-id" id="index-cindex-in-table"></a>
-</dd>
-<dt><code class="code">abb</code></dt>
+<dt><a class="index-entry-id" id="index-cindex-in-table"></a>
+<code class="code">abb</code></dt>
<dd><p>l–ine
</p></dd>
</dl>
@@ -3012,9 +2991,8 @@
$result_converted{'html_text'}->{'inter_item_commands_in_table'} = '<div class="
</dl>
<dl class="table">
-<dd><a class="index-entry-id" id="index-samp-cindex-in-table"></a>
-</dd>
-<dt>‘<samp class="samp">asamp--bb</samp>’</dt>
+<dt><a class="index-entry-id" id="index-samp-cindex-in-table"></a>
+‘<samp class="samp">asamp--bb</samp>’</dt>
<dd><p>l–ine samp
</p></dd>
</dl>
@@ -3047,9 +3025,8 @@
$result_converted{'html_text'}->{'inter_item_commands_in_table'} = '<div class="
</dl>
<dl class="table">
-<dd><a class="index-entry-id" id="index-cindex-first"></a>
-</dd>
-<dt><a class="index-entry-id" id="index-second"></a>
+<dt><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>
‘<samp class="samp">asamp--bb2</samp>’</dt>
</dl>
@@ -3068,8 +3045,8 @@
$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<node name="Top" s
<chapter spaces=" "><sectiontitle>chap</sectiontitle>
<vtable commandarg="code" spaces=" " endspaces=" ">
-<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="code"><indexterm index="vr"
number="1">acode--b</indexterm>acode--b</itemformat></item>
+<tableentry><tableterm><!-- c comment in table -->
+<item spaces=" "><itemformat command="code"><indexterm index="vr"
number="1">acode--b</indexterm>acode--b</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
@@ -3104,9 +3081,9 @@
$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<node name="Top" s
</para></tableitem></tableentry></ftable>
<table commandarg="code" spaces=" " endspaces=" ">
-<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp"
number="3">cindex in table</indexterm></cindex>
+<tableentry><tableterm><cindex index="cp" spaces=" "><indexterm index="cp"
number="3">cindex in table</indexterm></cindex>
<!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="code">abb</itemformat></item>
+<item spaces=" "><itemformat command="code">abb</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
@@ -3117,9 +3094,9 @@
$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<node name="Top" s
</tableterm></tableentry></table>
<table commandarg="samp" spaces=" " endspaces=" ">
-<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp"
number="5">samp cindex in table</indexterm></cindex>
+<tableentry><tableterm><cindex index="cp" spaces=" "><indexterm index="cp"
number="5">samp cindex in table</indexterm></cindex>
<!-- c samp comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="samp">asamp--bb</itemformat></item>
+<item spaces=" "><itemformat command="samp">asamp--bb</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine samp
</para></tableitem></tableentry></table>
@@ -3149,9 +3126,9 @@
$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<node name="Top" s
</tableterm></tableentry></table>
<table commandarg="samp" spaces=" " endspaces=" ">
-<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp"
number="10">cindex first</indexterm></cindex>
+<tableentry><tableterm><cindex index="cp" spaces=" "><indexterm index="cp"
number="10">cindex first</indexterm></cindex>
<!-- c commant -->
-</beforefirstitem><tableentry><tableterm><cindex index="cp" spaces="
"><indexterm index="cp" number="11">second</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp"
number="11">second</indexterm></cindex>
<cindex index="cp" spaces=" "><indexterm index="cp"
number="12">third</indexterm></cindex>
<item spaces=" "><itemformat command="samp">asamp--bb2</itemformat></item>
</tableterm></tableentry></table>
@@ -3164,8 +3141,8 @@
$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<node name="Top" s
$result_converted{'docbook'}->{'inter_item_commands_in_table'} = '<chapter
label="1" id="chapter">
<title>chap</title>
-<variablelist><!-- comment in table -->
-<varlistentry><term><indexterm
role="vr"><primary>acode--b</primary></indexterm><literal>acode--b</literal>
+<variablelist><varlistentry><term><!-- comment in table -->
+<indexterm
role="vr"><primary>acode--b</primary></indexterm><literal>acode--b</literal>
</term><listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<variablelist><varlistentry><term><indexterm
role="vr"><primary>aasis--b</primary></indexterm>aasis–b
@@ -3192,18 +3169,18 @@
$result_converted{'docbook'}->{'inter_item_commands_in_table'} = '<chapter label
<term><indexterm
role="fn"><primary>b</primary></indexterm><emphasis>b</emphasis>
</term><listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
-<variablelist><indexterm role="cp"><primary>cindex in
table</primary></indexterm>
+<variablelist><varlistentry><term><indexterm role="cp"><primary>cindex in
table</primary></indexterm>
<!-- comment in table -->
-<varlistentry><term><literal>abb</literal>
+<literal>abb</literal>
</term><listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<variablelist><indexterm role="cp"><primary>cindex in
table</primary></indexterm>
<para>Texte before first item.
</para><varlistentry><term><literal>abb</literal>
</term></varlistentry></variablelist>
-<variablelist><indexterm role="cp"><primary>samp cindex in
table</primary></indexterm>
+<variablelist><varlistentry><term><indexterm role="cp"><primary>samp cindex in
table</primary></indexterm>
<!-- samp comment in table -->
-<varlistentry><term>‘<literal>asamp--bb</literal>’
+‘<literal>asamp--bb</literal>’
</term><listitem><para>l–ine samp
</para></listitem></varlistentry></variablelist>
<variablelist><indexterm role="cp"><primary>samp cindex in
table</primary></indexterm>
@@ -3223,9 +3200,9 @@
$result_converted{'docbook'}->{'inter_item_commands_in_table'} = '<chapter label
<varlistentry><term><indexterm role="cp"><primary>cindex after
line</primary></indexterm>
‘<literal>asamp--bb2</literal>’
</term></varlistentry></variablelist>
-<variablelist><indexterm role="cp"><primary>cindex first</primary></indexterm>
+<variablelist><varlistentry><term><indexterm role="cp"><primary>cindex
first</primary></indexterm>
<!-- commant -->
-<varlistentry><term><indexterm role="cp"><primary>second</primary></indexterm>
+<indexterm role="cp"><primary>second</primary></indexterm>
<indexterm role="cp"><primary>third</primary></indexterm>
‘<literal>asamp--bb2</literal>’
</term></varlistentry></variablelist>
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 124c1e94d1..2b5e2e10f3 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
@@ -111,8 +111,8 @@ l--ine
\end{description}
\begin{description}
-\item[] \index[cp]{cindex in table@cindex in table}%
\item[{\parbox[b]{\linewidth}{%
+\index[cp]{cindex in table@cindex in table}%
\texttt{abb}}}]
l--ine
\end{description}
@@ -125,8 +125,8 @@ Texte before first item.
\end{description}
\begin{description}
-\item[] \index[cp]{samp cindex in table@samp cindex in table}%
\item[{\parbox[b]{\linewidth}{%
+\index[cp]{samp cindex in table@samp cindex in table}%
\Texinfotablestylesamp{asamp{-}{-}bb}}}]
l--ine samp
\end{description}
@@ -161,8 +161,8 @@ Texte before first item samp.
\end{description}
\begin{description}
-\item[] \index[cp]{cindex first@cindex first}%
\item[{\parbox[b]{\linewidth}{%
+\index[cp]{cindex first@cindex first}%
\index[cp]{second@second}%
\index[cp]{third@third}%
\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
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 63f5080b68..592b37203f 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
@@ -142,9 +142,8 @@ enum
</dl>
<dl class="table">
-<dd><a class="index-entry-id" id="index-cindex-in-table"></a>
-</dd>
-<dt><code class="code">abb</code></dt>
+<dt><a class="index-entry-id" id="index-cindex-in-table"></a>
+<code class="code">abb</code></dt>
<dd><p>l–ine
</p></dd>
</dl>
@@ -157,9 +156,8 @@ enum
</dl>
<dl class="table">
-<dd><a class="index-entry-id" id="index-samp-cindex-in-table"></a>
-</dd>
-<dt>‘<samp class="samp">asamp--bb</samp>’</dt>
+<dt><a class="index-entry-id" id="index-samp-cindex-in-table"></a>
+‘<samp class="samp">asamp--bb</samp>’</dt>
<dd><p>l–ine samp
</p></dd>
</dl>
@@ -192,9 +190,8 @@ enum
</dl>
<dl class="table">
-<dd><a class="index-entry-id" id="index-cindex-first"></a>
-</dd>
-<dt><a class="index-entry-id" id="index-second"></a>
+<dt><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>
‘<samp class="samp">asamp--bb2</samp>’</dt>
</dl>
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 b6de16877a..65fd07290b 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
@@ -158,8 +158,8 @@ l--ine
\end{description}
\begin{description}
-\item[] \index[cp]{cindex in table@cindex in table}%
\item[{\parbox[b]{\linewidth}{%
+\index[cp]{cindex in table@cindex in table}%
\texttt{abb}}}]
l--ine
\end{description}
@@ -172,8 +172,8 @@ Texte before first item.
\end{description}
\begin{description}
-\item[] \index[cp]{samp cindex in table@samp cindex in table}%
\item[{\parbox[b]{\linewidth}{%
+\index[cp]{samp cindex in table@samp cindex in table}%
\Texinfotablestylesamp{asamp{-}{-}bb}}}]
l--ine samp
\end{description}
@@ -208,8 +208,8 @@ Texte before first item samp.
\end{description}
\begin{description}
-\item[] \index[cp]{cindex first@cindex first}%
\item[{\parbox[b]{\linewidth}{%
+\index[cp]{cindex first@cindex first}%
\index[cp]{second@second}%
\index[cp]{third@third}%
\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
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 b6de16877a..65fd07290b 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
@@ -158,8 +158,8 @@ l--ine
\end{description}
\begin{description}
-\item[] \index[cp]{cindex in table@cindex in table}%
\item[{\parbox[b]{\linewidth}{%
+\index[cp]{cindex in table@cindex in table}%
\texttt{abb}}}]
l--ine
\end{description}
@@ -172,8 +172,8 @@ Texte before first item.
\end{description}
\begin{description}
-\item[] \index[cp]{samp cindex in table@samp cindex in table}%
\item[{\parbox[b]{\linewidth}{%
+\index[cp]{samp cindex in table@samp cindex in table}%
\Texinfotablestylesamp{asamp{-}{-}bb}}}]
l--ine samp
\end{description}
@@ -208,8 +208,8 @@ Texte before first item samp.
\end{description}
\begin{description}
-\item[] \index[cp]{cindex first@cindex first}%
\item[{\parbox[b]{\linewidth}{%
+\index[cp]{cindex first@cindex first}%
\index[cp]{second@second}%
\index[cp]{third@third}%
\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index 9bde6acb64..6f7198d622 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -659,8 +659,8 @@ ref” in <filename>a comma, in file</filename>
<!-- as documented The @table command is not supported inside @display -->
<!-- This command won't work in this context; perhaps the -->
<!-- problem is that we are in environment @example. -->
-<variablelist><!-- comment in table -->
-<varlistentry><term><emphasis role="bold">a–strong</emphasis>
+<variablelist><varlistentry><term><!-- comment in table -->
+<emphasis role="bold">a–strong</emphasis>
</term><listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<variablelist><varlistentry><term><indexterm
role="vr"><primary>a--asis</primary></indexterm>a–asis
@@ -850,13 +850,13 @@ aaa</literallayout></textobject></inlinemediaobject>
</para></listitem><listitem><para><!-- /@w --> without brace w c–d
</para></listitem></itemizedlist>
<!-- not style formatting -->
-<variablelist><!-- comment in table -->
-<varlistentry><term>a
+<variablelist><varlistentry><term><!-- comment in table -->
+a
</term><listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<!-- missing style formatting -->
-<variablelist><!-- comment in table -->
-<varlistentry><term>a–missing style formatting
+<variablelist><varlistentry><term><!-- comment in table -->
+a–missing style formatting
</term><listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<!-- not style formatting -->
@@ -1585,8 +1585,8 @@ ref” in <filename>a comma, in file</filename>
<!-- as documented The @table command is not supported inside @display -->
<!-- This command won't work in this context; perhaps the -->
<!-- problem is that we are in environment @example. -->
-<variablelist><!-- comment in table -->
-<varlistentry><term><emphasis role="bold">a–strong</emphasis>
+<variablelist><varlistentry><term><!-- comment in table -->
+<emphasis role="bold">a–strong</emphasis>
</term><listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<variablelist><varlistentry><term><indexterm
role="vr"><primary>a--asis</primary></indexterm>a–asis
@@ -1776,13 +1776,13 @@ aaa</literallayout></textobject></inlinemediaobject>
</para></listitem><listitem><para><!-- /@w --> without brace w c–d
</para></listitem></itemizedlist>
<!-- not style formatting -->
-<variablelist><!-- comment in table -->
-<varlistentry><term>a
+<variablelist><varlistentry><term><!-- comment in table -->
+a
</term><listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<!-- missing style formatting -->
-<variablelist><!-- comment in table -->
-<varlistentry><term>a–missing style formatting
+<variablelist><varlistentry><term><!-- comment in table -->
+a–missing style formatting
</term><listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<!-- not style formatting -->
@@ -2498,8 +2498,8 @@ ref” in <filename>a comma, in file</filename>
<!-- as documented The @table command is not supported inside @display -->
<!-- This command won't work in this context; perhaps the -->
<!-- problem is that we are in environment @example. -->
-<variablelist><!-- comment in table -->
-<varlistentry><term><emphasis role="bold">a–strong</emphasis>
+<variablelist><varlistentry><term><!-- comment in table -->
+<emphasis role="bold">a–strong</emphasis>
</term><listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<variablelist><varlistentry><term><indexterm
role="vr"><primary>a--asis</primary></indexterm>a–asis
@@ -2689,13 +2689,13 @@ aaa</literallayout></textobject></inlinemediaobject>
</para></listitem><listitem><para><!-- /@w --> without brace w c–d
</para></listitem></itemizedlist>
<!-- not style formatting -->
-<variablelist><!-- comment in table -->
-<varlistentry><term>a
+<variablelist><varlistentry><term><!-- comment in table -->
+a
</term><listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<!-- missing style formatting -->
-<variablelist><!-- comment in table -->
-<varlistentry><term>a–missing style formatting
+<variablelist><varlistentry><term><!-- comment in table -->
+a–missing style formatting
</term><listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<!-- not style formatting -->
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 263b6a675e..92ce507d59 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -2067,8 +2067,8 @@ ref</inforefrefname><inforefinfoname spaces=" ">a
comma, in file</inforefi
<!-- c This command won't work in this context; perhaps the -->
<!-- c problem is that we are in environment @example. -->
<table commandarg="strong" spaces=" " endspaces=" ">
-<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="strong">a&textndash;strong</itemformat></item>
+<tableentry><tableterm><!-- c comment in table -->
+<item spaces=" "><itemformat
command="strong">a&textndash;strong</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
@@ -2280,15 +2280,15 @@ in verbatim ''
<!-- c not style formatting -->
<table commandarg="asis" spaces=" " endspaces=" ">
-<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a</itemformat></item>
+<tableentry><tableterm><!-- c comment in table -->
+<item spaces=" "><itemformat command="asis">a</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<!-- c missing style formatting -->
<table commandarg="asis" endspaces=" ">
-<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a&textndash;missing style formatting</itemformat></item>
+<tableentry><tableterm><!-- c comment in table -->
+<item spaces=" "><itemformat command="asis">a&textndash;missing style
formatting</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
@@ -3216,8 +3216,8 @@ ref</inforefrefname><inforefinfoname spaces=" ">a
comma, in file</inforefi
<!-- c This command won't work in this context; perhaps the -->
<!-- c problem is that we are in environment @example. -->
<table commandarg="strong" spaces=" " endspaces=" ">
-<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="strong">a&textndash;strong</itemformat></item>
+<tableentry><tableterm><!-- c comment in table -->
+<item spaces=" "><itemformat
command="strong">a&textndash;strong</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
@@ -3429,15 +3429,15 @@ in verbatim ''
<!-- c not style formatting -->
<table commandarg="asis" spaces=" " endspaces=" ">
-<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a</itemformat></item>
+<tableentry><tableterm><!-- c comment in table -->
+<item spaces=" "><itemformat command="asis">a</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<!-- c missing style formatting -->
<table commandarg="asis" endspaces=" ">
-<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a&textndash;missing style formatting</itemformat></item>
+<tableentry><tableterm><!-- c comment in table -->
+<item spaces=" "><itemformat command="asis">a&textndash;missing style
formatting</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
@@ -4395,8 +4395,8 @@ ref</inforefrefname><inforefinfoname spaces=" ">a
comma, in file</inforefi
<!-- c This command won't work in this context; perhaps the -->
<!-- c problem is that we are in environment @example. -->
<table commandarg="strong" spaces=" " endspaces=" ">
-<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="strong">a&textndash;strong</itemformat></item>
+<tableentry><tableterm><!-- c comment in table -->
+<item spaces=" "><itemformat
command="strong">a&textndash;strong</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
@@ -4608,15 +4608,15 @@ in verbatim ''
<!-- c not style formatting -->
<table commandarg="asis" spaces=" " endspaces=" ">
-<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a</itemformat></item>
+<tableentry><tableterm><!-- c comment in table -->
+<item spaces=" "><itemformat command="asis">a</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<!-- c missing style formatting -->
<table commandarg="asis" endspaces=" ">
-<beforefirstitem><!-- c comment in table -->
-</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a&textndash;missing style formatting</itemformat></item>
+<tableentry><tableterm><!-- c comment in table -->
+<item spaces=" "><itemformat command="asis">a&textndash;missing style
formatting</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
| [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 comments from before_item to table_term.,
Patrice Dumas <=