[7529] macros treat formfeeds as whitespace

[gavinsmith0123]

Revision: 7529
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7529
Author:   gavin
Date:     2016-11-21 17:08:30 +0000 (Mon, 21 Nov 2016)
Log Message:
-----------
macros treat formfeeds as whitespace

Modified Paths:
--------------
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/macro/form_feeds.pl

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-11-21 16:56:48 UTC (rev 7528)
+++ trunk/tp/Texinfo/Parser.pm  2016-11-21 17:08:30 UTC (rev 7529)
@@ -2077,7 +2077,7 @@
         if ($braces_level == 1) {
           if (scalar(@$arguments) < $args_total) {
             push @$arguments, '';
-            $line =~ s/^[^\S\f]*//;
+            $line =~ s/^\s*//;
             print STDERR "MACRO NEW ARG\n" if ($self->{'DEBUG'});
           } else {
             # implicit quoting when there is one argument.
@@ -2111,7 +2111,7 @@
       }
     }
   }
-  if ($args_total == 0 and $arguments->[0] =~ /[\S\f]/) {
+  if ($args_total == 0 and $arguments->[0] =~ /\S/) {
     $self->line_error(sprintf($self->__(
                "macro `%s' declared without argument called with an 
argument"), 
                                 $name), $line_nr);
@@ -3918,7 +3918,7 @@
         my $expanded_macro = $self->{'macros'}->{$command}->{'element'};
         my $args_number = scalar(@{$expanded_macro->{'args'}}) -1;
         my $arguments = [];
-        if ($line =~ s/^\s*{[^\S\f]*//) { # macro with args
+        if ($line =~ s/^\s*{\s*//) { # macro with args
           ($arguments, $line, $line_nr) = 
             _expand_macro_arguments($self, $expanded_macro, $line, $line_nr);
         } elsif (($args_number >= 2) or ($args_number <1)) {
@@ -3933,7 +3933,7 @@
             ($line, $line_nr) = _new_line($self, $line_nr, $expanded_macro);
             $line = '' if (!defined($line));
           }
-          $line =~ s/^[^\S\f]*// if ($line =~ /[\S\f]/);
+          $line =~ s/^\s*// if ($line =~ /\S/);
           my $has_end_of_line = chomp $line;
           $arguments = [$line];
           $line = "\n" if ($has_end_of_line);

Modified: trunk/tp/t/results/macro/form_feeds.pl
===================================================================
--- trunk/tp/t/results/macro/form_feeds.pl      2016-11-21 16:56:48 UTC (rev 
7528)
+++ trunk/tp/t/results/macro/form_feeds.pl      2016-11-21 17:08:30 UTC (rev 
7529)
@@ -122,7 +122,7 @@
       'contents' => [
         {
           'parent' => {},
-          'text' => 'f '
+          'text' => 'f arg1'
         }
       ],
       'parent' => {},
@@ -142,47 +142,7 @@
       'contents' => [
         {
           'parent' => {},
-          'text' => 'arg1'
-        }
-      ],
-      'parent' => {},
-      'type' => 'paragraph'
-    },
-    {
-      'parent' => {},
-      'text' => '',
-      'type' => 'empty_line'
-    },
-    {
-      'parent' => {},
-      'text' => ' ',
-      'type' => 'empty_spaces_before_paragraph'
-    },
-    {
-      'contents' => [
-        {
-          'parent' => {},
-          'text' => 'n '
-        }
-      ],
-      'parent' => {},
-      'type' => 'paragraph'
-    },
-    {
-      'parent' => {},
-      'text' => '',
-      'type' => 'empty_line'
-    },
-    {
-      'parent' => {},
-      'text' => ' ',
-      'type' => 'empty_spaces_before_paragraph'
-    },
-    {
-      'contents' => [
-        {
-          'parent' => {},
-          'text' => 'arg2
+          'text' => 'n arg2
 '
         }
       ],
@@ -199,27 +159,7 @@
       'contents' => [
         {
           'parent' => {},
-          'text' => 'g '
-        }
-      ],
-      'parent' => {},
-      'type' => 'paragraph'
-    },
-    {
-      'parent' => {},
-      'text' => '',
-      'type' => 'empty_line'
-    },
-    {
-      'parent' => {},
-      'text' => '  ',
-      'type' => 'empty_spaces_before_paragraph'
-    },
-    {
-      'contents' => [
-        {
-          'parent' => {},
-          'text' => 'a'
+          'text' => 'g a'
         },
         {
           'cmdname' => '{',
@@ -267,23 +207,11 @@
 $result_trees{'form_feeds'}{'contents'}[9]{'contents'}[0]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[9];
 $result_trees{'form_feeds'}{'contents'}[9]{'parent'} = 
$result_trees{'form_feeds'};
 $result_trees{'form_feeds'}{'contents'}[10]{'parent'} = 
$result_trees{'form_feeds'};
+$result_trees{'form_feeds'}{'contents'}[11]{'contents'}[0]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[11];
+$result_trees{'form_feeds'}{'contents'}[11]{'contents'}[1]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[11];
+$result_trees{'form_feeds'}{'contents'}[11]{'contents'}[2]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[11];
 $result_trees{'form_feeds'}{'contents'}[11]{'parent'} = 
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[12]{'contents'}[0]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[12];
 $result_trees{'form_feeds'}{'contents'}[12]{'parent'} = 
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[13]{'parent'} = 
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[14]{'parent'} = 
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[15]{'contents'}[0]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[15];
-$result_trees{'form_feeds'}{'contents'}[15]{'parent'} = 
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[16]{'parent'} = 
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[17]{'contents'}[0]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[17];
-$result_trees{'form_feeds'}{'contents'}[17]{'parent'} = 
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[18]{'parent'} = 
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[19]{'parent'} = 
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[20]{'contents'}[0]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[20];
-$result_trees{'form_feeds'}{'contents'}[20]{'contents'}[1]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[20];
-$result_trees{'form_feeds'}{'contents'}[20]{'contents'}[2]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[20];
-$result_trees{'form_feeds'}{'contents'}[20]{'parent'} = 
$result_trees{'form_feeds'};
-$result_trees{'form_feeds'}{'contents'}[21]{'parent'} = 
$result_trees{'form_feeds'};
 
 $result_texis{'form_feeds'} = '@macro mymacro{a, b}
 f \\a\\ n \\b\\
@@ -293,18 +221,18 @@
 g \\c\\ v
 @end macro
 
-f  arg1 n  arg2
+f arg1 n arg2
 
-g   address@hidden v
+g address@hidden v
 
 ';
 
 
 $result_texts{'form_feeds'} = '
 
-f arg1n arg2
+f arg1n arg2
 
-g a{rgline v
+g a{rgline v
 
 ';