texinfo/Pod-Simple-Texinfo lib/Pod/Simple/Texin...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/02/11 20:30:25

Modified files:
        Pod-Simple-Texinfo/lib/Pod/Simple: Texinfo.pm 
        Pod-Simple-Texinfo/t: Pod-Simple-Texinfo.t 

Log message:
        Come back to using @verbatim for Verbatim blocks.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t?cvsroot=texinfo&r1=1.8&r2=1.9

Patches:
Index: lib/Pod/Simple/Texinfo.pm
===================================================================
RCS file: 
/sources/texinfo/texinfo/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- lib/Pod/Simple/Texinfo.pm   9 Feb 2012 21:55:05 -0000       1.12
+++ lib/Pod/Simple/Texinfo.pm   11 Feb 2012 20:30:25 -0000      1.13
@@ -383,8 +383,7 @@
 );
 
 my %environment_commands = (
-#  'Verbatim' => 'verbatim',
-  'Verbatim' => 'format',
+  'Verbatim' => 'verbatim',
   'over-text' => 'table @asis',
   'over-bullet' => 'itemize',
   'over-number' => 'enumerate',
@@ -541,15 +540,15 @@
       }
     } elsif ($type eq 'text') {
       my $text;
-      if (@format_stack and ref($format_stack[-1])
-          and 
defined($self->{'texinfo_raw_format_commands'}->{$format_stack[-1]})
-          and !$self->{'texinfo_raw_format_commands'}->{$format_stack[-1]}) {
+      if (@format_stack and !ref($format_stack[-1])
+          and 
((defined($self->{'texinfo_raw_format_commands'}->{$format_stack[-1]})
+                and 
!$self->{'texinfo_raw_format_commands'}->{$format_stack[-1]})
+               or ($format_stack[-1] eq 'verbatim'))) {
         $text = $token->text();
       } else {
         $text = _protect_text($token->text());
         if (@format_stack and !ref($format_stack[-1])
-            and ($format_stack[-1] eq 'verbatim' 
-                 or 
$self->{'texinfo_raw_format_commands'}->{$format_stack[-1]})) {
+            and ($self->{'texinfo_raw_format_commands'}->{$format_stack[-1]})) 
{
           $text =~ s/^(\s*)#(\s*(line)? (\d+)( 
"([^"]+)")?(\s+\d+)*\s*)$/address@hidden/mg;
         }
       }

Index: t/Pod-Simple-Texinfo.t
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/Pod-Simple-Texinfo.t      9 Feb 2012 21:55:05 -0000       1.8
+++ t/Pod-Simple-Texinfo.t      11 Feb 2012 20:30:25 -0000      1.9
@@ -219,21 +219,21 @@
 
   # line 4 "bbb"
   # 7 "aaaa"
-', '@chapter head
+','@chapter head
 @anchor{head}
 
address@hidden
- @hashchar{} line 4 "ggggg"
- and @@
- @hashchar{} line 5 "fff"
address@hidden format
address@hidden
+ # line 4 "ggggg"
+ and @
+ # line 5 "fff"
address@hidden verbatim
 
 Text
 
address@hidden
-  @hashchar{} line 4 "bbb"
-  @hashchar{} 7 "aaaa"
address@hidden format
address@hidden
+  # line 4 "bbb"
+  # 7 "aaaa"
address@hidden verbatim
 
 ', 'cpp lines in verbatim');