[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7215] misc text commands don't use Texinfo::Convert::Text
|
From: |
gavinsmith0123 |
|
Subject: |
[7215] misc text commands don't use Texinfo::Convert::Text |
|
Date: |
Sun, 12 Jun 2016 09:53:01 +0000 (UTC) |
Revision: 7215
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7215
Author: gavin
Date: 2016-06-12 09:53:00 +0000 (Sun, 12 Jun 2016)
Log Message:
-----------
misc text commands don't use Texinfo::Convert::Text
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/coverage/symbol_after_block.pl
trunk/tp/t/results/include/include_at_end_line.pl
trunk/tp/t/results/include/include_setfilename_on_setfilename_line.pl
trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
trunk/tp/t/results/info_tests/space_in_setfilename.pl
trunk/tp/t/results/misc_commands/bad_documentlanguage.pl
trunk/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
trunk/tp/t/results/misc_commands/invalid_documentencoding.pl
trunk/tp/t/results/misc_commands/setfilename.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2016-06-11 19:58:43 UTC (rev 7214)
+++ trunk/ChangeLog 2016-06-12 09:53:00 UTC (rev 7215)
@@ -1,5 +1,19 @@
2016-06-11 Gavin Smith <address@hidden>
+ * tp/Texinfo/Parser.pm (_end_line) <@end, @include>
+ <@documentencoding, @documentlanguage>: Do not call
+ Texinfo::Convert::Text::convert to get the argument to the
+ command. Instead, call _trim_spaces_comment_from_content to
+ find the element containing the text for the command. Give an
+ error message if there are excessive elements in the argument
+ (e.g. @-commands).
+
+ This has the consequence that @@ can no longer be used to
+ refer to an @-sign in an @include command (similarly for "@ "
+ for " ", and some other @-commands).
+
+2016-06-11 Gavin Smith <address@hidden>
+
* doc/texinfo.texi (@setfilename): Fix typo.
2016-06-09 Gavin Smith <address@hidden>
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2016-06-11 19:58:43 UTC (rev 7214)
+++ trunk/tp/Texinfo/Parser.pm 2016-06-12 09:53:00 UTC (rev 7215)
@@ -3145,12 +3145,26 @@
}
}
} elsif ($self->{'misc_commands'}->{$command} eq 'text') {
- my $text = Texinfo::Convert::Text::convert($current->{'args'}->[0],
- {'code' => 1,
-
Texinfo::Common::_convert_text_options($self)});
- if ($text eq '') {
- $self->_command_warn($current, $line_nr,
- $self->__("address@hidden missing argument"),
$command);
+ my $text = '';
+ my $superfluous_arg = 0;
+ if (defined $current->{'args'}->[0]->{'contents'}) {
+ my @contents = @{$current->{'args'}->[0]->{'contents'}};
+ _trim_spaces_comment_from_content (address@hidden);
+ if (scalar(@contents) > 1
+ or scalar(@contents) == 1
+ and not defined $contents[0]->{'text'}) {
+ # Too many arguments or @-commands used in argument.
+ $superfluous_arg = 1; # Used below to issue an error message.
+ }
+ $text = $contents[0]->{'text'}
+ if defined $contents[0]->{'text'};
+ }
+ if (not defined $text or $text eq '') {
+ if (not $superfluous_arg) {
+ $self->_command_warn($current, $line_nr,
+ $self->__("address@hidden missing argument"),
$command);
+ }
+ # Otherwise an error message is issued below.
$current->{'extra'}->{'missing_argument'} = 1;
} else {
$current->{'extra'}->{'text_arg'} = $text;
@@ -3179,19 +3193,23 @@
$current->{'extra'}->{'command_argument'} = $end_command
if (defined($end_command));
}
- if ($line =~ /\S/ and defined($end_command)) {
+ if (($superfluous_arg or $line =~ /\S/)
+ and defined($end_command)) {
my $texi_line
= Texinfo::Convert::Texinfo::convert($current->{'args'}->[0]);
$texi_line =~ s/^\s*([[:alnum:]][[:alnum:]-]+)//;
$self->_command_error($current, $line_nr,
$self->__("superfluous argument to address@hidden
%s: %s"),
$command, $end_command, $texi_line);
+ $superfluous_arg = 0; # Don't issue another error message below.
}
} else {
$self->_command_error($current, $line_nr,
$self->__("bad argument to address@hidden: %s"),
$command, $line);
}
+ } elsif ($superfluous_arg) {
+ # An error message is issued below.
} elsif ($command eq 'include') {
my $file = Texinfo::Common::locate_include_file($self, $text) ;
if (defined($file)) {
@@ -3261,6 +3279,17 @@
}
}
}
+ if ($superfluous_arg) {
+ my $texi_line
+ = Texinfo::Convert::Texinfo::convert($current->{'args'}->[0]);
+ $texi_line =~ s/^\s*//;
+ $texi_line =~ s/\s*$//;
+
+ $self->_command_error($current, $line_nr,
+ $self->__("bad argument to address@hidden: %s"),
+ $command, $texi_line);
+
+ }
} elsif ($command eq 'node') {
foreach my $arg (@{$current->{'args'}}) {
my $node = _parse_node_manual($arg);
Modified: trunk/tp/t/results/coverage/symbol_after_block.pl
===================================================================
--- trunk/tp/t/results/coverage/symbol_after_block.pl 2016-06-11 19:58:43 UTC
(rev 7214)
+++ trunk/tp/t/results/coverage/symbol_after_block.pl 2016-06-12 09:53:00 UTC
(rev 7215)
@@ -152,7 +152,7 @@
'command' => {},
'command_argument' => 'html',
'spaces_after_command' => {},
- 'text_arg' => 'html@ On the line.'
+ 'text_arg' => 'html'
},
'line_nr' => {
'file_name' => '',
@@ -632,7 +632,7 @@
'command' => {},
'command_argument' => 'table',
'spaces_after_command' => {},
- 'text_arg' => 'table@'
+ 'text_arg' => 'table'
},
'line_nr' => {
'file_name' => '',
@@ -915,7 +915,7 @@
'command' => {},
'command_argument' => 'itemize',
'spaces_after_command' => {},
- 'text_arg' => 'itemize@'
+ 'text_arg' => 'itemize'
},
'line_nr' => {
'file_name' => '',
@@ -1488,7 +1488,7 @@
'command' => {},
'command_argument' => 'multitable',
'spaces_after_command' => {},
- 'text_arg' => 'multitable{'
+ 'text_arg' => 'multitable'
},
'line_nr' => {
'file_name' => '',
@@ -1671,7 +1671,7 @@
'command' => {},
'command_argument' => 'flushleft',
'spaces_after_command' => {},
- 'text_arg' => 'flushleft@'
+ 'text_arg' => 'flushleft'
},
'line_nr' => {
'file_name' => '',
@@ -1856,7 +1856,7 @@
'command' => {},
'command_argument' => 'copying',
'spaces_after_command' => {},
- 'text_arg' => 'copying@'
+ 'text_arg' => 'copying'
},
'line_nr' => {
'file_name' => '',
Modified: trunk/tp/t/results/include/include_at_end_line.pl
===================================================================
--- trunk/tp/t/results/include/include_at_end_line.pl 2016-06-11 19:58:43 UTC
(rev 7214)
+++ trunk/tp/t/results/include/include_at_end_line.pl 2016-06-12 09:53:00 UTC
(rev 7215)
@@ -36,7 +36,7 @@
'cmdname' => 'include',
'extra' => {
'spaces_after_command' => {},
- 'text_arg' => 'inc_file.texi '
+ 'text_arg' => 'inc_file.texi'
},
'line_nr' => {
'file_name' => '',
@@ -85,12 +85,12 @@
$result_errors{'include_at_end_line'} = [
{
- 'error_line' => ':1: @include: could not find inc_file.texi
+ 'error_line' => ':1: bad argument to @include: inc_file.texi@
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => '@include: could not find inc_file.texi ',
+ 'text' => 'bad argument to @include: inc_file.texi@',
'type' => 'error'
}
];
Modified: trunk/tp/t/results/include/include_setfilename_on_setfilename_line.pl
===================================================================
--- trunk/tp/t/results/include/include_setfilename_on_setfilename_line.pl
2016-06-11 19:58:43 UTC (rev 7214)
+++ trunk/tp/t/results/include/include_setfilename_on_setfilename_line.pl
2016-06-12 09:53:00 UTC (rev 7215)
@@ -203,6 +203,24 @@
'macro' => '',
'text' => '@include: could not find are you joking!',
'type' => 'error'
+ },
+ {
+ 'error_line' => ':1: bad argument to @setfilename: other file @include are
you joking!
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'bad argument to @setfilename: other file @include are you
joking!',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':1: bad argument to @setfilename: file @setfilename other
file @include are you joking!
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'bad argument to @setfilename: file @setfilename other file
@include are you joking!',
+ 'type' => 'error'
}
];
Modified: trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
===================================================================
--- trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
2016-06-11 19:58:43 UTC (rev 7214)
+++ trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
2016-06-12 09:53:00 UTC (rev 7215)
@@ -96,7 +96,7 @@
'cmdname' => 'setfilename',
'extra' => {
'spaces_after_command' => {},
- 'text_arg' => 'address@hidden'
+ 'text_arg' => 'macro_i--n_pass'
},
'line_nr' => {
'file_name' => '',
@@ -194,7 +194,7 @@
'cmdname' => 'documentencoding',
'extra' => {
'spaces_after_command' => {},
- 'text_arg' => 'ISO-8859-1@'
+ 'text_arg' => 'ISO-8859-1'
},
'line_nr' => {
'file_name' => '',
@@ -396,15 +396,51 @@
},
{},
{
- 'contents' => [
+ 'args' => [
{
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'inc_'
+ },
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => 'f--ile.texi'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
'parent' => {},
- 'text' => 'In included file.
-'
+ 'type' => 'misc_line_arg'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'cmdname' => 'include',
+ 'extra' => {
+ 'spaces_after_command' => {},
+ 'text_arg' => 'inc_'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => 'multiinclude'
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -467,7 +503,7 @@
'cmdname' => 'verbatiminclude',
'extra' => {
'spaces_after_command' => {},
- 'text_arg' => 'address@hidden'
+ 'text_arg' => 'inc_'
},
'line_nr' => {
'file_name' => '',
@@ -561,7 +597,14 @@
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[2]
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'spaces_after_command'};
-$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[3]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[4]{'parent'}
= $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2];
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'parent'}
=
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'contents'}[5];
@@ -603,7 +646,7 @@
@macro themacro
in themacro
@end macro
-In included file.
address@hidden inc_@@f--ile.texi
in themacro
@@ -619,7 +662,6 @@
top
***
-In included file.
in themacro
@@ -678,22 +720,40 @@
$result_errors{'macro_and_commands_in_early_commands'} = [
{
- 'error_line' => ':11: warning: encoding address@hidden' is not a canonical
texinfo encoding
+ 'error_line' => ':5: bad argument to @setfilename:
macro_i--n_pass@@texi_commands.info
',
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 5,
'macro' => '',
- 'text' => 'encoding address@hidden' is not a canonical texinfo encoding',
- 'type' => 'warning'
+ 'text' => 'bad argument to @setfilename:
macro_i--n_pass@@texi_commands.info',
+ 'type' => 'error'
},
{
- 'error_line' => ':11: warning: unrecognized encoding name address@hidden'
+ 'error_line' => ':11: bad argument to @documentencoding: ISO-8859-1@@
',
'file_name' => '',
'line_nr' => 11,
'macro' => '',
- 'text' => 'unrecognized encoding name address@hidden'',
- 'type' => 'warning'
+ 'text' => 'bad argument to @documentencoding: ISO-8859-1@@',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':21: bad argument to @include: inc_@@f--ile.texi
(possibly involving @multiinclude)
+',
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => 'multiinclude',
+ 'text' => 'bad argument to @include: inc_@@f--ile.texi',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => ':25: bad argument to @verbatiminclude: inc_@@f--ile.texi
+',
+ 'file_name' => '',
+ 'line_nr' => 25,
+ 'macro' => '',
+ 'text' => 'bad argument to @verbatiminclude: inc_@@f--ile.texi',
+ 'type' => 'error'
}
];
Modified: trunk/tp/t/results/info_tests/space_in_setfilename.pl
===================================================================
--- trunk/tp/t/results/info_tests/space_in_setfilename.pl 2016-06-11
19:58:43 UTC (rev 7214)
+++ trunk/tp/t/results/info_tests/space_in_setfilename.pl 2016-06-12
09:53:00 UTC (rev 7215)
@@ -69,8 +69,8 @@
],
'cmdname' => 'setfilename',
'extra' => {
- 'spaces_after_command' => {},
- 'text_arg' => ' name '
+ 'missing_argument' => 1,
+ 'spaces_after_command' => {}
},
'line_nr' => {},
'parent' => {}
@@ -207,20 +207,29 @@
'macro' => '',
'text' => '@verb should not appear in @setfilename',
'type' => 'warning'
+ },
+ {
+ 'error_line' => ':1: bad argument to @setfilename: @ @verb{: name :}@
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'bad argument to @setfilename: @ @verb{: name :}@',
+ 'type' => 'error'
}
];
-$result_converted{'info'}->{'space_in_setfilename'} = 'This is name ,
produced from .
+$result_converted{'info'}->{'space_in_setfilename'} = 'This is , produced from
.
-File: name , Node: Top, Up: (dir)
+File: , Node: Top, Up: (dir)
Tag Table:
-Node: Top35
+Node: Top27
End Tag Table
';
Modified: trunk/tp/t/results/misc_commands/bad_documentlanguage.pl
===================================================================
--- trunk/tp/t/results/misc_commands/bad_documentlanguage.pl 2016-06-11
19:58:43 UTC (rev 7214)
+++ trunk/tp/t/results/misc_commands/bad_documentlanguage.pl 2016-06-12
09:53:00 UTC (rev 7215)
@@ -268,6 +268,15 @@
'type' => 'warning'
},
{
+ 'error_line' => ':4: bad argument to @documentlanguage: en
@documentlanguage en
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => 'bad argument to @documentlanguage: en @documentlanguage en',
+ 'type' => 'error'
+ },
+ {
'error_line' => ':6: warning: en after documentlanguage is not a valid
language code
',
'file_name' => '',
Modified:
trunk/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
===================================================================
--- trunk/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
2016-06-11 19:58:43 UTC (rev 7214)
+++ trunk/tp/t/results/misc_commands/command_not_closed_in_documentencoding.pl
2016-06-12 09:53:00 UTC (rev 7215)
@@ -77,13 +77,13 @@
'type' => 'error'
},
{
- 'error_line' => ':1: warning: @documentencoding missing argument
+ 'error_line' => ':1: bad argument to @documentencoding: @strong{}
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => '@documentencoding missing argument',
- 'type' => 'warning'
+ 'text' => 'bad argument to @documentencoding: @strong{}',
+ 'type' => 'error'
}
];
Modified: trunk/tp/t/results/misc_commands/invalid_documentencoding.pl
===================================================================
--- trunk/tp/t/results/misc_commands/invalid_documentencoding.pl
2016-06-11 19:58:43 UTC (rev 7214)
+++ trunk/tp/t/results/misc_commands/invalid_documentencoding.pl
2016-06-12 09:53:00 UTC (rev 7215)
@@ -71,8 +71,6 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'input_encoding_name' => 'us-ascii',
- 'input_perl_encoding' => 'ascii',
'spaces_after_command' => {},
'text_arg' => 'us-ascii'
},
@@ -137,7 +135,7 @@
'cmdname' => 'documentencoding',
'extra' => {
'spaces_after_command' => {},
- 'text_arg' => 'latin1a'
+ 'text_arg' => 'latin1'
},
'line_nr' => {},
'parent' => {}
@@ -337,8 +335,8 @@
],
'cmdname' => 'documentencoding',
'extra' => {
- 'spaces_after_command' => {},
- 'text_arg' => '@'
+ 'missing_argument' => 1,
+ 'spaces_after_command' => {}
},
'line_nr' => {
'file_name' => '',
@@ -394,7 +392,7 @@
'cmdname' => 'documentencoding',
'extra' => {
'spaces_after_command' => {},
- 'text_arg' => 'AAATeX'
+ 'text_arg' => 'AAA'
},
'line_nr' => {},
'parent' => {}
@@ -451,7 +449,7 @@
'cmdname' => 'documentencoding',
'extra' => {
'spaces_after_command' => {},
- 'text_arg' => 'BBBe\''
+ 'text_arg' => 'BBB'
},
'line_nr' => {},
'parent' => {}
@@ -566,22 +564,22 @@
$result_errors{'invalid_documentencoding'} = [
{
- 'error_line' => ':4: warning: encoding `latin1a\' is not a canonical
texinfo encoding
+ 'error_line' => ':2: bad argument to @documentencoding: address@hidden
',
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 2,
'macro' => '',
- 'text' => 'encoding `latin1a\' is not a canonical texinfo encoding',
- 'type' => 'warning'
+ 'text' => 'bad argument to @documentencoding: address@hidden',
+ 'type' => 'error'
},
{
- 'error_line' => ':4: warning: unrecognized encoding name `latin1a\'
+ 'error_line' => ':4: bad argument to @documentencoding: address@hidden
',
'file_name' => '',
'line_nr' => 4,
'macro' => '',
- 'text' => 'unrecognized encoding name `latin1a\'',
- 'type' => 'warning'
+ 'text' => 'bad argument to @documentencoding: address@hidden',
+ 'type' => 'error'
},
{
'error_line' => ':5: warning: encoding `YS-ASCII\' is not a canonical
texinfo encoding
@@ -665,58 +663,31 @@
'type' => 'warning'
},
{
- 'error_line' => ':9: warning: encoding address@hidden' is not a canonical
texinfo encoding
+ 'error_line' => ':9: bad argument to @documentencoding: @@
',
'file_name' => '',
'line_nr' => 9,
'macro' => '',
- 'text' => 'encoding address@hidden' is not a canonical texinfo encoding',
- 'type' => 'warning'
+ 'text' => 'bad argument to @documentencoding: @@',
+ 'type' => 'error'
},
{
- 'error_line' => ':9: warning: unrecognized encoding name address@hidden'
+ 'error_line' => ':10: bad argument to @documentencoding: address@hidden
',
'file_name' => '',
- 'line_nr' => 9,
- 'macro' => '',
- 'text' => 'unrecognized encoding name address@hidden'',
- 'type' => 'warning'
- },
- {
- 'error_line' => ':10: warning: encoding `AAATeX\' is not a canonical
texinfo encoding
-',
- 'file_name' => '',
'line_nr' => 10,
'macro' => '',
- 'text' => 'encoding `AAATeX\' is not a canonical texinfo encoding',
- 'type' => 'warning'
+ 'text' => 'bad argument to @documentencoding: address@hidden',
+ 'type' => 'error'
},
{
- 'error_line' => ':10: warning: unrecognized encoding name `AAATeX\'
+ 'error_line' => ':11: bad argument to @documentencoding: address@hidden'e
',
'file_name' => '',
- 'line_nr' => 10,
- 'macro' => '',
- 'text' => 'unrecognized encoding name `AAATeX\'',
- 'type' => 'warning'
- },
- {
- 'error_line' => ':11: warning: encoding `BBBe\'\' is not a canonical
texinfo encoding
-',
- 'file_name' => '',
'line_nr' => 11,
'macro' => '',
- 'text' => 'encoding `BBBe\'\' is not a canonical texinfo encoding',
- 'type' => 'warning'
- },
- {
- 'error_line' => ':11: warning: unrecognized encoding name `BBBe\'\'
-',
- 'file_name' => '',
- 'line_nr' => 11,
- 'macro' => '',
- 'text' => 'unrecognized encoding name `BBBe\'\'',
- 'type' => 'warning'
+ 'text' => 'bad argument to @documentencoding: address@hidden'e',
+ 'type' => 'error'
}
];
Modified: trunk/tp/t/results/misc_commands/setfilename.pl
===================================================================
--- trunk/tp/t/results/misc_commands/setfilename.pl 2016-06-11 19:58:43 UTC
(rev 7214)
+++ trunk/tp/t/results/misc_commands/setfilename.pl 2016-06-12 09:53:00 UTC
(rev 7215)
@@ -213,8 +213,8 @@
],
'cmdname' => 'setfilename',
'extra' => {
- 'spaces_after_command' => {},
- 'text_arg' => ' name '
+ 'missing_argument' => 1,
+ 'spaces_after_command' => {}
},
'line_nr' => {},
'parent' => {}
@@ -313,6 +313,15 @@
'macro' => '',
'text' => '@verb should not appear in @setfilename',
'type' => 'warning'
+ },
+ {
+ 'error_line' => ':4: bad argument to @setfilename: @ @verb{: name :}@
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => 'bad argument to @setfilename: @ @verb{: name :}@',
+ 'type' => 'error'
}
];
@@ -352,7 +361,7 @@
$result_converted{'xml'}->{'setfilename'} = '<setfilename file="file_comment"
spaces=" ">file_comment</setfilename><!-- c comment -->
<setfilename file="file_and_spaces" spaces=" ">file_and_spaces </setfilename>
<setfilename file="file_space_comment" spaces=" ">file_space_comment
</setfilename><!-- c comment -->
-<setfilename file=" name " spaces=" "><spacecmd type="spc"/><verb
delimiter=":"> name </verb><spacecmd type="spc"/></setfilename>
+<setfilename spaces=" "><spacecmd type="spc"/><verb delimiter=":"> name
</verb><spacecmd type="spc"/></setfilename>
';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7215] misc text commands don't use Texinfo::Convert::Text,
gavinsmith0123 <=