[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp texi2any.pl Texinfo/Convert/Paragrap...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp texi2any.pl Texinfo/Convert/Paragrap... |
|
Date: |
Thu, 10 Feb 2011 22:05:08 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/02/10 22:05:08
Modified files:
tp : texi2any.pl
tp/Texinfo/Convert: Paragraph.pm Plaintext.pm
tp/t : 22xtable.t
Added files:
tp/t/results/xtable: empty_item_itemx.pl long_item.pl
Log message:
Correct the options that take a --no- form.
Handle empty @item and @itemx in @*table.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Paragraph.pm?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/22xtable.t?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/empty_item_itemx.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/long_item.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- texi2any.pl 5 Feb 2011 13:31:03 -0000 1.14
+++ texi2any.pl 10 Feb 2011 22:05:04 -0000 1.15
@@ -218,7 +218,7 @@
'PROGRAM_NAME_IN_FOOTER', 'NODE_FILENAMES', 'DEFAULT_ENCODING',
'OUT_ENCODING', 'ENCODING_NAME', 'EXTERNAL_CROSSREF_SPLIT', 'BODYTEXT',
'CSS_LINES', 'RENAMED_NODES_REDIRECTIONS', 'RENAMED_NODES_FILE',
- 'TEXI2DVI');
+ 'TEXI2DVI', 'DUMP_TREE');
my %valid_options;
foreach my $var (@document_settable_at_commands, @document_global_at_commands,
@@ -392,19 +392,19 @@
my $result_options = Getopt::Long::GetOptions (
'macro-expand|E=s' => sub { push @texi2dvi_args, '-E';
set_from_cmdline('MACRO_EXPAND', $_[1]); },
- 'ifhtml' => sub { set_expansion('html', $_[1]); },
- 'ifinfo' => sub { set_expansion('info', $_[1]); },
- 'ifxml' => sub { set_expansion('xml', $_[1]); },
- 'ifdocbook' => sub { set_expansion('docbook', $_[1]); },
- 'iftex' => sub { set_expansion('tex', $_[1]); },
- 'ifplaintext' => sub { set_expansion('plaintext', $_[1]); },
+ 'ifhtml!' => sub { set_expansion('html', $_[1]); },
+ 'ifinfo!' => sub { set_expansion('info', $_[1]); },
+ 'ifxml!' => sub { set_expansion('xml', $_[1]); },
+ 'ifdocbook!' => sub { set_expansion('docbook', $_[1]); },
+ 'iftex!' => sub { set_expansion('tex', $_[1]); },
+ 'ifplaintext!' => sub { set_expansion('plaintext', $_[1]); },
'I=s' => sub { push @texi2dvi_args, ('-'.$_[0], $_[1]);
push @include_dirs, split(/$quoted_path_separator/, $_[1]); },
'conf-dir=s' => sub { push @conf_dirs, split(/$quoted_path_separator/,
$_[1]); },
'P=s' => sub { unshift @prepend_dirs, split(/$quoted_path_separator/, $_[1]);
},
- 'number-sections' => sub { set_from_cmdline('NUMBER_SECTIONS', $_[1]); },
- 'number-footnotes' => sub { set_from_cmdline('NUMBER_FOOTNOTES', $_[1]); },
- 'node-files' => sub { set_from_cmdline('NODE_FILES', $_[1]); },
+ 'number-sections!' => sub { set_from_cmdline('NUMBER_SECTIONS', $_[1]); },
+ 'number-footnotes!' => sub { set_from_cmdline('NUMBER_FOOTNOTES', $_[1]); },
+ 'node-files!' => sub { set_from_cmdline('NODE_FILES', $_[1]); },
'footnote-style=s' => sub {
if ($_[1] eq 'end' or $_[1] eq 'separate') {
set_from_cmdline('footnotestyle', $_[1]);
@@ -415,7 +415,7 @@
'split=s' => sub { set_from_cmdline('SPLIT', $_[1]); },
'no-split' => sub { set_from_cmdline('SPLIT', '');
set_from_cmdline('SPLIT_SIZE', undef);},
- 'headers' => sub { set_from_cmdline('HEADERS', $_[1]);
+ 'headers!' => sub { set_from_cmdline('HEADERS', $_[1]);
set_from_cmdline('SHOW_MENU', $_[1]);
$parser_default_options->{'SHOW_MENU'} = $_[1];
$format = 'plaintext' if (!$_[1] and $format eq 'info'); },
@@ -478,7 +478,7 @@
},
'css-include=s' => address@hidden,
'css-ref=s' => address@hidden,
- 'transliterate-file-names' =>
+ 'transliterate-file-names!' =>
sub {set_from_cmdline ('TRANSLITERATE_FILE_NAMES', $_[1]);},
'error-limit|e=i' => sub { set_from_cmdline('ERROR_LIMIT', $_[1]); },
'split-size=s' => sub {set_from_cmdline('SPLIT_SIZE', $_[1])},
@@ -602,7 +602,14 @@
next;
}
- #print STDERR Data::Dumper->Dump([$tree]);
+ if (defined(get_conf('DUMP_TREE'))) {
+ #Â this is very wrong, but a way to avoid a spurious warning.
+ no warnings 'once';
+ local $Data::Dumper::Purity = 1;
+ no warnings 'once';
+ local $Data::Dumper::Indent = 1;
+ print STDERR Data::Dumper->Dump([$tree]);
+ }
if (defined(get_conf('MACRO_EXPAND'))) {
my $texinfo_text = Texinfo::Convert::Texinfo::convert ($tree);
Index: Texinfo/Convert/Paragraph.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Paragraph.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Texinfo/Convert/Paragraph.pm 9 Feb 2011 08:24:23 -0000 1.16
+++ Texinfo/Convert/Paragraph.pm 10 Feb 2011 22:05:06 -0000 1.17
@@ -326,8 +326,10 @@
#Â FIXME
#Â this should never happen, all cases are taken into account above.
# however it happens with strange caracters that appear sometime and
- #Â look like invalid. Is it a perl bug?
- die "Unknown caracter leading $text";
+ #Â look like invalid. Is it a perl bug? Maybe an invalid character in
+ #Â the encoding?
+ #die "Unknown caracter leading $text";
+ last;
}
}
return $result;
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- Texinfo/Convert/Plaintext.pm 9 Feb 2011 21:08:35 -0000 1.79
+++ Texinfo/Convert/Plaintext.pm 10 Feb 2011 22:05:07 -0000 1.80
@@ -1589,7 +1589,10 @@
}
$self->{'format_context'}->[-1]->{'paragraph_count'} = 0;
} elsif (($root->{'cmdname'} eq 'item' or $root->{'cmdname'} eq 'itemx')
- and $root->{'extra'} and $root->{'extra'}->{'misc_content'}) {
+ and $root->{'args'} and $root->{'args'}->[0]
+ and $root->{'args'}->[0]->{'type'}
+ and $root->{'args'}->[0]->{'type'} eq 'misc_line_arg') {
+ if ($root->{'extra'} and $root->{'extra'}->{'misc_content'}) {
my $contents = $root->{'extra'}->{'misc_content'};
if ($root->{'parent'}->{'extra'} and
$root->{'parent'}->{'extra'}->{'command_as_argument'}) {
my $command_as_argument =
$root->{'parent'}->{'extra'}->{'command_as_argument'};
@@ -1615,7 +1618,7 @@
$result = $self->ensure_end_of_line($result);
$self->{'empty_lines_count'} = 0;
}
-
+ }
} elsif ($root->{'cmdname'} eq 'item' and $root->{'parent'}->{'cmdname'}
and $item_container_commands{$root->{'parent'}->{'cmdname'}}) {
$self->{'format_context'}->[-1]->{'paragraph_count'} = 0;
Index: t/22xtable.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/22xtable.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/22xtable.t 6 Feb 2011 16:43:20 -0000 1.4
+++ t/22xtable.t 10 Feb 2011 22:05:07 -0000 1.5
@@ -18,7 +18,26 @@
table content.
@end table
-']
+'],
+['empty_item_itemx',
+'@vtable @asis
+
+VTable
+
address@hidden first item
address@hidden
address@hidden after an empty itemx, before an empty item
address@hidden
address@hidden in item before end table
address@hidden vtable
+'],
+['long_item',
+'@table @emph
address@hidden first item aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaa
address@hidden second itemx bbbbbbbbbbbbbbbbbbbbbbbbbbbbb b b b b b b b b b b b
b b
+
+Text.
+'],
);
my @test_invalid = (
Index: t/results/xtable/empty_item_itemx.pl
===================================================================
RCS file: t/results/xtable/empty_item_itemx.pl
diff -N t/results/xtable/empty_item_itemx.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/xtable/empty_item_itemx.pl 10 Feb 2011 22:05:07 -0000
1.1
@@ -0,0 +1,337 @@
+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_trees{'empty_item_itemx'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'cmdname' => 'asis',
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'vtable',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'VTable
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'before_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'first item'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'index_at_command' => 'vtable',
+ 'index_name' => 'vr',
+ 'index_prefix' => 'v',
+ 'number' => 1
+ },
+ 'misc_content' => []
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'itemx',
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'after an empty itemx, before an empty item'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'itemx',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'index_at_command' => 'vtable',
+ 'index_name' => 'vr',
+ 'index_prefix' => 'v',
+ 'number' => 2
+ },
+ 'misc_content' => []
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'in item before end table'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'index_at_command' => 'vtable',
+ 'index_name' => 'vr',
+ 'index_prefix' => 'v',
+ 'number' => 3
+ },
+ 'misc_content' => []
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'command_as_argument' => {}
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'empty_item_itemx'}{'contents'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'empty_item_itemx'}{'contents'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'extra'}{'misc_content'}
=
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'empty_item_itemx'}{'contents'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[2];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'empty_item_itemx'}{'contents'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'extra'}{'misc_content'}
=
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'};
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'empty_item_itemx'}{'contents'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[4];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[4]{'parent'} =
$result_trees{'empty_item_itemx'}{'contents'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'args'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'extra'}{'misc_content'}
=
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'content'};
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[5]{'parent'} =
$result_trees{'empty_item_itemx'}{'contents'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'empty_item_itemx'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'parent'} =
$result_trees{'empty_item_itemx'};
+$result_trees{'empty_item_itemx'}{'contents'}[1]{'parent'} =
$result_trees{'empty_item_itemx'};
+
+$result_texis{'empty_item_itemx'} = '@vtable @asis
+
+VTable
+
address@hidden first item
address@hidden
address@hidden after an empty itemx, before an empty item
address@hidden
address@hidden in item before end table
address@hidden vtable
+';
+
+
+$result_texts{'empty_item_itemx'} = '
+VTable
+
+first item
+
+after an empty itemx, before an empty item
+
+in item before end table
+';
+
+$result_errors{'empty_item_itemx'} = [
+ {
+ 'error_line' => ':6: @itemx missing argument
+',
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => '',
+ 'text' => '@itemx missing argument',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':8: @item missing argument
+',
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => '',
+ 'text' => '@item missing argument',
+ 'type' => 'error'
+ }
+];
+
+
+
+$result_converted{'plaintext'}->{'empty_item_itemx'} = '
+ VTable
+
+first item
+after an empty itemx, before an empty item
+in item before end table
+';
+
+1;
Index: t/results/xtable/long_item.pl
===================================================================
RCS file: t/results/xtable/long_item.pl
diff -N t/results/xtable/long_item.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/xtable/long_item.pl 10 Feb 2011 22:05:07 -0000 1.1
@@ -0,0 +1,192 @@
+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_trees{'long_item'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'cmdname' => 'emph',
+ 'parent' => {},
+ 'type' => 'command_as_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'first item
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaa'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'misc_content' => [
+ {}
+ ]
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'second itemx bbbbbbbbbbbbbbbbbbbbbbbbbbbbb b b b
b b b b b b b b b b'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'itemx',
+ 'extra' => {
+ 'misc_content' => [
+ {}
+ ]
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Text.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'command_as_argument' => {}
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'long_item'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'long_item'}{'contents'}[0]{'args'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'long_item'}{'contents'}[0]{'args'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'long_item'}{'contents'}[0]{'args'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'long_item'}{'contents'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'long_item'}{'contents'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'long_item'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'long_item'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'long_item'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'long_item'}{'contents'}[0]{'contents'}[1];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'long_item'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'long_item'}{'contents'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'long_item'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'long_item'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'long_item'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'long_item'}{'contents'}[0]{'contents'}[2];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'misc_content'}[0]
=
$result_trees{'long_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'long_item'}{'contents'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'long_item'}{'contents'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'long_item'}{'contents'}[0]{'contents'}[4];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[4]{'parent'} =
$result_trees{'long_item'}{'contents'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'long_item'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'long_item'}{'contents'}[0]{'extra'}{'command_as_argument'} =
$result_trees{'long_item'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'long_item'}{'contents'}[0]{'parent'} =
$result_trees{'long_item'};
+
+$result_texis{'long_item'} = '@table @emph
address@hidden first item aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaa
address@hidden second itemx bbbbbbbbbbbbbbbbbbbbbbbbbbbbb b b b b b b b b b b b
b b
+
+Text.
address@hidden table';
+
+
+$result_texts{'long_item'} = 'first item
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaa
+second itemx bbbbbbbbbbbbbbbbbbbbbbbbbbbbb b b b b b b b b b b b b b
+
+Text.
+';
+
+$result_errors{'long_item'} = [
+ {
+ 'error_line' => ':5: No matching address@hidden table\'
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => 'No matching address@hidden table\'',
+ 'type' => 'error'
+ }
+];
+
+
+
+$result_converted{'plaintext'}->{'long_item'} = '_first item
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaa_
+_second itemx bbbbbbbbbbbbbbbbbbbbbbbbbbbbb b b b b b b b b b b b b b_
+
+ Text.
+';
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp texi2any.pl Texinfo/Convert/Paragrap...,
Patrice Dumas <=