texinfo/tp Texinfo/Convert/Plaintext.pm t/02cov...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/02/08 21:08:03

Modified files:
        tp/Texinfo/Convert: Plaintext.pm 
        tp/t           : 02coverage.t 
        tp/t/results/coverage: exdent_and_commands.pl 
                               exdent_and_formats.pl 

Log message:
        Exdent in preformatted should abide to the preformatting context.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/02coverage.t?cvsroot=texinfo&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_commands.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_formats.pl?cvsroot=texinfo&r1=1.4&r2=1.5

Patches:
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- Texinfo/Convert/Plaintext.pm        8 Feb 2011 00:27:38 -0000       1.77
+++ Texinfo/Convert/Plaintext.pm        8 Feb 2011 21:08:03 -0000       1.78
@@ -614,7 +614,6 @@
   return $text;
 }
 
-#Â not used
 sub convert_unfilled($$;$)
 {
   my $self = shift;
@@ -1680,9 +1679,15 @@
       $self->{'format_context'}->[-1]->{'paragraph_count'}++;
       return $result;
     } elsif ($root->{'cmdname'} eq 'exdent') {
+      if ($preformatted_context_commands{$self->{'context'}->[-1]}) {
+        $result = $self->convert_unfilled({'contents' => 
$root->{'extra'}->{'misc_content'}},
+         {'indent_level'
+          => $self->{'format_context'}->[-1]->{'indent_level'} -1});
+      } else {
       $result = $self->convert_line ({'contents' => 
$root->{'extra'}->{'misc_content'}},
          {'indent_level' 
           => $self->{'format_context'}->[-1]->{'indent_level'} -1});
+      }
       if ($result ne '') {
         $result = $self->ensure_end_of_line($result);
         $self->{'empty_lines_count'} = 0;

Index: t/02coverage.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/02coverage.t,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- t/02coverage.t      3 Feb 2011 23:38:02 -0000       1.34
+++ t/02coverage.t      8 Feb 2011 21:08:03 -0000       1.35
@@ -314,7 +314,7 @@
 
 
 @example
address@hidden exdented
address@hidden exdented  and dash --- in example
 Not exdented
 @exdent exdented
 Not exdented
@@ -353,7 +353,7 @@
 @end example
 
 @quotation
address@hidden exdented quotation line
address@hidden exdented quotation line   and dash --- in quotation
 @end quotation
 
 @quotation

Index: t/results/coverage/exdent_and_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/exdent_and_commands.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/coverage/exdent_and_commands.pl   30 Jan 2011 17:00:49 -0000      
1.3
+++ t/results/coverage/exdent_and_commands.pl   8 Feb 2011 21:08:03 -0000       
1.4
@@ -413,7 +413,7 @@
 in exdented protected eol  
      following
 in exdented a @*
-and following
+ and following
      after exdented
 ';
 

Index: t/results/coverage/exdent_and_formats.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/exdent_and_formats.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage/exdent_and_formats.pl    31 Jan 2011 00:37:22 -0000      
1.4
+++ t/results/coverage/exdent_and_formats.pl    8 Feb 2011 21:08:03 -0000       
1.5
@@ -151,7 +151,7 @@
                 },
                 {
                   'parent' => {},
-                  'text' => 'exdented'
+                  'text' => 'exdented  and dash --- in example'
                 },
                 {
                   'parent' => {},
@@ -572,7 +572,7 @@
                 },
                 {
                   'parent' => {},
-                  'text' => 'exdented quotation line'
+                  'text' => 'exdented quotation line   and dash --- in 
quotation'
                 },
                 {
                   'parent' => {},
@@ -1318,7 +1318,7 @@
 
 
 @example
address@hidden exdented
address@hidden exdented  and dash --- in example
 Not exdented
 @exdent exdented
 Not exdented
@@ -1357,7 +1357,7 @@
 @end example
 
 @quotation
address@hidden exdented quotation line
address@hidden exdented quotation line   and dash --- in quotation
 @end quotation
 
 @quotation
@@ -1399,7 +1399,7 @@
 not exdented
 
 
-exdented
+exdented  and dash --- in example
 Not exdented
 exdented
 Not exdented
@@ -1426,7 +1426,7 @@
 Nested Other line
 exdented nested other line
 
-exdented quotation line
+exdented quotation line   and dash --- in quotation
 
 Not exdented followed by exdented
 exdented quotation line
@@ -1457,7 +1457,7 @@
 Other line
      not exdented
 
-exdented
+exdented  and dash --- in example
      Not exdented
 exdented
      Not exdented
@@ -1484,7 +1484,7 @@
           Nested Other line
      exdented nested other line
 
-exdented quotation line
+exdented quotation line and dash -- in quotation
 
      Not exdented followed by exdented
 exdented quotation line