[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/HTML.pm Texinfo/Conv...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/HTML.pm Texinfo/Conv... |
|
Date: |
Wed, 28 Dec 2011 23:35:57 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/12/28 23:35:57
Modified files:
tp/Texinfo/Convert: HTML.pm Plaintext.pm
tp/t : converters_tests.t
tp/t/results/coverage: symbol_after_command.pl
Added files:
tp/t/results/converters_tests: test_deftypefnnewline.pl
Log message:
Handle @deftypefnnewline in HTML and Info/Plaintext outputs.
for html, add to @image_files_extensions '.jpeg' and '.gif'.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.217&r2=1.218
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.195&r2=1.196
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/converters_tests.t?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/symbol_after_command.pl?cvsroot=texinfo&r1=1.13&r2=1.14
Patches:
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -b -r1.217 -r1.218
--- Texinfo/Convert/HTML.pm 22 Dec 2011 10:54:41 -0000 1.217
+++ Texinfo/Convert/HTML.pm 28 Dec 2011 23:35:55 -0000 1.218
@@ -971,6 +971,7 @@
'BODYTEXT' => undef,
'documentlanguage' => 'en',
'xrefautomaticsectiontitle' => 'off',
+ 'deftypefnnewline' => 'off',
'SHOW_TITLE' => 1,
'USE_TITLEPAGE_FOR_TITLE' => 0,
'MONOLITHIC' => 1,
@@ -1098,7 +1099,7 @@
'summarycontents', 'allowcodebreaks', 'documentlanguage',
'footnotestyle', 'documentencoding',
'setcontentsaftertitlepage', 'setshortcontentsaftertitlepage',
- 'xrefautomaticsectiontitle');
+ 'xrefautomaticsectiontitle', 'deftypefnnewline');
# taken from global
# 'documentencoding'
# 'novalidate'
@@ -1595,7 +1596,7 @@
$default_commands_conversion{'uref'} = \&_convert_uref_command;
$default_commands_conversion{'url'} = \&_convert_uref_command;
-my @image_files_extensions = ('.png', '.jpg');
+my @image_files_extensions = ('.png', '.jpg', '.jpeg', '.gif');
sub _convert_image_command($$$$)
{
my $self = shift;
@@ -3865,16 +3866,32 @@
or $command_name eq 'deftypecv')
and !$command->{'extra'}->{'def_parsed_hash'}->{'class'})) {
if ($arguments) {
- $tree = $self->gdt("{category}: address@hidden address@hidden
address@hidden", {
+ my $strings = {
'category' => $category,
'name' => $name,
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
- 'arguments' => $arguments});
+ 'arguments' => $arguments};
+ if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $tree
+ = $self->gdt("{category}:@* address@hidden@* address@hidden
address@hidden",
+ $strings);
+ } else {
+ $tree
+ = $self->gdt("{category}: address@hidden address@hidden
address@hidden",
+ $strings);
+ }
} else {
- $tree = $self->gdt("{category}: address@hidden address@hidden", {
+ my $strings = {
'category' => $category,
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
- 'name' => $name});
+ 'name' => $name};
+ if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $tree = $self->gdt("{category}:@* address@hidden@* address@hidden",
+ $strings);
+ } else {
+ $tree = $self->gdt("{category}: address@hidden address@hidden",
+ $strings);
+ }
}
} elsif ($command_name eq 'defcv'
or ($command_name eq 'deftypecv'
@@ -3908,33 +3925,69 @@
}
} elsif ($command_name eq 'deftypeop') {
if ($arguments) {
- $tree = $self->gdt("{category} on {class}: address@hidden
address@hidden address@hidden", {
+ my $strings = {
'category' => $category,
'name' => $name,
'class' => $command->{'extra'}->{'def_parsed_hash'}->{'class'},
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
- 'arguments' => $arguments});
+ 'arguments' => $arguments};
+ if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $tree
+ = $self->gdt("{category} on {class}:@* address@hidden@*
address@hidden address@hidden",
+ $strings);
+ } else {
+ $tree
+ = $self->gdt("{category} on {class}: address@hidden address@hidden
address@hidden",
+ $strings);
+ }
} else {
- $tree = $self->gdt("{category} on {class}: address@hidden
address@hidden", {
+ my $strings = {
'category' => $category,
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
'class' => $command->{'extra'}->{'def_parsed_hash'}->{'class'},
- 'name' => $name});
+ 'name' => $name};
+ if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $tree
+ = $self->gdt("{category} on {class}:@* address@hidden@*
address@hidden",
+ $strings);
+ } else {
+ $tree
+ = $self->gdt("{category} on {class}: address@hidden
address@hidden",
+ $strings);
+ }
}
} elsif ($command_name eq 'deftypecv') {
if ($arguments) {
- $tree = $self->gdt("{category} of {class}: address@hidden
address@hidden address@hidden", {
+ my $strings = {
'category' => $category,
'name' => $name,
'class' => $command->{'extra'}->{'def_parsed_hash'}->{'class'},
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
- 'arguments' => $arguments});
+ 'arguments' => $arguments};
+ if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $tree
+ = $self->gdt("{category} of {class}:@* address@hidden@*
address@hidden address@hidden",
+ $strings);
+ } else {
+ $tree
+ = $self->gdt("{category} of {class}: address@hidden address@hidden
address@hidden",
+ $strings);
+ }
} else {
- $tree = $self->gdt("{category} of {class}: address@hidden
address@hidden", {
+ my $strings = {
'category' => $category,
'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
'class' => $command->{'extra'}->{'def_parsed_hash'}->{'class'},
- 'name' => $name});
+ 'name' => $name};
+ if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $tree
+ = $self->gdt("{category} of {class}:@* address@hidden@*
address@hidden",
+ $strings);
+ } else {
+ $tree
+ = $self->gdt("{category} of {class}: address@hidden
address@hidden",
+ $strings);
+ }
}
}
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -b -r1.195 -r1.196
--- Texinfo/Convert/Plaintext.pm 22 Dec 2011 10:54:41 -0000 1.195
+++ Texinfo/Convert/Plaintext.pm 28 Dec 2011 23:35:55 -0000 1.196
@@ -63,7 +63,7 @@
my @informative_global_commands = ('paragraphindent', 'firstparagraphindent',
'frenchspacing', 'documentencoding', 'footnotestyle', 'documentlanguage',
'contents', 'shortcontents', 'summarycontents', 'setcontentsaftertitlepage',
-'setshortcontentsaftertitlepage');
+'setshortcontentsaftertitlepage', 'deftypefnnewline');
my %informative_commands;
foreach my $informative_command (@informative_global_commands) {
@@ -2184,16 +2184,30 @@
} elsif ($command eq 'deftypefn'
or $command eq 'deftypevr') {
if ($arguments) {
- $tree = $self->gdt("address@hidden }-- {category}: {type} {name}
{arguments}", {
+ my $strings = {
'category' =>
$root->{'extra'}->{'def_parsed_hash'}->{'category'},
'name' => $name,
'type' => $root->{'extra'}->{'def_parsed_hash'}->{'type'},
- 'arguments' => $arguments});
+ 'arguments' => $arguments};
+ if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $tree = $self->gdt("address@hidden }--
{category}:@address@hidden {arguments}",
+ $strings);
+ } else {
+ $tree = $self->gdt("address@hidden }-- {category}: {type} {name}
{arguments}",
+ $strings);
+ }
} else {
- $tree = $self->gdt("address@hidden }-- {category}: {type} {name}",
{
+ my $strings = {
'category' =>
$root->{'extra'}->{'def_parsed_hash'}->{'category'},
'type' => $root->{'extra'}->{'def_parsed_hash'}->{'type'},
- 'name' => $name});
+ 'name' => $name};
+ if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $tree = $self->gdt("address@hidden }--
{category}:@address@hidden",
+ $strings);
+ } else {
+ $tree = $self->gdt("address@hidden }-- {category}: {type}
{name}",
+ $strings);
+ }
}
} elsif ($command eq 'defcv'
or ($command eq 'deftypecv'
@@ -2227,33 +2241,69 @@
}
} elsif ($command eq 'deftypeop') {
if ($arguments) {
- $tree = $self->gdt("address@hidden }-- {category} on {class}:
{type} {name} {arguments}", {
+ my $strings = {
'category' =>
$root->{'extra'}->{'def_parsed_hash'}->{'category'},
'name' => $name,
'class' =>
$root->{'extra'}->{'def_parsed_hash'}->{'class'},
'type' => $root->{'extra'}->{'def_parsed_hash'}->{'type'},
- 'arguments' => $arguments});
+ 'arguments' => $arguments};
+ if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $tree
+ = $self->gdt("address@hidden }-- {category} on
{class}:@address@hidden {arguments}",
+ $strings);
+ } else {
+ $tree
+ = $self->gdt("address@hidden }-- {category} on {class}: {type}
{name} {arguments}",
+ $strings);
+ }
} else {
- $tree = $self->gdt("address@hidden }-- {category} on {class}:
{type} {name}", {
+ my $strings = {
'category' =>
$root->{'extra'}->{'def_parsed_hash'}->{'category'},
'type' => $root->{'extra'}->{'def_parsed_hash'}->{'type'},
'class' =>
$root->{'extra'}->{'def_parsed_hash'}->{'class'},
- 'name' => $name});
+ 'name' => $name};
+ if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $tree
+ = $self->gdt("address@hidden }-- {category} on
{class}:@address@hidden",
+ $strings);
+ } else {
+ $tree
+ = $self->gdt("address@hidden }-- {category} on {class}: {type}
{name}",
+ $strings);
+ }
}
} elsif ($command eq 'deftypecv') {
if ($arguments) {
- $tree = $self->gdt("address@hidden }-- {category} of {class}:
{type} {name} {arguments}", {
+ my $strings = {
'category' =>
$root->{'extra'}->{'def_parsed_hash'}->{'category'},
'name' => $name,
'class' =>
$root->{'extra'}->{'def_parsed_hash'}->{'class'},
'type' => $root->{'extra'}->{'def_parsed_hash'}->{'type'},
- 'arguments' => $arguments});
+ 'arguments' => $arguments};
+ if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $tree
+ = $self->gdt("address@hidden }-- {category} of
{class}:@address@hidden {arguments}",
+ $strings);
+ } else {
+ $tree
+ = $self->gdt("address@hidden }-- {category} of {class}: {type}
{name} {arguments}",
+ $strings);
+ }
} else {
- $tree = $self->gdt("address@hidden }-- {category} of {class}:
{type} {name}", {
+ my $strings = {
'category' =>
$root->{'extra'}->{'def_parsed_hash'}->{'category'},
'type' => $root->{'extra'}->{'def_parsed_hash'}->{'type'},
'class' =>
$root->{'extra'}->{'def_parsed_hash'}->{'class'},
- 'name' => $name});
+ 'name' => $name};
+ if ($self->get_conf('deftypefnnewline') eq 'on') {
+ $tree
+ = $self->gdt("address@hidden }-- {category} of
{class}:@address@hidden",
+ $strings);
+ } else {
+ $tree
+ = $self->gdt("address@hidden }-- {category} of {class}: {type}
{name}",
+ $strings);
+ }
}
}
Index: t/converters_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/converters_tests.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/converters_tests.t 4 Dec 2011 22:16:10 -0000 1.9
+++ t/converters_tests.t 28 Dec 2011 23:35:56 -0000 1.10
@@ -257,6 +257,27 @@
-- --- \'\' `` @code{in code}. @~e.
@end example
'],
+['test_deftypefnnewline',
+'
address@hidden on
address@hidden data-type name arguments...
+aaa
address@hidden deftypefun
+
address@hidden fun arg
+fff
address@hidden deffn
+
address@hidden off
+
address@hidden data-type2 name2 arguments2...
+aaa2
address@hidden deftypefun
+
address@hidden fun2 arg2
+fff2
address@hidden deffn
+'],
);
Index: t/results/coverage/symbol_after_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/symbol_after_command.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/symbol_after_command.pl 18 Sep 2011 17:58:19 -0000
1.13
+++ t/results/coverage/symbol_after_command.pl 28 Dec 2011 23:35:56 -0000
1.14
@@ -663,13 +663,13 @@
<tableentry><tableterm><item><itemformat command="asis">.
dot</itemformat></item>
</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis">, comma</itemformat></item>
</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis">&arobase; &arobase;</itemformat></item>
-</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis">} }</itemformat></item>
+</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis">{ {</itemformat></item>
</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis">! exclam</itemformat></item>
</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis">&textrdquo; quotes</itemformat></item>
</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis">: colon</itemformat></item>
</tableterm></tableentry></table>
-<para>&arobase;. }, &arobase;&arobase; &eosquest;, &eosexcl;:
&arobase;} &arobase;&textrdquo; &arobase;:
+<para>&arobase;. {, &arobase;&arobase; &eosquest;, &eosexcl;:
&arobase;{ &arobase;&textrdquo; &arobase;:
</para>';
Index: t/results/converters_tests/test_deftypefnnewline.pl
===================================================================
RCS file: t/results/converters_tests/test_deftypefnnewline.pl
diff -N t/results/converters_tests/test_deftypefnnewline.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/converters_tests/test_deftypefnnewline.pl 28 Dec 2011 23:35:56
-0000 1.1
@@ -0,0 +1,990 @@
+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{'test_deftypefnnewline'} = {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'on'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'deftypefnnewline',
+ 'extra' => {
+ 'misc_args' => [
+ 'on'
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'cmdname' => 'deftypefun',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'data-type name arguments...
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'extra' => {
+ 'def_args' => [
+ [
+ 'category',
+ {
+ 'text' => 'Function'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'type',
+ {
+ 'text' => 'data-type'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'name',
+ {
+ 'text' => 'name'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'typearg',
+ {
+ 'text' => 'arguments...'
+ }
+ ]
+ ],
+ 'def_command' => 'deftypefun',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {},
+ 'type' => {}
+ },
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [
+ {}
+ ],
+ 'in_code' => 1,
+ 'index_at_command' => 'deftypefun',
+ 'index_name' => 'fn',
+ 'index_prefix' => 'f',
+ 'index_type_command' => 'deftypefun',
+ 'key' => 'name',
+ 'number' => 1
+ },
+ 'original_def_cmdname' => 'deftypefun'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'def_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'aaa
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'def_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'deftypefun'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'deftypefun',
+ 'text_arg' => 'deftypefun'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'deffn',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'fun arg
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'extra' => {
+ 'def_args' => [
+ [
+ 'category',
+ {
+ 'text' => 'fun'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'name',
+ {
+ 'text' => 'arg'
+ }
+ ]
+ ],
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [
+ {}
+ ],
+ 'in_code' => 1,
+ 'index_at_command' => 'deffn',
+ 'index_name' => 'fn',
+ 'index_prefix' => 'f',
+ 'index_type_command' => 'deffn',
+ 'key' => 'arg',
+ 'number' => 2
+ },
+ 'original_def_cmdname' => 'deffn'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'def_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'fff
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'def_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'deffn'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'deffn',
+ 'text_arg' => 'deffn'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'off'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'deftypefnnewline',
+ 'extra' => {
+ 'misc_args' => [
+ 'off'
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'deftypefun',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'data-type2 name2 arguments2...
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'extra' => {
+ 'def_args' => [
+ [
+ 'category',
+ {
+ 'text' => 'Function'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'type',
+ {
+ 'text' => 'data-type2'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'name',
+ {
+ 'text' => 'name2'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'typearg',
+ {
+ 'text' => 'arguments2...'
+ }
+ ]
+ ],
+ 'def_command' => 'deftypefun',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {},
+ 'type' => {}
+ },
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [
+ {}
+ ],
+ 'in_code' => 1,
+ 'index_at_command' => 'deftypefun',
+ 'index_name' => 'fn',
+ 'index_prefix' => 'f',
+ 'index_type_command' => 'deftypefun',
+ 'key' => 'name2',
+ 'number' => 3
+ },
+ 'original_def_cmdname' => 'deftypefun'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'def_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'aaa2
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'def_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'deftypefun'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'deftypefun',
+ 'text_arg' => 'deftypefun'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'deffn',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'fun2 arg2
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'extra' => {
+ 'def_args' => [
+ [
+ 'category',
+ {
+ 'text' => 'fun2'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'name',
+ {
+ 'text' => 'arg2'
+ }
+ ]
+ ],
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [
+ {}
+ ],
+ 'in_code' => 1,
+ 'index_at_command' => 'deffn',
+ 'index_name' => 'fn',
+ 'index_prefix' => 'f',
+ 'index_type_command' => 'deffn',
+ 'key' => 'arg2',
+ 'number' => 4
+ },
+ 'original_def_cmdname' => 'deffn'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'def_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'fff2
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'def_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'deffn'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'deffn',
+ 'text_arg' => 'deffn'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'test_deftypefnnewline'}{'contents'}[0]{'parent'} =
$result_trees{'test_deftypefnnewline'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[1]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[1]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[1]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'test_deftypefnnewline'}{'contents'}[1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[1]{'parent'} =
$result_trees{'test_deftypefnnewline'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[0][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'extra'}{'def_args'}[4][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'extra'}{'end_command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'line_nr'} =
$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'contents'}[0]{'line_nr'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[2]{'parent'} =
$result_trees{'test_deftypefnnewline'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[3]{'parent'} =
$result_trees{'test_deftypefnnewline'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'extra'}{'end_command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'line_nr'} =
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[0]{'line_nr'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'parent'} =
$result_trees{'test_deftypefnnewline'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[5]{'parent'} =
$result_trees{'test_deftypefnnewline'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[6];
+$result_trees{'test_deftypefnnewline'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[6]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[6]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[6]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[6]{'args'}[0]{'parent'} =
$result_trees{'test_deftypefnnewline'}{'contents'}[6];
+$result_trees{'test_deftypefnnewline'}{'contents'}[6]{'parent'} =
$result_trees{'test_deftypefnnewline'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[7]{'parent'} =
$result_trees{'test_deftypefnnewline'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[8];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[0][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[4][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[4][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'extra'}{'def_args'}[4][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[8];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[1]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[8];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[8];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[8];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'extra'}{'end_command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'line_nr'} =
$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'contents'}[0]{'line_nr'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[8]{'parent'} =
$result_trees{'test_deftypefnnewline'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[9]{'parent'} =
$result_trees{'test_deftypefnnewline'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[10];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[0][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[10];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[1]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[1];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[1]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[10];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2]{'args'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[10];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2]{'parent'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[10];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'extra'}{'end_command'}
= $result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'line_nr'} =
$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'contents'}[0]{'line_nr'};
+$result_trees{'test_deftypefnnewline'}{'contents'}[10]{'parent'} =
$result_trees{'test_deftypefnnewline'};
+
+$result_texis{'test_deftypefnnewline'} = '
address@hidden on
address@hidden data-type name arguments...
+aaa
address@hidden deftypefun
+
address@hidden fun arg
+fff
address@hidden deffn
+
address@hidden off
+
address@hidden data-type2 name2 arguments2...
+aaa2
address@hidden deftypefun
+
address@hidden fun2 arg2
+fff2
address@hidden deffn
+';
+
+
+$result_texts{'test_deftypefnnewline'} = '
+Function: data-type name arguments...
+aaa
+
+fun: arg
+fff
+
+
+Function: data-type2 name2 arguments2...
+aaa2
+
+fun2: arg2
+fff2
+';
+
+$result_errors{'test_deftypefnnewline'} = [
+ {
+ 'error_line' => ':3: Entry for index `fn\' outside of any node
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'Entry for index `fn\' outside of any node',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':7: Entry for index `fn\' outside of any node
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => 'Entry for index `fn\' outside of any node',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':13: Entry for index `fn\' outside of any node
+',
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => '',
+ 'text' => 'Entry for index `fn\' outside of any node',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':17: Entry for index `fn\' outside of any node
+',
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => '',
+ 'text' => 'Entry for index `fn\' outside of any node',
+ 'type' => 'error'
+ }
+];
+
+
+
+$result_converted{'plaintext'}->{'test_deftypefnnewline'} = ' -- Function:
+ data-type
+ name arguments...
+ aaa
+
+ -- fun: arg
+ fff
+
+ -- Function: data-type2 name2 arguments2...
+ aaa2
+
+ -- fun2: arg2
+ fff2
+';
+
+
+$result_converted{'html_text'}->{'test_deftypefnnewline'} = '
+<dl>
+<dt><a name="index-name"></a>Function:<br> <em>data-type</em><br>
<strong>name</strong> <em>arguments...</em></dt>
+<dd><p>aaa
+</p></dd></dl>
+
+<dl>
+<dt><a name="index-arg"></a>fun: <strong>arg</strong></dt>
+<dd><p>fff
+</p></dd></dl>
+
+
+<dl>
+<dt><a name="index-name2"></a>Function: <em>data-type2</em>
<strong>name2</strong> <em>arguments2...</em></dt>
+<dd><p>aaa2
+</p></dd></dl>
+
+<dl>
+<dt><a name="index-arg2"></a>fun2: <strong>arg2</strong></dt>
+<dd><p>fff2
+</p></dd></dl>
+';
+
+
+$result_converted{'docbook'}->{'test_deftypefnnewline'} = '
+<synopsis><indexterm role="fn"><primary>name</primary></indexterm><emphasis
role="bold">Function</emphasis>: <returnvalue>data-type</returnvalue>
<function>name</function> <type>arguments...</type></synopsis>
+<blockquote><para>aaa
+</para></blockquote>
+<synopsis><indexterm role="fn"><primary>arg</primary></indexterm><emphasis
role="bold">fun</emphasis>: <function>arg</function></synopsis>
+<blockquote><para>fff
+</para></blockquote>
+
+<synopsis><indexterm role="fn"><primary>name2</primary></indexterm><emphasis
role="bold">Function</emphasis>: <returnvalue>data-type2</returnvalue>
<function>name2</function> <type>arguments2...</type></synopsis>
+<blockquote><para>aaa2
+</para></blockquote>
+<synopsis><indexterm role="fn"><primary>arg2</primary></indexterm><emphasis
role="bold">fun2</emphasis>: <function>arg2</function></synopsis>
+<blockquote><para>fff2
+</para></blockquote>';
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Convert/HTML.pm Texinfo/Conv...,
Patrice Dumas <=