[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Basic inline stack for block line args
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: Basic inline stack for block line args |
|
Date: |
Sun, 05 Feb 2023 07:20:12 -0500 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 803608cca9 Basic inline stack for block line args
803608cca9 is described below
commit 803608cca937928b3801cf76f2ea5be2449a0f80
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Feb 5 12:19:33 2023 +0000
Basic inline stack for block line args
* tp/Texinfo/ParserNonXS.pm
(parser): Initialise 'basic_inline_stack_block' stack.
(_process_remaining_on_line) <line arg>: Push the new stack.
(_end_line_starting_block)
(_end_line_misc_line) <@columnfractions>:
Pop the new stack.
(_check_valid_nesting_context): Use 'basic_inline_stack_on_line'.
* tp/Texinfo/XS/parsetexi/context_stack.h (NESTING_CONTEXT):
Add basic_inline_stack_block field.
* tp/Texinfo/XS/parsetexi/api.c (reset_parser_except_conf): Reset it.
* tp/Texinfo/XS/parsetexi/parser.c (check_valid_nesting_context):
Use new stack.
* tp/Texinfo/XS/parsetexi/handle_commands.c (handle_block_command):
Push.
* tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block),
(end_line_misc_line) <@columnfractions>:
Pop.
---
ChangeLog | 25 +++++++++
tp/Texinfo/ParserNonXS.pm | 19 +++++++
tp/Texinfo/XS/parsetexi/api.c | 1 +
tp/Texinfo/XS/parsetexi/context_stack.h | 1 +
tp/Texinfo/XS/parsetexi/end_line.c | 8 ++-
tp/Texinfo/XS/parsetexi/handle_commands.c | 2 +
tp/Texinfo/XS/parsetexi/parser.c | 12 +++--
tp/t/results/invalid_nestings/in_table.pl | 9 ++++
.../invalid_nestings/on_block_command_line.pl | 63 ++++++++++++++++++++++
tp/t/results/invalid_nestings/on_itemize_line.pl | 54 +++++++++++++++++++
.../invalid_nestings/section_on_enumerate_line.pl | 18 +++++++
.../invalid_nestings/section_on_float_line.pl | 9 ++++
.../invalid_nestings/section_on_itemize_line.pl | 36 +++++++++++++
.../invalid_nestings/section_on_multitable_line.pl | 27 ++++++++++
.../invalid_nestings/section_on_xtable_line.pl | 36 +++++++++++++
.../example_invalid_at_commands_arguments.pl | 27 ++++++++++
.../results/xtable/definfoenclose_on_table_line.pl | 9 ++++
17 files changed, 351 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 073ef77297..8b8158c1f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2023-02-05 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Basic inline stack for block line args
+
+ * tp/Texinfo/ParserNonXS.pm
+ (parser): Initialise 'basic_inline_stack_block' stack.
+ (_process_remaining_on_line) <line arg>: Push the new stack.
+ (_end_line_starting_block)
+ (_end_line_misc_line) <@columnfractions>:
+ Pop the new stack.
+
+ (_check_valid_nesting_context): Use 'basic_inline_stack_on_line'.
+
+ * tp/Texinfo/XS/parsetexi/context_stack.h (NESTING_CONTEXT):
+ Add basic_inline_stack_block field.
+ * tp/Texinfo/XS/parsetexi/api.c (reset_parser_except_conf): Reset it.
+
+ * tp/Texinfo/XS/parsetexi/parser.c (check_valid_nesting_context):
+ Use new stack.
+ * tp/Texinfo/XS/parsetexi/handle_commands.c (handle_block_command):
+ Push.
+ * tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block),
+ (end_line_misc_line) <@columnfractions>:
+ Pop.
+
2023-02-05 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_merge_text, _process_remaining_on_line),
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 4224afe3d0..770be2d1c2 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -666,6 +666,7 @@ sub parser(;$$)
$parser->{'nesting_context'} = {%nesting_context_init};
$parser->{'nesting_context'}->{'basic_inline_stack'} = [];
$parser->{'nesting_context'}->{'basic_inline_stack_on_line'} = [];
+ $parser->{'nesting_context'}->{'basic_inline_stack_block'} = [];
$parser->{'basic_inline_commands'} = {%default_basic_inline_commands};
# handle user provided state.
@@ -3542,6 +3543,10 @@ sub _end_line_misc_line($$$)
} else {
# This is the multitable block_line_arg line context
$self->_pop_context(['ct_line'], $source_info, $current, 'for
multitable');
+ pop @{$self->{'nesting_context'}->{'basic_inline_stack_block'}};
+ # FIXME much better to pop contexts in exactly one place in the
+ # source code.
+
$current = $current->{'parent'};
$current->{'extra'} = {} if (!defined($current->{'extra'}));
$current->{'extra'}->{'max_columns'} = 0;
@@ -3691,9 +3696,14 @@ sub _end_line_starting_block($$$)
my $command = $current->{'parent'}->{'cmdname'};
$command = '' if !defined($command);
+ if ($self->{'basic_inline_commands'}->{$command}) {
+ pop @{$self->{'nesting_context'}->{'basic_inline_stack_block'}};
+ }
+
print STDERR "END BLOCK LINE: "
.Texinfo::Common::debug_print_element_short($current, 1)."\n"
if ($self->{'DEBUG'});
+
# @multitable args
if ($command eq 'multitable') {
# parse the prototypes and put them in a special arg
@@ -4435,6 +4445,11 @@ sub _check_valid_nesting_context
and !$in_basic_inline_commands{$command}) {
$invalid_context
= $self->{'nesting_context'}->{'basic_inline_stack_on_line'}->[-1];
+ } elsif (defined($self->{'nesting_context'}->{'basic_inline_stack_block'})
+ and @{$self->{'nesting_context'}->{'basic_inline_stack_block'}} > 0
+ and !$in_basic_inline_commands{$command}) {
+ $invalid_context
+ = $self->{'nesting_context'}->{'basic_inline_stack_block'}->[-1];
}
$self->_line_warn(sprintf(
@@ -5801,6 +5816,10 @@ sub _process_remaining_on_line($$$$)
$current = $current->{'args'}->[-1];
$self->_push_context('ct_line', $command)
unless ($def_commands{$command});
+ if ($self->{'basic_inline_commands'}->{$command}) {
+ push @{$self->{'nesting_context'}->{'basic_inline_stack_block'}},
+ $command;
+ }
$block->{'source_info'} = $source_info;
_register_global_command($self, $block, $source_info);
$line = _start_empty_line_after_command($line, $current, $block);
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index 5553e59a1c..3bd4a9daa5 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -131,6 +131,7 @@ reset_parser_except_conf (void)
reset_region_stack ();
reset_command_stack (&nesting_context.basic_inline_stack);
reset_command_stack (&nesting_context.basic_inline_stack_on_line);
+ reset_command_stack (&nesting_context.basic_inline_stack_block);
memset (&nesting_context, 0, sizeof (nesting_context));
reset_floats ();
wipe_global_info ();
diff --git a/tp/Texinfo/XS/parsetexi/context_stack.h
b/tp/Texinfo/XS/parsetexi/context_stack.h
index d63165b021..766c9932ce 100644
--- a/tp/Texinfo/XS/parsetexi/context_stack.h
+++ b/tp/Texinfo/XS/parsetexi/context_stack.h
@@ -71,6 +71,7 @@ typedef struct {
int caption;
COMMAND_STACK basic_inline_stack;
COMMAND_STACK basic_inline_stack_on_line;
+ COMMAND_STACK basic_inline_stack_block;
} NESTING_CONTEXT;
extern NESTING_CONTEXT nesting_context;
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index 89e1f2e431..68df1ddc91 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1,5 +1,5 @@
/* end_line.c -- what to do at the end of a whole line of input */
-/* Copyright 2010-2022 Free Software Foundation, Inc.
+/* Copyright 2010-2023 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1012,6 +1012,9 @@ end_line_starting_block (ELEMENT *current)
if (pop_context () != ct_line)
fatal ("line context expected");
+ if (command_flags(current->parent) & CF_contain_basic_inline)
+ (void) pop_command (&nesting_context.basic_inline_stack_block);
+
if (current->parent->cmd == CM_multitable)
{
/* Parse prototype row for a @multitable. Handling
@@ -1917,6 +1920,9 @@ end_line_misc_line (ELEMENT *current)
{
if (pop_context () != ct_line)
fatal ("line context expected");
+ (void) pop_command (&nesting_context.basic_inline_stack_block);
+ /* FIXME much better to pop contexts in only one place in the
+ source code. */
current = current->parent;
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index bb0cb278be..ffc4e02bfc 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -1003,6 +1003,8 @@ handle_block_command (ELEMENT *current, char **line_inout,
current = bla;
if (!(command_data(cmd).flags & CF_def))
push_context (ct_line, cmd);
+ if (command_data(cmd).flags & CF_contain_basic_inline)
+ push_command (&nesting_context.basic_inline_stack_block, cmd);
block->source_info = current_source_info;
register_global_command (block);
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index c470e1b056..fade45ec10 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1201,12 +1201,13 @@ check_valid_nesting_context (enum command_id cmd)
command_name(cmd));
}
else if (nesting_context.basic_inline_stack.top > 0
- || nesting_context.basic_inline_stack_on_line.top > 0)
+ || nesting_context.basic_inline_stack_on_line.top > 0
+ || nesting_context.basic_inline_stack_block.top > 0)
{
unsigned long flags = command_data(cmd).flags;
int data = command_data(cmd).data;
- if (!( /* inclusions */
+ if (!( /* inclusions */
(flags & (CF_accent | CF_brace | CF_in_heading_spec))
|| ((flags & CF_nobrace) && data == NOBRACE_symbol)
|| cmd == CM_c
@@ -1220,7 +1221,7 @@ check_valid_nesting_context (enum command_id cmd)
|| ((flags & CF_block)
&& (data == BLOCK_format_raw || data == BLOCK_conditional))
)
- || (flags & CF_ref) /* exclusions */
+ || (flags & (CF_ref | CF_INFOENCLOSE)) /* exclusions */
|| cmd == CM_caption
|| cmd == CM_shortcaption
|| cmd == CM_titlefont
@@ -1231,9 +1232,12 @@ check_valid_nesting_context (enum command_id cmd)
if (nesting_context.basic_inline_stack.top > 0)
invalid_context = top_command
(&nesting_context.basic_inline_stack);
- else
+ else if (nesting_context.basic_inline_stack_on_line.top > 0)
invalid_context = top_command
(&nesting_context.basic_inline_stack_on_line);
+ else if (nesting_context.basic_inline_stack_block.top > 0)
+ invalid_context = top_command
+ (&nesting_context.basic_inline_stack_block);
}
/* FIXME: This may not match exactly the definition of a basic inline
diff --git a/tp/t/results/invalid_nestings/in_table.pl
b/tp/t/results/invalid_nestings/in_table.pl
index 2072c7e84a..9882700007 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -1122,6 +1122,15 @@ $result_errors{'in_table'} = [
'text' => '@xref should not appear in @table',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @xref should not appear anywhere inside @table
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => '@xref should not appear anywhere inside @table',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @indent should not appear in @item
',
diff --git a/tp/t/results/invalid_nestings/on_block_command_line.pl
b/tp/t/results/invalid_nestings/on_block_command_line.pl
index 542f5852e3..037a414d68 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -378,6 +378,15 @@ in titlefont exdent
';
$result_errors{'on_block_command_line'} = [
+ {
+ 'error_line' => 'warning: @anchor should not appear anywhere inside
@multitable
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@anchor should not appear anywhere inside @multitable',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @titlefont should not appear in @multitable
',
@@ -387,6 +396,15 @@ $result_errors{'on_block_command_line'} = [
'text' => '@titlefont should not appear in @multitable',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @titlefont should not appear anywhere inside
@multitable
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@titlefont should not appear anywhere inside @multitable',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: unexpected argument on @multitable line:
@titlefont{in titlefont}
',
@@ -405,6 +423,15 @@ $result_errors{'on_block_command_line'} = [
'text' => '@indent should not appear in @quotation',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @indent should not appear anywhere inside
@quotation
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => '@indent should not appear anywhere inside @quotation',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @titlefont should not appear in @quotation
',
@@ -414,6 +441,15 @@ $result_errors{'on_block_command_line'} = [
'text' => '@titlefont should not appear in @quotation',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @titlefont should not appear anywhere inside
@quotation
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => '@titlefont should not appear anywhere inside @quotation',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @anchor should not appear in @quotation
',
@@ -423,6 +459,15 @@ $result_errors{'on_block_command_line'} = [
'text' => '@anchor should not appear in @quotation',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @anchor should not appear anywhere inside
@quotation
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => '@anchor should not appear anywhere inside @quotation',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @footnote should not appear in @quotation
',
@@ -432,6 +477,15 @@ $result_errors{'on_block_command_line'} = [
'text' => '@footnote should not appear in @quotation',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @footnote should not appear anywhere inside
@quotation
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => '@footnote should not appear anywhere inside @quotation',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @exdent should only appear at the beginning of a
line
',
@@ -449,6 +503,15 @@ $result_errors{'on_block_command_line'} = [
'macro' => '',
'text' => '@exdent should not appear in @quotation',
'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: @exdent should not appear anywhere inside
@quotation
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => '@exdent should not appear anywhere inside @quotation',
+ 'type' => 'warning'
}
];
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index ec97ecb8e2..74897279a9 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -307,6 +307,15 @@ $result_errors{'on_itemize_line'} = [
'text' => '@indent should not appear in @itemize',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @indent should not appear anywhere inside
@itemize
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@indent should not appear anywhere inside @itemize',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @titlefont should not appear in @itemize
',
@@ -316,6 +325,15 @@ $result_errors{'on_itemize_line'} = [
'text' => '@titlefont should not appear in @itemize',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @titlefont should not appear anywhere inside
@itemize
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@titlefont should not appear anywhere inside @itemize',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @anchor should not appear in @itemize
',
@@ -325,6 +343,15 @@ $result_errors{'on_itemize_line'} = [
'text' => '@anchor should not appear in @itemize',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @anchor should not appear anywhere inside
@itemize
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@anchor should not appear anywhere inside @itemize',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @footnote should not appear in @itemize
',
@@ -334,6 +361,15 @@ $result_errors{'on_itemize_line'} = [
'text' => '@footnote should not appear in @itemize',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @footnote should not appear anywhere inside
@itemize
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@footnote should not appear anywhere inside @itemize',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @exdent should only appear at the beginning of a
line
',
@@ -352,6 +388,15 @@ $result_errors{'on_itemize_line'} = [
'text' => '@exdent should not appear in @itemize',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @exdent should not appear anywhere inside
@itemize
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@exdent should not appear anywhere inside @itemize',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @item should not appear in @itemize
',
@@ -361,6 +406,15 @@ $result_errors{'on_itemize_line'} = [
'text' => '@item should not appear in @itemize',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @item should not appear anywhere inside @itemize
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => '@item should not appear anywhere inside @itemize',
+ 'type' => 'warning'
+ },
{
'error_line' => '@item outside of table or list
',
diff --git a/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
b/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
index 4bee3d0053..9e686e6688 100644
--- a/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
@@ -207,6 +207,15 @@ $result_errors{'section_on_enumerate_line'} = [
'text' => '@section should not appear in @enumerate',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside
@enumerate
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @enumerate',
+ 'type' => 'warning'
+ },
{
'error_line' => 'bad argument to @enumerate
',
@@ -243,6 +252,15 @@ $result_errors{'section_on_enumerate_line'} = [
'text' => '@section should not appear in @enumerate',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside
@enumerate
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @enumerate',
+ 'type' => 'warning'
+ },
{
'error_line' => '@section seen before @end enumerate
',
diff --git a/tp/t/results/invalid_nestings/section_on_float_line.pl
b/tp/t/results/invalid_nestings/section_on_float_line.pl
index 6a1d4e39e9..949c0a8b2b 100644
--- a/tp/t/results/invalid_nestings/section_on_float_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_float_line.pl
@@ -144,6 +144,15 @@ $result_errors{'section_on_float_line'} = [
'text' => '@section should not appear in @float',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside @float
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @float',
+ 'type' => 'warning'
+ },
{
'error_line' => '@section seen before @end float
',
diff --git a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
index b1cc22371f..7d87da1645 100644
--- a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
@@ -398,6 +398,15 @@ $result_errors{'section_on_itemize_line'} = [
'text' => '@section should not appear in @itemize',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside
@itemize
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @itemize',
+ 'type' => 'warning'
+ },
{
'error_line' => '@section seen before @end itemize
',
@@ -425,6 +434,15 @@ $result_errors{'section_on_itemize_line'} = [
'text' => '@section should not appear in @itemize',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside
@itemize
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @itemize',
+ 'type' => 'warning'
+ },
{
'error_line' => '@section seen before @end itemize
',
@@ -443,6 +461,15 @@ $result_errors{'section_on_itemize_line'} = [
'text' => '@section should not appear in @itemize',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside
@itemize
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @itemize',
+ 'type' => 'warning'
+ },
{
'error_line' => '@section seen before @end itemize
',
@@ -479,6 +506,15 @@ $result_errors{'section_on_itemize_line'} = [
'text' => '@section should not appear in @itemize',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside
@itemize
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @itemize',
+ 'type' => 'warning'
+ },
{
'error_line' => '@section seen before @end itemize
',
diff --git a/tp/t/results/invalid_nestings/section_on_multitable_line.pl
b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
index 267f564d36..fff7737deb 100644
--- a/tp/t/results/invalid_nestings/section_on_multitable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
@@ -323,6 +323,15 @@ $result_errors{'section_on_multitable_line'} = [
'text' => '@section should not appear in @multitable',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside
@multitable
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @multitable',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: empty multitable
',
@@ -359,6 +368,15 @@ $result_errors{'section_on_multitable_line'} = [
'text' => '@section should not appear in @multitable',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside
@multitable
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @multitable',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: unexpected argument on @multitable line:
@code{this}
',
@@ -404,6 +422,15 @@ $result_errors{'section_on_multitable_line'} = [
'text' => '@section should not appear in @multitable',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside
@multitable
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @multitable',
+ 'type' => 'warning'
+ },
{
'error_line' => '@section seen before @end multitable
',
diff --git a/tp/t/results/invalid_nestings/section_on_xtable_line.pl
b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
index ff8bfce58e..d885c14394 100644
--- a/tp/t/results/invalid_nestings/section_on_xtable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
@@ -391,6 +391,15 @@ $result_errors{'section_on_xtable_line'} = [
'text' => '@section should not appear in @vtable',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside
@vtable
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @vtable',
+ 'type' => 'warning'
+ },
{
'error_line' => 'missing @vtable argument
',
@@ -427,6 +436,15 @@ $result_errors{'section_on_xtable_line'} = [
'text' => '@section should not appear in @table',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside @table
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @table',
+ 'type' => 'warning'
+ },
{
'error_line' => 'command @TeX not accepting argument in brace should not
be on @table line
',
@@ -463,6 +481,15 @@ $result_errors{'section_on_xtable_line'} = [
'text' => '@section should not appear in @table',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside @table
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @table',
+ 'type' => 'warning'
+ },
{
'error_line' => '@section seen before @end table
',
@@ -499,6 +526,15 @@ $result_errors{'section_on_xtable_line'} = [
'text' => '@section should not appear in @ftable',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @section should not appear anywhere inside
@ftable
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => '@section should not appear anywhere inside @ftable',
+ 'type' => 'warning'
+ },
{
'error_line' => 'bad argument to @ftable: @ringaccent
',
diff --git a/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
b/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
index 992273b887..e9a42c586a 100644
--- a/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
+++ b/tp/t/results/preformatted/example_invalid_at_commands_arguments.pl
@@ -221,6 +221,15 @@ $result_errors{'example_invalid_at_commands_arguments'} = [
'text' => '@ref should not appear in @example',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @ref should not appear anywhere inside @example
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@ref should not appear anywhere inside @example',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @anchor should not appear in @example
',
@@ -230,6 +239,15 @@ $result_errors{'example_invalid_at_commands_arguments'} = [
'text' => '@anchor should not appear in @example',
'type' => 'warning'
},
+ {
+ 'error_line' => 'warning: @anchor should not appear anywhere inside
@example
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@anchor should not appear anywhere inside @example',
+ 'type' => 'warning'
+ },
{
'error_line' => 'warning: @center should not appear in @example
',
@@ -238,6 +256,15 @@ $result_errors{'example_invalid_at_commands_arguments'} = [
'macro' => '',
'text' => '@center should not appear in @example',
'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: @center should not appear anywhere inside
@example
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@center should not appear anywhere inside @example',
+ 'type' => 'warning'
}
];
diff --git a/tp/t/results/xtable/definfoenclose_on_table_line.pl
b/tp/t/results/xtable/definfoenclose_on_table_line.pl
index e8f346d5c0..d3e1f03416 100644
--- a/tp/t/results/xtable/definfoenclose_on_table_line.pl
+++ b/tp/t/results/xtable/definfoenclose_on_table_line.pl
@@ -257,6 +257,15 @@ $result_errors{'definfoenclose_on_table_line'} = [
'macro' => '',
'text' => '@phi should not appear in @table',
'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: @phi should not appear anywhere inside @table
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@phi should not appear anywhere inside @table',
+ 'type' => 'warning'
}
];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Basic inline stack for block line args,
Gavin D. Smith <=