[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/t/converters_tests.t (form_feeds), tp/Makefi
From: |
Patrice Dumas |
Subject: |
branch master updated: * tp/t/converters_tests.t (form_feeds), tp/Makefile.tres: add parts of t/03coverage_braces.t form_feed_in_brace_commands test relevant. Remove t/03coverage_braces.t form_feed_in_brace_commands. |
Date: |
Sat, 05 Oct 2024 02:38:55 -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 5289cd580a * tp/t/converters_tests.t (form_feeds), tp/Makefile.tres:
add parts of t/03coverage_braces.t form_feed_in_brace_commands test relevant.
Remove t/03coverage_braces.t form_feed_in_brace_commands.
5289cd580a is described below
commit 5289cd580a78f7168fd0ed0be1dd1bc0ff4efa6a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 18 21:29:31 2024 +0200
* tp/t/converters_tests.t (form_feeds), tp/Makefile.tres: add parts of
t/03coverage_braces.t form_feed_in_brace_commands test relevant.
Remove t/03coverage_braces.t form_feed_in_brace_commands.
Add an include, changes in TODO/comments/FIXME.
---
ChangeLog | 8 +
tp/Makefile.tres | 1 -
tp/Texinfo/XS/main/conversion_data.c | 1 +
tp/Texinfo/XS/main/converter_types.h | 1 +
tp/maintain/generate_code_convert_data.pl | 10 +-
tp/maintain/regenerate_file_lists.pl | 5 +-
tp/t/03coverage_braces.t | 4 -
tp/t/converters_tests.t | 4 +-
tp/t/init/ignore_and_comments_output.init | 1 -
tp/t/init/spaces_in_line_breaks.init | 12 +-
tp/t/results/converters_tests/form_feeds.pl | 257 ++++++++++++++++++---
.../coverage_braces/form_feed_in_brace_commands.pl | 254 --------------------
12 files changed, 257 insertions(+), 301 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2738342f90..e5a1112f86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-08-18 Patrice Dumas <pertusus@free.fr>
+
+ * tp/t/converters_tests.t (form_feeds), tp/Makefile.tres: add parts of
+ t/03coverage_braces.t form_feed_in_brace_commands test relevant.
+ Remove t/03coverage_braces.t form_feed_in_brace_commands.
+
+ Add an include, changes in TODO/comments/FIXME.
+
2024-08-18 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/converter.c (set_converter_init_information)
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index d519db1231..b677fd0480 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -418,7 +418,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/coverage_braces/footnote_no_braces.pl \
t/results/coverage_braces/footnote_no_node.pl \
t/results/coverage_braces/footnote_not_closed.pl \
- t/results/coverage_braces/form_feed_in_brace_commands.pl \
t/results/coverage_braces/format_on_first_footnote_line.pl \
t/results/coverage_braces/heading_in_footnote.pl \
t/results/coverage_braces/hyphenation_no_braces.pl \
diff --git a/tp/Texinfo/XS/main/conversion_data.c
b/tp/Texinfo/XS/main/conversion_data.c
index 160ad2cf22..bfdc96bd16 100644
--- a/tp/Texinfo/XS/main/conversion_data.c
+++ b/tp/Texinfo/XS/main/conversion_data.c
@@ -3,6 +3,7 @@
#include <config.h>
#include "conversion_data.h"
+#include "tree_types.h"
#include "converter_types.h"
const CSS_SELECTOR_STYLE base_default_css_element_class_styles[] = {
diff --git a/tp/Texinfo/XS/main/converter_types.h
b/tp/Texinfo/XS/main/converter_types.h
index e9016e1807..9d9f8cef98 100644
--- a/tp/Texinfo/XS/main/converter_types.h
+++ b/tp/Texinfo/XS/main/converter_types.h
@@ -21,6 +21,7 @@
/* for FILE */
#include <stdio.h>
+/* for enum special_unit_info_type SPECIAL_UNIT_INFO_TYPE_NR ... */
#include "conversion_data.h"
#include "element_types.h"
#include "command_ids.h"
diff --git a/tp/maintain/generate_code_convert_data.pl
b/tp/maintain/generate_code_convert_data.pl
index 806178b946..5d95e1cbaa 100755
--- a/tp/maintain/generate_code_convert_data.pl
+++ b/tp/maintain/generate_code_convert_data.pl
@@ -101,6 +101,8 @@ if ($perl_format) {
print OUT "my %base_default_css_element_class_styles = (\n";
} else {
+ # C format
+
my $header_file = $ARGV[6];
die "Need an output header\n" if (!defined($header_file));
@@ -114,6 +116,7 @@ if ($perl_format) {
print OUT "#include <config.h>\n\n";
print OUT "#include \"conversion_data.h\"\n";
+ print OUT "#include \"tree_types.h\"\n";
print OUT "#include \"converter_types.h\"\n\n";
print OUT "const CSS_SELECTOR_STYLE base_default_css_element_class_styles[]
= {\n";
@@ -326,7 +329,7 @@ if ($perl_format) {
.' return \%default_translated_special_unit_info;'."\n"
."}\n\n";
} else {
-
+ # C format
print OUT "static char *default_special_unit_varieties_array[] = {\n";
foreach my $special_units (@su_ordered) {
@@ -336,7 +339,7 @@ if ($perl_format) {
print OUT "const STRING_LIST default_special_unit_varieties =
{default_special_unit_varieties_array, $special_units_nr,
$special_units_nr};\n\n";
- # FIXME somewhere else?
+ # For now, this define is not used anywhere else. Keep it here only.
print OUT "#define pgdt_noop(Context,String) String\n";
print OUT "const char * const
default_special_unit_info[SPECIAL_UNIT_INFO_TYPE_NR][$special_units_nr] = {\n";
@@ -549,6 +552,7 @@ if ($perl_format) {
.' return \%default_translated_directions_strings;'."\n"
."}\n\n";
} else {
+ # C format
print HDR "#define HTML_GLOBAL_DIRECTIONS_LIST \\\n";
foreach my $direction (@{$direction_orders{'global'}}) {
@@ -694,6 +698,8 @@ if ($perl_format) {
print OUT "1;\n";
} else {
+ # C format
+
print HDR "extern const char *html_style_commands_element[];\n\n";
print HDR "#endif\n";
diff --git a/tp/maintain/regenerate_file_lists.pl
b/tp/maintain/regenerate_file_lists.pl
index 6200c2512e..e20408d145 100755
--- a/tp/maintain/regenerate_file_lists.pl
+++ b/tp/maintain/regenerate_file_lists.pl
@@ -30,9 +30,10 @@ sub wanted
{
if ((/\.pl$/ and $File::Find::dir =~ m:^t/results/[^/]+:)
or (!/^CVS$/ and !/^\.svn$/
+ # it could have been interesting to list each file but this
+ # leads to an "Argument list too long" error for the shell in
+ # make dist.
# to list each file
- # FIXME it would be better to list each file but then this leads to
- # an "Argument list too long" error for the shell in make dist
#and $File::Find::dir =~ m:^t/results/[^/]+/[^/]+/res_[^/]+$:)) {
# list only directories
and $File::Find::name =~ m:^t/results/[^/]+/[^/]+/res_[^/]+$:)) {
diff --git a/tp/t/03coverage_braces.t b/tp/t/03coverage_braces.t
index 36f3d102d3..b77861c855 100644
--- a/tp/t/03coverage_braces.t
+++ b/tp/t/03coverage_braces.t
@@ -295,10 +295,6 @@ mail,
text
}'],
-['form_feed_in_brace_commands',
-'@option{ aa} @anchor{aa}something @email{aaa, fff}@footnote{
- f1 } @footnote{ ggjj}.
-', {'test_formats' => ['xml']}],
# here even if invalid as we want to see how the @sortas is in index
['contain_plain_text_nestings',
'@node Top
diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index fe91523332..45909e6270 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -153,7 +153,6 @@ my @test_cases = (
['empty_accent',
'@`{}
'],
-# FIXME remove duplication from t/03coverage_braces.t
form_feed_in_brace_commands
['form_feeds',
'@node Top
@@ -171,6 +170,9 @@ cc \f dd".'
@code{middle'."\f".' in code}
+@anchor{aa}something @email{aaa, fff}@footnote{
+ f1 } @footnote{ ggjj}.
+
@xref{chap'."\f".'node}
@example '."\f".'
diff --git a/tp/t/init/ignore_and_comments_output.init
b/tp/t/init/ignore_and_comments_output.init
index b4f7a023c5..2a3e44642a 100644
--- a/tp/t/init/ignore_and_comments_output.init
+++ b/tp/t/init/ignore_and_comments_output.init
@@ -26,7 +26,6 @@ sub convert_ignore_command($$$$$)
$content = '' if (!defined($content));
- # FIXME should the spacing be set differently for raw commands?
return $self->xml_comment(" $content\n");
}
diff --git a/tp/t/init/spaces_in_line_breaks.init
b/tp/t/init/spaces_in_line_breaks.init
index 15dd6065ec..ec00703e4b 100644
--- a/tp/t/init/spaces_in_line_breaks.init
+++ b/tp/t/init/spaces_in_line_breaks.init
@@ -1,6 +1,14 @@
-# There is no API to set $self->{'converter_info'}->{'line_break_element'}.
-# FIXME if get_info is overriden, this test should fail
+# TODO keep test even though it accesses private data?
+
+# There is no specific API to set line_break_element, which is availaible
+# through get_info(). Therefore the test sets directly the converter state
+# although it is supposed to be private. As get_info is overriden, this test
+# fails with XS.
+
+# A space in line_break_element is needed to trigger code ensuring that
+# a space in line_break_element is kept even if all the spaces are transformed
+# to non breakable spaces.
texinfo_register_handler('setup', \&_texi2any_tests_set_line_break_element);
diff --git a/tp/t/results/converters_tests/form_feeds.pl
b/tp/t/results/converters_tests/form_feeds.pl
index 044b8c9d1f..73811ead3e 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -225,6 +225,159 @@ $result_trees{'form_feeds'} = {
},
{
'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aa'
+ }
+ ],
+ 'type' => 'brace_arg'
+ }
+ ],
+ 'cmdname' => 'anchor',
+ 'extra' => {
+ 'is_target' => 1,
+ 'normalized' => 'aa'
+ },
+ 'source_info' => {
+ 'line_nr' => 17
+ }
+ },
+ {
+ 'text' => '',
+ 'type' => 'spaces_after_close_brace'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'something '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aaa'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ''
+ }
+ },
+ 'type' => 'brace_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'fff'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'brace_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'source_info' => {
+ 'line_nr' => 17
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'spaces_before_paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'f1 '
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'footnote',
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 17
+ }
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'gg'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'jj'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'footnote',
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 18
+ }
+ },
+ {
+ 'text' => '.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
',
'type' => 'empty_line'
},
@@ -251,7 +404,7 @@ $result_trees{'form_feeds'} = {
],
'cmdname' => 'xref',
'source_info' => {
- 'line_nr' => 17
+ 'line_nr' => 20
}
},
{
@@ -316,12 +469,12 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 21
+ 'line_nr' => 24
}
}
],
'source_info' => {
- 'line_nr' => 19
+ 'line_nr' => 22
}
},
{
@@ -353,7 +506,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 23
+ 'line_nr' => 26
}
},
{
@@ -380,7 +533,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 24
+ 'line_nr' => 27
}
},
{
@@ -403,7 +556,7 @@ $result_trees{'form_feeds'} = {
],
'cmdname' => 'indicateurl',
'source_info' => {
- 'line_nr' => 26
+ 'line_nr' => 29
}
},
{
@@ -442,7 +595,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 28
+ 'line_nr' => 31
},
'type' => 'bracketed_arg'
}
@@ -470,7 +623,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 28
+ 'line_nr' => 31
},
'type' => 'bracketed_arg'
}
@@ -498,7 +651,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 28
+ 'line_nr' => 31
},
'type' => 'bracketed_arg'
}
@@ -526,7 +679,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 28
+ 'line_nr' => 31
},
'type' => 'bracketed_arg'
}
@@ -554,7 +707,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 28
+ 'line_nr' => 31
},
'type' => 'bracketed_arg'
}
@@ -602,7 +755,7 @@ $result_trees{'form_feeds'} = {
'original_def_cmdname' => 'deffn'
},
'source_info' => {
- 'line_nr' => 28
+ 'line_nr' => 31
},
'type' => 'def_line'
},
@@ -627,7 +780,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 29
+ 'line_nr' => 32
},
'type' => 'bracketed_arg'
}
@@ -655,7 +808,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 29
+ 'line_nr' => 32
},
'type' => 'bracketed_arg'
}
@@ -683,7 +836,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 29
+ 'line_nr' => 32
},
'type' => 'bracketed_arg'
}
@@ -711,7 +864,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 29
+ 'line_nr' => 32
},
'type' => 'bracketed_arg'
}
@@ -739,7 +892,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 29
+ 'line_nr' => 32
},
'type' => 'bracketed_arg'
}
@@ -793,7 +946,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 29
+ 'line_nr' => 32
}
},
{
@@ -837,7 +990,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 31
+ 'line_nr' => 34
}
}
],
@@ -847,7 +1000,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 28
+ 'line_nr' => 31
}
},
{
@@ -924,7 +1077,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 35
+ 'line_nr' => 38
}
},
{
@@ -986,7 +1139,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 36
+ 'line_nr' => 39
}
},
{
@@ -1029,7 +1182,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 37
+ 'line_nr' => 40
}
}
],
@@ -1039,7 +1192,7 @@ $result_trees{'form_feeds'} = {
'shortcaption' => {}
},
'source_info' => {
- 'line_nr' => 33
+ 'line_nr' => 36
}
},
{
@@ -1118,7 +1271,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 41
+ 'line_nr' => 44
}
}
],
@@ -1133,7 +1286,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 39
+ 'line_nr' => 42
}
},
{
@@ -1168,7 +1321,7 @@ $result_trees{'form_feeds'} = {
}
},
'source_info' => {
- 'line_nr' => 43
+ 'line_nr' => 46
}
},
{
@@ -1193,13 +1346,13 @@ $result_trees{'form_feeds'} = {
],
'type' => 'document_root'
};
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'form_feeds'}{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'form_feeds'}{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[1]{'extra'}{'float'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[4]{'extra'}{'float'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'extra'}{'caption'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[1];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'extra'}{'shortcaption'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[4];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'args'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'form_feeds'}{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'form_feeds'}{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[1]{'extra'}{'float'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[4]{'extra'}{'float'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'extra'}{'caption'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[1];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'extra'}{'shortcaption'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[33]{'contents'}[4];
$result_texis{'form_feeds'} = '@node Top
@@ -1217,6 +1370,9 @@ cc dd
@code{middle in code}
+@anchor{aa}something @email{aaa, fff}@footnote{
+ f1 } @footnote{ ggjj}.
+
@xref{chapnode}
@example
@@ -1262,6 +1418,8 @@ end in code
middle in code
+something fff .
+
chapnode
in example
@@ -1385,6 +1543,8 @@ aa
‘middle in code’
+ something fff <aaa>(1) (2).
+
See chap node
in example
@@ -1415,6 +1575,15 @@ type 1
* type 1: fl.
+ ---------- Footnotes ----------
+
+ (1) f1
+
+
+ (2) gg
+
+ jj
+
';
@@ -1435,6 +1604,8 @@ $result_converted{'html_text'}->{'form_feeds'} = '<h1
class="node" id="Top"><spa
</p>
<p><code class="code">middle in code</code>
</p>
+<a class="anchor" id="aa"></a><p>something <a class="email"
href="mailto:aaa">fff</a><a class="footnote" id="DOCF1"
href="#FOOT1"><sup>1</sup></a> <a class="footnote" id="DOCF2"
href="#FOOT2"><sup>2</sup></a>.
+</p>
<p>See <a class="xref" href="#chap-node">chapnode</a>
</p>
<div class="example">
@@ -1464,6 +1635,15 @@ $result_converted{'html_text'}->{'form_feeds'} = '<h1
class="node" id="Top"><spa
<dt><a href="#fl">type 1</a></dt><dd></dd>
</dl>
+<div class="footnotes-segment">
+<hr>
+<h4 class="footnotes-heading">Footnotes</h4>
+
+<h5 class="footnote-body-heading"><a id="FOOT1" href="#DOCF1">(1)</a></h5>
+<p>f1 </p>
+<h5 class="footnote-body-heading"><a id="FOOT2" href="#DOCF2">(2)</a></h5>
+<p>gg</p><p>jj</p>
+</div>
';
@@ -1483,6 +1663,8 @@ $result_converted{'xml'}->{'form_feeds'} = '<node
name="Top" spaces=" "><nodenam
</para>
<para><code>middle&formfeed; in code</code>
</para>
+<anchor name="aa">aa</anchor>&formfeed;<para>something <email><emailaddress
spaces="\\f">aaa</emailaddress><emailname spaces=" \\f
">fff</emailname></email><footnote spaces="\\n">&formfeed; <para>f1
</para>&formfeed;</footnote> <footnote spaces=" \\f
"><para>gg</para>&formfeed;<para>jj</para></footnote>.
+</para>
<para><xref
label="chap-node"><xrefnodename>chap&formfeed;node</xrefnodename></xref>
</para>
<example endspaces=" "> &formfeed;
@@ -1528,6 +1710,8 @@ $result_converted{'docbook'}->{'form_feeds'} = '<anchor
id="chap-node"/>
</para>
<para><literal>middle in code</literal>
</para>
+<anchor id="aa"/><para>something <ulink
url="mailto:aaa">fff</ulink><footnote><para>f1 </para> </footnote>
<footnote><para>gg</para> <para>jj</para></footnote>.
+</para>
<para>See <link linkend="chap-node">chap node</link>
</para>
<screen>in example
@@ -1569,6 +1753,11 @@ cc \\par{}
\\texttt{middle in code}
+\\label{anchor:aa}%
+\\par{}something \\href{mailto:aaa}{fff}\\footnote{ f1 \\par{}
+} \\footnote{gg\\par{}
+jj}.
+
See \\hyperref[anchor:chap-node]{[chapnode],
page~\\pageref*{anchor:chap-node}}
\\begin{Texinfoindented}
diff --git a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
b/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
deleted file mode 100644
index 36a322450d..0000000000
--- a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
+++ /dev/null
@@ -1,254 +0,0 @@
-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{'form_feed_in_brace_commands'} = {
- 'contents' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => ' aa'
- }
- ],
- 'type' => 'brace_container'
- }
- ],
- 'cmdname' => 'option',
- 'source_info' => {
- 'line_nr' => 1
- }
- },
- {
- 'text' => ' '
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'aa'
- }
- ],
- 'type' => 'brace_arg'
- }
- ],
- 'cmdname' => 'anchor',
- 'extra' => {
- 'is_target' => 1,
- 'normalized' => 'aa'
- },
- 'source_info' => {
- 'line_nr' => 1
- }
- },
- {
- 'text' => '',
- 'type' => 'spaces_after_close_brace'
- }
- ],
- 'type' => 'paragraph'
- },
- {
- 'text' => '',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'text' => 'something '
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'aaa'
- }
- ],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ''
- }
- },
- 'type' => 'brace_arg'
- },
- {
- 'contents' => [
- {
- 'text' => 'fff'
- }
- ],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'brace_arg'
- }
- ],
- 'cmdname' => 'email',
- 'source_info' => {
- 'line_nr' => 1
- }
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => ' ',
- 'type' => 'spaces_before_paragraph'
- },
- {
- 'contents' => [
- {
- 'text' => 'f1 '
- }
- ],
- 'type' => 'paragraph'
- },
- {
- 'text' => '',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'brace_command_context'
- }
- ],
- 'cmdname' => 'footnote',
- 'extra' => {},
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => '
-'
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
- },
- {
- 'text' => ' '
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'gg'
- }
- ],
- 'type' => 'paragraph'
- },
- {
- 'text' => '',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'text' => 'jj'
- }
- ],
- 'type' => 'paragraph'
- }
- ],
- 'type' => 'brace_command_context'
- }
- ],
- 'cmdname' => 'footnote',
- 'extra' => {},
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 2
- }
- },
- {
- 'text' => '.
-'
- }
- ],
- 'type' => 'paragraph'
- }
- ],
- 'type' => 'before_node_section'
- }
- ],
- 'type' => 'document_root'
-};
-
-$result_texis{'form_feed_in_brace_commands'} = '@option{ aa} @anchor{aa}
something @email{aaa, fff}@footnote{
- f1 } @footnote{ ggjj}.
-';
-
-
-$result_texts{'form_feed_in_brace_commands'} = ' aa something fff .
-';
-
-$result_errors{'form_feed_in_brace_commands'} = [];
-
-
-$result_floats{'form_feed_in_brace_commands'} = {};
-
-
-
-$result_converted{'xml'}->{'form_feed_in_brace_commands'} = '<para><option>
&formfeed;aa</option> <anchor
name="aa">aa</anchor></para>&formfeed;<para>something <email><emailaddress
spaces="\\f">aaa</emailaddress><emailname spaces=" \\f
">fff</emailname></email><footnote spaces=" \\n">&formfeed; <para>f1
</para>&formfeed;</footnote> <footnote spaces=" \\f
"><para>gg</para>&formfeed;<para>jj</para></footnote>.
-</para>';
-
-
-$result_converted{'plaintext'}->{'form_feed_in_brace_commands'} = '‘ aa’
-
- something fff <aaa>(1) (2).
-
- ---------- Footnotes ----------
-
- (1) f1
-
-
- (2) gg
-
- jj
-
-';
-
-
-$result_converted{'html_text'}->{'form_feed_in_brace_commands'} = '<p><samp
class="option"> aa</samp> <a class="anchor"
id="aa"></a></p><p>something <a class="email" href="mailto:aaa">fff</a><a
class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a> <a class="footnote"
id="DOCF2" href="#FOOT2"><sup>2</sup></a>.
-</p><div class="footnotes-segment">
-<hr>
-<h4 class="footnotes-heading">Footnotes</h4>
-
-<h5 class="footnote-body-heading"><a id="FOOT1" href="#DOCF1">(1)</a></h5>
-<p>f1 </p>
-<h5 class="footnote-body-heading"><a id="FOOT2" href="#DOCF2">(2)</a></h5>
-<p>gg</p><p>jj</p>
-</div>
-';
-
-
-$result_converted{'latex_text'}->{'form_feed_in_brace_commands'} =
'\\texttt{\\ aa} \\label{anchor:aa}%
-\\par{}
-something \\href{mailto:aaa}{fff}\\footnote{ f1 \\par{}
-} \\footnote{gg\\par{}
-jj}.
-';
-
-
-$result_converted{'docbook'}->{'form_feed_in_brace_commands'} =
'<para><option> aa</option> <anchor id="aa"/></para> <para>something <ulink
url="mailto:aaa">fff</ulink><footnote><para>f1 </para> </footnote>
<footnote><para>gg</para> <para>jj</para></footnote>.
-</para>';
-
-1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/t/converters_tests.t (form_feeds), tp/Makefile.tres: add parts of t/03coverage_braces.t form_feed_in_brace_commands test relevant. Remove t/03coverage_braces.t form_feed_in_brace_commands.,
Patrice Dumas <=