[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Common.pm Texinfo/Parse...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Common.pm Texinfo/Parse... |
|
Date: |
Tue, 03 Jan 2012 22:54:36 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/01/03 22:54:36
Modified files:
tp : TODO
tp/Texinfo : Common.pm Parser.pm
tp/Texinfo/Convert: HTML.pm Plaintext.pm Text.pm
tp/t : 16raw.t
Added files:
tp/t/results/raw: inline_missing_first_arg.pl inlinefmt.pl
inlinefmt_with_empty_line.pl inlineraw.pl
inlineraw_with_empty_line.pl
Log message:
Handle @inline* in Parser, raw text and plaintext.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.231&r2=1.232
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.346&r2=1.347
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.219&r2=1.220
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.198&r2=1.199
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/16raw.t?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/inline_missing_first_arg.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/inlinefmt.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/inlinefmt_with_empty_line.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/inlineraw.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/inlineraw_with_empty_line.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -b -r1.231 -r1.232
--- TODO 3 Jan 2012 01:47:52 -0000 1.231
+++ TODO 3 Jan 2012 22:54:34 -0000 1.232
@@ -2,6 +2,9 @@
perl -w t/02coverage.t -o
xmllint --nonet --noout --valid commands.xml
+
+add hashcahar, rbracechar... to tests.
+
Redo macros/space_macro_after_end with @verbatim
duplicate coverage_braces/'raw_in_style','raw_expanded_in_style'
and raw/'raw_in_brace_command'
@@ -54,6 +57,8 @@
Test for @html in @copying when expanding @html.
+Test for '' -- in @tex (or @html) and expanded in plaintext.
+
Test for the handling of #line.
Test tree leading to non empty preamble_before_setfilename. Currently there
Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- Texinfo/Common.pm 3 Jan 2012 18:26:58 -0000 1.112
+++ Texinfo/Common.pm 3 Jan 2012 22:54:34 -0000 1.113
@@ -445,7 +445,19 @@
$brace_commands{$context_brace_command} = 1;
}
-foreach my $two_arg_command('email','acronym','abbr') {
+our %explained_commands;
+foreach my $explained_command ('abbr', 'acronym') {
+ $explained_commands{$explained_command} = 1;
+ $brace_commands{$explained_command} = 2;
+}
+
+our %inline_format_commands;
+foreach my $inline_format_command ('inlineraw', 'inlinefmt') {
+ $inline_format_commands{$inline_format_command} = 1;
+ $brace_commands{$inline_format_command} = 2;
+}
+
+foreach my $two_arg_command('email') {
$brace_commands{$two_arg_command} = 2;
}
@@ -464,10 +476,6 @@
$ref_commands{$ref_command} = 1;
}
-our %explained_commands;
-foreach my $explained_command ('abbr', 'acronym') {
- $explained_commands{$explained_command} = 1;
-}
our %in_heading_commands;
foreach my $in_heading_command ('thischapter', 'thischaptername',
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -b -r1.346 -r1.347
--- Texinfo/Parser.pm 3 Jan 2012 01:47:52 -0000 1.346
+++ Texinfo/Parser.pm 3 Jan 2012 22:54:34 -0000 1.347
@@ -153,6 +153,7 @@
'GLOBAL_COMMANDS' => [], # list of commands registered
);
+# content is not copied but reference is copied when duplicating a parser.
my %tree_informations;
foreach my $tree_information ('values', 'macros', 'explained_commands',
'labels') {
$tree_informations{$tree_information} = 1;
@@ -258,8 +259,10 @@
my %code_style_commands = %Texinfo::Common::code_style_commands;
my %in_heading_commands = %Texinfo::Common::in_heading_commands;
my %explained_commands = %Texinfo::Common::explained_commands;
+my %inline_format_commands = %Texinfo::Common::inline_format_commands;
my %all_commands = %Texinfo::Common::all_commands;
+# keep line information for those commands.
my %keep_line_nr_brace_commands = %context_brace_commands;
foreach my $keep_line_nr_brace_command ('titlefont', 'anchor') {
$keep_line_nr_brace_commands{$keep_line_nr_brace_command} = 1;
@@ -4472,7 +4475,9 @@
and ($brace_commands{$current->{'parent'}->{'cmdname'}} > 1
or $simple_text_commands{$current->{'parent'}->{'cmdname'}})
and $current->{'parent'}->{'cmdname'} ne 'math') {
- $self->_isolate_last_space($current);
+ # @inline* always have end spaces considered as normal text
+ $self->_isolate_last_space($current)
+ unless
($inline_format_commands{$current->{'parent'}->{'cmdname'}});
$self->_register_command_arg($current, 'brace_command_contents');
# Remove empty arguments, as far as possible
_remove_empty_content_arguments($current);
@@ -4534,28 +4539,37 @@
Texinfo::Convert::Texinfo::convert($current)), $line_nr);
}
}
- } elsif ($explained_commands{$current->{'parent'}->{'cmdname'}}) {
- my $explained = $current->{'parent'};
- if (address@hidden>{'args'}}
- or address@hidden>{'extra'}->{'brace_command_contents'}}
- or
!defined($explained->{'extra'}->{'brace_command_contents'}->[0])) {
+ } elsif ($explained_commands{$current->{'parent'}->{'cmdname'}}
+ or
$inline_format_commands{$current->{'parent'}->{'cmdname'}}) {
+ my $current_command = $current->{'parent'};
+ if (address@hidden>{'args'}}
+ or address@hidden>{'extra'}->{'brace_command_contents'}}
+ or
!defined($current_command->{'extra'}->{'brace_command_contents'}->[0])) {
$self->line_warn(
sprintf($self->__("address@hidden missing first argument"),
- $explained->{'cmdname'}), $line_nr);
+ $current_command->{'cmdname'}), $line_nr);
} else {
+ if ($explained_commands{$current_command->{'cmdname'}}) {
my $normalized_type
= Texinfo::Convert::NodeNameNormalization::normalize_node(
{'contents' =>
-
$explained->{'extra'}->{'brace_command_contents'}->[0]});
- $explained->{'extra'}->{'normalized'} = $normalized_type;
- if (!$explained->{'extra'}->{'brace_command_contents'}->[1]) {
- if
($self->{'explained_commands'}->{$explained->{'cmdname'}}->{$normalized_type}) {
- $explained->{'extra'}->{'explanation_contents'}
- =
$self->{'explained_commands'}->{$explained->{'cmdname'}}->{$normalized_type};
+
$current_command->{'extra'}->{'brace_command_contents'}->[0]});
+ $current_command->{'extra'}->{'normalized'} =
$normalized_type;
+ if
(!$current_command->{'extra'}->{'brace_command_contents'}->[1]) {
+ if
($self->{'explained_commands'}->{$current_command->{'cmdname'}}->{$normalized_type})
{
+ $current_command->{'extra'}->{'explanation_contents'}
+ =
$self->{'explained_commands'}->{$current_command->{'cmdname'}}->{$normalized_type};
+ }
+ } else {
+
$self->{'explained_commands'}->{$current_command->{'cmdname'}}->{$normalized_type}
+ =
$current_command->{'extra'}->{'brace_command_contents'}->[1];
}
} else {
-
$self->{'explained_commands'}->{$explained->{'cmdname'}}->{$normalized_type}
- = $explained->{'extra'}->{'brace_command_contents'}->[1];
+ my $format
+ = Texinfo::Convert::Text::convert({'contents' =>
+
$current_command->{'extra'}->{'brace_command_contents'}->[0]},
+ {Texinfo::Common::_convert_text_options($self)});
+ $current_command->{'extra'}->{'format'} = $format;
}
}
} elsif ($current->{'parent'}->{'cmdname'} eq 'errormsg') {
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -b -r1.219 -r1.220
--- Texinfo/Convert/HTML.pm 3 Jan 2012 01:47:52 -0000 1.219
+++ Texinfo/Convert/HTML.pm 3 Jan 2012 22:54:35 -0000 1.220
@@ -3557,11 +3557,9 @@
my $command = shift;
my $text = shift;
- # do that first because in verb and verbatim, type is 'raw'
if ($self->in_verbatim()) {
return $self->protect_text($text);
}
- #return $text if ($type and $type eq 'raw');
return $text if ($self->in_raw());
$text = uc($text) if ($self->in_upper_case());
$text = $self->protect_text($text);
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- Texinfo/Convert/Plaintext.pm 3 Jan 2012 21:08:36 -0000 1.198
+++ Texinfo/Convert/Plaintext.pm 3 Jan 2012 22:54:35 -0000 1.199
@@ -86,6 +86,7 @@
my %root_commands = %Texinfo::Common::root_commands;
my %preformatted_commands = %Texinfo::Common::preformatted_commands;
my %explained_commands = %Texinfo::Common::explained_commands;
+my %inline_format_commands = %Texinfo::Common::inline_format_commands;
my %item_container_commands = %Texinfo::Common::item_container_commands;
my %raw_commands = %Texinfo::Common::raw_commands;
my %format_raw_commands = %Texinfo::Common::format_raw_commands;
@@ -1088,7 +1089,10 @@
and ($root->{'type'} ne 'empty_spaces_before_paragraph'
or $self->get_conf('paragraphindent') ne 'asis'))
or ($root->{'cmdname'}
- and $self->{'ignored_commands'}->{$root->{'cmdname'}})) {
+ and ($self->{'ignored_commands'}->{$root->{'cmdname'}}
+ or ($inline_format_commands{$root->{'cmdname'}}
+ and (!$root->{'extra'}->{'format'}
+ or
!$self->{'expanded_formats_hash'}->{$root->{'extra'}->{'format'}}))))) {
print STDERR "IGNORED\n" if ($self->get_conf('DEBUG'));
return '';
}
@@ -1571,7 +1575,7 @@
}
}
my @added = ({'text' => '.'});
- # the added dot do not end a senteence for pxref or ref.
+ # the added dot do not end a sentence for pxref or ref.
push @added, {'cmdname' => ':'} if ($command ne 'xref');
unshift @{$self->{'current_contents'}->[-1]}, @added;
}
@@ -1608,6 +1612,18 @@
}
}
return '';
+ } elsif ($inline_format_commands{$command}) {
+ if (scalar (@{$root->{'extra'}->{'brace_command_contents'}}) == 2
+ and defined($root->{'extra'}->{'brace_command_contents'}->[-1])) {
+ my $argument;
+ if ($command eq 'inlineraw') {
+ $argument->{'type'} = 'code';
+ }
+ $argument->{'contents'}
+ = $root->{'extra'}->{'brace_command_contents'}->[-1];
+ unshift @{$self->{'current_contents'}->[-1]}, ($argument);
+ }
+ return '';
} elsif ($command eq 'math') {
push @{$self->{'context'}}, 'math';
if ($root->{'args'}) {
Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- Texinfo/Convert/Text.pm 3 Jan 2012 18:26:59 -0000 1.89
+++ Texinfo/Convert/Text.pm 3 Jan 2012 22:54:35 -0000 1.90
@@ -342,6 +342,9 @@
or ($ignored_block_commands{$root->{'cmdname'}}
and !(defined($options->{'expanded_formats_hash'})
and
$options->{'expanded_formats_hash'}->{$root->{'cmdname'}}))
+ or
($Texinfo::Common::inline_format_commands{$root->{'cmdname'}}
+ and (!$root->{'extra'}->{'format'}
+ or
!$options->{'expanded_formats_hash'}->{$root->{'extra'}->{'format'}}))
# here ignore most of the misc commands
or ($root->{'args'} and $root->{'args'}->[0]
and $root->{'args'}->[0]->{'type'}
@@ -423,6 +426,9 @@
} else {
return _convert($root->{'args'}->[0], $options);
}
+ } elsif ($Texinfo::Common::inline_format_commands{$root->{'cmdname'}}) {
+ $options->{'raw'} = 1 if ($root->{'cmdname'} eq 'inlineraw');
+ return _convert($root->{'args'}->[1], $options);
} elsif ($root->{'args'} and $root->{'args'}->[0]
and (($root->{'args'}->[0]->{'type'}
and $root->{'args'}->[0]->{'type'} eq 'brace_command_arg')
Index: t/16raw.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/16raw.t,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/16raw.t 29 May 2011 13:42:34 -0000 1.17
+++ t/16raw.t 3 Jan 2012 22:54:35 -0000 1.18
@@ -238,6 +238,14 @@
in block
@end verbatim. A symbol after the closing command.
'],
+['inlinefmt',
+'A @inlinefmt{plaintext, plaintext `` @lbracechar{} } a. Now html
address@hidden, in <i>@acronym{HTML}</i>}.
+'],
+['inlineraw',
+'A @inlineraw{plaintext, plaintext `` @lbracechar{} } a. Now html
address@hidden, in <i>@acronym{HTML}</i>}.
+'],
);
my @test_invalid = (
@@ -272,7 +280,26 @@
in verbatim
@end verbatim
}
-']
+'],
+['inlineraw_with_empty_line',
+'A @inlineraw{plaintext, plaintext ``
+
address@hidden } a. Now html
address@hidden, in
+
+<i>@acronym{HTML}</i>}.
+'],
+['inlinefmt_with_empty_line',
+'A @inlinefmt{plaintext, plaintext ``
+
address@hidden } a. Now html
address@hidden, in
+
+<i>@acronym{HTML}</i>}.
+'],
+['inline_missing_first_arg',
+'@inlinefmt{ , aaa}. @inlineraw{, bbb}.
+'],
);
foreach my $test (@test_cases) {
Index: t/results/raw/inline_missing_first_arg.pl
===================================================================
RCS file: t/results/raw/inline_missing_first_arg.pl
diff -N t/results/raw/inline_missing_first_arg.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/raw/inline_missing_first_arg.pl 3 Jan 2012 22:54:35 -0000
1.1
@@ -0,0 +1,151 @@
+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{'inline_missing_first_arg'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'aaa'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ undef,
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '. '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'bbb'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlineraw',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ undef,
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0];
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1];
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0];
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1];
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0];
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0];
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2];
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1];
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2];
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[1];
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'line_nr'}
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0];
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0];
+$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'parent'} =
$result_trees{'inline_missing_first_arg'};
+
+$result_texis{'inline_missing_first_arg'} = '@inlinefmt{ , aaa}. @inlineraw{,
bbb}.
+';
+
+
+$result_texts{'inline_missing_first_arg'} = '. .
+';
+
+$result_errors{'inline_missing_first_arg'} = [
+ {
+ 'error_line' => ':1: warning: @inlinefmt missing first argument
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@inlinefmt missing first argument',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => ':1: warning: @inlineraw missing first argument
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@inlineraw missing first argument',
+ 'type' => 'warning'
+ }
+];
+
+
+1;
Index: t/results/raw/inlinefmt.pl
===================================================================
RCS file: t/results/raw/inlinefmt.pl
diff -N t/results/raw/inlinefmt.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/raw/inlinefmt.pl 3 Jan 2012 22:54:35 -0000 1.1
@@ -0,0 +1,225 @@
+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{'inlinefmt'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'A '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'plaintext'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'plaintext `` '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'lbracechar',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ],
+ [
+ {},
+ {},
+ {}
+ ]
+ ],
+ 'format' => 'plaintext'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' a. Now html
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'html'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'in <i>'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'HTML'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'acronym',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'normalized' => 'HTML'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '</i>'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ],
+ [
+ {},
+ {},
+ {}
+ ]
+ ],
+ 'format' => 'html'
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'inlinefmt'}{'contents'}[0];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[3]{'parent'}
= $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][2]
=
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[3];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'inlinefmt'}{'contents'}[0];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'inlinefmt'}{'contents'}[0];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[3]{'parent'}
= $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'parent'}
= $result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[1][2]
=
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[3];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'line_nr'} =
$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'line_nr'};
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'inlinefmt'}{'contents'}[0];
+$result_trees{'inlinefmt'}{'contents'}[0]{'contents'}[4]{'parent'} =
$result_trees{'inlinefmt'}{'contents'}[0];
+$result_trees{'inlinefmt'}{'contents'}[0]{'parent'} =
$result_trees{'inlinefmt'};
+
+$result_texis{'inlinefmt'} = 'A @inlinefmt{plaintext, plaintext ``
@lbracechar{} } a. Now html
address@hidden, in <i>@acronym{HTML}</i>}.
+';
+
+
+$result_texts{'inlinefmt'} = 'A a. Now html
+.
+';
+
+$result_errors{'inlinefmt'} = [];
+
+
+
+$result_converted{'plaintext'}->{'inlinefmt'} = 'A plaintext " { a. Now html .
+';
+
+1;
Index: t/results/raw/inlinefmt_with_empty_line.pl
===================================================================
RCS file: t/results/raw/inlinefmt_with_empty_line.pl
diff -N t/results/raw/inlinefmt_with_empty_line.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/raw/inlinefmt_with_empty_line.pl 3 Jan 2012 22:54:35 -0000
1.1
@@ -0,0 +1,274 @@
+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{'inlinefmt_with_empty_line'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'A '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'plaintext'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'plaintext ``
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'remaining_args' => 0
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'lbracechar',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' a. Now html
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'html'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'in
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'remaining_args' => 0
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '<i>'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'HTML'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'acronym',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'normalized' => 'HTML'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '</i>.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[0];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[0]{'parent'} =
$result_trees{'inlinefmt_with_empty_line'};
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[0];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[1];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[1]{'parent'} =
$result_trees{'inlinefmt_with_empty_line'};
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[2];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inlinefmt_with_empty_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[2]{'contents'}[1];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmt_with_empty_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[2];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'inlinefmt_with_empty_line'}{'contents'}[2];
+$result_trees{'inlinefmt_with_empty_line'}{'contents'}[2]{'parent'} =
$result_trees{'inlinefmt_with_empty_line'};
+
+$result_texis{'inlinefmt_with_empty_line'} = 'A @inlinefmt{plaintext,
plaintext ``
+
address@hidden a. Now html
address@hidden, in
+
+}<i>@acronym{HTML}</i>.
+';
+
+
+$result_texts{'inlinefmt_with_empty_line'} = 'A { a. Now html
+<i>HTML</i>.
+';
+
+$result_errors{'inlinefmt_with_empty_line'} = [
+ {
+ 'error_line' => ':1: @inlinefmt missing close brace
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@inlinefmt missing close brace',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':3: Misplaced }
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'Misplaced }',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':4: @inlinefmt missing close brace
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => '@inlinefmt missing close brace',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':6: Misplaced }
+',
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => '',
+ 'text' => 'Misplaced }',
+ 'type' => 'error'
+ }
+];
+
+
+1;
Index: t/results/raw/inlineraw.pl
===================================================================
RCS file: t/results/raw/inlineraw.pl
diff -N t/results/raw/inlineraw.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/raw/inlineraw.pl 3 Jan 2012 22:54:35 -0000 1.1
@@ -0,0 +1,225 @@
+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{'inlineraw'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'A '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'plaintext'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'plaintext `` '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'lbracechar',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlineraw',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ],
+ [
+ {},
+ {},
+ {}
+ ]
+ ],
+ 'format' => 'plaintext'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' a. Now html
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'html'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'in <i>'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'HTML'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'acronym',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'normalized' => 'HTML'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '</i>'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlineraw',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ],
+ [
+ {},
+ {},
+ {}
+ ]
+ ],
+ 'format' => 'html'
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'inlineraw'}{'contents'}[0];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[3]{'parent'}
= $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][2]
=
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[3];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'inlineraw'}{'contents'}[0];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'inlineraw'}{'contents'}[0];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[3]{'parent'}
= $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'parent'}
= $result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[1][2]
=
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[3];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'line_nr'} =
$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[2]{'line_nr'};
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'inlineraw'}{'contents'}[0];
+$result_trees{'inlineraw'}{'contents'}[0]{'contents'}[4]{'parent'} =
$result_trees{'inlineraw'}{'contents'}[0];
+$result_trees{'inlineraw'}{'contents'}[0]{'parent'} =
$result_trees{'inlineraw'};
+
+$result_texis{'inlineraw'} = 'A @inlineraw{plaintext, plaintext ``
@lbracechar{} } a. Now html
address@hidden, in <i>@acronym{HTML}</i>}.
+';
+
+
+$result_texts{'inlineraw'} = 'A a. Now html
+.
+';
+
+$result_errors{'inlineraw'} = [];
+
+
+
+$result_converted{'plaintext'}->{'inlineraw'} = 'A plaintext `` { a. Now html
.
+';
+
+1;
Index: t/results/raw/inlineraw_with_empty_line.pl
===================================================================
RCS file: t/results/raw/inlineraw_with_empty_line.pl
diff -N t/results/raw/inlineraw_with_empty_line.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/raw/inlineraw_with_empty_line.pl 3 Jan 2012 22:54:36 -0000
1.1
@@ -0,0 +1,274 @@
+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{'inlineraw_with_empty_line'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'A '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'plaintext'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'plaintext ``
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlineraw',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'remaining_args' => 0
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'lbracechar',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' a. Now html
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'html'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'in
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlineraw',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'remaining_args' => 0
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '<i>'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'HTML'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'acronym',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'normalized' => 'HTML'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '</i>.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[0];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[0];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[0]{'parent'} =
$result_trees{'inlineraw_with_empty_line'};
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[0];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[1];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[1];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[1];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[1]{'parent'} =
$result_trees{'inlineraw_with_empty_line'};
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[2];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inlineraw_with_empty_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[2]{'contents'}[1];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlineraw_with_empty_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[2];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'inlineraw_with_empty_line'}{'contents'}[2];
+$result_trees{'inlineraw_with_empty_line'}{'contents'}[2]{'parent'} =
$result_trees{'inlineraw_with_empty_line'};
+
+$result_texis{'inlineraw_with_empty_line'} = 'A @inlineraw{plaintext,
plaintext ``
+
address@hidden a. Now html
address@hidden, in
+
+}<i>@acronym{HTML}</i>.
+';
+
+
+$result_texts{'inlineraw_with_empty_line'} = 'A { a. Now html
+<i>HTML</i>.
+';
+
+$result_errors{'inlineraw_with_empty_line'} = [
+ {
+ 'error_line' => ':1: @inlineraw missing close brace
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@inlineraw missing close brace',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':3: Misplaced }
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'Misplaced }',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':4: @inlineraw missing close brace
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => '@inlineraw missing close brace',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':6: Misplaced }
+',
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => '',
+ 'text' => 'Misplaced }',
+ 'type' => 'error'
+ }
+];
+
+
+1;