[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Makefile.tres, tp/Makefile.am (test_files),
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Makefile.tres, tp/Makefile.am (test_files), t/19def.t: add the end_of_lines_protected_non_ascii test with non-ASCII character counted in source marks. Skipped for now as the XS parser counts bytes and not characters. |
|
Date: |
Thu, 26 Jan 2023 07:57:02 -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 9b620b9bc6 * tp/Makefile.tres, tp/Makefile.am (test_files), t/19def.t:
add the end_of_lines_protected_non_ascii test with non-ASCII character counted
in source marks. Skipped for now as the XS parser counts bytes and not
characters.
9b620b9bc6 is described below
commit 9b620b9bc6915e1e03e7855ddffbe19c8605aa8a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Jan 26 13:56:49 2023 +0100
* tp/Makefile.tres, tp/Makefile.am (test_files), t/19def.t:
add the end_of_lines_protected_non_ascii test with non-ASCII
character counted in source marks. Skipped for now as the
XS parser counts bytes and not characters.
---
ChangeLog | 7 +
tp/Makefile.am | 1 +
tp/Makefile.tres | 1 +
tp/t/19def.t | 3 +
.../end_of_lines_protected_non_ascii.texi | 8 +
.../def/end_of_lines_protected_non_ascii.pl | 348 +++++++++++++++++++++
6 files changed, 368 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 965b22a93e..59a66e41e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-26 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Makefile.tres, tp/Makefile.am (test_files), t/19def.t:
+ add the end_of_lines_protected_non_ascii test with non-ASCII
+ character counted in source marks. Skipped for now as the
+ XS parser counts bytes and not characters.
+
2023-01-26 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_register_source_mark),
diff --git a/tp/Makefile.am b/tp/Makefile.am
index 19cc92ca4c..516107a209 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -210,6 +210,7 @@ test_files = \
t/input_files/empty_lines_at_beginning_no_setfilename_no_element.texi \
t/input_files/encoding_index_latin1.texi \
t/input_files/encoding_index_utf8.texi \
+ t/input_files/end_of_lines_protected_non_ascii.texi \
t/input_files/float_copying.texi \
t/input_files/glossary.texi \
t/input_files/in_menu_only_special_spaces_node.texi \
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 550f432203..00f8844bdf 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -412,6 +412,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/def/end_of_line_protect_at_end.pl \
t/results/def/end_of_lines_protected.pl \
t/results/def/end_of_lines_protected_in_footnote.pl \
+ t/results/def/end_of_lines_protected_non_ascii.pl \
t/results/def/inter_item_commands_in_def.pl \
t/results/def/inter_item_commands_in_def_in_example.pl \
t/results/def/leading_space_in_def_arg.pl \
diff --git a/tp/t/19def.t b/tp/t/19def.t
index fc90014497..97e4a8713b 100644
--- a/tp/t/19def.t
+++ b/tp/t/19def.t
@@ -123,6 +123,9 @@ d--eftypemethod
deffn
@end deffn
'],
+['end_of_lines_protected_non_ascii',
+undef, {'test_file' => 'end_of_lines_protected_non_ascii.texi', 'skip' => 'XS
counts bytes not characters' },
+],
['empty_def_command',
'@deffn empty deffn
@end deffn
diff --git a/tp/t/input_files/end_of_lines_protected_non_ascii.texi
b/tp/t/input_files/end_of_lines_protected_non_ascii.texi
new file mode 100644
index 0000000000..288cfa510d
--- /dev/null
+++ b/tp/t/input_files/end_of_lines_protected_non_ascii.texi
@@ -0,0 +1,8 @@
+
+@deffn catégorie deffn_nùme àrguments @
+ more {àrgs @
+ with end ôf line within} with 3 @@ @@@
+ {one last arg}
+deffn
+@end deffn
+
diff --git a/tp/t/results/def/end_of_lines_protected_non_ascii.pl
b/tp/t/results/def/end_of_lines_protected_non_ascii.pl
new file mode 100644
index 0000000000..151ff8c001
--- /dev/null
+++ b/tp/t/results/def/end_of_lines_protected_non_ascii.pl
@@ -0,0 +1,348 @@
+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{'end_of_lines_protected_non_ascii'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
+ }
+ ],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
+ 'type' => 'preamble_before_content'
+ },
+ {
+ 'cmdname' => 'deffn',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'text' => "cat\x{e9}gorie"
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'text' => "deffn_n\x{f9}me"
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => "\x{e0}rguments"
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'source_marks' => [
+ {
+ 'counter' => 1,
+ 'location' => 'text',
+ 'position' => 1,
+ 'sourcemark_type' => 'defline_continuation'
+ }
+ ],
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'more'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'contents' => [
+ {
+ 'source_marks' => [
+ {
+ 'counter' => 2,
+ 'location' => 'text',
+ 'position' => 5,
+ 'sourcemark_type' => 'defline_continuation'
+ }
+ ],
+ 'text' => "\x{e0}rgs with end \x{f4}f line within"
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'source_info' => {
+ 'file_name' => 'end_of_lines_protected_non_ascii.texi',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => 'with'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'text' => '3'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'cmdname' => '@',
+ 'extra' => {
+ 'def_role' => 'arg'
+ }
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'cmdname' => '@',
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'source_marks' => [
+ {
+ 'counter' => 3,
+ 'sourcemark_type' => 'defline_continuation'
+ }
+ ]
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'one last arg'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'source_info' => {
+ 'file_name' => 'end_of_lines_protected_non_ascii.texi',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'type' => 'bracketed_def_content'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'extra' => {
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'content_normalized' => [
+ {}
+ ],
+ 'entry_content' => [
+ {}
+ ],
+ 'entry_element' => {},
+ 'entry_number' => 1,
+ 'in_code' => 1,
+ 'index_at_command' => 'deffn',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'deffn'
+ },
+ 'original_def_cmdname' => 'deffn'
+ },
+ 'source_info' => {
+ 'file_name' => 'end_of_lines_protected_non_ascii.texi',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'deffn
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'def_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'deffn'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'deffn'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'end_of_lines_protected_non_ascii.texi',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'end_of_lines_protected_non_ascii.texi',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'before_node_section'
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
=
$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
=
$result_trees{'end_of_lines_protected_non_ascii'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+
+$result_texis{'end_of_lines_protected_non_ascii'} = '
+@deffn catégorie deffn_nùme àrguments more {àrgs with end ôf line within}
with 3 @@ @@ {one last arg}
+deffn
+@end deffn
+
+';
+
+
+$result_texts{'end_of_lines_protected_non_ascii'} = 'catégorie: deffn_nùme
àrguments more àrgs with end ôf line within with 3 @ @ one last arg
+deffn
+
+';
+
+$result_errors{'end_of_lines_protected_non_ascii'} = [
+ {
+ 'error_line' => 'warning: entry for index `fn\' outside of any node
+',
+ 'file_name' => 'end_of_lines_protected_non_ascii.texi',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => 'entry for index `fn\' outside of any node',
+ 'type' => 'warning'
+ }
+];
+
+
+$result_floats{'end_of_lines_protected_non_ascii'} = {};
+
+
+$result_indices_sort_strings{'end_of_lines_protected_non_ascii'} = {
+ 'fn' => [
+ "deffn_n\x{f9}me"
+ ]
+};
+
+
+
+$result_converted{'plaintext'}->{'end_of_lines_protected_non_ascii'} = ' --
catégorie: deffn_nùme àrguments more àrgs with end ôf line within
+ with 3 @ @ one last arg
+ deffn
+
+';
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Makefile.tres, tp/Makefile.am (test_files), t/19def.t: add the end_of_lines_protected_non_ascii test with non-ASCII character counted in source marks. Skipped for now as the XS parser counts bytes and not characters.,
Patrice Dumas <=