[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/t/18itemize.t (@test_cases): add more tests
From: |
Patrice Dumas |
Subject: |
branch master updated: * tp/t/18itemize.t (@test_cases): add more tests of accents on @itemize lines in empty_accent_argument and accent_argument. |
Date: |
Fri, 09 Dec 2022 16:51:34 -0500 |
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 1a5db7d1ff * tp/t/18itemize.t (@test_cases): add more tests of accents
on @itemize lines in empty_accent_argument and accent_argument.
1a5db7d1ff is described below
commit 1a5db7d1ffe636c369ed6fcbc3053c9ea1d09cd1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Dec 9 22:51:08 2022 +0100
* tp/t/18itemize.t (@test_cases): add more tests of accents
on @itemize lines in empty_accent_argument and accent_argument.
* tp/t/22xtable.t (@test_cases): add more tests of accents
on @table line in accent_on_table_line.
---
ChangeLog | 8 +
tp/TODO | 2 -
tp/t/18itemize.t | 8 +
tp/t/22xtable.t | 20 +
tp/t/results/itemize/accent_argument.pl | 120 +++++
tp/t/results/itemize/empty_accent_argument.pl | 116 ++++
tp/t/results/xtable/accent_on_table_line.pl | 732 ++++++++++++++++++++++++++
7 files changed, 1004 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fb32f6a1a5..842cada785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-12-09 Patrice Dumas <pertusus@free.fr>
+
+ * tp/t/18itemize.t (@test_cases): add more tests of accents
+ on @itemize lines in empty_accent_argument and accent_argument.
+
+ * tp/t/22xtable.t (@test_cases): add more tests of accents
+ on @table line in accent_on_table_line.
+
2022-12-08 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
diff --git a/tp/TODO b/tp/TODO
index b06ea5aab4..d68ff237f2 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -13,8 +13,6 @@ Before next release
Bugs
====
-check that there are tests of @^{} and @ringaccent{?} on @itemize and @table
lines.
-
HTML API
========
diff --git a/tp/t/18itemize.t b/tp/t/18itemize.t
index 39c694306c..9b9d950c32 100644
--- a/tp/t/18itemize.t
+++ b/tp/t/18itemize.t
@@ -24,6 +24,10 @@ my @test_cases = (
@itemize @~{}
@item item
@end itemize
+
+@itemize @~
+@item item
+@end itemize
'],
['accent_argument',
'@itemize @~e
@@ -33,6 +37,10 @@ my @test_cases = (
@itemize @~{e}
@item item
@end itemize
+
+@itemize @ringaccent a
+@item item
+@end itemize
'],
['comment_first_on_itemize_line',
'@itemize @c comment on itemize line
diff --git a/tp/t/22xtable.t b/tp/t/22xtable.t
index b2e6594ab0..e211712097 100644
--- a/tp/t/22xtable.t
+++ b/tp/t/22xtable.t
@@ -16,6 +16,26 @@ my @test_cases = (
@item acc brace first item
@item no at-command @code{code acc brace}
@end table
+
+@table @~@comment
+@item acc comment first item
+@end table
+
+@table @~
+@item acc space first item
+@end table
+
+@table @ringaccent
+@item cmdacc first item
+@end table
+
+@table @ringaccent{}
+@item cmdacc braces first item
+@end table
+
+@table @ringaccent{a}
+@item cmdacc braces arg first item
+@end table
'],
['definfoenclose_on_table_line',
'@definfoenclose phi,:,:
diff --git a/tp/t/results/itemize/accent_argument.pl
b/tp/t/results/itemize/accent_argument.pl
index 369410fceb..ff88a078f4 100644
--- a/tp/t/results/itemize/accent_argument.pl
+++ b/tp/t/results/itemize/accent_argument.pl
@@ -205,6 +205,110 @@ $result_trees{'accent_argument'} = {
'line_nr' => 5,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => 'ringaccent',
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'itemize',
+ 'contents' => [
+ {
+ 'cmdname' => 'item',
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'item
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'item_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'itemize'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'itemize'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
}
],
'type' => 'before_node_section'
@@ -220,11 +324,17 @@ $result_texis{'accent_argument'} = '@itemize @~e
@itemize @~{e}
@item item
@end itemize
+
+@itemize @ringaccent a
+@item item
+@end itemize
';
$result_texts{'accent_argument'} = 'item
+item
+
item
';
@@ -238,6 +348,8 @@ $result_floats{'accent_argument'} = {};
$result_converted{'plaintext'}->{'accent_argument'} = ' ẽ item
ẽ item
+
+ å item
';
@@ -248,6 +360,10 @@ $result_converted{'html_text'}->{'accent_argument'} = '<ul
class="itemize" style
<ul class="itemize" style="list-style-type: \'\\1EBD \'">
<li>item
</li></ul>
+
+<ul class="itemize" style="list-style-type: \'\\00E5 \'">
+<li>item
+</li></ul>
';
@@ -258,6 +374,10 @@ $result_converted{'xml'}->{'accent_argument'} = '<itemize
spaces=" " endspaces="
<itemize spaces=" " endspaces=" "><itemprepend><accent
type="tilde">e</accent></itemprepend>
<listitem><prepend><accent type="tilde">e</accent></prepend> <para>item
</para></listitem></itemize>
+
+<itemize spaces=" " endspaces=" "><itemprepend><accent type="ring"
spacesaftercmd=" " bracketed="off">a</accent></itemprepend>
+<listitem><prepend><accent type="ring" spacesaftercmd=" "
bracketed="off">a</accent></prepend> <para>item
+</para></listitem></itemize>
';
1;
diff --git a/tp/t/results/itemize/empty_accent_argument.pl
b/tp/t/results/itemize/empty_accent_argument.pl
index 709ad376c4..60d4914c37 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -296,6 +296,97 @@ $result_trees{'empty_accent_argument'} = {
'line_nr' => 9,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'itemize',
+ 'contents' => [
+ {
+ 'cmdname' => 'item',
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'item
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'item_number' => 1
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'itemize'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'itemize'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
}
],
'type' => 'before_node_section'
@@ -315,6 +406,10 @@ $result_texis{'empty_accent_argument'} = '@itemize
@~@comment
@itemize @~{}
@item item
@end itemize
+
+@itemize @~
+@item item
+@end itemize
';
@@ -322,6 +417,8 @@ $result_texts{'empty_accent_argument'} = 'item
item
+item
+
item
';
@@ -352,6 +449,15 @@ $result_errors{'empty_accent_argument'} = [
'macro' => '',
'text' => 'accent command `@~\' not allowed as @itemize argument',
'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: command `@~\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => '',
+ 'text' => 'command `@~\' must not be followed by new line',
+ 'type' => 'warning'
}
];
@@ -365,6 +471,8 @@ $result_converted{'plaintext'}->{'empty_accent_argument'} =
' ̃ item
̃ item
̃ item
+
+ ̃ item
';
@@ -376,6 +484,10 @@ $result_converted{'html_text'}->{'empty_accent_argument'}
= '<ul class="itemize"
<li>item
</li></ul>
+<ul class="itemize" style="list-style-type: \'\\0303 \'">
+<li>item
+</li></ul>
+
<ul class="itemize" style="list-style-type: \'\\0303 \'">
<li>item
</li></ul>
@@ -393,6 +505,10 @@ $result_converted{'xml'}->{'empty_accent_argument'} =
'<itemize spaces=" " endsp
<itemize spaces=" " endspaces=" "><itemprepend><accent
type="tilde"></accent></itemprepend>
<listitem><prepend><accent type="tilde"></accent></prepend> <para>item
</para></listitem></itemize>
+
+<itemize spaces=" " endspaces=" "><itemprepend><accent type="tilde"></accent>
</itemprepend>
+<listitem><prepend><accent type="tilde"></accent></prepend> <para>item
+</para></listitem></itemize>
';
1;
diff --git a/tp/t/results/xtable/accent_on_table_line.pl
b/tp/t/results/xtable/accent_on_table_line.pl
index b8200de6c4..48b034a5c3 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -329,6 +329,571 @@ $result_trees{'accent_on_table_line'} = {
'line_nr' => 6,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'cmdname' => 'asis',
+ 'type' => 'command_as_argument_inserted'
+ },
+ {
+ 'contents' => [
+ {
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => '
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'comment',
+ 'extra' => {
+ 'misc_args' => [
+ '
+'
+ ]
+ }
+ }
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'acc comment first item'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'table_term'
+ }
+ ],
+ 'type' => 'table_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'table'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'table'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'command_as_argument' => {}
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'cmdname' => 'asis',
+ 'type' => 'command_as_argument_inserted'
+ },
+ {
+ 'contents' => [
+ {
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'acc space first item'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'table_term'
+ }
+ ],
+ 'type' => 'table_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'table'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'table'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'command_as_argument' => {}
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'cmdname' => 'asis',
+ 'type' => 'command_as_argument_inserted'
+ },
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'ringaccent',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cmdacc first item'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'table_term'
+ }
+ ],
+ 'type' => 'table_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'table'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'table'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'command_as_argument' => {}
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'cmdname' => 'asis',
+ 'type' => 'command_as_argument_inserted'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ringaccent',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ },
+ 'type' => 'command_as_argument'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cmdacc braces first item'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 24,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'table_term'
+ }
+ ],
+ 'type' => 'table_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'table'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'table'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 25,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'command_as_argument' => {}
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'cmdname' => 'asis',
+ 'type' => 'command_as_argument_inserted'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'ringaccent',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cmdacc braces arg first item'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 28,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'table_term'
+ }
+ ],
+ 'type' => 'table_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'table'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'table'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 29,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'command_as_argument' => {}
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => ''
+ }
}
],
'type' => 'before_node_section'
@@ -338,6 +903,11 @@ $result_trees{'accent_on_table_line'} = {
};
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[4]{'args'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[8]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[12]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[12]{'args'}[0];
$result_texis{'accent_on_table_line'} = '@table @~
@item first item
@@ -348,6 +918,26 @@ $result_texis{'accent_on_table_line'} = '@table @~
@item acc brace first item
@item no at-command @code{code acc brace}
@end table
+
+@table @~@comment
+@item acc comment first item
+@end table
+
+@table @~
+@item acc space first item
+@end table
+
+@table @ringaccent
+@item cmdacc first item
+@end table
+
+@table @ringaccent{}
+@item cmdacc braces first item
+@end table
+
+@table @ringaccent{a}
+@item cmdacc braces arg first item
+@end table
';
@@ -356,6 +946,16 @@ no at-command code
acc brace first item
no at-command code acc brace
+
+acc comment first item
+
+acc space first item
+
+cmdacc first item
+
+cmdacc braces first item
+
+cmdacc braces arg first item
';
$result_errors{'accent_on_table_line'} = [
@@ -385,6 +985,78 @@ $result_errors{'accent_on_table_line'} = [
'macro' => '',
'text' => 'accent command `@~\' not allowed as @table argument',
'type' => 'warning'
+ },
+ {
+ 'error_line' => '@~ expected braces
+',
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => '',
+ 'text' => '@~ expected braces',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'table requires an argument: the formatter for @item
+',
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => '',
+ 'text' => 'table requires an argument: the formatter for @item',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'warning: command `@~\' must not be followed by new line
+',
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => '',
+ 'text' => 'command `@~\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'table requires an argument: the formatter for @item
+',
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => '',
+ 'text' => 'table requires an argument: the formatter for @item',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'warning: command `@ringaccent\' must not be followed by
new line
+',
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => '',
+ 'text' => 'command `@ringaccent\' must not be followed by new line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'table requires an argument: the formatter for @item
+',
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => '',
+ 'text' => 'table requires an argument: the formatter for @item',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'warning: accent command `@ringaccent\' not allowed as
@table argument
+',
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => '',
+ 'text' => 'accent command `@ringaccent\' not allowed as @table argument',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'table requires an argument: the formatter for @item
+',
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => '',
+ 'text' => 'table requires an argument: the formatter for @item',
+ 'type' => 'error'
}
];
@@ -398,6 +1070,16 @@ no at-command ‘code’
acc brace first item
no at-command ‘code acc brace’
+
+acc comment first item
+
+acc space first item
+
+cmdacc first item
+
+cmdacc braces first item
+
+cmdacc braces arg first item
';
@@ -410,6 +1092,26 @@ $result_converted{'html_text'}->{'accent_on_table_line'}
= '<dl class="table">
<dt>acc brace first item</dt>
<dt>no at-command <code class="code">code acc brace</code></dt>
</dl>
+
+<dl class="table">
+<dt>acc comment first item</dt>
+</dl>
+
+<dl class="table">
+<dt>acc space first item</dt>
+</dl>
+
+<dl class="table">
+<dt>cmdacc first item</dt>
+</dl>
+
+<dl class="table">
+<dt>cmdacc braces first item</dt>
+</dl>
+
+<dl class="table">
+<dt>cmdacc braces arg first item</dt>
+</dl>
';
@@ -422,6 +1124,26 @@ $result_converted{'xml'}->{'accent_on_table_line'} =
'<table commandarg="asis" s
<tableentry><tableterm><item spaces=" "><itemformat command="asis">acc brace
first item</itemformat></item>
</tableterm></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis">no at-command <code>code acc brace</code></itemformat></item>
</tableterm></tableentry></table>
+
+<table commandarg="asis" spaces=" " endspaces=" "><!-- comment -->
+<tableentry><tableterm><item spaces=" "><itemformat command="asis">acc comment
first item</itemformat></item>
+</tableterm></tableentry></table>
+
+<table commandarg="asis" spaces=" " endspaces=" ">
+<tableentry><tableterm><item spaces=" "><itemformat command="asis">acc space
first item</itemformat></item>
+</tableterm></tableentry></table>
+
+<table commandarg="asis" spaces=" " endspaces=" ">
+<tableentry><tableterm><item spaces=" "><itemformat command="asis">cmdacc
first item</itemformat></item>
+</tableterm></tableentry></table>
+
+<table commandarg="asis" spaces=" " endspaces=" ">
+<tableentry><tableterm><item spaces=" "><itemformat command="asis">cmdacc
braces first item</itemformat></item>
+</tableterm></tableentry></table>
+
+<table commandarg="asis" spaces=" " endspaces=" ">
+<tableentry><tableterm><item spaces=" "><itemformat command="asis">cmdacc
braces arg first item</itemformat></item>
+</tableterm></tableentry></table>
';
@@ -430,6 +1152,16 @@ $result_converted{'docbook'}->{'accent_on_table_line'} =
'<variablelist><varlist
</term></varlistentry></variablelist>
<variablelist><varlistentry><term>acc brace first item
</term></varlistentry><varlistentry><term>no at-command <literal>code acc
brace</literal>
+</term></varlistentry></variablelist>
+<variablelist><varlistentry><term>acc comment first item
+</term></varlistentry></variablelist>
+<variablelist><varlistentry><term>acc space first item
+</term></varlistentry></variablelist>
+<variablelist><varlistentry><term>cmdacc first item
+</term></varlistentry></variablelist>
+<variablelist><varlistentry><term>cmdacc braces first item
+</term></varlistentry></variablelist>
+<variablelist><varlistentry><term>cmdacc braces arg first item
</term></varlistentry></variablelist>';
1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/t/18itemize.t (@test_cases): add more tests of accents on @itemize lines in empty_accent_argument and accent_argument.,
Patrice Dumas <=