[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/t/50value.t, tp/t/60macro.t, tp/Makefile.tre
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/t/50value.t, tp/t/60macro.t, tp/Makefile.tres: add closing_brace_in_value_in_ingnored_inline and closing_brace_in_macro_call_in_ingnored_inline with end of @inline* command in @value or macro expansion in the ignored @inline* command argument. |
|
Date: |
Sat, 11 Mar 2023 12:46:32 -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 f734d2d7f4 * tp/t/50value.t, tp/t/60macro.t, tp/Makefile.tres: add
closing_brace_in_value_in_ingnored_inline and
closing_brace_in_macro_call_in_ingnored_inline with end of @inline* command in
@value or macro expansion in the ignored @inline* command argument.
f734d2d7f4 is described below
commit f734d2d7f470a823f42ae4a670f69d531b3b7623
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Mar 11 18:42:04 2023 +0100
* tp/t/50value.t, tp/t/60macro.t, tp/Makefile.tres: add
closing_brace_in_value_in_ingnored_inline and
closing_brace_in_macro_call_in_ingnored_inline with end of @inline*
command in @value or macro expansion in the ignored @inline* command
argument.
---
ChangeLog | 8 +
tp/Makefile.tres | 2 +
tp/TODO | 9 -
tp/t/50value.t | 13 +-
tp/t/60macro.t | 13 ++
...osing_brace_in_macro_call_in_ingnored_inline.pl | 235 +++++++++++++++++++++
.../closing_brace_in_value_in_ingnored_inline.pl | 191 +++++++++++++++++
7 files changed, 461 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b414337313..ca8aa99dce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-03-11 Patrice Dumas <pertusus@free.fr>
+
+ * tp/t/50value.t, tp/t/60macro.t, tp/Makefile.tres: add
+ closing_brace_in_value_in_ingnored_inline and
+ closing_brace_in_macro_call_in_ingnored_inline with end of @inline*
+ command in @value or macro expansion in the ignored @inline* command
+ argument.
+
2023-03-11 Gavin Smith <gavinsmith0123@gmail.com>
* doc/texinfo-tex-test.texi (Macros):
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 151ac048af..c1e6fa37f3 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -1212,6 +1212,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/macro/bad_macro_name_with_underscore.pl \
t/results/macro/bib_example.pl \
t/results/macro/bye_in_macro.pl \
+ t/results/macro/closing_brace_in_macro_call_in_ingnored_inline.pl \
t/results/macro/complete_macro_for_end.pl \
t/results/macro/complex_argument.pl \
t/results/macro/cpp_directives_after_macros.pl \
@@ -1825,6 +1826,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/value/bad_syntax.pl \
t/results/value/begin_like_comment_on_set_line.pl \
t/results/value/clear_no_end_of_line.pl \
+ t/results/value/closing_brace_in_value_in_ingnored_inline.pl \
t/results/value/comment_on_clear_line.pl \
t/results/value/comment_on_set_line.pl \
t/results/value/empty_set.pl \
diff --git a/tp/TODO b/tp/TODO
index da2d49b90a..d94c2cd21e 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -48,15 +48,6 @@ Delayed bugs
See message/thread from Reißner Ernst: Feature request: api docs
-In @inline* ignored arguments, @value and user macros should not be
-expanded. For example
-
- @set closebrace }
-
- @inlinefmt{html,
- truc @value{closebrace}
- machin
-
hyphenation: should only appear in toplevel.
diff --git a/tp/t/50value.t b/tp/t/50value.t
index 3e8063455d..3f3a0312bb 100644
--- a/tp/t/50value.t
+++ b/tp/t/50value.t
@@ -394,7 +394,18 @@ line
}
@value{aa}.
-']
+'],
+['closing_brace_in_value_in_ingnored_inline',
+'@set closebrace }
+
+@inlinefmt{html,
+truc @value{closebrace}
+machin
+
+@inlinefmt{tex,
+bidule @value{closebrace}
+after
+'],
);
run_all('value', \@test_cases);
diff --git a/tp/t/60macro.t b/tp/t/60macro.t
index 029b5e7604..fc1cd00f01 100644
--- a/tp/t/60macro.t
+++ b/tp/t/60macro.t
@@ -615,6 +615,19 @@ Toto @inlineifclear{fl@clearargendignored{}}. After.
Again with space @inlineifclear{fl@clearargendignored{} }. After.
'],
+['closing_brace_in_macro_call_in_ingnored_inline',
+'@macro closebrace
+}
+@end macro
+
+@inlinefmt{html,
+truc @closebrace{}
+machin
+
+@inlinefmt{tex,
+bidule @closebrace
+after
+'],
['macro_call_in_node_manual',
'@macro openbrace
(
diff --git
a/tp/t/results/macro/closing_brace_in_macro_call_in_ingnored_inline.pl
b/tp/t/results/macro/closing_brace_in_macro_call_in_ingnored_inline.pl
new file mode 100644
index 0000000000..b5d350ee38
--- /dev/null
+++ b/tp/t/results/macro/closing_brace_in_macro_call_in_ingnored_inline.pl
@@ -0,0 +1,235 @@
+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{'closing_brace_in_macro_call_in_ingnored_inline'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'text' => 'closebrace',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'cmdname' => 'macro',
+ 'contents' => [
+ {
+ 'text' => '}
+',
+ 'type' => 'raw'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macro'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'macro'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'arg_line' => ' closebrace
+'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'html'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'source_marks' => [
+ {
+ 'counter' => 1,
+ 'element' => {
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'extra' => {
+ 'name' => 'closebrace'
+ },
+ 'type' => 'macro_call'
+ },
+ 'position' => 5,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'start'
+ }
+ ],
+ 'text' => 'truc '
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'extra' => {
+ 'expand_index' => 1,
+ 'format' => 'html'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'source_marks' => [
+ {
+ 'counter' => 1,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'end'
+ }
+ ]
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'text' => 'machin
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'tex'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => '
+bidule @closebrace
+after
+',
+ 'type' => 'raw'
+ }
+ ],
+ 'type' => 'elided_brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'extra' => {
+ 'format' => 'tex'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'closing_brace_in_macro_call_in_ingnored_inline'} = '@macro
closebrace
+}
+@end macro
+
+@inlinefmt{html,
+truc }
+machin
+
+@inlinefmt{tex,
+bidule @closebrace
+after
+}';
+
+
+$result_texts{'closing_brace_in_macro_call_in_ingnored_inline'} = '
+truc
+machin
+
+';
+
+$result_errors{'closing_brace_in_macro_call_in_ingnored_inline'} = [
+ {
+ 'error_line' => '@inlinefmt missing closing brace
+',
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => '',
+ 'text' => '@inlinefmt missing closing brace',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'closing_brace_in_macro_call_in_ingnored_inline'} = {};
+
+
+1;
diff --git a/tp/t/results/value/closing_brace_in_value_in_ingnored_inline.pl
b/tp/t/results/value/closing_brace_in_value_in_ingnored_inline.pl
new file mode 100644
index 0000000000..0d328c658a
--- /dev/null
+++ b/tp/t/results/value/closing_brace_in_value_in_ingnored_inline.pl
@@ -0,0 +1,191 @@
+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{'closing_brace_in_value_in_ingnored_inline'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'text' => 'closebrace',
+ 'type' => 'rawline_arg'
+ },
+ {
+ 'text' => '}',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'info' => {
+ 'arg_line' => ' closebrace }
+'
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'html'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'source_marks' => [
+ {
+ 'counter' => 1,
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'closebrace'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '}',
+ 'position' => 5,
+ 'sourcemark_type' => 'value_expansion',
+ 'status' => 'start'
+ }
+ ],
+ 'text' => 'truc '
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'extra' => {
+ 'expand_index' => 1,
+ 'format' => 'html'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'source_marks' => [
+ {
+ 'counter' => 1,
+ 'sourcemark_type' => 'value_expansion',
+ 'status' => 'end'
+ }
+ ]
+ },
+ {
+ 'text' => '
+'
+ },
+ {
+ 'text' => 'machin
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'tex'
+ }
+ ],
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => '
+bidule @value{closebrace}
+after
+',
+ 'type' => 'raw'
+ }
+ ],
+ 'type' => 'elided_brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'inlinefmt',
+ 'extra' => {
+ 'format' => 'tex'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+
+$result_texis{'closing_brace_in_value_in_ingnored_inline'} = '@set closebrace }
+
+@inlinefmt{html,
+truc }
+machin
+
+@inlinefmt{tex,
+bidule @value{closebrace}
+after
+}';
+
+
+$result_texts{'closing_brace_in_value_in_ingnored_inline'} = '
+truc
+machin
+
+';
+
+$result_errors{'closing_brace_in_value_in_ingnored_inline'} = [
+ {
+ 'error_line' => '@inlinefmt missing closing brace
+',
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => '',
+ 'text' => '@inlinefmt missing closing brace',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'closing_brace_in_value_in_ingnored_inline'} = {};
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/t/50value.t, tp/t/60macro.t, tp/Makefile.tres: add closing_brace_in_value_in_ingnored_inline and closing_brace_in_macro_call_in_ingnored_inline with end of @inline* command in @value or macro expansion in the ignored @inline* command argument.,
Patrice Dumas <=