texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp TODO Texinfo/Parser.pm t/results/mac...


From: Patrice Dumas
Subject: texinfo/tp TODO Texinfo/Parser.pm t/results/mac...
Date: Sat, 16 Oct 2010 19:57:50 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/16 19:57:50

Modified files:
        tp             : TODO 
        tp/Texinfo     : Parser.pm 
        tp/t/results/macro: macro_in_misc_commands.pl 
        tp/t/results/misc_commands: sp.pl 
        tp/t/results/paragraph: close_paragraph_command.pl 
        tp/t/results/value: value_in_misc_commands.pl 

Log message:
        @sp only accepts a numeric arg.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_misc_commands.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/sp.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/close_paragraph_command.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_misc_commands.pl?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- TODO        16 Oct 2010 13:41:22 -0000      1.16
+++ TODO        16 Oct 2010 19:57:49 -0000      1.17
@@ -21,8 +21,6 @@
 Test for @columnfractions in a random place and something like
 @multitable aaa @columnfractions 0.3 0.7
 
-parse @sp a bit more.
-
 t/results/macro/macro_in_misc_commands.pl
 some spaces are not counted as empty_spaces_after_command.
 

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- Texinfo/Parser.pm   16 Oct 2010 11:28:38 -0000      1.71
+++ Texinfo/Parser.pm   16 Oct 2010 19:57:50 -0000      1.72
@@ -183,9 +183,7 @@
   'author' => {'arg' => 'line'},
   'subtitle' => {'arg' => 'line'},
   'title' => {'arg' => 'line'},
-  #'sp' => {'skip' => 'line', 'arg' => 1}, # no arg 
-  'sp' => {'arg' => 'line'}, # no arg 
-                              # at the end of line or a numerical arg
+  'sp' => {'arg' => 1}, # numerical arg
   'page' => {'skip' => 'line'}, # no arg (pagebreak)
   'need' => {'arg' => 1}, # one numerical/real arg
   # formatting
@@ -216,12 +214,8 @@
   $brace_commands{$no_arg_command} = 0;
 }
 
-foreach my $accent_command ('"','~','^','`',"'",',','=') {
-  $accent_commands{$accent_command} = 1;
-  $brace_commands{$accent_command} = 1;
-}
-
-foreach my $accent_command('ringaccent','H','dotaccent','u','ubaraccent',
+foreach my $accent_command ('"','~','^','`',"'",',','=',
+                           'ringaccent','H','dotaccent','u','ubaraccent',
                            'udotaccent','v','ogonek','tieaccent') {
   $accent_commands{$accent_command} = 1;
   $brace_commands{$accent_command} = 1;
@@ -2545,6 +2539,12 @@
         }
       }
     }
+  } elsif ($command eq 'sp') {
+    if ($line =~ /^([0-9]+)/) {
+      $args = [$1];
+    } else {
+      _line_error ($self, sprintf($self->__("address@hidden arg must be 
numeric, not `%s'"), $line), $line_nr);
+    }
   } elsif ($command eq 'defindex' || $command eq 'defcodeindex') {
     # REMACRO
     if ($line =~ /^([[:alnum:]][[:alnum:]\-]*)\s*/) {

Index: t/results/macro/macro_in_misc_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/macro/macro_in_misc_commands.pl   16 Oct 2010 13:41:22 -0000      
1.1
+++ t/results/macro/macro_in_misc_commands.pl   16 Oct 2010 19:57:50 -0000      
1.2
@@ -2441,7 +2441,12 @@
         }
       ],
       'cmdname' => 'sp',
-      'parent' => {}
+      'parent' => {},
+      'special' => {
+        'misc_args' => [
+          '2'
+        ]
+      }
     },
     {
       'parent' => {},

Index: t/results/misc_commands/sp.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/sp.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/misc_commands/sp.pl       12 Oct 2010 16:45:08 -0000      1.5
+++ t/results/misc_commands/sp.pl       16 Oct 2010 19:57:50 -0000      1.6
@@ -38,7 +38,12 @@
         }
       ],
       'cmdname' => 'sp',
-      'parent' => {}
+      'parent' => {},
+      'special' => {
+        'misc_args' => [
+          '1'
+        ]
+      }
     },
     {
       'args' => [
@@ -60,7 +65,12 @@
         }
       ],
       'cmdname' => 'sp',
-      'parent' => {}
+      'parent' => {},
+      'special' => {
+        'misc_args' => [
+          '2'
+        ]
+      }
     },
     {
       'contents' => [
@@ -92,7 +102,12 @@
         }
       ],
       'cmdname' => 'sp',
-      'parent' => {}
+      'parent' => {},
+      'special' => {
+        'misc_args' => [
+          '1'
+        ]
+      }
     },
     {
       'contents' => [
@@ -125,7 +140,12 @@
         }
       ],
       'cmdname' => 'sp',
-      'parent' => {}
+      'parent' => {},
+      'special' => {
+        'misc_args' => [
+          '2'
+        ]
+      }
     }
   ]
 };

Index: t/results/paragraph/close_paragraph_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/paragraph/close_paragraph_command.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/paragraph/close_paragraph_command.pl      12 Oct 2010 16:45:08 
-0000      1.6
+++ t/results/paragraph/close_paragraph_command.pl      16 Oct 2010 19:57:50 
-0000      1.7
@@ -78,7 +78,12 @@
         }
       ],
       'cmdname' => 'sp',
-      'parent' => {}
+      'parent' => {},
+      'special' => {
+        'misc_args' => [
+          '4'
+        ]
+      }
     },
     {
       'contents' => [

Index: t/results/value/value_in_misc_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/value/value_in_misc_commands.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/value/value_in_misc_commands.pl   16 Oct 2010 13:41:22 -0000      
1.1
+++ t/results/value/value_in_misc_commands.pl   16 Oct 2010 19:57:50 -0000      
1.2
@@ -2115,7 +2115,12 @@
         }
       ],
       'cmdname' => 'sp',
-      'parent' => {}
+      'parent' => {},
+      'special' => {
+        'misc_args' => [
+          '2'
+        ]
+      }
     },
     {
       'parent' => {},



reply via email to

[Prev in Thread] Current Thread [Next in Thread]