[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Add tests of raw @-commands
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Add tests of raw @-commands |
|
Date: |
Fri, 09 Sep 2022 09:24:02 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 80b08218bd Add tests of raw @-commands
80b08218bd is described below
commit 80b08218bd322d33c436572c1f2360b1f75d403d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Sep 9 15:23:38 2022 +0200
Add tests of raw @-commands
---
tp/t/16raw.t | 20 ++
tp/t/results/raw/beginning_and_end_on_line.pl | 125 ++++++++++++
tp/t/results/raw/spurious_arg_on_line.pl | 265 ++++++++++++++++++++++++++
3 files changed, 410 insertions(+)
diff --git a/tp/t/16raw.t b/tp/t/16raw.t
index 6885603c5f..1979c0ce37 100644
--- a/tp/t/16raw.t
+++ b/tp/t/16raw.t
@@ -385,9 +385,29 @@ some verbatim @
['inline_missing_first_arg',
'@inlinefmt{ , aaa}. @inlineraw{, bbb}.
'],
+['spurious_arg_on_line',
+'
+@tex argt
+in tex
+@end tex
+
+@verbatim argverbatim
+in verbatim
+@end verbatim
+
+@html argh
+in html
+@end html
+',
+{'EXPANDED_FORMATS' => ['tex']}
+],
['beginning_and_end_on_line',
'
@tex in tex @end tex
+
+@verbatim in verbatim @end verbatim
+
+@html in html @end html
',
{'EXPANDED_FORMATS' => ['tex']}
],
diff --git a/tp/t/results/raw/beginning_and_end_on_line.pl
b/tp/t/results/raw/beginning_and_end_on_line.pl
index 914b1448e3..2163aeaa51 100644
--- a/tp/t/results/raw/beginning_and_end_on_line.pl
+++ b/tp/t/results/raw/beginning_and_end_on_line.pl
@@ -69,6 +69,95 @@ $result_trees{'beginning_and_end_on_line'} = {
'line_nr' => 2,
'macro' => ''
}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in verbatim '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'verbatim',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'verbatim'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'verbatim'
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'elided_block'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {}
}
],
'parent' => {},
@@ -84,14 +173,32 @@
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'conten
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1];
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'beginning_and_end_on_line'}{'contents'}[0];
+$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'beginning_and_end_on_line'}{'contents'}[0];
+$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[3];
+$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[3];
+$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'beginning_and_end_on_line'}{'contents'}[0];
+$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'beginning_and_end_on_line'}{'contents'}[0];
+$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[5];
+$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
= $result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[5];
+$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
= $result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[5];
+$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[5]{'parent'}
= $result_trees{'beginning_and_end_on_line'}{'contents'}[0];
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'parent'} =
$result_trees{'beginning_and_end_on_line'};
$result_texis{'beginning_and_end_on_line'} = '
@tex in tex @end tex
+
+@verbatim in verbatim @end verbatim
+
+@html
';
$result_texts{'beginning_and_end_on_line'} = '
+
+
';
$result_errors{'beginning_and_end_on_line'} = [
@@ -103,6 +210,24 @@ $result_errors{'beginning_and_end_on_line'} = [
'macro' => '',
'text' => '@end should only appear at the beginning of a line',
'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: @end should only appear at the beginning of a
line
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => '@end should only appear at the beginning of a line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'no matching `@end html\'
+',
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => '',
+ 'text' => 'no matching `@end html\'',
+ 'type' => 'error'
}
];
diff --git a/tp/t/results/raw/spurious_arg_on_line.pl
b/tp/t/results/raw/spurious_arg_on_line.pl
new file mode 100644
index 0000000000..3ac4c16338
--- /dev/null
+++ b/tp/t/results/raw/spurious_arg_on_line.pl
@@ -0,0 +1,265 @@
+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 %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'spurious_arg_on_line'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'argt'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in tex
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'tex'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'tex'
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'argverbatim'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'verbatim',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in verbatim
+',
+ 'type' => 'raw'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'verbatim'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'verbatim'
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'elided_block'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'html'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'html'
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[5];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[5];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[5];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'contents'}[5]{'parent'}
= $result_trees{'spurious_arg_on_line'}{'contents'}[0];
+$result_trees{'spurious_arg_on_line'}{'contents'}[0]{'parent'} =
$result_trees{'spurious_arg_on_line'};
+
+$result_texis{'spurious_arg_on_line'} = '
+@tex argt
+in tex
+@end tex
+
+@verbatim argverbatim
+in verbatim
+@end verbatim
+
+@html
+@end html
+';
+
+
+$result_texts{'spurious_arg_on_line'} = '
+
+in verbatim
+
+';
+
+$result_errors{'spurious_arg_on_line'} = [];
+
+
+$result_floats{'spurious_arg_on_line'} = {};
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Add tests of raw @-commands,
Patrice Dumas <=