[7519] set treat form feed characters as whitespace

[gavinsmith0123]

Revision: 7519
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7519
Author:   gavin
Date:     2016-11-20 14:59:29 +0000 (Sun, 20 Nov 2016)
Log Message:
-----------
set treat form feed characters as whitespace

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/value/set_form_feed.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-11-20 11:14:47 UTC (rev 7518)
+++ trunk/ChangeLog     2016-11-20 14:59:29 UTC (rev 7519)
@@ -1,3 +1,8 @@
+2016-11-20  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Parser.pm (_parse_special_misc_command) <@set>: 
+       Treat form feed characters the same as any other whitespace.
+
 2016-11-17  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Parser.pm (_parse_texi): Supply 'contents' and 

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-11-20 11:14:47 UTC (rev 7518)
+++ trunk/tp/Texinfo/Parser.pm  2016-11-20 14:59:29 UTC (rev 7519)
@@ -5551,11 +5551,11 @@
   my $remaining;
   if ($command eq 'set') {
     # REVALUE
-    if ($line =~ 
/^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)(\@(c|comment)((\@|\s+).*)?|[^\S\f]+(.*?))?[^\S\f]*$/)
 {
+    if ($line =~ 
/^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)(\@(c|comment)((\@|\s+).*)?|\s+(.*?))?\s*$/) {
       if ($line =~ s/\@(c|comment)((\@|\s+).*)?$//) {
         $has_comment = 1;
       }
-      $line =~ /^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)([^\S\f]+(.*?))?[^\S\f]*$/;
+      $line =~ /^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)(\s+(.*?))?\s*$/;
       my $name = $1;
       my $arg = $3;
       $arg = '' if (!defined($arg));

Modified: trunk/tp/t/results/value/set_form_feed.pl
===================================================================
--- trunk/tp/t/results/value/set_form_feed.pl   2016-11-20 11:14:47 UTC (rev 
7518)
+++ trunk/tp/t/results/value/set_form_feed.pl   2016-11-20 14:59:29 UTC (rev 
7519)
@@ -16,7 +16,7 @@
         },
         {
           'parent' => {},
-          'text' => ' a\\a\\f\\\\',
+          'text' => 'a\\a\\f\\\\',
           'type' => 'misc_arg'
         }
       ],
@@ -26,16 +26,32 @@
 ',
         'misc_args' => [
           'gg',
-          ' a\\a\\f\\\\'
+          'a\\a\\f\\\\'
         ]
       },
       'parent' => {}
     },
     {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'hh',
+          'type' => 'misc_arg'
+        },
+        {
+          'parent' => {},
+          'text' => '',
+          'type' => 'misc_arg'
+        }
+      ],
       'cmdname' => 'set',
       'extra' => {
         'arg_line' => ' hh
-'
+',
+        'misc_args' => [
+          'hh',
+          ''
+        ]
       },
       'parent' => {}
     },
@@ -48,7 +64,7 @@
         },
         {
           'parent' => {},
-          'text' => '',
+          'text' => '',
           'type' => 'misc_arg'
         }
       ],
@@ -58,7 +74,7 @@
 ',
         'misc_args' => [
           'll',
-          ''
+          ''
         ]
       },
       'parent' => {}
@@ -77,17 +93,7 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => ' a\\a\\f\\\\. '
-                },
-                {
-                  'cmdname' => 'value',
-                  'contents' => [],
-                  'parent' => {},
-                  'type' => 'hh'
-                },
-                {
-                  'parent' => {},
-                  'text' => '. '
+                  'text' => 'a\\a\\f\\\\. . '
                 }
               ],
               'parent' => {},
@@ -118,14 +124,14 @@
 $result_trees{'set_form_feed'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'set_form_feed'}{'contents'}[0];
 $result_trees{'set_form_feed'}{'contents'}[0]{'args'}[1]{'parent'} = 
$result_trees{'set_form_feed'}{'contents'}[0];
 $result_trees{'set_form_feed'}{'contents'}[0]{'parent'} = 
$result_trees{'set_form_feed'};
+$result_trees{'set_form_feed'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'set_form_feed'}{'contents'}[1];
+$result_trees{'set_form_feed'}{'contents'}[1]{'args'}[1]{'parent'} = 
$result_trees{'set_form_feed'}{'contents'}[1];
 $result_trees{'set_form_feed'}{'contents'}[1]{'parent'} = 
$result_trees{'set_form_feed'};
 $result_trees{'set_form_feed'}{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'set_form_feed'}{'contents'}[2];
 $result_trees{'set_form_feed'}{'contents'}[2]{'args'}[1]{'parent'} = 
$result_trees{'set_form_feed'}{'contents'}[2];
 $result_trees{'set_form_feed'}{'contents'}[2]{'parent'} = 
$result_trees{'set_form_feed'};
 $result_trees{'set_form_feed'}{'contents'}[3]{'parent'} = 
$result_trees{'set_form_feed'};
 
$result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0];
-$result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0];
-$result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0];
 $result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'set_form_feed'}{'contents'}[4];
 $result_trees{'set_form_feed'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'set_form_feed'}{'contents'}[4];
@@ -135,42 +141,23 @@
 @set hh
 @set ll 
 
address@hidden a\\a\\f\\\\. @value{hh}. }.
address@hidden . }.
 ';
 
 
 $result_texts{'set_form_feed'} = '
- a\\a\\f\\\\. . .
+a\\a\\f\\\\. . .
 ';
 
-$result_errors{'set_form_feed'} = [
-  {
-    'error_line' => ':2: bad name for @set
-',
-    'file_name' => '',
-    'line_nr' => 2,
-    'macro' => '',
-    'text' => 'bad name for @set',
-    'type' => 'error'
-  },
-  {
-    'error_line' => ':5: warning: undefined flag: hh
-',
-    'file_name' => '',
-    'line_nr' => 5,
-    'macro' => '',
-    'text' => 'undefined flag: hh',
-    'type' => 'warning'
-  }
-];
+$result_errors{'set_form_feed'} = [];
 
 
 
-$result_converted{'xml'}->{'set_form_feed'} = '<set name="gg" line=" gg 
&attrformfeed; a\\\\a\\\\f\\\\\\\\">&formfeed; a\\a\\f\\\\</set>
-<set line=" hh&attrformfeed;"></set>
-<set name="ll" line=" ll &attrformfeed;">&formfeed;</set>
+$result_converted{'xml'}->{'set_form_feed'} = '<set name="gg" line=" gg 
&attrformfeed; a\\\\a\\\\f\\\\\\\\">a\\a\\f\\\\</set>
+<set name="hh" line=" hh&attrformfeed;"></set>
+<set name="ll" line=" ll &attrformfeed;"></set>
 
-<para><code>&formfeed; a\\a\\f\\\\. . &formfeed;</code>.
+<para><code>a\\a\\f\\\\. . </code>.
 </para>';
 
 1;