[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/t/65linemacro.t, tp/Makefile.tres: add block
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/t/65linemacro.t, tp/Makefile.tres: add blockitem_no_item test. |
|
Date: |
Fri, 07 Jul 2023 16:52:48 -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 67e81fe59e * tp/t/65linemacro.t, tp/Makefile.tres: add
blockitem_no_item test.
67e81fe59e is described below
commit 67e81fe59e6f4976abeac3139e3695b86bc37adc
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Jul 7 22:52:37 2023 +0200
* tp/t/65linemacro.t, tp/Makefile.tres: add blockitem_no_item
test.
---
ChangeLog | 5 +
tp/Makefile.tres | 2 +
tp/t/65linemacro.t | 12 ++
tp/t/results/linemacro/blockitem_no_item.pl | 305 ++++++++++++++++++++++++++++
4 files changed, 324 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 6e15307ff2..9917d4c49d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-07-07 Patrice Dumas <pertusus@free.fr>
+
+ * tp/t/65linemacro.t, tp/Makefile.tres: add blockitem_no_item
+ test.
+
2023-07-02 Gavin Smith <gavinsmith0123@gmail.com>
* doc/texinfo.tex (\link): Call \unsepspaces in case
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index b7293756d5..db1b3af268 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -425,6 +425,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/def/def_groupings_args.pl \
t/results/def/defblock_no_defline.pl \
t/results/def/defline_no_params.pl \
+ t/results/def/deftypeline.pl \
t/results/def/defx_after_comment.pl \
t/results/def/defx_after_comment_in_example.pl \
t/results/def/defx_after_empty_line.pl \
@@ -1206,6 +1207,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/layout/no_monolithic_only_toc_out.pl \
t/results/layout/no_monolithic_only_toc_out/res_html \
t/results/linemacro/api_doc_with_linemacro.pl \
+ t/results/linemacro/blockitem_no_item.pl \
t/results/linemacro/brace_command_not_closed.pl \
t/results/linemacro/braces_after_text.pl \
t/results/linemacro/empty_last_argument.pl \
diff --git a/tp/t/65linemacro.t b/tp/t/65linemacro.t
index 5d020054ab..49fa48a449 100644
--- a/tp/t/65linemacro.t
+++ b/tp/t/65linemacro.t
@@ -41,6 +41,18 @@ Some text @mycommand {a
call}
and after.
'],
+# FIXME currently incorrect output, probably because @end is handled
+# when the linemacro is processed.
+['blockitem_no_item',
+'@linemacro mycommand {a, b, c}
+\a\, \b\ \c\
+@end linemacro
+
+@itemize
+AA
+@mycommand d e f @
+@end itemize
+'],
['missing_formal_arg',
'@linemacro mymacro {a, , b}
\a\ and \b\.
diff --git a/tp/t/results/linemacro/blockitem_no_item.pl
b/tp/t/results/linemacro/blockitem_no_item.pl
new file mode 100644
index 0000000000..b997b0c1d4
--- /dev/null
+++ b/tp/t/results/linemacro/blockitem_no_item.pl
@@ -0,0 +1,305 @@
+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{'blockitem_no_item'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'text' => 'mycommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'cmdname' => 'linemacro',
+ 'contents' => [
+ {
+ 'text' => '\\a\\, \\b\\ \\c\\
+',
+ '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' => ' mycommand {a, b, c}
+'
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'itemize',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'AA
+'
+ },
+ {
+ 'source_marks' => [
+ {
+ 'counter' => 1,
+ 'element' => {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'd'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'text' => 'e'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'f'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'cmdname' => '
+'
+ }
+ ],
+ 'type' => 'def_aggregate'
+ }
+ ],
+ 'type' => 'line_arg'
+ }
+ ],
+ 'extra' => {
+ 'name' => 'mycommand'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'linemacro_call'
+ },
+ 'sourcemark_type' => 'linemacro_expansion',
+ 'status' => 'start'
+ }
+ ],
+ 'text' => '',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'before_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'itemize'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'itemize'
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'command_as_argument' => {}
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'd, e f '
+ },
+ {
+ 'cmdname' => '
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'source_marks' => [
+ {
+ 'counter' => 1,
+ 'position' => 1,
+ 'sourcemark_type' => 'linemacro_expansion',
+ 'status' => 'end'
+ }
+ ],
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'blockitem_no_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'blockitem_no_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+
+$result_texis{'blockitem_no_item'} = '@linemacro mycommand {a, b, c}
+\\a\\, \\b\\ \\c\\
+@end linemacro
+
+@itemize
+AA
+@end itemize
+d, e f @
+
+';
+
+
+$result_texts{'blockitem_no_item'} = '
+AA
+d, e f
+';
+
+$result_errors{'blockitem_no_item'} = [
+ {
+ 'error_line' => 'warning: @end should only appear at the beginning of a
line
+',
+ 'file_name' => '',
+ 'line_nr' => 8,
+ 'macro' => '',
+ 'text' => '@end should only appear at the beginning of a line',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: @itemize has text but no @item
+',
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => '@itemize has text but no @item',
+ 'type' => 'warning'
+ }
+];
+
+
+$result_floats{'blockitem_no_item'} = {};
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/t/65linemacro.t, tp/Makefile.tres: add blockitem_no_item test.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * doc/texinfo.tex (\link): Call \unsepspaces in case @link is used in @example environment, to stop the label in e.g. @link{One, Three} being taken as " Three" with a extra leading space. Report from Andreas Falkenhahn.
- Next by Date:
branch master updated: * tp/Texinfo/Common.pm (debug_print_element), tp/Texinfo/ParserNonXS.pm (_merge_text, _abort_empty_line) (_isolate_last_space, _end_line_misc_line, _parse_texi), tp/Texinfo/XS/parsetexi/context_stack.c (push_context, pop_context), tp/Texinfo/XS/parsetexi/debug.c (print_element_debug), tp/Texinfo/XS/parsetexi/end_line.c (end_line), tp/Texinfo/XS/parsetexi/macro.c (parse_macro_command_line), tp/Texinfo/XS/parsetexi/parser.c (merge_text, abort_empty_line) (parse_texi): shorten debug messages, [...]
- Previous by thread:
branch master updated: * doc/texinfo.tex (\link): Call \unsepspaces in case @link is used in @example environment, to stop the label in e.g. @link{One, Three} being taken as " Three" with a extra leading space. Report from Andreas Falkenhahn.
- Next by thread:
branch master updated: * tp/Texinfo/Common.pm (debug_print_element), tp/Texinfo/ParserNonXS.pm (_merge_text, _abort_empty_line) (_isolate_last_space, _end_line_misc_line, _parse_texi), tp/Texinfo/XS/parsetexi/context_stack.c (push_context, pop_context), tp/Texinfo/XS/parsetexi/debug.c (print_element_debug), tp/Texinfo/XS/parsetexi/end_line.c (end_line), tp/Texinfo/XS/parsetexi/macro.c (parse_macro_command_line), tp/Texinfo/XS/parsetexi/parser.c (merge_text, abort_empty_line) (parse_texi): shorten debug messages, [...]
- Index(es):