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

[Patrice Dumas]

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

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

Log message:
        Really capitalize when in @sc or @var.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/02coverage.t?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.28&r2=1.29

Patches:
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- Texinfo/Convert/Plaintext.pm        1 Jan 2011 12:56:16 -0000       1.44
+++ Texinfo/Convert/Plaintext.pm        1 Jan 2011 13:55:01 -0000       1.45
@@ -242,6 +242,7 @@
   'output_file'          => undef,
   'documentlanguage'     => 'en',
   'number_footnotes'     => 1,
+  'file_bytes_count'     => 0,
   'split_size'           => 300000,
   'expanded_formats'     => undef,
   'include_directories'  => undef,
@@ -390,7 +391,7 @@
     $converter->{'ignored_commands'}->{$format} = 1 
        unless ($converter->{'expanded_formats_hash'}->{$format});
   }
-  $converter->Texinfo::Report::new;
+  $converter->Texinfo::Report::new();
 
   return $converter;
 }
@@ -463,7 +464,7 @@
   my $context = shift;
   my $text = $command->{'text'};
 
-  $text = uc($text) if ($self->{'upper_case'});
+  $text = uc($text) if ($self->{'formatters'}->[-1]->{'upper_case'});
   if ($self->{'enable_encoding'} and $self->{'documentencoding'} 
       and $self->{'documentencoding'} eq 'utf-8') {
     return Texinfo::Convert::Unicode($self, $command);

Index: t/02coverage.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/02coverage.t,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/02coverage.t      6 Dec 2010 21:46:28 -0000       1.29
+++ t/02coverage.t      1 Jan 2011 13:55:01 -0000       1.30
@@ -6,7 +6,8 @@
 ['commands','@@ @TeX{} @
 @"e @address@hidden @~{a} @ringaccent a
 @clicksequence{File @click{} address@hidden
address@hidden, b}
address@hidden, b} @code{code --- -- \'\' ``}
+--- -- \'\' ``. @sc{small caps}.
 
 @cindex index entry in text @LaTeX{}
 

Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/coverage/commands.pl      7 Dec 2010 20:34:27 -0000       1.28
+++ t/results/coverage/commands.pl      1 Jan 2011 13:55:01 -0000       1.29
@@ -216,8 +216,55 @@
         },
         {
           'parent' => {},
+          'text' => ' '
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'code --- -- \'\' ``'
+                }
+              ],
+              'parent' => {},
+              'type' => 'brace_command_arg'
+            }
+          ],
+          'cmdname' => 'code',
+          'contents' => [],
+          'parent' => {}
+        },
+        {
+          'parent' => {},
           'text' => '
 '
+        },
+        {
+          'parent' => {},
+          'text' => '--- -- \'\' ``. '
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'small caps'
+                }
+              ],
+              'parent' => {},
+              'type' => 'brace_command_arg'
+            }
+          ],
+          'cmdname' => 'sc',
+          'contents' => [],
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '.
+'
         }
       ],
       'parent' => {},
@@ -281,7 +328,7 @@
       },
       'line_nr' => {
         'file_name' => '',
-        'line_nr' => 6,
+        'line_nr' => 7,
         'macro' => ''
       },
       'parent' => {}
@@ -343,7 +390,7 @@
       'level' => 1,
       'line_nr' => {
         'file_name' => '',
-        'line_nr' => 8,
+        'line_nr' => 9,
         'macro' => ''
       },
       'parent' => {}
@@ -389,6 +436,15 @@
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'extra'}{'brace_command_contents'}[1][0]
 = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'args'}[1]{'contents'}[1];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[16]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[17]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[18]{'args'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'parent'} 
= $result_trees{'commands'}{'contents'}[0]{'contents'}[18];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[18]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[19]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[20]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[21]{'args'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'parent'} 
= $result_trees{'commands'}{'contents'}[0]{'contents'}[21];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[21]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
+$result_trees{'commands'}{'contents'}[0]{'contents'}[22]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 $result_trees{'commands'}{'contents'}[0]{'parent'} = $result_trees{'commands'};
 $result_trees{'commands'}{'contents'}[1]{'parent'} = $result_trees{'commands'};
 $result_trees{'commands'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'commands'}{'contents'}[2]{'args'}[0];
@@ -417,7 +473,8 @@
 $result_texis{'commands'} = '@@ @TeX{} @
 @"e @address@hidden @~{a} @ringaccent a
 @clicksequence{File @click{} address@hidden
address@hidden, b}
address@hidden, b} @code{code --- -- \'\' ``}
+--- -- \'\' ``. @sc{small caps}.
 
 @cindex index entry in text @LaTeX{}
 
@@ -427,7 +484,8 @@
 
 $result_texts{'commands'} = '@ TeX  e" i^ a~ a*
 File -> Open.
-b
+b code --- -- \'\' ``
+--- -- \'\' ``. small caps.
 
 
 majorheading in b
@@ -438,7 +496,8 @@
 
 
 
-$result_converted{'plaintext'}->{'commands'} = '@ TeX  e" i^ a~ a* File -> 
Open.  b <a>
+$result_converted{'plaintext'}->{'commands'} = '@ TeX  e" i^ a~ a* File -> 
Open.  b <a> `code --- -- \'\' ``\' -- - " ".
+SMALL CAPS.
 
 majorheading in b
 *****************