texinfo/tp/Texinfo Parser.pm Structuring.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        13/01/27 16:07:26

Modified files:
        tp/Texinfo     : Parser.pm Structuring.pm 

Log message:
        Reindent.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.418&r2=1.419
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.144&r2=1.145

Patches:
Index: Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -b -r1.418 -r1.419
--- Parser.pm   26 Jan 2013 14:15:53 -0000      1.418
+++ Parser.pm   27 Jan 2013 16:07:24 -0000      1.419
@@ -5476,14 +5476,16 @@
       
       } else {
         if ($self->{'merged_indices'}->{$name}) {
-          $self->line_warn (sprintf($self->__("Printing an index `%s' merged 
in another one `%s'"), 
+          $self->line_warn (sprintf($self->__(
+                       "Printing an index `%s' merged in another one `%s'"), 
                                      $name, 
$self->{'merged_indices'}->{$name}),
                              $line_nr); 
         }
         if (!defined($self->{'current_node'}) 
             and !defined($self->{'current_section'})
             and !scalar(@{$self->{'regions_stack'}})) {
-          $self->line_warn (sprintf($self->__("Printindex before document 
beginning: address@hidden %s"), 
+          $self->line_warn (sprintf($self->__(
+                     "Printindex before document beginning: address@hidden 
%s"), 
                                     $name), $line_nr);
         }
         $args = [$name];
@@ -5498,32 +5500,41 @@
     if ($line eq 'top' or $line eq 'bottom') {
       $args = [$line];
     } else {
-      $self->line_error (sprintf($self->__("address@hidden arg must be `top' 
or `bottom', not `%s'"), $command, $line), $line_nr);
+      $self->line_error (sprintf($self->__(
+                      "address@hidden arg must be `top' or `bottom', not 
`%s'"), 
+                                 $command, $line), $line_nr);
     }
   } elsif ($command eq 'fonttextsize') {
     if ($line eq '10' or $line eq '11') {
       $args = [$line];
     } else {
-      $self->line_error (sprintf($self->__("Only address@hidden 10 or 11 is 
supported, not `%s'"),$command, $line), $line_nr);
+      $self->line_error (sprintf($self->__(
+                        "Only address@hidden 10 or 11 is supported, not `%s'"),
+                                 $command, $line), $line_nr);
     }
   } elsif ($command eq 'footnotestyle') {
     if ($line eq 'separate' or $line eq 'end') {
       $args = [$line];
     } else {
-      $self->line_error (sprintf($self->__("address@hidden arg must be 
`separate' or `end', not `%s'"), $command, $line), $line_nr);
+      $self->line_error (sprintf($self->__(
+                            "address@hidden arg must be `separate' or `end', 
not `%s'"), 
+                                           $command, $line), $line_nr);
     }
   } elsif ($command eq 'setchapternewpage') {
     if ($line eq 'on' or $line eq 'off' or $line eq 'odd') {
       $args = [$1];
     } else {
-      $self->line_error (sprintf($self->__("address@hidden arg must be `on', 
`off' or `odd', not `%s'"), $command, $line), $line_nr);
+      $self->line_error (sprintf($self->__(
+                           "address@hidden arg must be `on', `off' or `odd', 
not `%s'"), 
+                                 $command, $line), $line_nr);
     }
   } elsif ($command eq 'need') { # only a warning
     if (($line =~ /^([0-9]+(\.[0-9]*)?)$/) or
              ($line =~ /^(\.[0-9]+)$/)) {
       $args = [$1];
     } else {
-      $self->line_error (sprintf($self->__("Bad argument to address@hidden: 
%s"), $command, $line), $line_nr);
+      $self->line_error (sprintf($self->__("Bad argument to address@hidden: 
%s"), 
+                                 $command, $line), $line_nr);
     }
   } elsif ($command eq 'paragraphindent') {
     if ($line =~ /^([\w\-]+)$/) {
@@ -5531,16 +5542,22 @@
       if ($value =~ /^([0-9]+)$/ or $value eq 'none' or $value eq 'asis') {
         $args = [$1];
       } else {
-        $self->line_error (sprintf($self->__("address@hidden arg must be 
numeric/`none'/`asis', not `%s'"), $value), $line_nr);
+        $self->line_error (sprintf($self->__(
+           "address@hidden arg must be numeric/`none'/`asis', not `%s'"), 
+                                             $value), $line_nr);
       } 
     } else {
-      $self->line_error (sprintf($self->__("address@hidden arg must be 
numeric/`none'/`asis', not `%s'"), $line), $line_nr);
+      $self->line_error (sprintf($self->__(
+             "address@hidden arg must be numeric/`none'/`asis', not `%s'"), 
+                                           $line), $line_nr);
     }
   } elsif ($command eq 'firstparagraphindent') {
     if ($line eq 'none' or $line eq 'insert') {
       $args = [$line];
     } else {
-      $self->line_error (sprintf($self->__("address@hidden arg must be `none' 
or `insert', not `%s'"), $line), $line_nr);
+      $self->line_error (sprintf($self->__(
+         "address@hidden arg must be `none' or `insert', not `%s'"), 
+                                           $line), $line_nr);
     }
   } elsif ($command eq 'exampleindent') {
     if ($line =~ /^([0-9]+)/) {
@@ -5548,7 +5565,9 @@
     } elsif ($line =~ /^(asis)$/) {
       $args = [$1];
     } else {
-      $self->line_error (sprintf($self->__("address@hidden arg must be 
numeric/`asis', not `%s'"), $line), $line_nr);
+      $self->line_error (sprintf($self->__(
+           "address@hidden arg must be numeric/`asis', not `%s'"), 
+                                           $line), $line_nr);
     }
   } elsif ($command eq 'frenchspacing' 
            or $command eq 'xrefautomaticsectiontitle'
@@ -5558,7 +5577,8 @@
     if ($line eq 'on' or $line eq 'off') {
       $args = [$line];
     } else {
-      $self->line_error (sprintf($self->__("Expected address@hidden on or off, 
not `%s'"), $command, $line), $line_nr);
+      $self->line_error (sprintf($self->__("Expected address@hidden on or off, 
not `%s'"), 
+                                           $command, $line), $line_nr);
     }
   } elsif ($command eq 'kbdinputstyle') {
     if ($line eq 'code' or $line eq 'example' or $line eq 'distinct') {
@@ -5566,26 +5586,33 @@
           unless (_ignore_global_commands($self));
       $args = [$line];
     } else {
-      $self->line_error (sprintf($self->__("address@hidden arg must be 
`code'/`example'/`distinct', not `%s'"), $line), $line_nr);
+      $self->line_error (sprintf($self->__(
+      "address@hidden arg must be `code'/`example'/`distinct', not `%s'"), 
+                                           $line), $line_nr);
     }
   } elsif ($command eq 'allowcodebreaks') {
     if ($line eq 'true' or $line eq 'false') {
       $args = [$line];
     } else {
-      $self->line_error (sprintf($self->__("address@hidden arg must be `true' 
or `false', not `%s'"), $line), $line_nr);
+      $self->line_error (sprintf($self->__(
+               "address@hidden arg must be `true' or `false', not `%s'"), 
+                                           $line), $line_nr);
     }
   } elsif ($command eq 'urefbreakstyle') {
     if ($line eq 'after' or $line eq 'before' or $line eq 'none') {
       $args = [$line];
     } else {
-      $self->line_error (sprintf($self->__("address@hidden arg must be 
`after'/`before'/`none', not `%s'"), $line), $line_nr);
+      $self->line_error (sprintf($self->__(
+         "address@hidden arg must be `after'/`before'/`none', not `%s'"), 
+                                           $line), $line_nr);
     }
   } elsif ($command eq 'headings') {
     if ($line eq 'off' or $line eq 'on' or $line eq 'single' 
        or $line eq 'double' or  $line eq 'singleafter' or $line eq 
'doubleafter') {
       $args = [$line];
     } else {
-      $self->line_error (sprintf($self->__("Bad argument to address@hidden: 
%s"), $command, $line), $line_nr);
+      $self->line_error (sprintf($self->__("Bad argument to address@hidden: 
%s"), 
+                                 $command, $line), $line_nr);
     }
   }
   return $args;

Index: Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- Structuring.pm      26 Jan 2013 14:49:00 -0000      1.144
+++ Structuring.pm      27 Jan 2013 16:07:25 -0000      1.145
@@ -526,7 +526,7 @@
 # first go through all the menu and set menu_up, menu_next, menu_prev
 # and warn for unknown nodes.
 # then go through all the nodes and set directions
-sub nodes_tree ($)
+sub nodes_tree($)
 {
   my $self = shift;
   return undef unless ($self->{'nodes'} and @{$self->{'nodes'}});