[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/Plaintext.pm t/05par...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/Plaintext.pm t/05par... |
|
Date: |
Tue, 23 Nov 2010 19:46:37 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/11/23 19:46:37
Modified files:
tp/Texinfo/Convert: Plaintext.pm
tp/t : 05paragraph.t
tp/t/results/coverage: math.pl nested_block_commands.pl
tp/t/results/paragraph: close_paragraph_command.pl
comment_between_text.pl
no_paragraph_commands.pl
paragraph_command.pl text.pl
text_comment.pl text_line.pl
text_space_comment.pl two_lines.pl
Log message:
Handle titlefont and paragraph indenting.
Add a formatter for @-commands outside of any environment.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/05paragraph.t?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/math.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/nested_block_commands.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/close_paragraph_command.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/comment_between_text.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/no_paragraph_commands.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/paragraph_command.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/text.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/text_comment.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/text_line.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/text_space_comment.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/two_lines.pl?cvsroot=texinfo&r1=1.11&r2=1.12
Patches:
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- Texinfo/Convert/Plaintext.pm 22 Nov 2010 23:52:42 -0000 1.18
+++ Texinfo/Convert/Plaintext.pm 23 Nov 2010 19:46:37 -0000 1.19
@@ -128,7 +128,7 @@
}
foreach my $format_context_command (keys(%menu_commands), 'verbatim',
- 'flushleft', 'flushright', 'multitable') {
+ 'flushleft', 'flushright', 'multitable', 'float') {
$format_context_commands{$format_context_command} = 1;
}
@@ -189,7 +189,7 @@
# math is special
my @asis_commands = ('asis', 'w', 'b', 'ctrl', 'i', 'sc', 't', 'r',
- 'slanted', 'sansserif', 'var', 'titlefont', 'verb', 'clicksequence',
+ 'slanted', 'sansserif', 'var', 'verb', 'clicksequence',
'headitemfont');
foreach my $asis_command (@asis_commands) {
@@ -259,13 +259,14 @@
$converter->{$key} = $defaults{$key} if (!$converter->{'set'}->{$key});
}
$converter->{'context'} = ['_Root_context'];
- $converter->{'formatters'} = [];
$converter->{'format_context'} = [{
'cmdname' => '_top_format',
'paragraph_count' => 0,
'indent_level' => 0,
'max' => $converter->{'fillcolumn'}
}];
+ $converter->{'formatters'} = [$converter->new_formatter('line')];
+ $converter->{'formatters'}->[-1]->{'_top_formatter'} = 1;
return $converter;
}
@@ -305,6 +306,9 @@
my $type = shift;
my $conf = shift;
+ my $first_indent_length = $conf->{'first_indent_length'};
+ delete $conf->{'first_indent_length'};
+
my $container;
my $container_conf = {
'max' => $self->{'format_context'}->[-1]->{'max'},
@@ -318,8 +322,18 @@
$container_conf->{$key} = $conf->{$key};
}
}
- $container_conf->{'indent_length'} =
$indent_length*$container_conf->{'indent_level'}
- if (!defined($container_conf->{'indent_length'}));
+ my $indent = $container_conf->{'indent_length'};
+ $indent = $indent_length*$container_conf->{'indent_level'}
+ if (!defined($indent));
+ if ($first_indent_length) {
+ $container_conf->{'indent_length'} = $first_indent_length;
+ $container_conf->{'indent_length_next'} = $indent;
+ } else {
+ $container_conf->{'indent_length'} = $indent;
+ }
+
+ #$container_conf->{'indent_length'} =
$indent_length*$container_conf->{'indent_level'}
+ # if (!defined($container_conf->{'indent_length'}));
if ($type eq 'line') {
$container = Texinfo::Convert::Line->new($container_conf);
} elsif ($type eq 'paragraph') {
@@ -428,10 +442,10 @@
my $self = shift;
my $root = shift;
- my $container_context;
- if (@{$self->{'formatters'}}) {
- $container_context = $self->{'formatters'}->[-1];
- }
+ #my $formatter;
+ #if (@{$self->{'formatters'}}) {
+ my $formatter = $self->{'formatters'}->[-1];
+ #}
if ($self->{'debug'}) {
print STDERR "ROOT (@{$self->{'context'}}|@{$self->{'format_context'}})";
print STDERR " format_context:
$self->{'format_context'}->[-1]->{'cmdname'},
$self->{'format_context'}->[-1]->{'paragraph_count'},
$self->{'format_context'}->[-1]->{'indent_level'},
$self->{'format_context'}->[-1]->{'counter'},
$self->{'format_context'}->[-1]->{'max'}\n";
@@ -441,9 +455,9 @@
print STDERR " Text: $root->{'text'}\n" if (defined($root->{'text'}));
#print STDERR " Special def_command: $root->{'extra'}->{'def_command'}\n"
# if (defined($root->{'extra'}) and $root->{'extra'}->{'def_command'});
- if ($container_context) {
- print STDERR "
Container:($container_context->{'code'},$container_context->{'upper_case'},$container_context->{'preformatted'},$container_context->{'frenchspacing_stack'}->[-1])
";
- $container_context->{'container'}->dump();
+ if ($formatter) {
+ print STDERR "
Container:($formatter->{'code'},$formatter->{'upper_case'},$formatter->{'preformatted'},$formatter->{'frenchspacing_stack'}->[-1])
";
+ $formatter->{'container'}->dump();
}
}
@@ -482,13 +496,13 @@
if ($root->{'type'} and $root->{'type'} eq 'bracketed'
and $self->{'context'}->[-1] eq 'math') {
- $result .= $container_context->{'container'}->add_text('{');
+ $result .= $formatter->{'container'}->add_text('{');
}
if (defined($root->{'text'})) {
- if ($container_context) {
- $result .= $container_context->{'container'}->add_text(
- $self->process_text($root, $container_context));
+ if (!$formatter->{'_top_formatter'}) {
+ $result .= $formatter->{'container'}->add_text(
+ $self->process_text($root, $formatter));
# ignore text outside of any format, but warn if ignored text not empty
} elsif ($root->{'text'} =~ /\S/) {
warn "BUG: ignored text not empty `$root->{'text'}'\n";
@@ -500,16 +514,16 @@
my $command = $root->{'cmdname'};
if (defined($text_no_brace_commands{$root->{'cmdname'}})) {
if ($command eq ':') {
- $container_context->{'container'}->inhibit_end_sentence();
+ $formatter->{'container'}->inhibit_end_sentence();
} elsif ($command eq '*') {
- $result .= $container_context->{'container'}->add_pending_word();
- $result .= $container_context->{'container'}->end_line();
+ $result .= $formatter->{'container'}->add_pending_word();
+ $result .= $formatter->{'container'}->end_line();
} elsif ($command eq '.' or $command eq '?' or $command eq '!') {
- $result .= $container_context->{'container'}->add_next($command,
undef, 1),
+ $result .= $formatter->{'container'}->add_next($command, undef, 1),
} elsif ($command eq ' ' or $command eq "\n" or $command eq "\t") {
- $result .=
$container_context->{'container'}->add_next($text_no_brace_commands{$root->{'cmdname'}});
+ $result .=
$formatter->{'container'}->add_next($text_no_brace_commands{$root->{'cmdname'}});
} else {
- $result .=
$container_context->{'container'}->add_text($text_no_brace_commands{$root->{'cmdname'}});
+ $result .=
$formatter->{'container'}->add_text($text_no_brace_commands{$root->{'cmdname'}});
}
return $result;
} elsif (defined($text_brace_no_arg_commands{$root->{'cmdname'}})) {
@@ -518,47 +532,47 @@
and defined($root->{'extra'}->{'clickstyle'})
and
defined($text_brace_no_arg_commands{$root->{'extra'}->{'clickstyle'}}));
if ($command eq 'enddots') {
- $result .=
$container_context->{'container'}->add_next($text_brace_no_arg_commands{$command},
undef, 1),
+ $result .=
$formatter->{'container'}->add_next($text_brace_no_arg_commands{$command},
undef, 1),
} else {
- $result .=
$container_context->{'container'}->add_text($text_brace_no_arg_commands{$command});
+ $result .=
$formatter->{'container'}->add_text($text_brace_no_arg_commands{$command});
if ($command eq 'dots') {
- $container_context->{'container'}->inhibit_end_sentence();
+ $formatter->{'container'}->inhibit_end_sentence();
}
}
return $result;
# commands with braces
} elsif ($accent_commands{$root->{'cmdname'}}) {
- $result .= $container_context->{'container'}->add_text(
+ $result .= $formatter->{'container'}->add_text(
Texinfo::Convert::Text::text_accents($root, $self->{'encoding'}));
return $result;
} elsif ($style_map{$command}) {
if ($code_style_commands{$command}) {
- $container_context->{'code'}++;
- push @{$container_context->{'frenchspacing_stack'}}, 1;
- $container_context->{'container'}->set_space_protection(undef,
+ $formatter->{'code'}++;
+ push @{$formatter->{'frenchspacing_stack'}}, 1;
+ $formatter->{'container'}->set_space_protection(undef,
undef,undef,1);
}
- $container_context->{'upper_case'}++ if ($upper_case_commands{$command});
+ $formatter->{'upper_case'}++ if ($upper_case_commands{$command});
if ($command eq 'w') {
- $container_context->{'w'}++;
- $container_context->{'container'}->set_space_protection(1,1)
- if ($container_context->{'w'} == 1);
+ $formatter->{'w'}++;
+ $formatter->{'container'}->set_space_protection(1,1)
+ if ($formatter->{'w'} == 1);
}
- $result .=
$container_context->{'container'}->add_text($style_map{$command}->[0]);
+ $result .=
$formatter->{'container'}->add_text($style_map{$command}->[0]);
$result .= $self->convert($root->{'args'}->[0]) if ($root->{'args'});
- $result .=
$container_context->{'container'}->add_text($style_map{$command}->[1]);
+ $result .=
$formatter->{'container'}->add_text($style_map{$command}->[1]);
if ($command eq 'w') {
- $container_context->{'w'}--;
- $container_context->{'container'}->set_space_protection(0,0)
- if ($container_context->{'w'} == 0);
+ $formatter->{'w'}--;
+ $formatter->{'container'}->set_space_protection(0,0)
+ if ($formatter->{'w'} == 0);
}
if ($code_style_commands{$command}) {
- $container_context->{'code'}--;
- pop @{$container_context->{'frenchspacing_stack'}};
- $container_context->{'container'}->set_space_protection(undef,
- undef, undef, $container_context->{'frenchspacing_stack'}->[-1]);
+ $formatter->{'code'}--;
+ pop @{$formatter->{'frenchspacing_stack'}};
+ $formatter->{'container'}->set_space_protection(undef,
+ undef, undef, $formatter->{'frenchspacing_stack'}->[-1]);
}
- $container_context->{'upper_case'}-- if ($upper_case_commands{$command});
+ $formatter->{'upper_case'}-- if ($upper_case_commands{$command});
} elsif ($root->{'cmdname'} eq 'image') {
# FIXME
#return $self->convert($root->{'args'}->[0]);
@@ -594,7 +608,7 @@
@contents = (@{$root->{'extra'}->{'brace_command_contents'}->[1]},
{'text' => ' ('},
{'type' => 'code',
- 'contents' =>
address@hidden>{'extra'}->{'brace_command_contents'}->[0]}]
+ 'contents' =>
$root->{'extra'}->{'brace_command_contents'}->[0]
},
{'text' => ')'});
} else {
@@ -636,7 +650,7 @@
if (defined($args[3])) {
$file = [{'text' => '('},
{'type' => 'code',
- 'contents' => address@hidden,
+ 'contents' => $args[3]},
{'text' => ')'},];
} elsif (defined($args[4])) {
# FIXME this is a bit strange.
@@ -649,7 +663,7 @@
}
# node name
push @contents, ({'type' => 'code',
- 'contents' => address@hidden);
+ 'contents' => $args[0]});
push @contents, {'text' => '.'} if ($command eq 'pxref');
} else {
push @contents, (@{$args[0]}, {'text' => '::'});
@@ -663,7 +677,7 @@
# in abbr spaces never end a sentence.
if ($command eq 'abbr') {
@contents = ({'type' => 'frenchspacing',
- 'contents' =>
address@hidden>{'extra'}->{'brace_command_contents'}->[0]}]});
+ 'contents' =>
$root->{'extra'}->{'brace_command_contents'}->[0]});
} else {
@contents = @{$root->{'extra'}->{'brace_command_contents'}->[0]};
}
@@ -681,6 +695,12 @@
pop @{$self->{'context'}};
return $result;
# could this be used otherwise?
+ } elsif ($command eq 'titlefont') {
+ $result .= $self->convert_line ($root->{'args'}->[0]);
+ chomp($result);
+ $result .= "\n";
+ $self->{'format_context'}->[-1]->{'counter'} +=
+ Texinfo::Convert::Unicode::string_width($result);
} elsif ($root->{'args'} and $root->{'args'}->[0]
and $root->{'args'}->[0]->{'type'}
and $root->{'args'}->[0]->{'type'} eq 'brace_command_arg') {
@@ -699,8 +719,8 @@
# enumerate
# menu
# def
- # group and raggedright -> nothing on format stack
# cartouche
+ # group and raggedright -> nothing on format stack
# flushleft and flushright -> keep track of result and add space
# at the end. do something specific here or at the end?
# punctuation munging is done, but end of lines are kept.
@@ -753,10 +773,10 @@
if ($root->{'parent'}->{'extra'} and
$root->{'parent'}->{'extra'}->{'command_as_argument'}) {
$contents = [{'cmdname' =>
$root->{'parent'}->{'extra'}->{'command_as_argument'},
'args' => [{'type' => 'brace_command_arg',
- 'contents' => address@hidden
+ 'contents' => $contents}]
}];
}
- $result = $self->convert_line({'contents' => address@hidden,
+ $result = $self->convert_line({'contents' => $contents},
{'indent_level' =>
$self->{'format_context'}->[-1]->{'indent_level'} -1});
chomp ($result);
$result .= "\n";
@@ -862,7 +882,15 @@
# my $paragraphindent = get_conf('paragraphindent');
# $paragraphindent = 0 if ($paragraphindent eq 'none');
# if ($paragraphindent ne 'asis' and $paragraphindent and
$line_char_counter == 0 and (defined($content->{'paragraph_in_element_nr'}))
and ($info_state->{'indent_para'} or (!defined($info_state->{'indent_para'})
and ($content->{'paragraph_in_element_nr'} or (get_conf('firstparagraphindent')
eq 'insert')))))
- $paragraph = $self->new_formatter('paragraph');
+ my $conf;
+ if ($self->{'format_context'}->[-1]->{'cmdname'} eq '_top_format'
+ and ($self->{'format_context'}->[-1]->{'paragraph_count'}
+ or $self->{'firstparagraphindent'} eq 'insert')
+ and $self->{'paragraphindent'} ne 'asis' and
$self->{'paragraphindent'}
+ and !$self->{'format_context'}->[-1]->{'counter'}) {
+ $conf->{'first_indent_length'} = $self->{'paragraphindent'};
+ }
+ $paragraph = $self->new_formatter('paragraph', $conf);
push @{$self->{'formatters'}}, $paragraph;
$self->{'format_context'}->[-1]->{'paragraph_count'}++;
} elsif ($root->{'type'} eq 'def_line') {
@@ -925,13 +953,13 @@
$result .= $self->convert($arg);
}
} elsif ($root->{'type'} eq 'frenchspacing') {
- push @{$container_context->{'frenchspacing_stack'}}, 1;
- $container_context->{'container'}->set_space_protection(undef,
+ push @{$formatter->{'frenchspacing_stack'}}, 1;
+ $formatter->{'container'}->set_space_protection(undef,
undef,undef,1);
} elsif ($root->{'type'} eq 'code') {
- $container_context->{'code'}++;
- push @{$container_context->{'frenchspacing_stack'}}, 1;
- $container_context->{'container'}->set_space_protection(undef,
+ $formatter->{'code'}++;
+ push @{$formatter->{'frenchspacing_stack'}}, 1;
+ $formatter->{'container'}->set_space_protection(undef,
undef,undef,1);
}
}
@@ -953,17 +981,17 @@
}
if ($root->{'type'}) {
if ($root->{'type'} eq 'frenchspacing') {
- pop @{$container_context->{'frenchspacing_stack'}};
- $container_context->{'container'}->set_space_protection(undef,
- undef, undef, $container_context->{'frenchspacing_stack'}->[-1]);
+ pop @{$formatter->{'frenchspacing_stack'}};
+ $formatter->{'container'}->set_space_protection(undef,
+ undef, undef, $formatter->{'frenchspacing_stack'}->[-1]);
} elsif ($root->{'type'} eq 'code') {
- $container_context->{'code'}--;
- pop @{$container_context->{'frenchspacing_stack'}};
- $container_context->{'container'}->set_space_protection(undef,
- undef, undef, $container_context->{'frenchspacing_stack'}->[-1]);
+ $formatter->{'code'}--;
+ pop @{$formatter->{'frenchspacing_stack'}};
+ $formatter->{'container'}->set_space_protection(undef,
+ undef, undef, $formatter->{'frenchspacing_stack'}->[-1]);
} elsif ($root->{'type'} eq 'bracketed'
and $self->{'context'}->[-1] eq 'math') {
- $result .= $container_context->{'container'}->add_text('}');
+ $result .= $formatter->{'container'}->add_text('}');
}
}
if ($paragraph) {
Index: t/05paragraph.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/05paragraph.t,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/05paragraph.t 23 Oct 2010 15:36:53 -0000 1.8
+++ t/05paragraph.t 23 Nov 2010 19:46:37 -0000 1.9
@@ -29,7 +29,10 @@
p before sp
@sp 4
-inew p after sp'],
+inew p after sp'
+]);
+
+my @test_invalid = (
['paragraph_in_style_command',
'a 2 paragraphs sample @samp{in first paragraph
@@ -43,7 +46,11 @@
']
);
+foreach my $test (@test_cases) {
+ $test->[2]->{'test_formats'} = ['plaintext'];
+}
+
our ($arg_test_case, $arg_generate, $arg_debug);
-run_all ('paragraph', address@hidden, $arg_test_case,
+run_all ('paragraph', address@hidden, @test_invalid], $arg_test_case,
$arg_generate, $arg_debug);
Index: t/results/coverage/math.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/math.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/coverage/math.pl 20 Nov 2010 17:05:41 -0000 1.14
+++ t/results/coverage/math.pl 23 Nov 2010 19:46:37 -0000 1.15
@@ -371,11 +371,11 @@
$result_converted{'plaintext'}->{'math'} = 'Simple math {x^i}\\over{\\tan y}
-Math with @-command `math code\' a < b
+ Math with @-command `math code\' a < b
-Complex \\underline{`math \\hbox{ code }\'} \\i \\sum_{i}{\\underline{f}}
+ Complex \\underline{`math \\hbox{ code }\'} \\i \\sum_{i}{\\underline{f}}
address@hidden outside of math \\
+ @\\ outside of math \\
';
Index: t/results/coverage/nested_block_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/nested_block_commands.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/coverage/nested_block_commands.pl 20 Nov 2010 23:35:41 -0000
1.14
+++ t/results/coverage/nested_block_commands.pl 23 Nov 2010 19:46:37 -0000
1.15
@@ -1096,18 +1096,18 @@
in quotation
-In group
+ In group
in quotation
-after quotation
+ after quotation
-In group sp b
+ In group sp b
in quotation
-In group sp b a
+ In group sp b a
in quotation
-In group sp a
+ In group sp a
in quotation
@@ -1119,14 +1119,14 @@
in quotation
-After quotation sp b
+ After quotation sp b
in quotation
-After quotation sp a
+ After quotation sp a
in quotation
-After quotation sp b a
+ After quotation sp b a
';
Index: t/results/paragraph/close_paragraph_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/paragraph/close_paragraph_command.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/paragraph/close_paragraph_command.pl 20 Nov 2010 16:58:08
-0000 1.21
+++ t/results/paragraph/close_paragraph_command.pl 23 Nov 2010 19:46:37
-0000 1.22
@@ -154,4 +154,17 @@
$result_errors{'close_paragraph_command'} = [];
+
+$result_converted{'plaintext'}->{'close_paragraph_command'} = 'para
+in titlefont
+ after titlefont.
+
+ p before sp
+
+
+
+
+ inew p after sp
+';
+
1;
Index: t/results/paragraph/comment_between_text.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/paragraph/comment_between_text.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/paragraph/comment_between_text.pl 20 Nov 2010 16:58:08 -0000
1.11
+++ t/results/paragraph/comment_between_text.pl 23 Nov 2010 19:46:37 -0000
1.12
@@ -51,4 +51,8 @@
$result_errors{'comment_between_text'} = [];
+
+$result_converted{'plaintext'}->{'comment_between_text'} = 'text end para
+';
+
1;
Index: t/results/paragraph/no_paragraph_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/paragraph/no_paragraph_commands.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/paragraph/no_paragraph_commands.pl 20 Nov 2010 16:58:08
-0000 1.14
+++ t/results/paragraph/no_paragraph_commands.pl 23 Nov 2010 19:46:37
-0000 1.15
@@ -166,4 +166,9 @@
$result_errors{'no_paragraph_commands'} = [];
+
+$result_converted{'plaintext'}->{'no_paragraph_commands'} = '
+title font
+';
+
1;
Index: t/results/paragraph/paragraph_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/paragraph/paragraph_command.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/paragraph/paragraph_command.pl 20 Nov 2010 16:58:08 -0000
1.13
+++ t/results/paragraph/paragraph_command.pl 23 Nov 2010 19:46:37 -0000
1.14
@@ -80,4 +80,10 @@
$result_errors{'paragraph_command'} = [];
+
+$result_converted{'plaintext'}->{'paragraph_command'} = '@
+
+ aaa.
+';
+
1;
Index: t/results/paragraph/text.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/paragraph/text.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/paragraph/text.pl 20 Nov 2010 16:58:08 -0000 1.11
+++ t/results/paragraph/text.pl 23 Nov 2010 19:46:37 -0000 1.12
@@ -28,4 +28,8 @@
$result_errors{'text'} = [];
+
+$result_converted{'plaintext'}->{'text'} = 'text
+';
+
1;
Index: t/results/paragraph/text_comment.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/paragraph/text_comment.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/paragraph/text_comment.pl 20 Nov 2010 16:58:08 -0000 1.11
+++ t/results/paragraph/text_comment.pl 23 Nov 2010 19:46:37 -0000 1.12
@@ -41,4 +41,8 @@
$result_errors{'text_comment'} = [];
+
+$result_converted{'plaintext'}->{'text_comment'} = 'text
+';
+
1;
Index: t/results/paragraph/text_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/paragraph/text_line.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/paragraph/text_line.pl 20 Nov 2010 16:58:08 -0000 1.12
+++ t/results/paragraph/text_line.pl 23 Nov 2010 19:46:37 -0000 1.13
@@ -49,4 +49,10 @@
$result_errors{'text_line'} = [];
+
+$result_converted{'plaintext'}->{'text_line'} = '
+text
+
+';
+
1;
Index: t/results/paragraph/text_space_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/paragraph/text_space_comment.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/paragraph/text_space_comment.pl 20 Nov 2010 16:58:09 -0000
1.13
+++ t/results/paragraph/text_space_comment.pl 23 Nov 2010 19:46:37 -0000
1.14
@@ -47,4 +47,8 @@
$result_errors{'text_space_comment'} = [];
+
+$result_converted{'plaintext'}->{'text_space_comment'} = 'text
+';
+
1;
Index: t/results/paragraph/two_lines.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/paragraph/two_lines.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/paragraph/two_lines.pl 20 Nov 2010 16:58:09 -0000 1.11
+++ t/results/paragraph/two_lines.pl 23 Nov 2010 19:46:37 -0000 1.12
@@ -39,4 +39,8 @@
$result_errors{'two_lines'} = [];
+
+$result_converted{'plaintext'}->{'two_lines'} = 'text l 1 text l 2
+';
+
1;
- texinfo/tp Texinfo/Convert/Plaintext.pm t/05par...,
Patrice Dumas <=