[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7252] implement @ktable
|
From: |
gavinsmith0123 |
|
Subject: |
[7252] implement @ktable |
|
Date: |
Sun, 10 Jul 2016 12:47:09 +0000 (UTC) |
Revision: 7252
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7252
Author: gavin
Date: 2016-07-10 12:47:09 +0000 (Sun, 10 Jul 2016)
Log Message:
-----------
implement @ktable
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Common.pm
trunk/tp/Texinfo/Convert/HTML.pm
trunk/tp/Texinfo/Convert/Plaintext.pm
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/22xtable.t
Added Paths:
-----------
trunk/tp/t/results/xtable/ktable.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2016-07-09 21:46:40 UTC (rev 7251)
+++ trunk/ChangeLog 2016-07-10 12:47:09 UTC (rev 7252)
@@ -1,3 +1,20 @@
+2016-07-10 Gavin Smith <address@hidden>
+
+ * tp/Texinfo/Common.pm (%block_commands, %block_item_commands)
+ (%item_line_commands): Add 'ktable'.
+ (%command_index): Add 'ktable'.
+ * tp/Texinfo/Parser.pm (module documentation part): Mention
+ @ktable and small grammar changes.
+ * tp/Texinfo/Convert/HTML.pm (%default_commands_conversion):
+ Add conversion for @ktable.
+ (_convert_before_item_type): Add 'ktable' to a condition.
+ * tp/Texinfo/Convert/Plaintext.pm (%item_indent_format_length):
+ Add 'ktable'.
+ * tp/t/22xtable.t (ktable): New test.
+
+ @ktable requested by Robert Weiner, following pattern of @vtable
+ and @ftable.
+
2016-07-09 Gavin Smith <address@hidden>
* tp/Texinfo/Convert/Texinfo.pm: Remove commented-out debugging
Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm 2016-07-09 21:46:40 UTC (rev 7251)
+++ trunk/tp/Texinfo/Common.pm 2016-07-10 12:47:09 UTC (rev 7252)
@@ -719,6 +719,7 @@
$command_index{'vtable'} = 'vr';
$command_index{'ftable'} = 'fn';
+$command_index{'ktable'} = 'ky';
foreach my $index_type (keys %index_type_def) {
foreach my $def (@{$index_type_def{$index_type}}) {
@@ -815,7 +816,7 @@
$block_commands{'ifcommandnotdefined'} = 'conditional';
# 'macro' ?
-foreach my $block_command_one_arg('table', 'ftable', 'vtable',
+foreach my $block_command_one_arg('table', 'ftable', 'vtable', 'ktable',
'itemize', 'enumerate', 'quotation', 'smallquotation') {
$block_commands{$block_command_one_arg} = 1;
$block_item_commands{$block_command_one_arg} = 1
@@ -853,7 +854,7 @@
$item_container_commands{$item_container_command} = 1;
}
our %item_line_commands;
-foreach my $item_line_command ('table', 'ftable', 'vtable') {
+foreach my $item_line_command ('table', 'ftable', 'vtable', 'ktable') {
$item_line_commands{$item_line_command} = 1;
}
Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm 2016-07-09 21:46:40 UTC (rev 7251)
+++ trunk/tp/Texinfo/Convert/HTML.pm 2016-07-10 12:47:09 UTC (rev 7252)
@@ -2990,6 +2990,7 @@
$default_commands_conversion{'table'} = \&_convert_xtable_command;
$default_commands_conversion{'ftable'} = \&_convert_xtable_command;
$default_commands_conversion{'vtable'} = \&_convert_xtable_command;
+$default_commands_conversion{'ktable'} = \&_convert_xtable_command;
sub _convert_item_command($$$$)
{
@@ -3996,7 +3997,7 @@
if ($top_format eq 'itemize' or $top_format eq 'enumerate') {
return '<li>'. $content .'</li>';
} elsif ($top_format eq 'table' or $top_format eq 'vtable'
- or $top_format eq 'ftable') {
+ or $top_format eq 'ftable' or $top_format eq 'ktable') {
return '<dd>'. $content .'</dd>'."\n";
} elsif ($top_format eq 'multitable') {
$content =~ s/^\s*//;
Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm 2016-07-09 21:46:40 UTC (rev
7251)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm 2016-07-10 12:47:09 UTC (rev
7252)
@@ -170,6 +170,7 @@
'table' => 0,
'vtable' => 0,
'ftable' => 0,
+ 'ktable' => 0,
);
my $indent_length = 5;
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2016-07-09 21:46:40 UTC (rev 7251)
+++ trunk/tp/Texinfo/Parser.pm 2016-07-10 12:47:09 UTC (rev 7252)
@@ -6575,13 +6575,13 @@
=item command_as_argument
This is the type of a command given in argument of C<@itemize>,
-C<@table>, C<@vtable> or C<@ftable>. For example in
+C<@table>, C<@vtable>, C<@ftable> or C<@ktable>. For example, in
@itemize @bullet
@item item
@end itemize
-the element corresponding with bullet has the following keys:
+the element corresponding to @bullet has the following keys:
'cmdname' => 'bullet'
'type' => 'command_as_argument'
Modified: trunk/tp/t/22xtable.t
===================================================================
--- trunk/tp/t/22xtable.t 2016-07-09 21:46:40 UTC (rev 7251)
+++ trunk/tp/t/22xtable.t 2016-07-10 12:47:09 UTC (rev 7252)
@@ -205,6 +205,21 @@
@itemx in itemx
@end table
'],
+['ktable',
+'@ktable @kbd
address@hidden C-y
+yyy
address@hidden C-z
+zzz
address@hidden ktable
+
address@hidden @code
address@hidden y
+yyy
address@hidden z
+zzz
address@hidden vtable
+'],
);
my @test_invalid = (
Added: trunk/tp/t/results/xtable/ktable.pl
===================================================================
--- trunk/tp/t/results/xtable/ktable.pl (rev 0)
+++ trunk/tp/t/results/xtable/ktable.pl 2016-07-10 12:47:09 UTC (rev 7252)
@@ -0,0 +1,752 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'ktable'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'cmdname' => 'kbd',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'ktable',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'C-y'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [],
+ 'in_code' => 1,
+ 'index_at_command' => 'item',
+ 'index_name' => 'ky',
+ 'index_type_command' => 'ktable',
+ 'key' => 'C-y',
+ 'number' => 1
+ },
+ 'misc_content' => [],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_term'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'yyy
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_item'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_entry'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'C-z'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [],
+ 'in_code' => 1,
+ 'index_at_command' => 'item',
+ 'index_name' => 'ky',
+ 'index_type_command' => 'ktable',
+ 'key' => 'C-z',
+ 'number' => 2
+ },
+ 'misc_content' => [],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_term'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'zzz
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_item'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'ktable'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'ktable',
+ 'spaces_after_command' => {},
+ 'text_arg' => 'ktable'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'command_as_argument' => {},
+ 'end_command' => {},
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'vtable',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'y'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [],
+ 'in_code' => 1,
+ 'index_at_command' => 'item',
+ 'index_name' => 'vr',
+ 'index_type_command' => 'vtable',
+ 'key' => 'y',
+ 'number' => 1
+ },
+ 'misc_content' => [],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_term'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'yyy
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_item'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_entry'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'z'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [],
+ 'in_code' => 1,
+ 'index_at_command' => 'item',
+ 'index_name' => 'vr',
+ 'index_type_command' => 'vtable',
+ 'key' => 'z',
+ 'number' => 2
+ },
+ 'misc_content' => [],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_term'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'zzz
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_item'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'table_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'vtable'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'vtable',
+ 'spaces_after_command' => {},
+ 'text_arg' => 'vtable'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'command_as_argument' => {},
+ 'end_command' => {},
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'ktable'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'ktable'}{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'ktable'}{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'ktable'}{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} =
$result_trees{'ktable'}{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'ktable'}{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'ktable'}{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'ktable'}{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[0]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'ktable'}{'contents'}[0]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'ktable'}{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'ktable'}{'contents'}[0]{'contents'}[2];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'ktable'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'ktable'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'ktable'}{'contents'}[0]{'contents'}[2];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'} =
$result_trees{'ktable'}{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'ktable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'ktable'}{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'ktable'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[0]{'extra'}{'command_as_argument'} =
$result_trees{'ktable'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'ktable'}{'contents'}[0]{'contents'}[2];
+$result_trees{'ktable'}{'contents'}[0]{'extra'}{'spaces_after_command'} =
$result_trees{'ktable'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[0]{'line_nr'} =
$result_trees{'ktable'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'ktable'}{'contents'}[0]{'parent'} = $result_trees{'ktable'};
+$result_trees{'ktable'}{'contents'}[1]{'parent'} = $result_trees{'ktable'};
+$result_trees{'ktable'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'ktable'}{'contents'}[2];
+$result_trees{'ktable'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'ktable'}{'contents'}[2]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'ktable'}{'contents'}[2]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'} =
$result_trees{'ktable'}{'contents'}[2]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'ktable'}{'contents'}[2];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[2]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'ktable'}{'contents'}[2]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'ktable'}{'contents'}[2];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[2]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'ktable'}{'contents'}[2]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'ktable'}{'contents'}[2];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'ktable'}{'contents'}[2]{'contents'}[2];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'ktable'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'ktable'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'ktable'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'ktable'}{'contents'}[2]{'contents'}[2];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[2]{'extra'}{'command'} =
$result_trees{'ktable'}{'contents'}[2];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'ktable'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'ktable'}{'contents'}[2];
+$result_trees{'ktable'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'ktable'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[2]{'extra'}{'command_as_argument'} =
$result_trees{'ktable'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'ktable'}{'contents'}[2]{'extra'}{'end_command'} =
$result_trees{'ktable'}{'contents'}[2]{'contents'}[2];
+$result_trees{'ktable'}{'contents'}[2]{'extra'}{'spaces_after_command'} =
$result_trees{'ktable'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'ktable'}{'contents'}[2]{'line_nr'} =
$result_trees{'ktable'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'ktable'}{'contents'}[2]{'parent'} = $result_trees{'ktable'};
+
+$result_texis{'ktable'} = '@ktable @kbd
address@hidden C-y
+yyy
address@hidden C-z
+zzz
address@hidden ktable
+
address@hidden @code
address@hidden y
+yyy
address@hidden z
+zzz
address@hidden vtable
+';
+
+
+$result_texts{'ktable'} = 'C-y
+yyy
+C-z
+zzz
+
+y
+yyy
+z
+zzz
+';
+
+$result_errors{'ktable'} = [
+ {
+ 'error_line' => ':2: warning: entry for index `ky\' outside of any node
+',
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => '',
+ 'text' => 'entry for index `ky\' outside of any node',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => ':4: warning: entry for index `ky\' outside of any node
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => 'entry for index `ky\' outside of any node',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => ':9: warning: entry for index `vr\' outside of any node
+',
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => '',
+ 'text' => 'entry for index `vr\' outside of any node',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => ':11: warning: entry for index `vr\' outside of any node
+',
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => '',
+ 'text' => 'entry for index `vr\' outside of any node',
+ 'type' => 'warning'
+ }
+];
+
+
+
+$result_converted{'plaintext'}->{'ktable'} = '\'C-y\'
+ yyy
+\'C-z\'
+ zzz
+
+\'y\'
+ yyy
+\'z\'
+ zzz
+';
+
+
+$result_converted{'html_text'}->{'ktable'} = '<dl compact="compact">
+<dt><kbd>C-y</kbd>
+<a name="index-C_002dy"></a>
+</dt>
+<dd><p>yyy
+</p></dd>
+<dt><kbd>C-z</kbd>
+<a name="index-C_002dz"></a>
+</dt>
+<dd><p>zzz
+</p></dd>
+</dl>
+
+<dl compact="compact">
+<dt><code>y</code>
+<a name="index-y"></a>
+</dt>
+<dd><p>yyy
+</p></dd>
+<dt><code>z</code>
+<a name="index-z"></a>
+</dt>
+<dd><p>zzz
+</p></dd>
+</dl>
+';
+
+
+$result_converted{'xml'}->{'ktable'} = '<ktable commandarg="kbd" spaces=" "
endspaces=" ">
+<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="ky" number="1">C-y</indexterm>C-y</itemformat></item>
+</tableterm><tableitem><para>yyy
+</para></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="kbd"><indexterm index="ky"
number="2">C-z</indexterm>C-z</itemformat></item>
+</tableterm><tableitem><para>zzz
+</para></tableitem></tableentry></ktable>
+
+<vtable commandarg="code" spaces=" " endspaces=" ">
+<tableentry><tableterm><item spaces=" "><itemformat command="code"><indexterm
index="vr" number="1">y</indexterm>y</itemformat></item>
+</tableterm><tableitem><para>yyy
+</para></tableitem></tableentry><tableentry><tableterm><item spaces="
"><itemformat command="code"><indexterm index="vr"
number="2">z</indexterm>z</itemformat></item>
+</tableterm><tableitem><para>zzz
+</para></tableitem></tableentry></vtable>
+';
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7252] implement @ktable,
gavinsmith0123 <=