texinfo/tp Texinfo/Convert/Plaintext.pm t/resul...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/01/01 16:11:01

Modified files:
        tp/Texinfo/Convert: Plaintext.pm 
        tp/t/results/coverage: multitable.pl 
        tp/t/results/float: numbering_captions_listoffloats.pl 
        tp/t/results/multitable: multitable_in_example.pl 
                                 paragraph_in_cells.pl 

Log message:
        Better spacing in multitable and caption.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_in_example.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/paragraph_in_cells.pl?cvsroot=texinfo&r1=1.2&r2=1.3

Patches:
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- Texinfo/Convert/Plaintext.pm        1 Jan 2011 13:55:01 -0000       1.45
+++ Texinfo/Convert/Plaintext.pm        1 Jan 2011 16:11:00 -0000       1.46
@@ -1307,7 +1307,7 @@
             print STDERR " MULTITABLE_PROTO {$formatted_prototype}\n" 
               if ($self->{'debug'});
             push @$columnsize, 
-                  
Texinfo::Convert::Unicode::string_width($formatted_prototype);
+                 
2+Texinfo::Convert::Unicode::string_width($formatted_prototype);
           }
         }
         print STDERR "MULTITABLE_SIZES @$columnsize\n" if ($self->{'debug'});
@@ -1462,7 +1462,8 @@
           and $self->{'floats'} 
           and $self->{'floats'}->{$root->{'extra'}->{'type'}->{'normalized'}}
           and 
@{$self->{'floats'}->{$root->{'extra'}->{'type'}->{'normalized'}}}) {
-        $result = "* Menu:\n\n";
+        $result .= "\n" if (!$self->{'empty_lines_count'});
+        $result .= "* Menu:\n\n";
         foreach my $float 
(@{$self->{'floats'}->{$root->{'extra'}->{'type'}->{'normalized'}}}) {
           next if 
(!defined($float->{'extra'}->{'block_command_line_contents'}->[1]));
           my $float_entry;
@@ -1500,7 +1501,7 @@
                         'type' => $caption->{'cmdname'}.'_listoffloats'});
             while ($caption_text =~ 
s/^\s*(\p{Unicode::EastAsianWidth::InFullwidth}\s*|\S+\s*)//) {
               my $new_word = $1;
-              $new_word =~ s/\n/ /g;
+              $new_word =~ s/\n//g;
               if ((Texinfo::Convert::Unicode::string_width($new_word) +
                    $line_width) > 
                        ($self->{'format_context'}->[-1]->{'max'} - 3)) {
@@ -1840,11 +1841,11 @@
         } elsif ($root->{'extra'}->{'shortcaption'}) {
           $caption = $root->{'extra'}->{'shortcaption'};
         }
-        if ($self->{'debug'}) {
-          my $caption_texi = 
-            Texinfo::Convert::Texinfo::convert({ 'contents' => 
$caption->{'contents'}});
-          print STDERR "  CAPTION: $caption_texi\n";
-        }
+        #if ($self->{'debug'}) {
+        #  my $caption_texi = 
+        #    Texinfo::Convert::Texinfo::convert({ 'contents' => 
$caption->{'contents'}});
+        #  print STDERR "  CAPTION: $caption_texi\n";
+        #}
         my $type;
         if ($root->{'extra'}->{'type'}) {
           $type = {'contents' => $root->{'extra'}->{'type'}->{'content'}};

Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27

Index: t/results/float/numbering_captions_listoffloats.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/float/numbering_captions_listoffloats.pl  1 Jan 2011 14:28:01 
-0000       1.8
+++ t/results/float/numbering_captions_listoffloats.pl  1 Jan 2011 16:11:01 
-0000       1.9
@@ -7028,7 +7028,7 @@
 * Text 1.3: text in section.             
 * Text 5: unnumbered float.              SC unnumbered float 
 * Text 6: Section within unnumbered float.
-                                         SC Section within ...
+                                         SC Section within unnumbered
 * Text 2.1: Chapter with subsec float.   SC Chapter with subsec 
 * Text 2.2: unnumbered sec float.        SC unnumbered sec float 
 * Text A.1: appendix sec float.          SC appendix sec float 

Index: t/results/multitable/multitable_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_in_example.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3

Index: t/results/multitable/paragraph_in_cells.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/multitable/paragraph_in_cells.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/multitable/paragraph_in_cells.pl  7 Dec 2010 20:34:31 -0000       
1.2
+++ t/results/multitable/paragraph_in_cells.pl  1 Jan 2011 16:11:01 -0000       
1.3
@@ -304,14 +304,14 @@
 
 
 
-$result_converted{'plaintext'}->{'paragraph_in_cells'} = 'trucbidule
-beginbegin
-itemtab
+$result_converted{'plaintext'}->{'paragraph_in_cells'} = 'truc  bidule
+begin begin
+item  tab
     
 new new
 paragraphparagraph
 in  in
-item.tab.
+item. tab.
 
 ';