[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5276]
From: |
Patrice Dumas |
Subject: |
[5276] |
Date: |
Tue, 06 Aug 2013 18:08:32 +0000 |
Revision: 5276
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5276
Author: pertusus
Date: 2013-08-06 18:08:31 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
* Texinfo/Parser.pm: keep form-feed in @set value.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/50value.t
Added Paths:
-----------
trunk/tp/t/results/value/set_form_feed.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2013-08-06 17:56:36 UTC (rev 5275)
+++ trunk/ChangeLog 2013-08-06 18:08:31 UTC (rev 5276)
@@ -1,3 +1,7 @@
+2013-08-06 Patrice Dumas <address@hidden>
+
+ * Texinfo/Parser.pm: keep form-feed in @set value.
+
2013-08-06 Karl Berry <address@hidden>
* doc/texinfo.tex (\smartitaliccorrection): also omit italic
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2013-08-06 17:56:36 UTC (rev 5275)
+++ trunk/tp/Texinfo/Parser.pm 2013-08-06 18:08:31 UTC (rev 5276)
@@ -5344,11 +5344,11 @@
if ($command eq 'set') {
# REVALUE
#if ($line =~ s/^\s+([\w\-]+)(\s+(.*?))\s*$//) {
- if ($line =~
/^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)(\@(c|comment)((\@|\s+).*)?|\s+(.*?))?\s*$/) {
+ if ($line =~
/^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)(\@(c|comment)((\@|\s+).*)?|[^\S\f]+(.*?))?[^\S\f]*$/)
{
if ($line =~ s/\@(c|comment)((\@|\s+).*)?$//) {
$has_comment = 1;
}
- $line =~ /^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)(\s+(.*?))?\s*$/;
+ $line =~ /^\s+([\w\-][^\s{\\}~`\^+"<>|@]*)([^\S\f]+(.*?))?[^\S\f]*$/;
my $name = $1;
my $arg = $3;
$arg = '' if (!defined($arg));
Modified: trunk/tp/t/50value.t
===================================================================
--- trunk/tp/t/50value.t 2013-08-06 17:56:36 UTC (rev 5275)
+++ trunk/tp/t/50value.t 2013-08-06 18:08:31 UTC (rev 5276)
@@ -332,6 +332,13 @@
@item xx @set address@hidden
@item jj
@end table
+'],
+['set_form_feed',
+'@set gg aa
address@hidden hh
address@hidden ll
+
address@hidden@value{gg}. @value{hh}. @value{ll}}.
']
);
Added: trunk/tp/t/results/value/set_form_feed.pl
===================================================================
--- trunk/tp/t/results/value/set_form_feed.pl (rev 0)
+++ trunk/tp/t/results/value/set_form_feed.pl 2013-08-06 18:08:31 UTC (rev
5276)
@@ -0,0 +1,165 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'set_form_feed'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'gg',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' aa',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'arg_line' => ' gg aa
+',
+ 'misc_args' => [
+ 'gg',
+ ' aa'
+ ]
+ },
+ 'parent' => {}
+ },
+ {
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'arg_line' => ' hh
+'
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'll',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'parent' => {},
+ 'text' => '',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'arg_line' => ' ll
+',
+ 'misc_args' => [
+ 'll',
+ ''
+ ]
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' aa. '
+ },
+ {
+ 'cmdname' => 'value',
+ 'type' => 'hh'
+ },
+ {
+ 'parent' => {},
+ 'text' => '. '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$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]{'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'}[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];
+$result_trees{'set_form_feed'}{'contents'}[4]{'parent'} =
$result_trees{'set_form_feed'};
+
+$result_texis{'set_form_feed'} = '@set gg aa
address@hidden hh
address@hidden ll
+
address@hidden aa. @value{hh}. }.
+';
+
+
+$result_texts{'set_form_feed'} = '
+ aa. . .
+';
+
+$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'
+ }
+];
+
+
+1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |