[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Makefile.tres, tp/t/65linemacro.t (protectio
From: |
Patrice Dumas |
Subject: |
branch master updated: * tp/Makefile.tres, tp/t/65linemacro.t (protection_of_end_of_line_by_command): add specific test of protection of end of line by @ in linemacro call. From Gavin. |
Date: |
Sun, 23 Jul 2023 03:36:26 -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 3be42a2e58 * tp/Makefile.tres, tp/t/65linemacro.t
(protection_of_end_of_line_by_command): add specific test of protection of end
of line by @ in linemacro call. From Gavin.
3be42a2e58 is described below
commit 3be42a2e58b6c1a3d250a8f1467428e151b6c860
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jul 23 09:36:16 2023 +0200
* tp/Makefile.tres, tp/t/65linemacro.t
(protection_of_end_of_line_by_command): add specific test of
protection of end of line by @ in linemacro call. From Gavin.
---
ChangeLog | 6 +
tp/Makefile.tres | 1 +
tp/t/65linemacro.t | 8 +
.../protection_of_end_of_line_by_command.pl | 173 +++++++++++++++++++++
4 files changed, 188 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 5d208c63e9..1717bed537 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-07-23 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Makefile.tres, tp/t/65linemacro.t
+ (protection_of_end_of_line_by_command): add specific test of
+ protection of end of line by @ in linemacro call. From Gavin.
+
2023-07-22 Patrice Dumas <pertusus@free.fr>
* tp/t/60macro.t (non_ascii_in_macro_name): skip test if /a regex flag
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index e8bf0aef4d..d027ad055a 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -1239,6 +1239,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/linemacro/no_arguments.pl \
t/results/linemacro/paragraph_no_paragraph.pl \
t/results/linemacro/protected_spaces_on_line.pl \
+ t/results/linemacro/protection_of_end_of_line_by_command.pl \
t/results/linemacro/recursive_linemacro_in_body.pl \
t/results/linemacro/recursive_linemacro_in_call.pl \
t/results/linemacro/simple_nested_linemacro_calls.pl \
diff --git a/tp/t/65linemacro.t b/tp/t/65linemacro.t
index 70b61cc6b7..d879bdd24b 100644
--- a/tp/t/65linemacro.t
+++ b/tp/t/65linemacro.t
@@ -80,6 +80,14 @@ Some text @mycommand {a
protected} in @var{the
call}
and after.
+'],
+['protection_of_end_of_line_by_command',
+'@linemacro lm {one}
+\one\bullet{}
+@end linemacro
+
+@lm @
+
'],
['blockitem_no_item',
'@linemacro mycommand {a, b, c}
diff --git a/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
b/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
new file mode 100644
index 0000000000..fbf8cb1250
--- /dev/null
+++ b/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
@@ -0,0 +1,173 @@
+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{'protection_of_end_of_line_by_command'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'text' => 'lm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'one',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'cmdname' => 'linemacro',
+ 'contents' => [
+ {
+ 'text' => '\\one\\bullet{}
+',
+ 'type' => 'raw'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'linemacro'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'linemacro'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'arg_line' => ' lm {one}
+'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'source_marks' => [
+ {
+ 'counter' => 1,
+ 'element' => {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '@
+'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ }
+ }
+ ],
+ 'extra' => {
+ 'name' => 'lm'
+ },
+ 'type' => 'linemacro_call'
+ },
+ 'position' => 1,
+ 'sourcemark_type' => 'linemacro_expansion',
+ 'status' => 'start'
+ }
+ ],
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'cmdname' => '
+'
+ },
+ {
+ 'source_marks' => [
+ {
+ 'counter' => 1,
+ 'position' => 6,
+ 'sourcemark_type' => 'linemacro_expansion',
+ 'status' => 'end'
+ }
+ ],
+ 'text' => 'bullet
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'protection_of_end_of_line_by_command'} = '@linemacro lm {one}
+\\one\\bullet{}
+@end linemacro
+
+@
+bullet
+';
+
+
+$result_texts{'protection_of_end_of_line_by_command'} = '
+ bullet
+';
+
+$result_errors{'protection_of_end_of_line_by_command'} = [
+ {
+ 'error_line' => 'misplaced { (possibly involving @lm)
+',
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => 'lm',
+ 'text' => 'misplaced {',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'misplaced } (possibly involving @lm)
+',
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => 'lm',
+ 'text' => 'misplaced }',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'protection_of_end_of_line_by_command'} = {};
+
+
+1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Makefile.tres, tp/t/65linemacro.t (protection_of_end_of_line_by_command): add specific test of protection of end of line by @ in linemacro call. From Gavin.,
Patrice Dumas <=