texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: Use latex_text for convert() instead of OUTPUT va


From: Patrice Dumas
Subject: branch master updated: Use latex_text for convert() instead of OUTPUT value
Date: Thu, 01 Sep 2022 14:44:51 -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 bb9696a7fd Use latex_text for convert() instead of OUTPUT value
bb9696a7fd is described below

commit bb9696a7fdc6f3276f05410644ec9832e4540f91
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Sep 1 20:42:40 2022 +0200

    Use latex_text for convert() instead of OUTPUT value
---
 tp/t/02coverage.t                                     |   2 +-
 tp/t/03coverage_braces.t                              |   2 +-
 tp/t/08misc_commands.t                                |   2 +-
 tp/t/18itemize.t                                      |   2 +-
 tp/t/19def.t                                          |   2 +-
 tp/t/20preformatted.t                                 |   2 +-
 tp/t/25regions.t                                      |   2 +-
 tp/t/30sectioning.t                                   |   6 +++---
 tp/t/80include.t                                      |   2 +-
 tp/t/converters_tests.t                               |   2 +-
 tp/t/formats_encodings.t                              |   4 ++--
 tp/t/html_tests.t                                     |   2 +-
 tp/t/latex_tests.t                                    |   8 ++++----
 tp/t/results/converters_tests/accent_with_text.pl     |   2 +-
 tp/t/results/converters_tests/at_commands_in_raw.pl   |   2 +-
 tp/t/results/converters_tests/complex_nestings.pl     |   2 +-
 .../email_table_command_as_argument.pl                |   2 +-
 tp/t/results/converters_tests/empty_accent.pl         |   2 +-
 tp/t/results/converters_tests/enumerate_above_ten.pl  |   2 +-
 tp/t/results/converters_tests/footnote_no_number.pl   |   2 +-
 .../converters_tests/footnote_no_number_separate.pl   |   2 +-
 tp/t/results/converters_tests/form_feeds.pl           |   2 +-
 .../converters_tests/frenchspacing_and_code.pl        |   2 +-
 tp/t/results/converters_tests/image_extension.pl      |   4 ++--
 tp/t/results/converters_tests/image_formatting.pl     |   4 ++--
 tp/t/results/converters_tests/image_with_spaces.pl    | Bin 8060 -> 8065 bytes
 .../converters_tests/index_entry_in_preformatted.pl   |   2 +-
 tp/t/results/converters_tests/inline.pl               |   2 +-
 tp/t/results/converters_tests/inline_expand_tex.pl    |   2 +-
 tp/t/results/converters_tests/inlinefmtifelse.pl      |   2 +-
 tp/t/results/converters_tests/inlineifsetifclear.pl   |   2 +-
 tp/t/results/converters_tests/line_breaks.pl          |   2 +-
 tp/t/results/converters_tests/non_empty_part.pl       |   2 +-
 .../converters_tests/normal_font_in_monospace.pl      |   2 +-
 tp/t/results/converters_tests/raw_block_commands.pl   |   2 +-
 .../converters_tests/raw_block_commands_expand_tex.pl |   2 +-
 tp/t/results/converters_tests/ref_error_formatting.pl |   2 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl    |   2 +-
 tp/t/results/converters_tests/refs_formatting.pl      |   2 +-
 .../converters_tests/some_at_commands_in_ref_nodes.pl |   2 +-
 tp/t/results/converters_tests/sp_in_example.pl        |   2 +-
 .../converters_tests/spaces_in_empty_node_names.pl    |   2 +-
 tp/t/results/converters_tests/spaces_in_node_names.pl |   2 +-
 .../converters_tests/table_in_display_in_example.pl   |   2 +-
 .../converters_tests/table_in_example_in_display.pl   |   2 +-
 .../results/converters_tests/test_deftypefnnewline.pl |   2 +-
 tp/t/results/converters_tests/test_sp.pl              |   2 +-
 .../converters_tests/things_before_setfilename.pl     |   2 +-
 .../things_before_setfilename_no_element.pl           |   2 +-
 tp/t/results/converters_tests/top_in_ref.pl           |   2 +-
 tp/t/results/converters_tests/unknown_value.pl        |   2 +-
 tp/t/results/coverage/accent_and_dash.pl              |   2 +-
 tp/t/results/coverage/at_after_accent_command.pl      |   2 +-
 tp/t/results/coverage/block_commands.pl               |   2 +-
 tp/t/results/coverage/cartouche.pl                    |   2 +-
 tp/t/results/coverage/cartouche_in_example.pl         |   2 +-
 tp/t/results/coverage/cartouche_in_quotation.pl       |   2 +-
 tp/t/results/coverage/center.pl                       |   2 +-
 tp/t/results/coverage/commands.pl                     |   2 +-
 tp/t/results/coverage/commands_in_math.pl             |   2 +-
 tp/t/results/coverage/comment_on_cartouche_line.pl    |   2 +-
 tp/t/results/coverage/comment_on_group_line.pl        |   2 +-
 tp/t/results/coverage/def.pl                          |   2 +-
 tp/t/results/coverage/displaymath.pl                  |   2 +-
 tp/t/results/coverage/empty_w.pl                      |   2 +-
 tp/t/results/coverage/exdent_and_commands.pl          |   2 +-
 tp/t/results/coverage/exdent_and_formats.pl           |   2 +-
 tp/t/results/coverage/flushleft_flushright.pl         |   2 +-
 .../coverage/flushleft_flushright_in_quotation.pl     |   2 +-
 tp/t/results/coverage/flushright_example_nested.pl    |   2 +-
 tp/t/results/coverage/hyphenation.pl                  |   2 +-
 tp/t/results/coverage/indentedblock.pl                |   2 +-
 tp/t/results/coverage/insertcopying.pl                |   2 +-
 tp/t/results/coverage/invalid_U.pl                    |   2 +-
 tp/t/results/coverage/item_container.pl               |   2 +-
 tp/t/results/coverage/lettered_accent_and_spaces.pl   |   2 +-
 tp/t/results/coverage/math.pl                         |   2 +-
 tp/t/results/coverage/multitable.pl                   |   2 +-
 tp/t/results/coverage/nested_block_commands.pl        |   2 +-
 tp/t/results/coverage/preformatted.pl                 |   2 +-
 tp/t/results/coverage/punctuation_in_line_commands.pl |   2 +-
 tp/t/results/coverage/quotation_author.pl             |   2 +-
 tp/t/results/coverage/raggedright.pl                  |   2 +-
 tp/t/results/coverage/setfilename_in_paragraph.pl     |   2 +-
 tp/t/results/coverage/symbol_after_command.pl         |   2 +-
 tp/t/results/coverage/table.pl                        |   2 +-
 tp/t/results/coverage/table_command_comment.pl        |   2 +-
 tp/t/results/coverage/test_errormsg.pl                |   2 +-
 tp/t/results/coverage/test_tie.pl                     |   2 +-
 tp/t/results/coverage/test_today.pl                   |   2 +-
 tp/t/results/coverage/titlefont_in_center.pl          |   2 +-
 tp/t/results/coverage/unknown_accents.pl              |   2 +-
 tp/t/results/coverage/verbatiminclude.pl              |   2 +-
 tp/t/results/coverage_braces/abbr_acronym.pl          |   2 +-
 tp/t/results/coverage_braces/email_possibilities.pl   |   2 +-
 tp/t/results/coverage_braces/empty_commands.pl        |   2 +-
 tp/t/results/coverage_braces/empty_line_in_email.pl   |   2 +-
 .../coverage_braces/empty_second_email_argument.pl    |   2 +-
 tp/t/results/coverage_braces/end_line_in_anchor.pl    |   2 +-
 tp/t/results/coverage_braces/footnote.pl              |   2 +-
 .../coverage_braces/footnote_ending_on_empty_line.pl  |   2 +-
 tp/t/results/coverage_braces/footnote_no_node.pl      |   2 +-
 .../coverage_braces/form_feed_in_brace_commands.pl    |   2 +-
 .../coverage_braces/format_on_first_footnote_line.pl  |   2 +-
 tp/t/results/coverage_braces/heading_in_footnote.pl   |   2 +-
 tp/t/results/coverage_braces/inforef_too_much_args.pl |   2 +-
 tp/t/results/coverage_braces/kbd.pl                   |   2 +-
 tp/t/results/coverage_braces/nested.pl                |   2 +-
 tp/t/results/coverage_braces/nested_args.pl           |   2 +-
 tp/t/results/coverage_braces/nested_in_sc.pl          |   2 +-
 .../one_argument_leading_trailing_spaces.pl           |   2 +-
 tp/t/results/coverage_braces/recursive_acronym.pl     |   2 +-
 .../coverage_braces/recursive_acronym_definition.pl   |   2 +-
 tp/t/results/coverage_braces/ref_in_style_command.pl  |   2 +-
 tp/t/results/coverage_braces/simple.pl                |   2 +-
 .../results/coverage_braces/space_command_in_image.pl |   2 +-
 tp/t/results/coverage_braces/space_in_anchor.pl       |   2 +-
 tp/t/results/coverage_braces/space_in_footnote.pl     |   2 +-
 tp/t/results/coverage_braces/space_in_image.pl        |   4 ++--
 tp/t/results/coverage_braces/test_image.pl            |   2 +-
 tp/t/results/coverage_braces/test_w.pl                |   2 +-
 tp/t/results/coverage_braces/too_much_args.pl         |   2 +-
 .../results/coverage_braces/two_footnotes_in_nodes.pl |   2 +-
 .../two_footnotes_in_nodes_separate.pl                |   2 +-
 tp/t/results/coverage_braces/uref_in_ref.pl           |   2 +-
 tp/t/results/coverage_braces/uref_url.pl              |   2 +-
 .../coverage_braces/uref_with_commands_characters.pl  |   2 +-
 tp/t/results/coverage_braces/verb_in_xref.pl          |   2 +-
 tp/t/results/coverage_braces/w_end_sentence.pl        |   2 +-
 tp/t/results/def/omit_def_space.pl                    |   2 +-
 tp/t/results/formats_encodings/accent.pl              |   2 +-
 .../formats_encodings/accent_enable_encoding.pl       |   2 +-
 tp/t/results/formats_encodings/accentenc.pl           |   2 +-
 tp/t/results/formats_encodings/at_commands_in_refs.pl |   4 ++--
 tp/t/results/formats_encodings/weird_accents.pl       |   2 +-
 .../weird_accents_disable_encoding.pl                 |   2 +-
 .../mathjax_with_texinfo_enable_encoding.pl           |   2 +-
 tp/t/results/include/simple.pl                        |   2 +-
 tp/t/results/itemize/enumerate_in_example.pl          |   2 +-
 tp/t/results/itemize/itemize_in_example.pl            |   2 +-
 tp/t/results/itemize/itemize_long_item.pl             |   2 +-
 tp/t/results/itemize/w_argument.pl                    |   2 +-
 tp/t/results/latex_tests/anchor_before_top.pl         |   2 +-
 tp/t/results/latex_tests/anchor_in_copying.pl         |   2 +-
 .../anchor_in_copying_insertcopying_chap.pl           |   2 +-
 .../anchor_in_copying_insertcopying_titlepage.pl      |   2 +-
 .../anchor_in_copying_insertcopying_titlepage_chap.pl |   2 +-
 .../anchor_links_xref_xrefautomaticsectiontitle.pl    |   2 +-
 tp/t/results/latex_tests/brace_in_index.pl            |   2 +-
 tp/t/results/latex_tests/custom_headings.pl           |   2 +-
 tp/t/results/latex_tests/enumerate_arguments.pl       |   2 +-
 .../latex_tests/error_in_sectioning_command.pl        |   2 +-
 tp/t/results/latex_tests/example_in_cartouche.pl      |   2 +-
 tp/t/results/latex_tests/float_and_refs.pl            |   2 +-
 tp/t/results/latex_tests/fonttextsize.pl              |   2 +-
 tp/t/results/latex_tests/indices.pl                   |   2 +-
 .../latex_tests/informative_commands_in_top_node.pl   |   2 +-
 tp/t/results/latex_tests/nested_enumerate.pl          |   2 +-
 tp/t/results/latex_tests/nested_itemize.pl            |   2 +-
 .../no_titlepage_and_setchapternewpage_odd.pl         |   2 +-
 .../no_titlepage_and_setchapternewpage_on.pl          |   2 +-
 tp/t/results/latex_tests/node_before_top.pl           |   2 +-
 tp/t/results/latex_tests/pagesizes.pl                 |   2 +-
 tp/t/results/latex_tests/pagetype.pl                  |   2 +-
 .../latex_tests/setchapternewpage_on_odd_titlepage.pl |   2 +-
 tp/t/results/latex_tests/settitle_and_headings.pl     |   2 +-
 tp/t/results/latex_tests/shorttitlepage.pl            |   2 +-
 .../latex_tests/three_setchapternewpage_on_odd_off.pl |   2 +-
 tp/t/results/latex_tests/titlepage_and_headings.pl    |   2 +-
 .../titlepage_and_setchapternewpage_odd.pl            |   2 +-
 .../latex_tests/titlepage_and_setchapternewpage_on.pl |   2 +-
 tp/t/results/latex_tests/titlepage_classical.pl       |   2 +-
 tp/t/results/latex_tests/titlepage_in_top_node.pl     |   2 +-
 tp/t/results/latex_tests/titlepage_long_title.pl      |   2 +-
 tp/t/results/latex_tests/titlepage_no_author.pl       |   2 +-
 tp/t/results/latex_tests/titlepage_no_title.pl        |   2 +-
 .../latex_tests/titlepage_with_commands_classical.pl  |   2 +-
 tp/t/results/latex_tests/top_no_sectioning_command.pl |   2 +-
 .../latex_tests/two_setchapternewpage_odd_on.pl       |   2 +-
 .../latex_tests/two_setchapternewpage_on_odd.pl       |   2 +-
 tp/t/results/latex_tests/verbatim_in_smallformat.pl   |   2 +-
 .../codequoteundirected_codequotebacktick.pl          |   2 +-
 .../misc_commands/command_in_heading_footing.pl       |   2 +-
 .../misc_commands/comment_space_command_on_line.pl    |   2 +-
 tp/t/results/misc_commands/comments_in_text.pl        |   2 +-
 tp/t/results/misc_commands/definfoenclose.pl          |   2 +-
 .../misc_commands/definfoenclose_with_empty_arg.pl    |   2 +-
 tp/t/results/misc_commands/empty_center.pl            |   2 +-
 tp/t/results/misc_commands/empty_center_with_arg.pl   |   2 +-
 tp/t/results/misc_commands/footnote_in_center.pl      |   2 +-
 .../misc_commands/heading_command_in_commands.pl      |   2 +-
 .../incorrect_allowcodebreaks_argument.pl             |   2 +-
 tp/t/results/misc_commands/indent_in_quotation.pl     |   2 +-
 tp/t/results/misc_commands/kbdinputstyle.pl           |   2 +-
 tp/t/results/misc_commands/kbdinputstyle_in_table.pl  |   2 +-
 .../misc_commands/no_empty_line_between_headings.pl   |   2 +-
 .../misc_commands/noindent_after_smallexample.pl      |   2 +-
 tp/t/results/misc_commands/noindent_empty_para.pl     |   2 +-
 tp/t/results/misc_commands/noindent_in_paragraph.pl   |   2 +-
 tp/t/results/misc_commands/noindent_indent.pl         |   2 +-
 tp/t/results/misc_commands/ref_in_center.pl           |   2 +-
 tp/t/results/misc_commands/setfilename.pl             |   2 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl    |   2 +-
 tp/t/results/misc_commands/vskip.pl                   |   2 +-
 tp/t/results/preformatted/caption_in_example.pl       |   2 +-
 .../preformatted/comment_example_and_blank_lines.pl   |   2 +-
 tp/t/results/preformatted/comments_in_example.pl      |   2 +-
 tp/t/results/preformatted/def_in_example.pl           |   2 +-
 tp/t/results/preformatted/empty_line.pl               |   2 +-
 tp/t/results/preformatted/insertcopying_in_example.pl |   2 +-
 .../preformatted/nested_example_and_comment.pl        |   2 +-
 tp/t/results/preformatted/nested_formats.pl           |   2 +-
 tp/t/results/preformatted/page_in_example.pl          |   2 +-
 tp/t/results/preformatted/quote_dash_in_display.pl    |   2 +-
 tp/t/results/preformatted/quote_dash_in_example.pl    |   2 +-
 .../preformatted/text_on_display_command_line.pl      |   2 +-
 .../preformatted/text_on_example_command_line.pl      |   2 +-
 tp/t/results/preformatted/titlefont_in_example.pl     |   2 +-
 tp/t/results/regions/anchor_in_copying.pl             |   2 +-
 tp/t/results/regions/anchor_in_copying_in_footnote.pl |   2 +-
 tp/t/results/regions/anchor_in_titlepage.pl           |   2 +-
 tp/t/results/regions/anchor_in_titlepage_titlepage.pl |   2 +-
 tp/t/results/regions/format_in_titlepage.pl           |   2 +-
 tp/t/results/regions/format_in_titlepage_titlepage.pl |   2 +-
 tp/t/results/regions/ref_in_copying.pl                |   2 +-
 .../regions/ref_in_copying_insert_in_chapter.pl       |   2 +-
 tp/t/results/regions/today_in_copying.pl              |   2 +-
 tp/t/results/sectioning/chapter_between_nodes.pl      |   2 +-
 .../sectioning/character_and_spaces_in_refs.pl        |   2 +-
 tp/t/results/sectioning/lone_Top_node.pl              |   2 +-
 tp/t/results/sectioning/loop_nodes.pl                 |   2 +-
 .../sectioning/node_sectop_before_chapter_no_node.pl  |   2 +-
 .../sectioning/node_sectop_before_lone_node_Top.pl    |   2 +-
 tp/t/results/sectioning/nodes_before_after_top.pl     |   2 +-
 .../results/sectioning/nodes_before_after_top_xref.pl |   2 +-
 tp/t/results/sectioning/nodes_before_top.pl           |   2 +-
 .../sectioning/section_before_after_top_node.pl       |   2 +-
 .../section_before_after_top_node_last_node.pl        |   2 +-
 .../sectioning/section_chapter_before_top_nodes.pl    |   2 +-
 tp/t/results/sectioning/top_node_part_top.pl          |   2 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl       |   2 +-
 .../unnumbered_top_without_node_sections.pl           |   2 +-
 tp/t/test_utils.pl                                    |   7 ++++---
 243 files changed, 255 insertions(+), 254 deletions(-)

diff --git a/tp/t/02coverage.t b/tp/t/02coverage.t
index d6c23f79fa..09cf4a59b9 100644
--- a/tp/t/02coverage.t
+++ b/tp/t/02coverage.t
@@ -885,7 +885,7 @@ foreach my $test (@test_cases) {
   push @{$test->[2]->{'test_formats'}}, 'plaintext';
   push @{$test->[2]->{'test_formats'}}, 'html_text';
   push @{$test->[2]->{'test_formats'}}, 'xml';
-  push @{$test->[2]->{'test_formats'}}, 'latex';
+  push @{$test->[2]->{'test_formats'}}, 'latex_text';
   if ($docbooc_doc_tests{$test->[0]}) {
     push @{$test->[2]->{'test_formats'}}, 'docbook_doc';
   } else {
diff --git a/tp/t/03coverage_braces.t b/tp/t/03coverage_braces.t
index 524708cf26..45cf651b45 100644
--- a/tp/t/03coverage_braces.t
+++ b/tp/t/03coverage_braces.t
@@ -352,7 +352,7 @@ third}
 foreach my $test (@test_cases) {
   push @{$test->[2]->{'test_formats'}}, 'plaintext';
   push @{$test->[2]->{'test_formats'}}, 'html_text';
-  push @{$test->[2]->{'test_formats'}}, 'latex';
+  push @{$test->[2]->{'test_formats'}}, 'latex_text';
 }
 
 run_all('coverage_braces', [@test_cases, @test_invalid]);
diff --git a/tp/t/08misc_commands.t b/tp/t/08misc_commands.t
index e0e6d64aba..8b998a005e 100644
--- a/tp/t/08misc_commands.t
+++ b/tp/t/08misc_commands.t
@@ -578,7 +578,7 @@ my %latex_tests = (
 foreach my $test (@converted_test_cases) {
   push @{$test->[2]->{'test_formats'}}, 'plaintext';
   push @{$test->[2]->{'test_formats'}}, 'html_text';
-  push @{$test->[2]->{'test_formats'}}, 'latex';
+  push @{$test->[2]->{'test_formats'}}, 'latex_text';
   if ($docbook_tests{$test->[0]}) {
     push @{$test->[2]->{'test_formats'}}, 'docbook';
   } elsif ($docbooc_doc_tests{$test->[0]}) {
diff --git a/tp/t/18itemize.t b/tp/t/18itemize.t
index 7763439ca8..b75038c1f2 100644
--- a/tp/t/18itemize.t
+++ b/tp/t/18itemize.t
@@ -625,7 +625,7 @@ my @latex_tests_cases_tests = ('w_argument', 
'enumerate_in_example',
 foreach my $test (@test_cases) {
   push @{$test->[2]->{'test_formats'}}, 'plaintext';
   push @{$test->[2]->{'test_formats'}}, 'html_text';
-  push @{$test->[2]->{'test_formats'}}, 'latex'
+  push @{$test->[2]->{'test_formats'}}, 'latex_text'
     if (grep {$_ eq $test->[0]} @latex_tests_cases_tests);
 }
 
diff --git a/tp/t/19def.t b/tp/t/19def.t
index 3df0561794..fbf98a0b95 100644
--- a/tp/t/19def.t
+++ b/tp/t/19def.t
@@ -569,7 +569,7 @@ Documentation of @code{foo}.
 explain
 @end defun
 ',
-{'test_formats' => ['plaintext', 'html', 'latex']}],
+{'test_formats' => ['plaintext', 'html', 'latex_text']}],
 );
 
 my @test_printindex = ();
diff --git a/tp/t/20preformatted.t b/tp/t/20preformatted.t
index b9bf777954..b00443ad22 100644
--- a/tp/t/20preformatted.t
+++ b/tp/t/20preformatted.t
@@ -203,7 +203,7 @@ foreach my $test (@test_cases) {
   push @{$test->[2]->{'test_formats'}}, 'html_text';
   push @{$test->[2]->{'test_formats'}}, 'docbook';
   push @{$test->[2]->{'test_formats'}}, 'xml';
-  push @{$test->[2]->{'test_formats'}}, 'latex';
+  push @{$test->[2]->{'test_formats'}}, 'latex_text';
 }
 
 run_all('preformatted', [@test_cases, @test_invalid]);
diff --git a/tp/t/25regions.t b/tp/t/25regions.t
index 279d7fc6bf..87136e759b 100644
--- a/tp/t/25regions.t
+++ b/tp/t/25regions.t
@@ -170,7 +170,7 @@ $anchor_in_titlepage_text, {}, {'SHOW_TITLE' => 1}
 foreach my $test (@test_formatted) {
   push @{$test->[2]->{'test_formats'}}, 'info';
   push @{$test->[2]->{'test_formats'}}, 'html';
-  push @{$test->[2]->{'test_formats'}}, 'latex';
+  push @{$test->[2]->{'test_formats'}}, 'latex_text';
   $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
 }
 
diff --git a/tp/t/30sectioning.t b/tp/t/30sectioning.t
index fad27820d9..2bdf829ef8 100644
--- a/tp/t/30sectioning.t
+++ b/tp/t/30sectioning.t
@@ -2101,7 +2101,7 @@ foreach my $test (@tests_converted) {
     if (grep {$_ eq $test->[0]} @xml_tests_converted_tests);
   push @{$test->[2]->{'test_formats'}}, 'docbook'
     if (grep {$_ eq $test->[0]} @docbook_tests_converted_tests);
-  push @{$test->[2]->{'test_formats'}}, 'latex'
+  push @{$test->[2]->{'test_formats'}}, 'latex_text'
     if (grep {$_ eq $test->[0]} @latex_tests_converted_tests);
   push @{$test->[2]->{'test_formats'}}, 'file_latex'
     if (grep {$_ eq $test->[0]} @file_latex_tests_converted_tests);
@@ -2152,7 +2152,7 @@ foreach my $test (@tests_info) {
   push @{$test->[2]->{'test_formats'}}, 'docbook'
     if (grep {$_ eq $test->[0]} @docbook_tests_info_tests);
   if (grep {$_ eq $test->[0]} @latex_tests_info_tests) {
-    push @{$test->[2]->{'test_formats'}}, 'latex';
+    push @{$test->[2]->{'test_formats'}}, 'latex_text';
     $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
   }
   if (grep {$_ eq $test->[0]} @file_latex_tests_info_tests) {
@@ -2184,7 +2184,7 @@ foreach my $test (@test_cases) {
     if (grep {$_ eq $test->[0]} @xml_tests_cases_tests);
   push @{$test->[2]->{'test_formats'}}, 'docbook'
     if (grep {$_ eq $test->[0]} @docbook_tests_cases_tests);
-  push @{$test->[2]->{'test_formats'}}, 'latex'
+  push @{$test->[2]->{'test_formats'}}, 'latex_text'
     if (grep {$_ eq $test->[0]} @latex_tests_cases_tests);
   if (grep {$_ eq $test->[0]} @file_latex_tests_cases_tests) {
     push @{$test->[2]->{'test_formats'}}, 'file_latex';
diff --git a/tp/t/80include.t b/tp/t/80include.t
index e410deb7b9..266d27fef8 100644
--- a/tp/t/80include.t
+++ b/tp/t/80include.t
@@ -8,7 +8,7 @@ require 't/test_utils.pl';
 my @test_cases = (
 [ 'simple',
 '@include inc_file.texi
-',{'test_formats' => ['info', 'plaintext', 'html', 'xml', 'docbook', 
'latex']}],
+',{'test_formats' => ['info', 'plaintext', 'html', 'xml', 'docbook', 
'latex_text']}],
 ['simple_no_eol',
 '@include inc_file.texi'
 ],
diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index 2b8caeaaa4..8255fbc89a 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -1207,7 +1207,7 @@ foreach my $test (@test_cases) {
         unless (exists($test->[2]->{'full_document'}));
     push @{$test->[2]->{'test_formats'}}, 'file_latex';
   } else {
-    push @{$test->[2]->{'test_formats'}}, 'latex';
+    push @{$test->[2]->{'test_formats'}}, 'latex_text';
   }
   push @{$test->[2]->{'test_formats'}}, 'info'
     if ($info_tests{$test->[0]});
diff --git a/tp/t/formats_encodings.t b/tp/t/formats_encodings.t
index 092dacfc5f..f42056e6d8 100644
--- a/tp/t/formats_encodings.t
+++ b/tp/t/formats_encodings.t
@@ -401,7 +401,7 @@ foreach my $test (@test_cases) {
   }
   push @{$test->[2]->{'test_formats'}}, 'xml';
   push @{$test->[2]->{'test_formats'}}, 'docbook';
-  push @{$test->[2]->{'test_formats'}}, 'latex'
+  push @{$test->[2]->{'test_formats'}}, 'latex_text'
     if ($latex_tests{$test->[0]});
   push @{$test->[2]->{'test_formats'}}, 'info'
     if ($info_tests{$test->[0]});
@@ -416,7 +416,7 @@ foreach my $test (@test_full_doc) {
   }
   push @{$test->[2]->{'test_formats'}}, 'xml';
   push @{$test->[2]->{'test_formats'}}, 'docbook';
-  push @{$test->[2]->{'test_formats'}}, 'latex';
+  push @{$test->[2]->{'test_formats'}}, 'latex_text';
   push @{$test->[2]->{'test_formats'}}, 'info'
     if ($info_tests{$test->[0]});
 
diff --git a/tp/t/html_tests.t b/tp/t/html_tests.t
index 67e37978ec..5135ab6313 100644
--- a/tp/t/html_tests.t
+++ b/tp/t/html_tests.t
@@ -493,7 +493,7 @@ in <b>html</b> in copying ``
 ['mathjax_with_texinfo',
 $mathjax_with_texinfo, {}, {'HTML_MATH' => 'mathjax'}],
 ['mathjax_with_texinfo_enable_encoding',
-$mathjax_with_texinfo, {'test_formats' => ['latex', 'file_latex'],
+$mathjax_with_texinfo, {'test_formats' => ['latex_text', 'file_latex'],
                         'full_document' => 1},
 {'HTML_MATH' => 'mathjax', 'ENABLE_ENCODING' => 1,},],
 ['mathjax_with_texinfo_no_convert_to_latex',
diff --git a/tp/t/latex_tests.t b/tp/t/latex_tests.t
index c921a1c397..f5577c984c 100644
--- a/tp/t/latex_tests.t
+++ b/tp/t/latex_tests.t
@@ -141,7 +141,7 @@ in titlepage
 @end titlepage
 
 '],
-# note that those tests with 'latex' do not really correspond to
+# note that those tests with 'latex_text' do not really correspond to
 # what happens for real documents, as in real documents,
 # LaTeX default (start chapter on odd page) is switched
 # to Texinfo default (@setchapternewpage on).  With 'file_latex',
@@ -193,7 +193,7 @@ in titlepage
 
 @setchapternewpage off
 '],
-# With 'latex' test type this is more like what would actually 
+# With 'latex_text' test type this is more like what would actually 
 # happen in the default case with output to a file, switching
 # to @setchapternewpage on in preamble, then odd and then the
 # title page
@@ -733,13 +733,13 @@ CCC
 );
 
 foreach my $test (@test_cases) {
-  $test->[2]->{'test_formats'} = ['latex'];
+  $test->[2]->{'test_formats'} = ['latex_text'];
 
   $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
 }
 
 foreach my $test (@file_tests) {
-  $test->[2]->{'test_formats'} = ['latex', 'file_latex'];
+  $test->[2]->{'test_formats'} = ['latex_text', 'file_latex'];
 
   $test->[2]->{'full_document'} = 1 unless 
(exists($test->[2]->{'full_document'}));
 }
diff --git a/tp/t/results/converters_tests/accent_with_text.pl 
b/tp/t/results/converters_tests/accent_with_text.pl
index 55bac46a7d..acc6d07adb 100644
--- a/tp/t/results/converters_tests/accent_with_text.pl
+++ b/tp/t/results/converters_tests/accent_with_text.pl
@@ -266,7 +266,7 @@ $result_converted{'docbook'}->{'accent_with_text'} = 
'<para>&#8211;a&#774; &#821
 </para>';
 
 
-$result_converted{'latex'}->{'accent_with_text'} = '\\u{--a} --b \\^{--\\i{}} 
\\^{--\\j{}} \\^{--a}
+$result_converted{'latex_text'}->{'accent_with_text'} = '\\u{--a} --b 
\\^{--\\i{}} \\^{--\\j{}} \\^{--a}
 ';
 
 1;
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl 
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index b7eac4108a..9a0069345d 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -1570,7 +1570,7 @@ $result_converted{'docbook'}->{'at_commands_in_raw'} = 
'<chapter label="1" id="c
 ';
 
 
-$result_converted{'latex'}->{'at_commands_in_raw'} = '\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'at_commands_in_raw'} = '\\label{anchor:Top}%
 \\chapter{{Chapter}}
 \\label{anchor:chap}%
 
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index beb3df28f2..b9b10fa755 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -1773,7 +1773,7 @@ explanation
 ';
 
 
-$result_converted{'latex'}->{'complex_nestings'} = '\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'complex_nestings'} = '\\label{anchor:Top}%
 \\chapter{{Chapter}}
 \\label{anchor:chap}%
 
diff --git a/tp/t/results/converters_tests/email_table_command_as_argument.pl 
b/tp/t/results/converters_tests/email_table_command_as_argument.pl
index 77a9e6e4a7..0f1b5ac95d 100644
--- a/tp/t/results/converters_tests/email_table_command_as_argument.pl
+++ b/tp/t/results/converters_tests/email_table_command_as_argument.pl
@@ -213,7 +213,7 @@ 
$result_converted{'docbook'}->{'email_table_command_as_argument'} = '<variableli
 </para></listitem></varlistentry></variablelist>';
 
 
-$result_converted{'latex'}->{'email_table_command_as_argument'} = 
'\\begin{description}
+$result_converted{'latex_text'}->{'email_table_command_as_argument'} = 
'\\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
 www-discuss@gnu.org}}]
 discussion
diff --git a/tp/t/results/converters_tests/empty_accent.pl 
b/tp/t/results/converters_tests/empty_accent.pl
index 7f8fa4f410..1d02be6605 100644
--- a/tp/t/results/converters_tests/empty_accent.pl
+++ b/tp/t/results/converters_tests/empty_accent.pl
@@ -79,7 +79,7 @@ $result_converted{'docbook'}->{'empty_accent'} = '<para>&#768;
 </para>';
 
 
-$result_converted{'latex'}->{'empty_accent'} = '\\`{}
+$result_converted{'latex_text'}->{'empty_accent'} = '\\`{}
 ';
 
 1;
diff --git a/tp/t/results/converters_tests/enumerate_above_ten.pl 
b/tp/t/results/converters_tests/enumerate_above_ten.pl
index 26784d2b5b..7a4a06fd3a 100644
--- a/tp/t/results/converters_tests/enumerate_above_ten.pl
+++ b/tp/t/results/converters_tests/enumerate_above_ten.pl
@@ -152,7 +152,7 @@ $result_converted{'docbook'}->{'enumerate_above_ten'} = 
'<orderedlist numeration
 </para></listitem></orderedlist>';
 
 
-$result_converted{'latex'}->{'enumerate_above_ten'} = 
'\\begin{enumerate}[start=14]
+$result_converted{'latex_text'}->{'enumerate_above_ten'} = 
'\\begin{enumerate}[start=14]
 \\item a
 \\end{enumerate}
 ';
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index 7577e299fb..8d9d4f5c71 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -494,7 +494,7 @@ $result_converted{'docbook'}->{'footnote_no_number'} = 
'<chapter label="1" id="c
 ';
 
 
-$result_converted{'latex'}->{'footnote_no_number'} = '\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'footnote_no_number'} = '\\label{anchor:Top}%
 \\chapter{{Chapter}}
 \\label{anchor:chap}%
 
diff --git a/tp/t/results/converters_tests/footnote_no_number_separate.pl 
b/tp/t/results/converters_tests/footnote_no_number_separate.pl
index 801b486a0f..f4be111ea6 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -494,7 +494,7 @@ 
$result_converted{'docbook'}->{'footnote_no_number_separate'} = '<chapter label=
 ';
 
 
-$result_converted{'latex'}->{'footnote_no_number_separate'} = 
'\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'footnote_no_number_separate'} = 
'\\label{anchor:Top}%
 \\chapter{{Chapter}}
 \\label{anchor:chap}%
 
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 72ce3699f9..dcfd616949 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -1450,7 +1450,7 @@ $result_converted{'docbook'}->{'form_feeds'} = '<anchor 
id="first-node"/>
 ';
 
 
-$result_converted{'latex'}->{'form_feeds'} = '\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'form_feeds'} = '\\label{anchor:Top}%
 \\label{anchor:first-node}%
 
 \\par{}
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 133f54df77..3f34573c8f 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -2519,7 +2519,7 @@ $result_converted{'docbook'}->{'frenchspacing_and_code'} 
= '<chapter label="1" i
 ';
 
 
-$result_converted{'latex'}->{'frenchspacing_and_code'} = '
+$result_converted{'latex_text'}->{'frenchspacing_and_code'} = '
 \\frenchspacing
 
 \\label{anchor:Top}%
diff --git a/tp/t/results/converters_tests/image_extension.pl 
b/tp/t/results/converters_tests/image_extension.pl
index 6e6ce5b491..6b6fe8c0f1 100644
--- a/tp/t/results/converters_tests/image_extension.pl
+++ b/tp/t/results/converters_tests/image_extension.pl
@@ -151,10 +151,10 @@ $result_converted_errors{'docbook'}->{'image_extension'} 
= [
 
 
 
-$result_converted{'latex'}->{'image_extension'} = '\\includegraphics{f---ile}
+$result_converted{'latex_text'}->{'image_extension'} = 
'\\includegraphics{f---ile}
 ';
 
-$result_converted_errors{'latex'}->{'image_extension'} = [
+$result_converted_errors{'latex_text'}->{'image_extension'} = [
   {
     'error_line' => 'warning: @image file `f---ile\' (for LaTeX) not found
 ',
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 1fe9a2a1bb..a3dd2c5cf2 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -3022,7 +3022,7 @@ $result_converted_errors{'docbook'}->{'image_formatting'} 
= [
 
 
 
-$result_converted{'latex'}->{'image_formatting'} = '\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'image_formatting'} = '\\label{anchor:Top}%
 \\chapter{{Chapter}}
 \\label{anchor:chap}%
 
@@ -3056,7 +3056,7 @@ in para
 \\includegraphics{f--ile}.
 ';
 
-$result_converted_errors{'latex'}->{'image_formatting'} = [
+$result_converted_errors{'latex_text'}->{'image_formatting'} = [
   {
     'error_line' => 'warning: @image file `f-ile\' (for LaTeX) not found
 ',
diff --git a/tp/t/results/converters_tests/image_with_spaces.pl 
b/tp/t/results/converters_tests/image_with_spaces.pl
index a15cbf0c79..3dff2e0905 100644
Binary files a/tp/t/results/converters_tests/image_with_spaces.pl and 
b/tp/t/results/converters_tests/image_with_spaces.pl differ
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl 
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index c1ea82c7a8..3817f18655 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -642,7 +642,7 @@ 
$result_converted{'docbook'}->{'index_entry_in_preformatted'} = '<chapter label=
 ';
 
 
-$result_converted{'latex'}->{'index_entry_in_preformatted'} = 
'\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'index_entry_in_preformatted'} = 
'\\label{anchor:Top}%
 \\chapter{{Chapter}}
 \\label{anchor:chap}%
 
diff --git a/tp/t/results/converters_tests/inline.pl 
b/tp/t/results/converters_tests/inline.pl
index 2ee122c2c1..3d0f49e507 100644
--- a/tp/t/results/converters_tests/inline.pl
+++ b/tp/t/results/converters_tests/inline.pl
@@ -917,7 +917,7 @@ raw <emphasis>docbook</emphasis> ``,
 </para>';
 
 
-$result_converted{'latex'}->{'inline'} = '
+$result_converted{'latex_text'}->{'inline'} = '
 , 
 , 
 ,
diff --git a/tp/t/results/converters_tests/inline_expand_tex.pl 
b/tp/t/results/converters_tests/inline_expand_tex.pl
index 8ed70dfa77..cb02cec284 100644
--- a/tp/t/results/converters_tests/inline_expand_tex.pl
+++ b/tp/t/results/converters_tests/inline_expand_tex.pl
@@ -781,7 +781,7 @@ raw $\\underline{a < b <literal>tex \\hbox{ code 
}</literal>}$ ``
 </para>';
 
 
-$result_converted{'latex'}->{'inline_expand_tex'} = '
+$result_converted{'latex_text'}->{'inline_expand_tex'} = '
 , 
 , 
 ,
diff --git a/tp/t/results/converters_tests/inlinefmtifelse.pl 
b/tp/t/results/converters_tests/inlinefmtifelse.pl
index 324ffc930b..ba6cf07fb5 100644
--- a/tp/t/results/converters_tests/inlinefmtifelse.pl
+++ b/tp/t/results/converters_tests/inlinefmtifelse.pl
@@ -779,7 +779,7 @@ else plaintext.
 </para>';
 
 
-$result_converted{'latex'}->{'inlinefmtifelse'} = 'else html no if.
+$result_converted{'latex_text'}->{'inlinefmtifelse'} = 'else html no if.
 else html.
 
 .
diff --git a/tp/t/results/converters_tests/inlineifsetifclear.pl 
b/tp/t/results/converters_tests/inlineifsetifclear.pl
index f7858fc78e..eed8c37e61 100644
--- a/tp/t/results/converters_tests/inlineifsetifclear.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclear.pl
@@ -354,7 +354,7 @@ $result_converted{'docbook'}->{'inlineifsetifclear'} = 
'<para>iclear first .
 </para>';
 
 
-$result_converted{'latex'}->{'inlineifsetifclear'} = 'iclear first .
+$result_converted{'latex_text'}->{'inlineifsetifclear'} = 'iclear first .
 
 .
 
diff --git a/tp/t/results/converters_tests/line_breaks.pl 
b/tp/t/results/converters_tests/line_breaks.pl
index dd666dec89..e4f9f8d0b0 100644
--- a/tp/t/results/converters_tests/line_breaks.pl
+++ b/tp/t/results/converters_tests/line_breaks.pl
@@ -702,7 +702,7 @@ $result_converted{'docbook_doc'}->{'line_breaks'} = '<?xml 
version="1.0"?>
 ';
 
 
-$result_converted{'latex'}->{'line_breaks'} = '
+$result_converted{'latex_text'}->{'line_breaks'} = '
 {\\raggedright {\\huge \\bfseries AWK As A Major Systems Programming 
\\leavevmode{}\\\\ Language---Revisited}}
 \\vskip 4pt \\hrule height 4pt width \\hsize \\vskip 4pt
 
diff --git a/tp/t/results/converters_tests/non_empty_part.pl 
b/tp/t/results/converters_tests/non_empty_part.pl
index 046965340a..8fc2cf712f 100644
--- a/tp/t/results/converters_tests/non_empty_part.pl
+++ b/tp/t/results/converters_tests/non_empty_part.pl
@@ -1778,7 +1778,7 @@ $result_converted{'docbook'}->{'non_empty_part'} = '<part 
label="">
 ';
 
 
-$result_converted{'latex'}->{'non_empty_part'} = '\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'non_empty_part'} = '\\label{anchor:Top}%
 \\part{{part I}}
 
 Content I
diff --git a/tp/t/results/converters_tests/normal_font_in_monospace.pl 
b/tp/t/results/converters_tests/normal_font_in_monospace.pl
index 9e8468e416..67bed14a7a 100644
--- a/tp/t/results/converters_tests/normal_font_in_monospace.pl
+++ b/tp/t/results/converters_tests/normal_font_in_monospace.pl
@@ -290,7 +290,7 @@ $result_converted{'docbook'}->{'normal_font_in_monospace'} 
= '<screen>in example
 </para>';
 
 
-$result_converted{'latex'}->{'normal_font_in_monospace'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'normal_font_in_monospace'} = 
'\\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
 \\ttfamily in example \\textnormal{in r---now \\texttt{in co{-}{-}{-}de}}
 \\end{GNUTexinfopreformatted}
diff --git a/tp/t/results/converters_tests/raw_block_commands.pl 
b/tp/t/results/converters_tests/raw_block_commands.pl
index 4c55914935..8424c52b12 100644
--- a/tp/t/results/converters_tests/raw_block_commands.pl
+++ b/tp/t/results/converters_tests/raw_block_commands.pl
@@ -631,7 +631,7 @@ $result_converted{'docbook'}->{'raw_block_commands'} = '
 ';
 
 
-$result_converted{'latex'}->{'raw_block_commands'} = '
+$result_converted{'latex_text'}->{'raw_block_commands'} = '
 
 
 
diff --git a/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl 
b/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
index fc62db6d4c..6dac724943 100644
--- a/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
+++ b/tp/t/results/converters_tests/raw_block_commands_expand_tex.pl
@@ -646,7 +646,7 @@ $\\underline{a < b <literal>tex \\hbox{ code }</literal>}$ 
``
 ';
 
 
-$result_converted{'latex'}->{'raw_block_commands_expand_tex'} = '
+$result_converted{'latex_text'}->{'raw_block_commands_expand_tex'} = '
 
 
 
diff --git a/tp/t/results/converters_tests/ref_error_formatting.pl 
b/tp/t/results/converters_tests/ref_error_formatting.pl
index f3fae2214c..fa45032a15 100644
--- a/tp/t/results/converters_tests/ref_error_formatting.pl
+++ b/tp/t/results/converters_tests/ref_error_formatting.pl
@@ -4597,7 +4597,7 @@ $result_converted{'docbook'}->{'ref_error_formatting'} = '
 </para>';
 
 
-$result_converted{'latex'}->{'ref_error_formatting'} = '
+$result_converted{'latex_text'}->{'ref_error_formatting'} = '
 \\texttt{@ref\\{node\\}} node
 
 \\texttt{@ref\\{,cross ref name\\}} 
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index fec90138f1..ad53c069ca 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2981,7 +2981,7 @@ $result_converted{'docbook'}->{'ref_in_sectioning'} = 
'<chapter label="1" id="no
 ';
 
 
-$result_converted{'latex'}->{'ref_in_sectioning'} = '
+$result_converted{'latex_text'}->{'ref_in_sectioning'} = '
 \\label{anchor:Top}%
 \\chapter{{See Section ``title\'\' in \\textsl{Manual}.}}
 \\label{anchor:node}%
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index 43e4da12ca..105ee3f055 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -4584,7 +4584,7 @@ $result_converted{'docbook'}->{'refs_formatting'} = 
'<chapter label="1" id="chap
 ';
 
 
-$result_converted{'latex'}->{'refs_formatting'} = '\\chapter{{chapter}}
+$result_converted{'latex_text'}->{'refs_formatting'} = '\\chapter{{chapter}}
 \\label{anchor:chapter}%
 
 \\texttt{@ref\\{chapter,cross ref name\\}} 
\\hyperref[anchor:chapter]{\\chaptername~\\ref*{anchor:chapter} [chapter], 
page~\\pageref*{anchor:chapter}}
diff --git a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl 
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index adfd91de65..d344ff25b4 100644
--- a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
+++ b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
@@ -2291,7 +2291,7 @@ 
$result_converted{'docbook'}->{'some_at_commands_in_ref_nodes'} = '<chapter labe
 ';
 
 
-$result_converted{'latex'}->{'some_at_commands_in_ref_nodes'} = '
+$result_converted{'latex_text'}->{'some_at_commands_in_ref_nodes'} = '
 \\label{anchor:Top}%
 \\chapter{{A \\textsc{sc} node \\"{i} \\"{\\i{}} \\`{\\={E}} \\l{} 
\\c{\\\'{C}} \\textexclamdown{}}}
 \\label{anchor:A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1}%
diff --git a/tp/t/results/converters_tests/sp_in_example.pl 
b/tp/t/results/converters_tests/sp_in_example.pl
index 396432cea5..1e9acf6ce6 100644
--- a/tp/t/results/converters_tests/sp_in_example.pl
+++ b/tp/t/results/converters_tests/sp_in_example.pl
@@ -463,7 +463,7 @@ sp after para
 </screen>';
 
 
-$result_converted{'latex'}->{'sp_in_example'} = '\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'sp_in_example'} = 
'\\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
 \\ttfamily Para
 \\vskip 1\\baselineskip %
diff --git a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
index 4cb33ca5a8..a67a9156f2 100644
--- a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
@@ -1013,7 +1013,7 @@ 
$result_converted{'docbook'}->{'spaces_in_empty_node_names'} = '
 </para>';
 
 
-$result_converted{'latex'}->{'spaces_in_empty_node_names'} = 
'\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'spaces_in_empty_node_names'} = 
'\\label{anchor:Top}%
 \\label{anchor:}%
 
 \\label{anchor:}%
diff --git a/tp/t/results/converters_tests/spaces_in_node_names.pl 
b/tp/t/results/converters_tests/spaces_in_node_names.pl
index e19cd0eca5..c27dc53cf7 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -1124,7 +1124,7 @@ $result_converted{'docbook'}->{'spaces_in_node_names'} = 
'<anchor id="a-"/>
 </para>';
 
 
-$result_converted{'latex'}->{'spaces_in_node_names'} = '\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'spaces_in_node_names'} = 
'\\label{anchor:Top}%
 \\label{anchor:a-}%
 
 \\label{anchor:b-}%
diff --git a/tp/t/results/converters_tests/table_in_display_in_example.pl 
b/tp/t/results/converters_tests/table_in_display_in_example.pl
index 039cb5cd6c..363555b5d6 100644
--- a/tp/t/results/converters_tests/table_in_display_in_example.pl
+++ b/tp/t/results/converters_tests/table_in_display_in_example.pl
@@ -337,7 +337,7 @@ 
$result_converted{'docbook'}->{'table_in_display_in_example'} = '<variablelist><
 </literallayout></listitem></varlistentry></variablelist>';
 
 
-$result_converted{'latex'}->{'table_in_display_in_example'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'table_in_display_in_example'} = 
'\\begin{GNUTexinfoindented}
 \\begin{GNUTexinfoindented}
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
diff --git a/tp/t/results/converters_tests/table_in_example_in_display.pl 
b/tp/t/results/converters_tests/table_in_example_in_display.pl
index ff0643467f..5ebb1fb590 100644
--- a/tp/t/results/converters_tests/table_in_example_in_display.pl
+++ b/tp/t/results/converters_tests/table_in_example_in_display.pl
@@ -337,7 +337,7 @@ 
$result_converted{'docbook'}->{'table_in_example_in_display'} = '<variablelist><
 </screen></listitem></varlistentry></variablelist>';
 
 
-$result_converted{'latex'}->{'table_in_example_in_display'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'table_in_example_in_display'} = 
'\\begin{GNUTexinfoindented}
 \\begin{GNUTexinfoindented}
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 258e31be11..718e3c2a8d 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -3617,7 +3617,7 @@ $result_converted{'docbook'}->{'test_deftypefnnewline'} = 
'<chapter label="1" id
 ';
 
 
-$result_converted{'latex'}->{'test_deftypefnnewline'} = '
+$result_converted{'latex_text'}->{'test_deftypefnnewline'} = '
 
 \\label{anchor:Top}%
 \\chapter{{chap}}
diff --git a/tp/t/results/converters_tests/test_sp.pl 
b/tp/t/results/converters_tests/test_sp.pl
index 045252d779..0af50ddaf7 100644
--- a/tp/t/results/converters_tests/test_sp.pl
+++ b/tp/t/results/converters_tests/test_sp.pl
@@ -429,7 +429,7 @@ Now lone @sp:
 </para>';
 
 
-$result_converted{'latex'}->{'test_sp'} = 'Para
+$result_converted{'latex_text'}->{'test_sp'} = 'Para
 \\vskip 1\\baselineskip %
 other para
 Now lone @sp:
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 72c8edae35..ce6e4076f5 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -1769,7 +1769,7 @@ 
$result_converted{'docbook'}->{'things_before_setfilename'} = '<chapter label="1
 ';
 
 
-$result_converted{'latex'}->{'things_before_setfilename'} = '
+$result_converted{'latex_text'}->{'things_before_setfilename'} = '
 \\begin{document}
 \\tableofcontents\\newpage
 \\label{anchor:Top}%
diff --git 
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index 22592f4277..d905cc9f62 100644
--- a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -1454,7 +1454,7 @@ 
$result_converted{'docbook'}->{'things_before_setfilename_no_element'} = '
 ';
 
 
-$result_converted{'latex'}->{'things_before_setfilename_no_element'} = '
+$result_converted{'latex_text'}->{'things_before_setfilename_no_element'} = '
 \\begin{document}
 Ref to anchor
 \\hyperref[anchor:An-anchor]{[An anchor], page~\\pageref*{anchor:An-anchor}}
diff --git a/tp/t/results/converters_tests/top_in_ref.pl 
b/tp/t/results/converters_tests/top_in_ref.pl
index fa1d2550a1..4089176a14 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -4588,7 +4588,7 @@ $result_converted{'docbook'}->{'top_in_ref'} = '<anchor 
id="refs-node"/>
 </para>';
 
 
-$result_converted{'latex'}->{'top_in_ref'} = '\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'top_in_ref'} = '\\label{anchor:Top}%
 \\label{anchor:refs-node}%
 
 \\texttt{@ref\\{Top,cross ref name\\}} \\hyperref[anchor:Top]{[Top], 
page~\\pageref*{anchor:Top}}
diff --git a/tp/t/results/converters_tests/unknown_value.pl 
b/tp/t/results/converters_tests/unknown_value.pl
index 2e0e78844d..b634ac790a 100644
--- a/tp/t/results/converters_tests/unknown_value.pl
+++ b/tp/t/results/converters_tests/unknown_value.pl
@@ -60,6 +60,6 @@ $result_converted{'xml'}->{'unknown_value'} = '';
 $result_converted{'docbook'}->{'unknown_value'} = '';
 
 
-$result_converted{'latex'}->{'unknown_value'} = '\\{No value for 
`unknown\'\\}';
+$result_converted{'latex_text'}->{'unknown_value'} = '\\{No value for 
`unknown\'\\}';
 
 1;
diff --git a/tp/t/results/coverage/accent_and_dash.pl 
b/tp/t/results/coverage/accent_and_dash.pl
index dd3db6aeb4..b8eb495d69 100644
--- a/tp/t/results/coverage/accent_and_dash.pl
+++ b/tp/t/results/coverage/accent_and_dash.pl
@@ -72,7 +72,7 @@ $result_converted{'html_text'}->{'accent_and_dash'} = 
'<p>a&ndash;&#770;</p>';
 $result_converted{'xml'}->{'accent_and_dash'} = '<para><accent 
type="circ">a&textndash;</accent></para>';
 
 
-$result_converted{'latex'}->{'accent_and_dash'} = '\\^{a--}';
+$result_converted{'latex_text'}->{'accent_and_dash'} = '\\^{a--}';
 
 
 $result_converted{'docbook'}->{'accent_and_dash'} = 
'<para>a&#8211;&#770;</para>';
diff --git a/tp/t/results/coverage/at_after_accent_command.pl 
b/tp/t/results/coverage/at_after_accent_command.pl
index f26d366c45..b12a809f2d 100644
--- a/tp/t/results/coverage/at_after_accent_command.pl
+++ b/tp/t/results/coverage/at_after_accent_command.pl
@@ -116,7 +116,7 @@ $result_converted{'xml'}->{'at_after_accent_command'} = 
'<para><accent type="rin
 </para>';
 
 
-$result_converted{'latex'}->{'at_after_accent_command'} = '\\r{}@. \\^{}@.
+$result_converted{'latex_text'}->{'at_after_accent_command'} = '\\r{}@. \\^{}@.
 ';
 
 
diff --git a/tp/t/results/coverage/block_commands.pl 
b/tp/t/results/coverage/block_commands.pl
index 9935369aa1..f450c9f8c6 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -495,7 +495,7 @@ $result_converted{'xml'}->{'block_commands'} = '
 ';
 
 
-$result_converted{'latex'}->{'block_commands'} = '
+$result_converted{'latex_text'}->{'block_commands'} = '
 in group
 
 \\begin{quote}
diff --git a/tp/t/results/coverage/cartouche.pl 
b/tp/t/results/coverage/cartouche.pl
index 8673e0f770..0ce86ee752 100644
--- a/tp/t/results/coverage/cartouche.pl
+++ b/tp/t/results/coverage/cartouche.pl
@@ -118,7 +118,7 @@ $result_converted{'xml'}->{'cartouche'} = '<cartouche 
endspaces=" ">
 </para></cartouche>';
 
 
-$result_converted{'latex'}->{'cartouche'} = 
'\\begin{mdframed}[style=GNUTexinfocartouche]
+$result_converted{'latex_text'}->{'cartouche'} = 
'\\begin{mdframed}[style=GNUTexinfocartouche]
 in cartouche.
 \\end{mdframed}
 ';
diff --git a/tp/t/results/coverage/cartouche_in_example.pl 
b/tp/t/results/coverage/cartouche_in_example.pl
index 83954bf02a..41fdf2c21c 100644
--- a/tp/t/results/coverage/cartouche_in_example.pl
+++ b/tp/t/results/coverage/cartouche_in_example.pl
@@ -227,7 +227,7 @@ $result_converted{'xml'}->{'cartouche_in_example'} = 
'<example endspaces=" ">
 ';
 
 
-$result_converted{'latex'}->{'cartouche_in_example'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'cartouche_in_example'} = 
'\\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
 \\ttfamily In example
 \\end{GNUTexinfopreformatted}
diff --git a/tp/t/results/coverage/cartouche_in_quotation.pl 
b/tp/t/results/coverage/cartouche_in_quotation.pl
index 3ee4e0242e..59ddb5c0b4 100644
--- a/tp/t/results/coverage/cartouche_in_quotation.pl
+++ b/tp/t/results/coverage/cartouche_in_quotation.pl
@@ -227,7 +227,7 @@ $result_converted{'xml'}->{'cartouche_in_quotation'} = 
'<quotation endspaces=" "
 ';
 
 
-$result_converted{'latex'}->{'cartouche_in_quotation'} = '\\begin{quote}
+$result_converted{'latex_text'}->{'cartouche_in_quotation'} = '\\begin{quote}
 In quotation
 \\begin{mdframed}[style=GNUTexinfocartouche]
 In cartouche in quotation
diff --git a/tp/t/results/coverage/center.pl b/tp/t/results/coverage/center.pl
index d412b0d6f6..000713934e 100644
--- a/tp/t/results/coverage/center.pl
+++ b/tp/t/results/coverage/center.pl
@@ -123,7 +123,7 @@ $result_converted{'xml'}->{'center'} = '
 ';
 
 
-$result_converted{'latex'}->{'center'} = '
+$result_converted{'latex_text'}->{'center'} = '
 \\begin{center}
 in center \\texttt{in code}
 \\end{center}
diff --git a/tp/t/results/coverage/commands.pl 
b/tp/t/results/coverage/commands.pl
index 24a03218a5..0dd5d2c1c9 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -615,7 +615,7 @@ $result_converted{'xml'}->{'commands'} = '<para>&arobase; 
&tex; <spacecmd type="
 ';
 
 
-$result_converted{'latex'}->{'commands'} = '@ \\TeX{} \\ {}\\"{e} \\^{\\i{}} 
\\~{a} \\r{a}
+$result_converted{'latex_text'}->{'commands'} = '@ \\TeX{} \\ {}\\"{e} 
\\^{\\i{}} \\~{a} \\r{a}
 
 File $\\rightarrow{}$ Open\\@.
 \\href{mailto:a}{b} \\texttt{code {-}{-}{-} {-}{-} {\'}{\'} {`}{`}}
diff --git a/tp/t/results/coverage/commands_in_math.pl 
b/tp/t/results/coverage/commands_in_math.pl
index e83cde2c26..85767c053f 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -2897,7 +2897,7 @@ $result_converted{'xml'}->{'commands_in_math'} = '
 ';
 
 
-$result_converted{'latex'}->{'commands_in_math'} = '
+$result_converted{'latex_text'}->{'commands_in_math'} = '
 $$
 \\mathbf{``simple-double--three---four----\'\'} \\hbox{aa}
 `\\hbox{}`simple-double-\\hbox{}-three---four----\'\\hbox{}\'
diff --git a/tp/t/results/coverage/comment_on_cartouche_line.pl 
b/tp/t/results/coverage/comment_on_cartouche_line.pl
index a878f6f5be..f7a861997f 100644
--- a/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -143,7 +143,7 @@ $result_converted{'xml'}->{'comment_on_cartouche_line'} = 
'<cartouche spaces=" "
 ';
 
 
-$result_converted{'latex'}->{'comment_on_cartouche_line'} = 
'\\begin{mdframed}[style=GNUTexinfocartouche]
+$result_converted{'latex_text'}->{'comment_on_cartouche_line'} = 
'\\begin{mdframed}[style=GNUTexinfocartouche]
 in cartouche.
 \\end{mdframed}
 ';
diff --git a/tp/t/results/coverage/comment_on_group_line.pl 
b/tp/t/results/coverage/comment_on_group_line.pl
index 4d8cd8cbea..182482007c 100644
--- a/tp/t/results/coverage/comment_on_group_line.pl
+++ b/tp/t/results/coverage/comment_on_group_line.pl
@@ -141,7 +141,7 @@ $result_converted{'xml'}->{'comment_on_group_line'} = 
'<group spaces=" " endspac
 ';
 
 
-$result_converted{'latex'}->{'comment_on_group_line'} = 'in group.
+$result_converted{'latex_text'}->{'comment_on_group_line'} = 'in group.
 ';
 
 
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 89665ac008..8166f5c009 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -2527,7 +2527,7 @@ $result_converted{'xml'}->{'def'} = '
 ';
 
 
-$result_converted{'latex'}->{'def'} = '
+$result_converted{'latex_text'}->{'def'} = '
 
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
diff --git a/tp/t/results/coverage/displaymath.pl 
b/tp/t/results/coverage/displaymath.pl
index 19d577fa6b..2f1146b278 100644
--- a/tp/t/results/coverage/displaymath.pl
+++ b/tp/t/results/coverage/displaymath.pl
@@ -737,7 +737,7 @@ a/2
 ';
 
 
-$result_converted{'latex'}->{'displaymath'} = 'Simple
+$result_converted{'latex_text'}->{'displaymath'} = 'Simple
 $$
 --{x^i}\\over{\\tan y}
 $$
diff --git a/tp/t/results/coverage/empty_w.pl b/tp/t/results/coverage/empty_w.pl
index 0738c1d43f..fe0972166c 100644
--- a/tp/t/results/coverage/empty_w.pl
+++ b/tp/t/results/coverage/empty_w.pl
@@ -101,7 +101,7 @@ $result_converted{'html_text'}->{'empty_w'} = '<p><!-- /@w 
--> a&nbsp;b<!-- /@w
 $result_converted{'xml'}->{'empty_w'} = '<para><w></w> <w>a b</w>.</para>';
 
 
-$result_converted{'latex'}->{'empty_w'} = '\\hbox{} \\hbox{a b}.';
+$result_converted{'latex_text'}->{'empty_w'} = '\\hbox{} \\hbox{a b}.';
 
 
 $result_converted{'docbook'}->{'empty_w'} = '<para><!-- /@w --> a b<!-- /@w 
-->.</para>';
diff --git a/tp/t/results/coverage/exdent_and_commands.pl 
b/tp/t/results/coverage/exdent_and_commands.pl
index c310d4da9d..38c15a7ecf 100644
--- a/tp/t/results/coverage/exdent_and_commands.pl
+++ b/tp/t/results/coverage/exdent_and_commands.pl
@@ -484,7 +484,7 @@ $result_converted{'xml'}->{'exdent_and_commands'} = 
'<quotation endspaces=" ">
 ';
 
 
-$result_converted{'latex'}->{'exdent_and_commands'} = '\\begin{quote}
+$result_converted{'latex_text'}->{'exdent_and_commands'} = '\\begin{quote}
 quotation1
 \\leavevmode{}\\\\
 \\hbox{\\kern -\\leftmargin}%
diff --git a/tp/t/results/coverage/exdent_and_formats.pl 
b/tp/t/results/coverage/exdent_and_formats.pl
index aaa6bd8e87..d85d77f31d 100644
--- a/tp/t/results/coverage/exdent_and_formats.pl
+++ b/tp/t/results/coverage/exdent_and_formats.pl
@@ -2083,7 +2083,7 @@ quotation2
 ';
 
 
-$result_converted{'latex'}->{'exdent_and_formats'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'exdent_and_formats'} = 
'\\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
 \\ttfamily \\ Example   Hoho.\\ \\TeX{}\\ .\\ \\leavevmode{}\\\\\\ @.
 
diff --git a/tp/t/results/coverage/flushleft_flushright.pl 
b/tp/t/results/coverage/flushleft_flushright.pl
index a47ecca572..a72c04545c 100644
--- a/tp/t/results/coverage/flushleft_flushright.pl
+++ b/tp/t/results/coverage/flushleft_flushright.pl
@@ -332,7 +332,7 @@ ldskf dsflj
 ';
 
 
-$result_converted{'latex'}->{'flushleft_flushright'} = '
+$result_converted{'latex_text'}->{'flushleft_flushright'} = '
 \\begin{flushleft}
 \\begin{GNUTexinfopreformatted}
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
diff --git a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl 
b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
index 7990ee79b6..ff8aa3fce9 100644
--- a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
+++ b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
@@ -307,7 +307,7 @@ 
$result_converted{'xml'}->{'flushleft_flushright_in_quotation'} = '
 ';
 
 
-$result_converted{'latex'}->{'flushleft_flushright_in_quotation'} = '
+$result_converted{'latex_text'}->{'flushleft_flushright_in_quotation'} = '
 \\begin{quote}
 \\begin{flushleft}
 \\begin{GNUTexinfopreformatted}
diff --git a/tp/t/results/coverage/flushright_example_nested.pl 
b/tp/t/results/coverage/flushright_example_nested.pl
index 0fa9e77c46..2235a22e09 100644
--- a/tp/t/results/coverage/flushright_example_nested.pl
+++ b/tp/t/results/coverage/flushright_example_nested.pl
@@ -386,7 +386,7 @@ flush then example
 ';
 
 
-$result_converted{'latex'}->{'flushright_example_nested'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'flushright_example_nested'} = 
'\\begin{GNUTexinfoindented}
 \\begin{flushright}
 \\begin{GNUTexinfopreformatted}
 \\begin{GNUTexinfopreformatted}
diff --git a/tp/t/results/coverage/hyphenation.pl 
b/tp/t/results/coverage/hyphenation.pl
index 0ec167f513..526a458b04 100644
--- a/tp/t/results/coverage/hyphenation.pl
+++ b/tp/t/results/coverage/hyphenation.pl
@@ -98,7 +98,7 @@ $result_converted{'xml'}->{'hyphenation'} = '
 ';
 
 
-$result_converted{'latex'}->{'hyphenation'} = '
+$result_converted{'latex_text'}->{'hyphenation'} = '
 \\hyphenation{some-where}
 ';
 
diff --git a/tp/t/results/coverage/indentedblock.pl 
b/tp/t/results/coverage/indentedblock.pl
index fc3a82d6e5..9f60a9baf8 100644
--- a/tp/t/results/coverage/indentedblock.pl
+++ b/tp/t/results/coverage/indentedblock.pl
@@ -160,7 +160,7 @@ $result_converted{'xml'}->{'indentedblock'} = 
'<indentedblock endspaces=" ">
 ';
 
 
-$result_converted{'latex'}->{'indentedblock'} = '\\begin{quote}
+$result_converted{'latex_text'}->{'indentedblock'} = '\\begin{quote}
   indented block
 
 Text
diff --git a/tp/t/results/coverage/insertcopying.pl 
b/tp/t/results/coverage/insertcopying.pl
index 9e2a3abb18..96cab14f1f 100644
--- a/tp/t/results/coverage/insertcopying.pl
+++ b/tp/t/results/coverage/insertcopying.pl
@@ -278,7 +278,7 @@ $result_converted{'xml'}->{'insertcopying'} = '<copying 
endspaces=" ">
 ';
 
 
-$result_converted{'latex'}->{'insertcopying'} = '
+$result_converted{'latex_text'}->{'insertcopying'} = '
 License:
 
 License.
diff --git a/tp/t/results/coverage/invalid_U.pl 
b/tp/t/results/coverage/invalid_U.pl
index af4b2d9929..97e57b2a1f 100644
--- a/tp/t/results/coverage/invalid_U.pl
+++ b/tp/t/results/coverage/invalid_U.pl
@@ -407,7 +407,7 @@ $result_converted{'xml'}->{'invalid_U'} = '<para><U></U> 
<U>z</U> <U>abc</U> <U>
 </para>';
 
 
-$result_converted{'latex'}->{'invalid_U'} = ' U+z ઼ U+9999999999999 U+110000 
U+10FFFF
+$result_converted{'latex_text'}->{'invalid_U'} = ' U+z ઼ U+9999999999999 
U+110000 U+10FFFF
 \\# � U+wxyz
 ';
 
diff --git a/tp/t/results/coverage/item_container.pl 
b/tp/t/results/coverage/item_container.pl
index 660b3cc16e..2cd3e87522 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -428,7 +428,7 @@ $result_converted{'xml'}->{'item_container'} = '
 ';
 
 
-$result_converted{'latex'}->{'item_container'} = '
+$result_converted{'latex_text'}->{'item_container'} = '
 \\begin{itemize}[label=+]
 \\item i--tem +
 \\end{itemize}
diff --git a/tp/t/results/coverage/lettered_accent_and_spaces.pl 
b/tp/t/results/coverage/lettered_accent_and_spaces.pl
index ec58d6d141..0278e396ce 100644
--- a/tp/t/results/coverage/lettered_accent_and_spaces.pl
+++ b/tp/t/results/coverage/lettered_accent_and_spaces.pl
@@ -569,7 +569,7 @@ $result_converted{'xml'}->{'lettered_accent_and_spaces'} = 
'<para><accent type="
 ';
 
 
-$result_converted{'latex'}->{'lettered_accent_and_spaces'} = '\\r{a}
+$result_converted{'latex_text'}->{'lettered_accent_and_spaces'} = '\\r{a}
 
 \\r{a}
 
diff --git a/tp/t/results/coverage/math.pl b/tp/t/results/coverage/math.pl
index e66a745f48..59c9122641 100644
--- a/tp/t/results/coverage/math.pl
+++ b/tp/t/results/coverage/math.pl
@@ -636,7 +636,7 @@ $result_converted{'xml'}->{'math'} = '<para>Simple math
 ';
 
 
-$result_converted{'latex'}->{'math'} = 'Simple math
+$result_converted{'latex_text'}->{'math'} = 'Simple math
 $--{x^i}\\over{\\tan y}$
 
 Math with @-command
diff --git a/tp/t/results/coverage/multitable.pl 
b/tp/t/results/coverage/multitable.pl
index 7d635ec575..863080a129 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -734,7 +734,7 @@ $result_converted{'xml'}->{'multitable'} = '
 ';
 
 
-$result_converted{'latex'}->{'multitable'} = '
+$result_converted{'latex_text'}->{'multitable'} = '
 \\begin{tabular}{m{0.6\\textwidth} m{0.4\\textwidth}}%
 mu--ltitable headitem &another tab\\\\
 mu--ltitable item &multitable tab\\\\
diff --git a/tp/t/results/coverage/nested_block_commands.pl 
b/tp/t/results/coverage/nested_block_commands.pl
index 9412a3c475..2530ffc9da 100644
--- a/tp/t/results/coverage/nested_block_commands.pl
+++ b/tp/t/results/coverage/nested_block_commands.pl
@@ -2270,7 +2270,7 @@ $result_converted{'xml'}->{'nested_block_commands'} = 
'<group endspaces=" ">
 ';
 
 
-$result_converted{'latex'}->{'nested_block_commands'} = 'In group
+$result_converted{'latex_text'}->{'nested_block_commands'} = 'In group
 \\begin{quote}
 in quotation
 \\end{quote}
diff --git a/tp/t/results/coverage/preformatted.pl 
b/tp/t/results/coverage/preformatted.pl
index d00a8a739a..fc4b276fb8 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -440,7 +440,7 @@ in table in format
 ';
 
 
-$result_converted{'latex'}->{'preformatted'} = '
+$result_converted{'latex_text'}->{'preformatted'} = '
 \\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
 \\ttfamily e{-}{-}xample  some  
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 5b6194e74a..b8bffa03f8 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1279,7 +1279,7 @@ 
$result_converted{'xml'}->{'punctuation_in_line_commands'} = '
 ';
 
 
-$result_converted{'latex'}->{'punctuation_in_line_commands'} = '
+$result_converted{'latex_text'}->{'punctuation_in_line_commands'} = '
 \\part*{{top! After punc}}
 \\label{anchor:node_0021-After-punc}%
 
diff --git a/tp/t/results/coverage/quotation_author.pl 
b/tp/t/results/coverage/quotation_author.pl
index 24c1958d24..6de4242242 100644
--- a/tp/t/results/coverage/quotation_author.pl
+++ b/tp/t/results/coverage/quotation_author.pl
@@ -269,7 +269,7 @@ quotation continues.
 ';
 
 
-$result_converted{'latex'}->{'quotation_author'} = '\\begin{quote}
+$result_converted{'latex_text'}->{'quotation_author'} = '\\begin{quote}
 
 quotation
 quotation continues.
diff --git a/tp/t/results/coverage/raggedright.pl 
b/tp/t/results/coverage/raggedright.pl
index 4ba7ec7377..fdedbf5aef 100644
--- a/tp/t/results/coverage/raggedright.pl
+++ b/tp/t/results/coverage/raggedright.pl
@@ -133,7 +133,7 @@ $result_converted{'xml'}->{'raggedright'} = '
 ';
 
 
-$result_converted{'latex'}->{'raggedright'} = '
+$result_converted{'latex_text'}->{'raggedright'} = '
 \\begin{flushleft}
 in raggedright
 \\end{flushleft}
diff --git a/tp/t/results/coverage/setfilename_in_paragraph.pl 
b/tp/t/results/coverage/setfilename_in_paragraph.pl
index ff75dae47b..49236cd8fd 100644
--- a/tp/t/results/coverage/setfilename_in_paragraph.pl
+++ b/tp/t/results/coverage/setfilename_in_paragraph.pl
@@ -91,7 +91,7 @@ $result_converted{'xml'}->{'setfilename_in_paragraph'} = 
'<para>Some text
 ';
 
 
-$result_converted{'latex'}->{'setfilename_in_paragraph'} = 'Some text
+$result_converted{'latex_text'}->{'setfilename_in_paragraph'} = 'Some text
 ';
 
 
diff --git a/tp/t/results/coverage/symbol_after_command.pl 
b/tp/t/results/coverage/symbol_after_command.pl
index 8158aa9151..c80fea3388 100644
--- a/tp/t/results/coverage/symbol_after_command.pl
+++ b/tp/t/results/coverage/symbol_after_command.pl
@@ -586,7 +586,7 @@ $result_converted{'xml'}->{'symbol_after_command'} = 
'<table commandarg="asis" s
 </para>';
 
 
-$result_converted{'latex'}->{'symbol_after_command'} = '\\begin{description}
+$result_converted{'latex_text'}->{'symbol_after_command'} = 
'\\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
 . dot}}]
 \\item[{\\parbox[b]{\\linewidth}{%
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 401b90bc62..e0c39a7d48 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -894,7 +894,7 @@ $result_converted{'xml'}->{'table'} = '
 ';
 
 
-$result_converted{'latex'}->{'table'} = '
+$result_converted{'latex_text'}->{'table'} = '
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
 table item\\\\
diff --git a/tp/t/results/coverage/table_command_comment.pl 
b/tp/t/results/coverage/table_command_comment.pl
index 659b9c1833..343fc2d606 100644
--- a/tp/t/results/coverage/table_command_comment.pl
+++ b/tp/t/results/coverage/table_command_comment.pl
@@ -184,7 +184,7 @@ $result_converted{'xml'}->{'table_command_comment'} = 
'<table commandarg="code"
 </tableterm></tableentry></table>';
 
 
-$result_converted{'latex'}->{'table_command_comment'} = '\\begin{description}
+$result_converted{'latex_text'}->{'table_command_comment'} = 
'\\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
 \\texttt{item}}}]
 \\end{description}
diff --git a/tp/t/results/coverage/test_errormsg.pl 
b/tp/t/results/coverage/test_errormsg.pl
index c8366c0462..184e551b6c 100644
--- a/tp/t/results/coverage/test_errormsg.pl
+++ b/tp/t/results/coverage/test_errormsg.pl
@@ -205,7 +205,7 @@ $result_converted{'xml'}->{'test_errormsg'} = '<para>Some 
text
 </para>';
 
 
-$result_converted{'latex'}->{'test_errormsg'} = 'Some text
+$result_converted{'latex_text'}->{'test_errormsg'} = 'Some text
 
 
 ';
diff --git a/tp/t/results/coverage/test_tie.pl 
b/tp/t/results/coverage/test_tie.pl
index 090597a966..8f4cf668e0 100644
--- a/tp/t/results/coverage/test_tie.pl
+++ b/tp/t/results/coverage/test_tie.pl
@@ -81,7 +81,7 @@ $result_converted{'xml'}->{'test_tie'} = 
'<para>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 </para>';
 
 
-$result_converted{'latex'}->{'test_tie'} = 
'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA~BBBBBBBBBBB
+$result_converted{'latex_text'}->{'test_tie'} = 
'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA~BBBBBBBBBBB
 ';
 
 
diff --git a/tp/t/results/coverage/test_today.pl 
b/tp/t/results/coverage/test_today.pl
index 540beb8215..ea85f68e91 100644
--- a/tp/t/results/coverage/test_today.pl
+++ b/tp/t/results/coverage/test_today.pl
@@ -71,7 +71,7 @@ $result_converted{'html_text'}->{'test_today'} = '<p>a sunny 
day.</p>';
 $result_converted{'xml'}->{'test_today'} = '<para><today/>.</para>';
 
 
-$result_converted{'latex'}->{'test_today'} = '\\today{}.';
+$result_converted{'latex_text'}->{'test_today'} = '\\today{}.';
 
 
 $result_converted{'docbook'}->{'test_today'} = '<para>a sunny day.</para>';
diff --git a/tp/t/results/coverage/titlefont_in_center.pl 
b/tp/t/results/coverage/titlefont_in_center.pl
index 2d5f1eeeaf..c5cfd35230 100644
--- a/tp/t/results/coverage/titlefont_in_center.pl
+++ b/tp/t/results/coverage/titlefont_in_center.pl
@@ -107,7 +107,7 @@ $result_converted{'xml'}->{'titlefont_in_center'} = '
 ';
 
 
-$result_converted{'latex'}->{'titlefont_in_center'} = '
+$result_converted{'latex_text'}->{'titlefont_in_center'} = '
 \\begin{center}
 {\\huge \\bfseries A manual}
 \\end{center}
diff --git a/tp/t/results/coverage/unknown_accents.pl 
b/tp/t/results/coverage/unknown_accents.pl
index d67de13a13..ad283db200 100644
--- a/tp/t/results/coverage/unknown_accents.pl
+++ b/tp/t/results/coverage/unknown_accents.pl
@@ -937,7 +937,7 @@ $result_converted{'xml'}->{'unknown_accents'} = 
'<para><accent type="uml" bracke
 </para>';
 
 
-$result_converted{'latex'}->{'unknown_accents'} = '\\"{X} \\"{x} \\"{Q} \\"{Y}
+$result_converted{'latex_text'}->{'unknown_accents'} = '\\"{X} \\"{x} \\"{Q} 
\\"{Y}
 
 \\\'{z} \\\'{q} \\\'{r}
 \\\'{Z} \\\'{Q} \\\'{R}
diff --git a/tp/t/results/coverage/verbatiminclude.pl 
b/tp/t/results/coverage/verbatiminclude.pl
index 24c54ceab0..35de8efd4d 100644
--- a/tp/t/results/coverage/verbatiminclude.pl
+++ b/tp/t/results/coverage/verbatiminclude.pl
@@ -87,7 +87,7 @@ $result_converted{'xml'}->{'verbatiminclude'} = '
 ';
 
 
-$result_converted{'latex'}->{'verbatiminclude'} = '
+$result_converted{'latex_text'}->{'verbatiminclude'} = '
 \\begin{verbatim}
 This is the @emph{included} file (include-value2.txi) <> ---. 
 \\end{verbatim}
diff --git a/tp/t/results/coverage_braces/abbr_acronym.pl 
b/tp/t/results/coverage_braces/abbr_acronym.pl
index 46fc219285..5aa55b6eea 100644
--- a/tp/t/results/coverage_braces/abbr_acronym.pl
+++ b/tp/t/results/coverage_braces/abbr_acronym.pl
@@ -488,7 +488,7 @@ $result_converted{'html_text'}->{'abbr_acronym'} = 
'<p><abbr class="acronym" tit
 </p>';
 
 
-$result_converted{'latex'}->{'abbr_acronym'} = '--a (an accronym)
+$result_converted{'latex_text'}->{'abbr_acronym'} = '--a (an accronym)
 --a
 --a (an accronym , \\dots{})
 
diff --git a/tp/t/results/coverage_braces/email_possibilities.pl 
b/tp/t/results/coverage_braces/email_possibilities.pl
index 859e254608..cf60f1f1d4 100644
--- a/tp/t/results/coverage_braces/email_possibilities.pl
+++ b/tp/t/results/coverage_braces/email_possibilities.pl
@@ -164,7 +164,7 @@ $result_converted{'html_text'}->{'email_possibilities'} = 
'<p><a class="email" h
 </p>';
 
 
-$result_converted{'latex'}->{'email_possibilities'} = '\\href{mailto:--a}{--b}
+$result_converted{'latex_text'}->{'email_possibilities'} = 
'\\href{mailto:--a}{--b}
 --b
 \\href{mailto:--a}{\\nolinkurl{--a}}
 ';
diff --git a/tp/t/results/coverage_braces/empty_commands.pl 
b/tp/t/results/coverage_braces/empty_commands.pl
index 76e86484b8..a29f93e37c 100644
--- a/tp/t/results/coverage_braces/empty_commands.pl
+++ b/tp/t/results/coverage_braces/empty_commands.pl
@@ -298,7 +298,7 @@ $result_converted{'html_text'}->{'empty_commands'} = '
 ';
 
 
-$result_converted{'latex'}->{'empty_commands'} = '{\\huge \\bfseries }
+$result_converted{'latex_text'}->{'empty_commands'} = '{\\huge \\bfseries }
 
    \\texttt{}\\footnote{} \\~{}  \\verb;;
 ';
diff --git a/tp/t/results/coverage_braces/empty_line_in_email.pl 
b/tp/t/results/coverage_braces/empty_line_in_email.pl
index 9340b1cd31..7026ea32f0 100644
--- a/tp/t/results/coverage_braces/empty_line_in_email.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_email.pl
@@ -142,7 +142,7 @@ $result_converted{'html_text'}->{'empty_line_in_email'} = 
'<p>mail,
 </p>';
 
 
-$result_converted{'latex'}->{'empty_line_in_email'} = '\\href{mailto:
+$result_converted{'latex_text'}->{'empty_line_in_email'} = '\\href{mailto:
 }{\\nolinkurl{
 }}mail,
 
diff --git a/tp/t/results/coverage_braces/empty_second_email_argument.pl 
b/tp/t/results/coverage_braces/empty_second_email_argument.pl
index 51679e077e..5744a60099 100644
--- a/tp/t/results/coverage_braces/empty_second_email_argument.pl
+++ b/tp/t/results/coverage_braces/empty_second_email_argument.pl
@@ -91,6 +91,6 @@ 
$result_converted{'plaintext'}->{'empty_second_email_argument'} = '<a@b.c>
 $result_converted{'html_text'}->{'empty_second_email_argument'} = '<p><a 
class="email" href="mailto:a@b.c";>a@b.c</a></p>';
 
 
-$result_converted{'latex'}->{'empty_second_email_argument'} = 
'\\href{mailto:a@b.c}{\\nolinkurl{a@b.c}}';
+$result_converted{'latex_text'}->{'empty_second_email_argument'} = 
'\\href{mailto:a@b.c}{\\nolinkurl{a@b.c}}';
 
 1;
diff --git a/tp/t/results/coverage_braces/end_line_in_anchor.pl 
b/tp/t/results/coverage_braces/end_line_in_anchor.pl
index 8aee203633..385b7ab79a 100644
--- a/tp/t/results/coverage_braces/end_line_in_anchor.pl
+++ b/tp/t/results/coverage_braces/end_line_in_anchor.pl
@@ -85,7 +85,7 @@ $result_converted{'plaintext'}->{'end_line_in_anchor'} = '';
 $result_converted{'html_text'}->{'end_line_in_anchor'} = '<a class="anchor" 
id="an-anchor"></a>';
 
 
-$result_converted{'latex'}->{'end_line_in_anchor'} = 
'\\label{anchor:an-anchor}%
+$result_converted{'latex_text'}->{'end_line_in_anchor'} = 
'\\label{anchor:an-anchor}%
 ';
 
 1;
diff --git a/tp/t/results/coverage_braces/footnote.pl 
b/tp/t/results/coverage_braces/footnote.pl
index f7a61da339..551b72f33d 100644
--- a/tp/t/results/coverage_braces/footnote.pl
+++ b/tp/t/results/coverage_braces/footnote.pl
@@ -149,7 +149,7 @@ $result_converted{'html_text'}->{'footnote'} = '<p>text<a 
class="footnote" id="D
 ';
 
 
-$result_converted{'latex'}->{'footnote'} = 'text\\footnote{in footnote.
+$result_converted{'latex_text'}->{'footnote'} = 'text\\footnote{in footnote.
 
 \\textnormal{in footnote r}. } after footnote.';
 
diff --git a/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl 
b/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
index af2cfc40c6..5259a2326e 100644
--- a/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
+++ b/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
@@ -107,7 +107,7 @@ 
$result_converted{'html_text'}->{'footnote_ending_on_empty_line'} = '<p>text<a c
 ';
 
 
-$result_converted{'latex'}->{'footnote_ending_on_empty_line'} = 
'text\\footnote{in footnote.
+$result_converted{'latex_text'}->{'footnote_ending_on_empty_line'} = 
'text\\footnote{in footnote.
 
 }';
 
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl 
b/tp/t/results/coverage_braces/footnote_no_node.pl
index 3eb1405398..1e02397887 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -170,7 +170,7 @@ $result_converted{'html_text'}->{'footnote_no_node'} = 
'<div class="top-level-ex
 ';
 
 
-$result_converted{'latex'}->{'footnote_no_node'} = '\\part*{{top}}
+$result_converted{'latex_text'}->{'footnote_no_node'} = '\\part*{{top}}
 
 F\\footnote{In footnote}.
 ';
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
index 42c82b808b..5f5d6591b6 100644
--- a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
+++ b/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
@@ -313,7 +313,7 @@ 
$result_converted{'html_text'}->{'form_feed_in_brace_commands'} = '<p><samp clas
 ';
 
 
-$result_converted{'latex'}->{'form_feed_in_brace_commands'} = '\\texttt{\\ 
aa} \\label{anchor:aa}%
+$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{}
diff --git a/tp/t/results/coverage_braces/format_on_first_footnote_line.pl 
b/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
index aa1685ca11..937349d146 100644
--- a/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
+++ b/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
@@ -314,7 +314,7 @@ 
$result_converted{'html_text'}->{'format_on_first_footnote_line'} = '<p>Texte<a
 ';
 
 
-$result_converted{'latex'}->{'format_on_first_footnote_line'} = 
'Texte\\footnote{\\begin{quote}
+$result_converted{'latex_text'}->{'format_on_first_footnote_line'} = 
'Texte\\footnote{\\begin{quote}
 in quotation on the first footnote line
 \\end{quote}
 }.
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl 
b/tp/t/results/coverage_braces/heading_in_footnote.pl
index 44f3766abc..6ceed8ebf7 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -228,7 +228,7 @@ $result_converted{'html_text'}->{'heading_in_footnote'} = 
'<p>T<a class="footnot
 ';
 
 
-$result_converted{'latex'}->{'heading_in_footnote'} = 'T\\footnote{AAA
+$result_converted{'latex_text'}->{'heading_in_footnote'} = 'T\\footnote{AAA
 \\GNUTexinfonopagebreakheading{\\section*}{{H1}}
 \\index[cp]{ind e}%
 BBB
diff --git a/tp/t/results/coverage_braces/inforef_too_much_args.pl 
b/tp/t/results/coverage_braces/inforef_too_much_args.pl
index 46738f882c..4cee597fd1 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -198,7 +198,7 @@ $result_converted{'html_text'}->{'inforef_too_much_args'} = 
'<h4 class="node" id
 </p>';
 
 
-$result_converted{'latex'}->{'inforef_too_much_args'} = 
'\\label{anchor:chapter}%
+$result_converted{'latex_text'}->{'inforef_too_much_args'} = 
'\\label{anchor:chapter}%
 
 Section ``chapter\'\' in \\texttt{file name,\\ spurious arg}
 ';
diff --git a/tp/t/results/coverage_braces/kbd.pl 
b/tp/t/results/coverage_braces/kbd.pl
index fa22f94e42..69334b7a6c 100644
--- a/tp/t/results/coverage_braces/kbd.pl
+++ b/tp/t/results/coverage_braces/kbd.pl
@@ -581,7 +581,7 @@ $result_converted{'html_text'}->{'kbd'} = '<p>kbd: <code 
class="code">in kbd</co
 ';
 
 
-$result_converted{'latex'}->{'kbd'} = 'kbd: \\texttt{in kbd}.
+$result_converted{'latex_text'}->{'kbd'} = 'kbd: \\texttt{in kbd}.
 
 kbd in code: \\texttt{in first \\GNUTexinfocommandstyletextkbd{in nested kbd}}.
 
diff --git a/tp/t/results/coverage_braces/nested.pl 
b/tp/t/results/coverage_braces/nested.pl
index 843b24c2a2..645f93bcfc 100644
--- a/tp/t/results/coverage_braces/nested.pl
+++ b/tp/t/results/coverage_braces/nested.pl
@@ -104,6 +104,6 @@ $result_converted{'plaintext'}->{'nested'} = 'type the 
characters ‘l o g o u t
 $result_converted{'html_text'}->{'nested'} = '<p>type the characters <kbd 
class="kbd">l o g o u t <kbd class="key">RET</kbd></kbd>.</p>';
 
 
-$result_converted{'latex'}->{'nested'} = 'type the characters 
\\GNUTexinfocommandstyletextkbd{l o g o u t \\texttt{RET}}.';
+$result_converted{'latex_text'}->{'nested'} = 'type the characters 
\\GNUTexinfocommandstyletextkbd{l o g o u t \\texttt{RET}}.';
 
 1;
diff --git a/tp/t/results/coverage_braces/nested_args.pl 
b/tp/t/results/coverage_braces/nested_args.pl
index de1a12a9ad..181db517e7 100644
--- a/tp/t/results/coverage_braces/nested_args.pl
+++ b/tp/t/results/coverage_braces/nested_args.pl
@@ -238,6 +238,6 @@ $result_converted{'plaintext'}->{'nested_args'} = '*Note 
descr in b: (‘manual
 $result_converted{'html_text'}->{'nested_args'} = '<p>See <a 
data-manual="manual" 
href="manual.html#g_t_0040-in-samp">(manual)S&#7869;ction</a>.</p>';
 
 
-$result_converted{'latex'}->{'nested_args'} = 'See Section ``S\\~{e}ction\'\' 
in \\texttt{\\GNUTexinfocommandstyletextcite{manual}}.';
+$result_converted{'latex_text'}->{'nested_args'} = 'See Section 
``S\\~{e}ction\'\' in \\texttt{\\GNUTexinfocommandstyletextcite{manual}}.';
 
 1;
diff --git a/tp/t/results/coverage_braces/nested_in_sc.pl 
b/tp/t/results/coverage_braces/nested_in_sc.pl
index 604a56838d..ec5eef86d6 100644
--- a/tp/t/results/coverage_braces/nested_in_sc.pl
+++ b/tp/t/results/coverage_braces/nested_in_sc.pl
@@ -352,7 +352,7 @@ $result_converted{'html_text'}->{'nested_in_sc'} = 
'<p><small class="sc"><small
 ';
 
 
-$result_converted{'latex'}->{'nested_in_sc'} = '\\textsc{\\textsc{aaa \\~{n} 
\\aa{} \\TeX{} \\~{\\aa{}} \\footnote{In footnote}, ABr (expl), 
+$result_converted{'latex_text'}->{'nested_in_sc'} = '\\textsc{\\textsc{aaa 
\\~{n} \\aa{} \\TeX{} \\~{\\aa{}} \\footnote{In footnote}, ABr (expl), 
 \\verb:in verb:}}
 ';
 
diff --git 
a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl 
b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
index fee122abea..dae8d717b7 100644
--- a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
+++ b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
@@ -341,7 +341,7 @@ 
$result_converted{'html_text'}->{'one_argument_leading_trailing_spaces'} = '<p><
 </p>';
 
 
-$result_converted{'latex'}->{'one_argument_leading_trailing_spaces'} = 
'\\texttt{\\ in code } \\textsl{ in slanted } \\GNUTexinfocommandstyletextvar{ 
var } \\textsubscript{ sub }
+$result_converted{'latex_text'}->{'one_argument_leading_trailing_spaces'} = 
'\\texttt{\\ in code } \\textsl{ in slanted } \\GNUTexinfocommandstyletextvar{ 
var } \\textsubscript{ sub }
 \\hyphenation{a-b c-d}`\\texttt{http://example.com}\' ሴ \\hbox{ w } \\verb: 
verb :.
 ';
 
diff --git a/tp/t/results/coverage_braces/recursive_acronym.pl 
b/tp/t/results/coverage_braces/recursive_acronym.pl
index b94d2c25f7..4fb8b941b9 100644
--- a/tp/t/results/coverage_braces/recursive_acronym.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym.pl
@@ -118,7 +118,7 @@ $result_converted{'html_text'}->{'recursive_acronym'} = 
'<p><abbr class="acronym
 </p>';
 
 
-$result_converted{'latex'}->{'recursive_acronym'} = 'GNU (GNU\'s Not Unix)
+$result_converted{'latex_text'}->{'recursive_acronym'} = 'GNU (GNU\'s Not Unix)
 ';
 
 1;
diff --git a/tp/t/results/coverage_braces/recursive_acronym_definition.pl 
b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
index 3d212037b4..f336ae3084 100644
--- a/tp/t/results/coverage_braces/recursive_acronym_definition.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
@@ -173,7 +173,7 @@ 
$result_converted{'html_text'}->{'recursive_acronym_definition'} = '<p><abbr cla
 </p>';
 
 
-$result_converted{'latex'}->{'recursive_acronym_definition'} = 'GNU (GNU (GNU 
(is something)\'s Not Unix)\'s Not Unix)
+$result_converted{'latex_text'}->{'recursive_acronym_definition'} = 'GNU (GNU 
(GNU (is something)\'s Not Unix)\'s Not Unix)
 ';
 
 1;
diff --git a/tp/t/results/coverage_braces/ref_in_style_command.pl 
b/tp/t/results/coverage_braces/ref_in_style_command.pl
index 3e64254aea..f7380304ae 100644
--- a/tp/t/results/coverage_braces/ref_in_style_command.pl
+++ b/tp/t/results/coverage_braces/ref_in_style_command.pl
@@ -121,6 +121,6 @@ $result_converted{'plaintext'}->{'ref_in_style_command'} = 
'‘*note (manula)oth
 $result_converted{'html_text'}->{'ref_in_style_command'} = '<p>&lsquo;<samp 
class="samp"><a data-manual="manula" 
href="manula.html#other-node">(manula)other node</a></samp>&rsquo;.</p>';
 
 
-$result_converted{'latex'}->{'ref_in_style_command'} = 
'`\\texttt{(manula)other node}\'.';
+$result_converted{'latex_text'}->{'ref_in_style_command'} = 
'`\\texttt{(manula)other node}\'.';
 
 1;
diff --git a/tp/t/results/coverage_braces/simple.pl 
b/tp/t/results/coverage_braces/simple.pl
index 3d7ccea872..506c806376 100644
--- a/tp/t/results/coverage_braces/simple.pl
+++ b/tp/t/results/coverage_braces/simple.pl
@@ -74,6 +74,6 @@ $result_converted{'plaintext'}->{'simple'} = 'in b.
 $result_converted{'html_text'}->{'simple'} = '<p><b class="b">in  b</b>.</p>';
 
 
-$result_converted{'latex'}->{'simple'} = '\\textbf{in  b}.';
+$result_converted{'latex_text'}->{'simple'} = '\\textbf{in  b}.';
 
 1;
diff --git a/tp/t/results/coverage_braces/space_command_in_image.pl 
b/tp/t/results/coverage_braces/space_command_in_image.pl
index f2748f97aa..01b5b5e1ca 100644
--- a/tp/t/results/coverage_braces/space_command_in_image.pl
+++ b/tp/t/results/coverage_braces/space_command_in_image.pl
@@ -145,6 +145,6 @@ $result_converted{'plaintext'}->{'space_command_in_image'} 
= 'Image description"
 $result_converted{'html_text'}->{'space_command_in_image'} = '<img 
class="image" src="f--ile.png" alt="&nbsp;"> <img class="image" 
src="f--ile.png" alt="f--ile">';
 
 
-$result_converted{'latex'}->{'space_command_in_image'} = 
'\\includegraphics{f--ile} \\includegraphics{f--ile}';
+$result_converted{'latex_text'}->{'space_command_in_image'} = 
'\\includegraphics{f--ile} \\includegraphics{f--ile}';
 
 1;
diff --git a/tp/t/results/coverage_braces/space_in_anchor.pl 
b/tp/t/results/coverage_braces/space_in_anchor.pl
index 0e38e942ce..338cd1815d 100644
--- a/tp/t/results/coverage_braces/space_in_anchor.pl
+++ b/tp/t/results/coverage_braces/space_in_anchor.pl
@@ -89,7 +89,7 @@ $result_converted{'html_text'}->{'space_in_anchor'} = '<a 
class="anchor" id="anc
 </p>';
 
 
-$result_converted{'latex'}->{'space_in_anchor'} = '\\label{anchor:anchor-name}%
+$result_converted{'latex_text'}->{'space_in_anchor'} = 
'\\label{anchor:anchor-name}%
 .
 ';
 
diff --git a/tp/t/results/coverage_braces/space_in_footnote.pl 
b/tp/t/results/coverage_braces/space_in_footnote.pl
index 63b89b7d55..e9291cdc54 100644
--- a/tp/t/results/coverage_braces/space_in_footnote.pl
+++ b/tp/t/results/coverage_braces/space_in_footnote.pl
@@ -96,6 +96,6 @@ $result_converted{'html_text'}->{'space_in_footnote'} = 
'<p>text<a class="footno
 ';
 
 
-$result_converted{'latex'}->{'space_in_footnote'} = 'text\\footnote{in 
footnote.}';
+$result_converted{'latex_text'}->{'space_in_footnote'} = 'text\\footnote{in 
footnote.}';
 
 1;
diff --git a/tp/t/results/coverage_braces/space_in_image.pl 
b/tp/t/results/coverage_braces/space_in_image.pl
index 9f488622a8..f2cd7e5828 100644
--- a/tp/t/results/coverage_braces/space_in_image.pl
+++ b/tp/t/results/coverage_braces/space_in_image.pl
@@ -197,9 +197,9 @@ $result_converted_errors{'html_text'}->{'space_in_image'} = 
[
 
 
 
-$result_converted{'latex'}->{'space_in_image'} = 
'\\includegraphics[width=bb,height=cc]{a}. \\includegraphics{f}.';
+$result_converted{'latex_text'}->{'space_in_image'} = 
'\\includegraphics[width=bb,height=cc]{a}. \\includegraphics{f}.';
 
-$result_converted_errors{'latex'}->{'space_in_image'} = [
+$result_converted_errors{'latex_text'}->{'space_in_image'} = [
   {
     'error_line' => 'warning: @image file `a\' (for LaTeX) not found
 ',
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index efffaaf87a..e86008eb4c 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -4302,7 +4302,7 @@ $result_converted_errors{'html_text'}->{'test_image'} = [
 
 
 
-$result_converted{'latex'}->{'test_image'} = '
+$result_converted{'latex_text'}->{'test_image'} = '
 
 \\label{anchor:Top}%
 \\label{anchor:Image-with-commands}%
diff --git a/tp/t/results/coverage_braces/test_w.pl 
b/tp/t/results/coverage_braces/test_w.pl
index 4923c486d8..496c4a7b69 100644
--- a/tp/t/results/coverage_braces/test_w.pl
+++ b/tp/t/results/coverage_braces/test_w.pl
@@ -1009,7 +1009,7 @@ two single quotes to left- and right-hand doubled.
 </p>';
 
 
-$result_converted{'latex'}->{'test_w'} = 
'\\hbox{aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb bbbbb 
bbb b b b b b b b b b bb .
+$result_converted{'latex_text'}->{'test_w'} = 
'\\hbox{aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb bbbbb 
bbb b b b b b b b b b bb .
 ccc dddd}.
 
 a a a a a a a a a a a a a a a a a a a a a a a a a a a a  \\hbox{b a a a a a a 
a a a a a a a a a a a a a a a a a a a a a a a a a a a a}
diff --git a/tp/t/results/coverage_braces/too_much_args.pl 
b/tp/t/results/coverage_braces/too_much_args.pl
index 7f272c61dc..4b18bae665 100644
--- a/tp/t/results/coverage_braces/too_much_args.pl
+++ b/tp/t/results/coverage_braces/too_much_args.pl
@@ -84,6 +84,6 @@ $result_converted{'plaintext'}->{'too_much_args'} = 'AZE (A 
truc Z b, E eep)
 $result_converted{'html_text'}->{'too_much_args'} = '<p><abbr class="abbr" 
title="A truc Z b, E eep">AZE</abbr> (A truc Z b, E eep)</p>';
 
 
-$result_converted{'latex'}->{'too_much_args'} = 'AZE (A truc Z b, E eep)';
+$result_converted{'latex_text'}->{'too_much_args'} = 'AZE (A truc Z b, E eep)';
 
 1;
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
index 437d09b11a..9ffdc85837 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -1037,7 +1037,7 @@ 
$result_converted{'html_text'}->{'two_footnotes_in_nodes'} = '<div class="top-le
 ';
 
 
-$result_converted{'latex'}->{'two_footnotes_in_nodes'} = '\\begin{document}
+$result_converted{'latex_text'}->{'two_footnotes_in_nodes'} = 
'\\begin{document}
 \\label{anchor:Top}%
 \\chapter{{chapter}}
 \\label{anchor:chapter}%
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl 
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
index fb660db453..959f50c8bb 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
@@ -1077,7 +1077,7 @@ 
$result_converted{'html_text'}->{'two_footnotes_in_nodes_separate'} = '<div clas
 </div>';
 
 
-$result_converted{'latex'}->{'two_footnotes_in_nodes_separate'} = 
'\\begin{document}
+$result_converted{'latex_text'}->{'two_footnotes_in_nodes_separate'} = 
'\\begin{document}
 \\label{anchor:Top}%
 \\chapter{{chapter}}
 \\label{anchor:chapter}%
diff --git a/tp/t/results/coverage_braces/uref_in_ref.pl 
b/tp/t/results/coverage_braces/uref_in_ref.pl
index af8977d81c..c69f94661c 100644
--- a/tp/t/results/coverage_braces/uref_in_ref.pl
+++ b/tp/t/results/coverage_braces/uref_in_ref.pl
@@ -328,7 +328,7 @@ $result_converted{'html_text'}->{'uref_in_ref'} = '<p><a 
data-manual="info file
 </p>';
 
 
-$result_converted{'latex'}->{'uref_in_ref'} = 'Section ``title with uref2 
\\href{href://http/myhost.com/index2.html}{uref2 
(\\nolinkurl{href://http/myhost.com/index2.html})}\'\' in \\textsl{printed 
manual with uref4 \\href{href://http/myhost.com/index4.html}{uref4 
(\\nolinkurl{href://http/myhost.com/index4.html})}}
+$result_converted{'latex_text'}->{'uref_in_ref'} = 'Section ``title with uref2 
\\href{href://http/myhost.com/index2.html}{uref2 
(\\nolinkurl{href://http/myhost.com/index2.html})}\'\' in \\textsl{printed 
manual with uref4 \\href{href://http/myhost.com/index4.html}{uref4 
(\\nolinkurl{href://http/myhost.com/index4.html})}}
 ';
 
 1;
diff --git a/tp/t/results/coverage_braces/uref_url.pl 
b/tp/t/results/coverage_braces/uref_url.pl
index 69f4db73c4..5b8a5f4b0b 100644
--- a/tp/t/results/coverage_braces/uref_url.pl
+++ b/tp/t/results/coverage_braces/uref_url.pl
@@ -476,7 +476,7 @@ $result_converted{'html_text'}->{'uref_url'} = '<p><a 
class="uref" href="--a">&n
 </p>';
 
 
-$result_converted{'latex'}->{'uref_url'} = '\\href{--a}{--b (\\nolinkurl{--a})}
+$result_converted{'latex_text'}->{'uref_url'} = '\\href{--a}{--b 
(\\nolinkurl{--a})}
 \\url{--c}
 --d
 --g
diff --git a/tp/t/results/coverage_braces/uref_with_commands_characters.pl 
b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
index 0cc7240b1e..39d51933b7 100644
--- a/tp/t/results/coverage_braces/uref_with_commands_characters.pl
+++ b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
@@ -193,7 +193,7 @@ 
$result_converted{'html_text'}->{'uref_with_commands_characters'} = '<p><a class
 </p>';
 
 
-$result_converted{'latex'}->{'uref_with_commands_characters'} = 
'\\href{http://my-host.com/~toto\\%5Cs\'q"a&e?b\\}b\\{ba@s\\\\s p+h\\#aaa}{see 
that \\textbf{\\LaTeX{}} 
(\\nolinkurl{http://my-host.com/~toto\\%5Cs\'q"a&e?b\\}b\\{ba@s\\\\s 
p+h\\#aaa})}
+$result_converted{'latex_text'}->{'uref_with_commands_characters'} = 
'\\href{http://my-host.com/~toto\\%5Cs\'q"a&e?b\\}b\\{ba@s\\\\s p+h\\#aaa}{see 
that \\textbf{\\LaTeX{}} 
(\\nolinkurl{http://my-host.com/~toto\\%5Cs\'q"a&e?b\\}b\\{ba@s\\\\s 
p+h\\#aaa})}
 ';
 
 1;
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl 
b/tp/t/results/coverage_braces/verb_in_xref.pl
index fe4111f188..c57b2de52c 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -240,7 +240,7 @@ ggg </code></a>.
 </p>';
 
 
-$result_converted{'latex'}->{'verb_in_xref'} = '\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'verb_in_xref'} = '\\label{anchor:Top}%
 ';
 
 1;
diff --git a/tp/t/results/coverage_braces/w_end_sentence.pl 
b/tp/t/results/coverage_braces/w_end_sentence.pl
index dd42485e34..df6da02ff5 100644
--- a/tp/t/results/coverage_braces/w_end_sentence.pl
+++ b/tp/t/results/coverage_braces/w_end_sentence.pl
@@ -74,6 +74,6 @@ $result_converted{'plaintext'}->{'w_end_sentence'} = 'a.  b
 $result_converted{'html_text'}->{'w_end_sentence'} = '<p>a. b<!-- /@w --></p>';
 
 
-$result_converted{'latex'}->{'w_end_sentence'} = 'a. \\hbox{b}';
+$result_converted{'latex_text'}->{'w_end_sentence'} = 'a. \\hbox{b}';
 
 1;
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 0abea5b60b..1d4bde6944 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -643,7 +643,7 @@ $result_converted_errors{'html'}->{'omit_def_space'} = [
 
 
 
-$result_converted{'latex'}->{'omit_def_space'} = '\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'omit_def_space'} = '\\label{anchor:Top}%
 \\label{anchor:first}%
 
 
diff --git a/tp/t/results/formats_encodings/accent.pl 
b/tp/t/results/formats_encodings/accent.pl
index a25963dcea..4c50ca35a0 100644
--- a/tp/t/results/formats_encodings/accent.pl
+++ b/tp/t/results/formats_encodings/accent.pl
@@ -3498,7 +3498,7 @@ $result_converted{'docbook'}->{'accent'} = '<chapter 
label="" id="Top-node">
 ';
 
 
-$result_converted{'latex'}->{'accent'} = '\\begin{document}
+$result_converted{'latex_text'}->{'accent'} = '\\begin{document}
 \\part*{{top}}
 \\label{anchor:Top-node}%
 
diff --git a/tp/t/results/formats_encodings/accent_enable_encoding.pl 
b/tp/t/results/formats_encodings/accent_enable_encoding.pl
index 99e7237084..dd4c2e781d 100644
--- a/tp/t/results/formats_encodings/accent_enable_encoding.pl
+++ b/tp/t/results/formats_encodings/accent_enable_encoding.pl
@@ -3498,7 +3498,7 @@ $result_converted{'docbook'}->{'accent_enable_encoding'} 
= '<chapter label="" id
 ';
 
 
-$result_converted{'latex'}->{'accent_enable_encoding'} = '\\begin{document}
+$result_converted{'latex_text'}->{'accent_enable_encoding'} = 
'\\begin{document}
 \\part*{{top}}
 \\label{anchor:Top-node}%
 
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index 5df0443d57..b648fe1f5a 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -3546,7 +3546,7 @@ $result_converted{'docbook'}->{'accentenc'} = '<chapter 
label="" id="Top-node">
 ';
 
 
-$result_converted{'latex'}->{'accentenc'} = '
+$result_converted{'latex_text'}->{'accentenc'} = '
 \\begin{document}
 \\part*{{top}}
 \\label{anchor:Top-node}%
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index a5801c6b3d..61e406d1b7 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -23615,7 +23615,7 @@ 
$result_converted_errors{'docbook'}->{'at_commands_in_refs'} = [
 
 
 
-$result_converted{'latex'}->{'at_commands_in_refs'} = '\\begin{document}
+$result_converted{'latex_text'}->{'at_commands_in_refs'} = '\\begin{document}
 \\label{anchor:Top}%
 \\chapter{{\\-{} \\{ \\}}}
 \\label{anchor:-_007b-_007d}%
@@ -23754,7 +23754,7 @@ $result_converted{'latex'}->{'at_commands_in_refs'} = 
'\\begin{document}
 
 ';
 
-$result_converted_errors{'latex'}->{'at_commands_in_refs'} = [
+$result_converted_errors{'latex_text'}->{'at_commands_in_refs'} = [
   {
     'error_line' => 'warning: @image file `f--ile1\' (for LaTeX) not found
 ',
diff --git a/tp/t/results/formats_encodings/weird_accents.pl 
b/tp/t/results/formats_encodings/weird_accents.pl
index 79d93e984a..34e5441143 100644
--- a/tp/t/results/formats_encodings/weird_accents.pl
+++ b/tp/t/results/formats_encodings/weird_accents.pl
@@ -860,7 +860,7 @@ $result_converted{'docbook'}->{'weird_accents'} = '<chapter 
label="1" id="chap">
 ';
 
 
-$result_converted{'latex'}->{'weird_accents'} = '
+$result_converted{'latex_text'}->{'weird_accents'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\chapter{{Chapter}}
diff --git a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl 
b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
index 54bebc12a8..19a670c7b4 100644
--- a/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
+++ b/tp/t/results/formats_encodings/weird_accents_disable_encoding.pl
@@ -860,7 +860,7 @@ 
$result_converted{'docbook'}->{'weird_accents_disable_encoding'} = '<chapter lab
 ';
 
 
-$result_converted{'latex'}->{'weird_accents_disable_encoding'} = '
+$result_converted{'latex_text'}->{'weird_accents_disable_encoding'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\chapter{{Chapter}}
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
index e537dedc27..e64173121f 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding.pl
@@ -371,7 +371,7 @@ $result_floats{'mathjax_with_texinfo_enable_encoding'} = {};
 
 
 
-$result_converted{'latex'}->{'mathjax_with_texinfo_enable_encoding'} = 
'\\begin{document}
+$result_converted{'latex_text'}->{'mathjax_with_texinfo_enable_encoding'} = 
'\\begin{document}
 $$
 a^{b - \\frac{\\xi}{phi \\copyright{}}} ı
 $$
diff --git a/tp/t/results/include/simple.pl b/tp/t/results/include/simple.pl
index 32cc66650f..738de70c32 100644
--- a/tp/t/results/include/simple.pl
+++ b/tp/t/results/include/simple.pl
@@ -120,7 +120,7 @@ $result_converted{'docbook'}->{'simple'} = '<para>In 
included file.
 </para>';
 
 
-$result_converted{'latex'}->{'simple'} = 'In included file.
+$result_converted{'latex_text'}->{'simple'} = 'In included file.
 ';
 
 1;
diff --git a/tp/t/results/itemize/enumerate_in_example.pl 
b/tp/t/results/itemize/enumerate_in_example.pl
index 6bb4da101c..7c22cbf593 100644
--- a/tp/t/results/itemize/enumerate_in_example.pl
+++ b/tp/t/results/itemize/enumerate_in_example.pl
@@ -264,7 +264,7 @@ still second
 ';
 
 
-$result_converted{'latex'}->{'enumerate_in_example'} = '
+$result_converted{'latex_text'}->{'enumerate_in_example'} = '
 \\begin{GNUTexinfoindented}
 \\begin{enumerate}[start=1]
 \\item \\begin{GNUTexinfopreformatted}
diff --git a/tp/t/results/itemize/itemize_in_example.pl 
b/tp/t/results/itemize/itemize_in_example.pl
index 7758d14515..5a4a7cb6a7 100644
--- a/tp/t/results/itemize/itemize_in_example.pl
+++ b/tp/t/results/itemize/itemize_in_example.pl
@@ -760,7 +760,7 @@ more.
 ';
 
 
-$result_converted{'latex'}->{'itemize_in_example'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'itemize_in_example'} = 
'\\begin{GNUTexinfoindented}
 \\begin{itemize}[label=\\textbullet{}]
 \\item \\begin{GNUTexinfopreformatted}
 \\ttfamily first
diff --git a/tp/t/results/itemize/itemize_long_item.pl 
b/tp/t/results/itemize/itemize_long_item.pl
index d2481ce5e4..01251b8448 100644
--- a/tp/t/results/itemize/itemize_long_item.pl
+++ b/tp/t/results/itemize/itemize_long_item.pl
@@ -688,7 +688,7 @@ empty line.
 ';
 
 
-$result_converted{'latex'}->{'itemize_long_item'} = 
'\\begin{itemize}[label=youhou itemize very long item aaaaaaaaaaaaaaaa 
bbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccc]
+$result_converted{'latex_text'}->{'itemize_long_item'} = 
'\\begin{itemize}[label=youhou itemize very long item aaaaaaaaaaaaaaaa 
bbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccc]
 \\item first item
 \\item \\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
diff --git a/tp/t/results/itemize/w_argument.pl 
b/tp/t/results/itemize/w_argument.pl
index 2d030a1319..a91227412e 100644
--- a/tp/t/results/itemize/w_argument.pl
+++ b/tp/t/results/itemize/w_argument.pl
@@ -241,7 +241,7 @@ $result_converted{'html_text'}->{'w_argument'} = '<ul 
class="itemize mark-none">
 ';
 
 
-$result_converted{'latex'}->{'w_argument'} = '\\begin{itemize}[label={}]
+$result_converted{'latex_text'}->{'w_argument'} = '\\begin{itemize}[label={}]
 \\item \\texttt{{-}{-}build=} platform on which the program is compiled,
 \\item \\texttt{{-}{-}target=} target platform on which the program is 
processed.
 \\end{itemize}
diff --git a/tp/t/results/latex_tests/anchor_before_top.pl 
b/tp/t/results/latex_tests/anchor_before_top.pl
index cfc178709e..c22de036ef 100644
--- a/tp/t/results/latex_tests/anchor_before_top.pl
+++ b/tp/t/results/latex_tests/anchor_before_top.pl
@@ -425,7 +425,7 @@ $result_floats{'anchor_before_top'} = {};
 
 
 
-$result_converted{'latex'}->{'anchor_before_top'} = '\\begin{document}
+$result_converted{'latex_text'}->{'anchor_before_top'} = '\\begin{document}
 \\label{anchor:a-before-Top}%
 
 \\label{anchor:Top}%
diff --git a/tp/t/results/latex_tests/anchor_in_copying.pl 
b/tp/t/results/latex_tests/anchor_in_copying.pl
index a4835b4e6b..824b229b6f 100644
--- a/tp/t/results/latex_tests/anchor_in_copying.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying.pl
@@ -489,7 +489,7 @@ $result_floats{'anchor_in_copying'} = {};
 
 
 
-$result_converted{'latex'}->{'anchor_in_copying'} = '
+$result_converted{'latex_text'}->{'anchor_in_copying'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\chapter{{Chap}}
diff --git a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
index 94f1243bf0..51af68e3f1 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
@@ -578,7 +578,7 @@ $result_floats{'anchor_in_copying_insertcopying_chap'} = {};
 
 
 
-$result_converted{'latex'}->{'anchor_in_copying_insertcopying_chap'} = '
+$result_converted{'latex_text'}->{'anchor_in_copying_insertcopying_chap'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\chapter{{Chap}}
diff --git 
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
index c9559125d2..553e6c45ef 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
@@ -724,7 +724,7 @@ $result_floats{'anchor_in_copying_insertcopying_titlepage'} 
= {};
 
 
 
-$result_converted{'latex'}->{'anchor_in_copying_insertcopying_titlepage'} = '
+$result_converted{'latex_text'}->{'anchor_in_copying_insertcopying_titlepage'} 
= '
 
 \\begin{document}
 
diff --git 
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
index 43e7ec5f8b..4cd2dfdded 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
@@ -725,7 +725,7 @@ 
$result_floats{'anchor_in_copying_insertcopying_titlepage_chap'} = {};
 
 
 
-$result_converted{'latex'}->{'anchor_in_copying_insertcopying_titlepage_chap'} 
= '
+$result_converted{'latex_text'}->{'anchor_in_copying_insertcopying_titlepage_chap'}
 = '
 
 \\begin{document}
 
diff --git 
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
index ca7fe15829..fd8e03498d 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -1187,7 +1187,7 @@ 
$result_floats{'anchor_links_xref_xrefautomaticsectiontitle'} = {};
 
 
 
-$result_converted{'latex'}->{'anchor_links_xref_xrefautomaticsectiontitle'} = '
+$result_converted{'latex_text'}->{'anchor_links_xref_xrefautomaticsectiontitle'}
 = '
 \\begin{document}
 \\label{anchor:node-before}%
 
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index 998500399e..78eabcaaf3 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -672,7 +672,7 @@ $result_indices_sort_strings{'brace_in_index'} = {
 
 
 
-$result_converted{'latex'}->{'brace_in_index'} = '\\begin{document}
+$result_converted{'latex_text'}->{'brace_in_index'} = '\\begin{document}
 \\{
 
 $\\{$
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index c11c04b1a2..f00d2306bf 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -1088,7 +1088,7 @@ $result_floats{'custom_headings'} = {};
 
 
 
-$result_converted{'latex'}->{'custom_headings'} = '
+$result_converted{'latex_text'}->{'custom_headings'} = '
 \\newpagestyle{custom}{%
 \\sethead[\\thepage{} \\sectiontitle{}][\\thesection{} Section \\thesection{} 
\\sectiontitle{}][\\chaptertitle{} \\thechapter{}]%
 {}{}{}%
diff --git a/tp/t/results/latex_tests/enumerate_arguments.pl 
b/tp/t/results/latex_tests/enumerate_arguments.pl
index eb5225205c..36e4a0887a 100644
--- a/tp/t/results/latex_tests/enumerate_arguments.pl
+++ b/tp/t/results/latex_tests/enumerate_arguments.pl
@@ -931,7 +931,7 @@ $result_floats{'enumerate_arguments'} = {};
 
 
 
-$result_converted{'latex'}->{'enumerate_arguments'} = '
+$result_converted{'latex_text'}->{'enumerate_arguments'} = '
 \\begin{document}
 \\begin{enumerate}[label=\\alph*.]
 \\item value
diff --git a/tp/t/results/latex_tests/error_in_sectioning_command.pl 
b/tp/t/results/latex_tests/error_in_sectioning_command.pl
index 6c6045a3c2..ef3b8f1603 100644
--- a/tp/t/results/latex_tests/error_in_sectioning_command.pl
+++ b/tp/t/results/latex_tests/error_in_sectioning_command.pl
@@ -561,7 +561,7 @@ $result_floats{'error_in_sectioning_command'} = {};
 
 
 
-$result_converted{'latex'}->{'error_in_sectioning_command'} = '
+$result_converted{'latex_text'}->{'error_in_sectioning_command'} = '
 
 \\begin{document}
 \\tableofcontents\\newpage
diff --git a/tp/t/results/latex_tests/example_in_cartouche.pl 
b/tp/t/results/latex_tests/example_in_cartouche.pl
index 0951fef083..b6033516a8 100644
--- a/tp/t/results/latex_tests/example_in_cartouche.pl
+++ b/tp/t/results/latex_tests/example_in_cartouche.pl
@@ -339,7 +339,7 @@ $result_floats{'example_in_cartouche'} = {};
 
 
 
-$result_converted{'latex'}->{'example_in_cartouche'} = '
+$result_converted{'latex_text'}->{'example_in_cartouche'} = '
 \\begin{document}
 \\begin{mdframed}[style=GNUTexinfocartouche]
 Normal cartouche
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index 24f6361d18..c8fee14a15 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -2468,7 +2468,7 @@ 
$result_floats{'float_and_refs'}{'Thing'}[0]{'extra'}{'shortcaption'}{'extra'}{'
 
 
 
-$result_converted{'latex'}->{'float_and_refs'} = '
+$result_converted{'latex_text'}->{'float_and_refs'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\chapter{{chapter}}
diff --git a/tp/t/results/latex_tests/fonttextsize.pl 
b/tp/t/results/latex_tests/fonttextsize.pl
index caeb2139d6..74373b9dec 100644
--- a/tp/t/results/latex_tests/fonttextsize.pl
+++ b/tp/t/results/latex_tests/fonttextsize.pl
@@ -907,7 +907,7 @@ $result_floats{'fonttextsize'} = {};
 
 
 
-$result_converted{'latex'}->{'fonttextsize'} = '
+$result_converted{'latex_text'}->{'fonttextsize'} = '
 \\changefontsize{10}
 
 \\begin{document}
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 01a6bb9262..e870db64cb 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -1357,7 +1357,7 @@ $result_indices_sort_strings{'indices'} = {
 
 
 
-$result_converted{'latex'}->{'indices'} = '
+$result_converted{'latex_text'}->{'indices'} = '
 
 \\begin{document}
 \\label{anchor:Top}%
diff --git a/tp/t/results/latex_tests/informative_commands_in_top_node.pl 
b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
index 27bbce7a58..ff8ac563f5 100644
--- a/tp/t/results/latex_tests/informative_commands_in_top_node.pl
+++ b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
@@ -558,7 +558,7 @@ $result_floats{'informative_commands_in_top_node'} = {};
 
 
 
-$result_converted{'latex'}->{'informative_commands_in_top_node'} = '
+$result_converted{'latex_text'}->{'informative_commands_in_top_node'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\setlength{\\parindent}{5em}
diff --git a/tp/t/results/latex_tests/nested_enumerate.pl 
b/tp/t/results/latex_tests/nested_enumerate.pl
index e70919e61f..58e70c6a87 100644
--- a/tp/t/results/latex_tests/nested_enumerate.pl
+++ b/tp/t/results/latex_tests/nested_enumerate.pl
@@ -664,7 +664,7 @@ $result_floats{'nested_enumerate'} = {};
 
 
 
-$result_converted{'latex'}->{'nested_enumerate'} = '
+$result_converted{'latex_text'}->{'nested_enumerate'} = '
 \\begin{document}
 \\begin{enumerate}[start=1]
    \\item First level item
diff --git a/tp/t/results/latex_tests/nested_itemize.pl 
b/tp/t/results/latex_tests/nested_itemize.pl
index 42099b125c..1763340ef1 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -691,7 +691,7 @@ $result_floats{'nested_itemize'} = {};
 
 
 
-$result_converted{'latex'}->{'nested_itemize'} = '\\begin{document}
+$result_converted{'latex_text'}->{'nested_itemize'} = '\\begin{document}
 \\begin{itemize}
    \\item First level item
    \\item First level item
diff --git a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl 
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
index c7dac58065..7ea680edf2 100644
--- a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
@@ -105,7 +105,7 @@ $result_floats{'no_titlepage_and_setchapternewpage_odd'} = 
{};
 
 
 
-$result_converted{'latex'}->{'no_titlepage_and_setchapternewpage_odd'} = 
'\\GNUTexinfosetdoubleheader{}%
+$result_converted{'latex_text'}->{'no_titlepage_and_setchapternewpage_odd'} = 
'\\GNUTexinfosetdoubleheader{}%
 \\begin{document}
 ';
 
diff --git a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl 
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
index b533b60b23..8d4be30b96 100644
--- a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
@@ -105,7 +105,7 @@ $result_floats{'no_titlepage_and_setchapternewpage_on'} = 
{};
 
 
 
-$result_converted{'latex'}->{'no_titlepage_and_setchapternewpage_on'} = 
'\\makeatletter
+$result_converted{'latex_text'}->{'no_titlepage_and_setchapternewpage_on'} = 
'\\makeatletter
 
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\GNUTexinfosetsingleheader{}%
diff --git a/tp/t/results/latex_tests/node_before_top.pl 
b/tp/t/results/latex_tests/node_before_top.pl
index 1e475ec125..a806cd7d57 100644
--- a/tp/t/results/latex_tests/node_before_top.pl
+++ b/tp/t/results/latex_tests/node_before_top.pl
@@ -418,7 +418,7 @@ $result_floats{'node_before_top'} = {};
 
 
 
-$result_converted{'latex'}->{'node_before_top'} = '\\begin{document}
+$result_converted{'latex_text'}->{'node_before_top'} = '\\begin{document}
 \\label{anchor:before-Top}%
 
 \\label{anchor:Top}%
diff --git a/tp/t/results/latex_tests/pagesizes.pl 
b/tp/t/results/latex_tests/pagesizes.pl
index 5f9f71e982..6dc8733a95 100644
--- a/tp/t/results/latex_tests/pagesizes.pl
+++ b/tp/t/results/latex_tests/pagesizes.pl
@@ -597,7 +597,7 @@ $result_floats{'pagesizes'} = {};
 
 
 
-$result_converted{'latex'}->{'pagesizes'} = '
+$result_converted{'latex_text'}->{'pagesizes'} = '
 \\newgeometry{textheight=200mm,textwidth=150mm}
 
 \\begin{document}
diff --git a/tp/t/results/latex_tests/pagetype.pl 
b/tp/t/results/latex_tests/pagetype.pl
index f6bd82bfff..5a5c095695 100644
--- a/tp/t/results/latex_tests/pagetype.pl
+++ b/tp/t/results/latex_tests/pagetype.pl
@@ -627,7 +627,7 @@ $result_floats{'pagetype'} = {};
 
 
 
-$result_converted{'latex'}->{'pagetype'} = '
+$result_converted{'latex_text'}->{'pagetype'} = '
 \\geometry{papername=a4paper}%
 
 \\geometry{papername=a4paper}%
diff --git a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl 
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
index e0ccdd173b..56b643afd2 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -245,7 +245,7 @@ $result_floats{'setchapternewpage_on_odd_titlepage'} = {};
 
 
 
-$result_converted{'latex'}->{'setchapternewpage_on_odd_titlepage'} = 
'\\makeatletter
+$result_converted{'latex_text'}->{'setchapternewpage_on_odd_titlepage'} = 
'\\makeatletter
 
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 
diff --git a/tp/t/results/latex_tests/settitle_and_headings.pl 
b/tp/t/results/latex_tests/settitle_and_headings.pl
index 95711d69b7..4e26f6d368 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -317,7 +317,7 @@ $result_floats{'settitle_and_headings'} = {};
 
 
 
-$result_converted{'latex'}->{'settitle_and_headings'} = '
+$result_converted{'latex_text'}->{'settitle_and_headings'} = '
 \\GNUTexinfosetdoubleheader{}%
 
 \\begin{document}
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl 
b/tp/t/results/latex_tests/shorttitlepage.pl
index 250fd4ebba..21985ff549 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -419,7 +419,7 @@ $result_floats{'shorttitlepage'} = {};
 
 
 
-$result_converted{'latex'}->{'shorttitlepage'} = '
+$result_converted{'latex_text'}->{'shorttitlepage'} = '
 
 \\begin{document}
 
diff --git a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl 
b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
index bbc4610867..f0d9eb9d15 100644
--- a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
+++ b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
@@ -212,7 +212,7 @@ $result_floats{'three_setchapternewpage_on_odd_off'} = {};
 
 
 
-$result_converted{'latex'}->{'three_setchapternewpage_on_odd_off'} = 
'\\makeatletter
+$result_converted{'latex_text'}->{'three_setchapternewpage_on_odd_off'} = 
'\\makeatletter
 
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\GNUTexinfosetsingleheader{}%
diff --git a/tp/t/results/latex_tests/titlepage_and_headings.pl 
b/tp/t/results/latex_tests/titlepage_and_headings.pl
index 05f62fa273..50f91c55c0 100644
--- a/tp/t/results/latex_tests/titlepage_and_headings.pl
+++ b/tp/t/results/latex_tests/titlepage_and_headings.pl
@@ -165,7 +165,7 @@ $result_floats{'titlepage_and_headings'} = {};
 
 
 
-$result_converted{'latex'}->{'titlepage_and_headings'} = '
+$result_converted{'latex_text'}->{'titlepage_and_headings'} = '
 
 \\begin{document}
 
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl 
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
index 643df30b58..0aad67aaa3 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
@@ -209,7 +209,7 @@ $result_floats{'titlepage_and_setchapternewpage_odd'} = {};
 
 
 
-$result_converted{'latex'}->{'titlepage_and_setchapternewpage_odd'} = '
+$result_converted{'latex_text'}->{'titlepage_and_setchapternewpage_odd'} = '
 
 
 \\begin{document}
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl 
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
index cc38f05403..13d889eb0e 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -200,7 +200,7 @@ $result_floats{'titlepage_and_setchapternewpage_on'} = {};
 
 
 
-$result_converted{'latex'}->{'titlepage_and_setchapternewpage_on'} = 
'\\makeatletter
+$result_converted{'latex_text'}->{'titlepage_and_setchapternewpage_on'} = 
'\\makeatletter
 
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index c0b08e84fc..d50a774c20 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -799,7 +799,7 @@ $result_floats{'titlepage_classical'} = {};
 
 
 
-$result_converted{'latex'}->{'titlepage_classical'} = '
+$result_converted{'latex_text'}->{'titlepage_classical'} = '
 
 
 \\begin{document}
diff --git a/tp/t/results/latex_tests/titlepage_in_top_node.pl 
b/tp/t/results/latex_tests/titlepage_in_top_node.pl
index 85ff21d96c..014957c219 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -496,7 +496,7 @@ $result_floats{'titlepage_in_top_node'} = {};
 
 
 
-$result_converted{'latex'}->{'titlepage_in_top_node'} = '
+$result_converted{'latex_text'}->{'titlepage_in_top_node'} = '
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 8d852c6c15..3ae23bca7c 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -481,7 +481,7 @@ $result_floats{'titlepage_long_title'} = {};
 
 
 
-$result_converted{'latex'}->{'titlepage_long_title'} = '
+$result_converted{'latex_text'}->{'titlepage_long_title'} = '
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index e7f0eb176a..6c94657af4 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -463,7 +463,7 @@ $result_floats{'titlepage_no_author'} = {};
 
 
 
-$result_converted{'latex'}->{'titlepage_no_author'} = '
+$result_converted{'latex_text'}->{'titlepage_no_author'} = '
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index 61660f0a2f..b0172b1aa5 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -505,7 +505,7 @@ $result_floats{'titlepage_no_title'} = {};
 
 
 
-$result_converted{'latex'}->{'titlepage_no_title'} = '
+$result_converted{'latex_text'}->{'titlepage_no_title'} = '
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl 
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index 114130a450..77d74300ec 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -1023,7 +1023,7 @@ $result_floats{'titlepage_with_commands_classical'} = {};
 
 
 
-$result_converted{'latex'}->{'titlepage_with_commands_classical'} = '
+$result_converted{'latex_text'}->{'titlepage_with_commands_classical'} = '
 
 
 \\begin{document}
diff --git a/tp/t/results/latex_tests/top_no_sectioning_command.pl 
b/tp/t/results/latex_tests/top_no_sectioning_command.pl
index 81c9a0ad1a..e5fa3b6c4c 100644
--- a/tp/t/results/latex_tests/top_no_sectioning_command.pl
+++ b/tp/t/results/latex_tests/top_no_sectioning_command.pl
@@ -296,7 +296,7 @@ $result_floats{'top_no_sectioning_command'} = {};
 
 
 
-$result_converted{'latex'}->{'top_no_sectioning_command'} = '\\begin{document}
+$result_converted{'latex_text'}->{'top_no_sectioning_command'} = 
'\\begin{document}
 \\label{anchor:Top}%
 \\chapter{{Chap}}
 \\label{anchor:Chapter}%
diff --git a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl 
b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
index 831da9499d..e08c2fa2ae 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
@@ -159,7 +159,7 @@ $result_floats{'two_setchapternewpage_odd_on'} = {};
 
 
 
-$result_converted{'latex'}->{'two_setchapternewpage_odd_on'} = 
'\\GNUTexinfosetdoubleheader{}%
+$result_converted{'latex_text'}->{'two_setchapternewpage_odd_on'} = 
'\\GNUTexinfosetdoubleheader{}%
 
 \\makeatletter
 
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
diff --git a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl 
b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
index b262411585..0be40ba2a1 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
@@ -159,7 +159,7 @@ $result_floats{'two_setchapternewpage_on_odd'} = {};
 
 
 
-$result_converted{'latex'}->{'two_setchapternewpage_on_odd'} = '\\makeatletter
+$result_converted{'latex_text'}->{'two_setchapternewpage_on_odd'} = 
'\\makeatletter
 
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\GNUTexinfosetsingleheader{}%
diff --git a/tp/t/results/latex_tests/verbatim_in_smallformat.pl 
b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
index 1211982a58..f2ae7dca26 100644
--- a/tp/t/results/latex_tests/verbatim_in_smallformat.pl
+++ b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
@@ -183,7 +183,7 @@ $result_floats{'verbatim_in_smallformat'} = {};
 
 
 
-$result_converted{'latex'}->{'verbatim_in_smallformat'} = '
+$result_converted{'latex_text'}->{'verbatim_in_smallformat'} = '
 \\begin{document}
 \\begin{verbatim}
 ... still verbatim, but in a smaller font ...
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 71701fbfbe..84846b8bdf 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -5551,7 +5551,7 @@ samp: &lsquo;<samp 
class="samp">``simple-double--three---four----\'\' `simple\'
 ';
 
 
-$result_converted{'latex'}->{'codequoteundirected_codequotebacktick'} = '
+$result_converted{'latex_text'}->{'codequoteundirected_codequotebacktick'} = '
 
 
 
diff --git a/tp/t/results/misc_commands/command_in_heading_footing.pl 
b/tp/t/results/misc_commands/command_in_heading_footing.pl
index d02524cebd..1751178239 100644
--- a/tp/t/results/misc_commands/command_in_heading_footing.pl
+++ b/tp/t/results/misc_commands/command_in_heading_footing.pl
@@ -216,7 +216,7 @@ 
$result_converted{'html_text'}->{'command_in_heading_footing'} = '
 </p>';
 
 
-$result_converted{'latex'}->{'command_in_heading_footing'} = 
'\\newpagestyle{custom}{%
+$result_converted{'latex_text'}->{'command_in_heading_footing'} = 
'\\newpagestyle{custom}{%
 \\sethead[something \\thepage{} \\thechapter{}][][]%
 {something \\thepage{} \\thechapter{}}{}{}%
 }%
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl 
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index f39d78c892..8a961a4d06 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -1059,7 +1059,7 @@ 
$result_converted{'html_text'}->{'comment_space_command_on_line'} = '
 ';
 
 
-$result_converted{'latex'}->{'comment_space_command_on_line'} = '
+$result_converted{'latex_text'}->{'comment_space_command_on_line'} = '
 \\label{anchor:Top}%
 \\chapter{{Chapter\\ {}}}
 \\label{anchor:chap}%
diff --git a/tp/t/results/misc_commands/comments_in_text.pl 
b/tp/t/results/misc_commands/comments_in_text.pl
index 9efc3e006f..663f059e57 100644
--- a/tp/t/results/misc_commands/comments_in_text.pl
+++ b/tp/t/results/misc_commands/comments_in_text.pl
@@ -214,7 +214,7 @@ $result_converted{'html_text'}->{'comments_in_text'} = '
 <p>Comment at the end of the line </p>';
 
 
-$result_converted{'latex'}->{'comments_in_text'} = '
+$result_converted{'latex_text'}->{'comments_in_text'} = '
 
 Text line followed by a comment on the same line and another below Text line 
after the comment followed by a comment Text line after the text line followed 
by the comment.
 
diff --git a/tp/t/results/misc_commands/definfoenclose.pl 
b/tp/t/results/misc_commands/definfoenclose.pl
index 4318d64883..0c2385cce0 100644
--- a/tp/t/results/misc_commands/definfoenclose.pl
+++ b/tp/t/results/misc_commands/definfoenclose.pl
@@ -462,7 +462,7 @@ $result_converted{'html_text'}->{'definfoenclose'} = '
 </p>';
 
 
-$result_converted{'latex'}->{'definfoenclose'} = '
+$result_converted{'latex_text'}->{'definfoenclose'} = '
 definfoenclose phoo,//,\\textbackslash{}  
 bar
 
diff --git a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl 
b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
index c1e3bf13f7..4b3f0d9b1f 100644
--- a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
+++ b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
@@ -161,7 +161,7 @@ 
$result_converted{'html_text'}->{'definfoenclose_with_empty_arg'} = '
 ';
 
 
-$result_converted{'latex'}->{'definfoenclose_with_empty_arg'} = '
+$result_converted{'latex_text'}->{'definfoenclose_with_empty_arg'} = '
 
 My something.
 
diff --git a/tp/t/results/misc_commands/empty_center.pl 
b/tp/t/results/misc_commands/empty_center.pl
index 660ac43987..bb6005a187 100644
--- a/tp/t/results/misc_commands/empty_center.pl
+++ b/tp/t/results/misc_commands/empty_center.pl
@@ -73,7 +73,7 @@ $result_converted{'plaintext'}->{'empty_center'} = '';
 $result_converted{'html_text'}->{'empty_center'} = '';
 
 
-$result_converted{'latex'}->{'empty_center'} = '';
+$result_converted{'latex_text'}->{'empty_center'} = '';
 
 
 $result_converted{'docbook'}->{'empty_center'} = '<simpara 
role="center"></simpara>
diff --git a/tp/t/results/misc_commands/empty_center_with_arg.pl 
b/tp/t/results/misc_commands/empty_center_with_arg.pl
index 6f79562a87..1fa68845b2 100644
--- a/tp/t/results/misc_commands/empty_center_with_arg.pl
+++ b/tp/t/results/misc_commands/empty_center_with_arg.pl
@@ -84,7 +84,7 @@ $result_converted{'html_text'}->{'empty_center_with_arg'} = 
'<div class="center"
 </div>';
 
 
-$result_converted{'latex'}->{'empty_center_with_arg'} = '\\begin{center}
+$result_converted{'latex_text'}->{'empty_center_with_arg'} = '\\begin{center}
 \\hbox{}
 \\end{center}
 ';
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl 
b/tp/t/results/misc_commands/footnote_in_center.pl
index f178969c03..eff1e13ac6 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -358,7 +358,7 @@ shows an important feature of the centered text.
 ';
 
 
-$result_converted{'latex'}->{'footnote_in_center'} = '\\begin{center}
+$result_converted{'latex_text'}->{'footnote_in_center'} = '\\begin{center}
 Centered text with a footnote\\footnote{This footnote
 shows an important feature of the centered text.
 
diff --git a/tp/t/results/misc_commands/heading_command_in_commands.pl 
b/tp/t/results/misc_commands/heading_command_in_commands.pl
index 16fbc8ae7f..b0082303ba 100644
--- a/tp/t/results/misc_commands/heading_command_in_commands.pl
+++ b/tp/t/results/misc_commands/heading_command_in_commands.pl
@@ -355,7 +355,7 @@ 
$result_converted{'html_text'}->{'heading_command_in_commands'} = '
 ';
 
 
-$result_converted{'latex'}->{'heading_command_in_commands'} = '
+$result_converted{'latex_text'}->{'heading_command_in_commands'} = '
 \\texttt{
 \\newpagestyle{custom}{%
 \\sethead[in code][][]%
diff --git a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl 
b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
index 5791097330..0cc46cfb2b 100644
--- a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
+++ b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
@@ -120,7 +120,7 @@ 
$result_converted{'html_text'}->{'incorrect_allowcodebreaks_argument'} = '<p><co
 </p>';
 
 
-$result_converted{'latex'}->{'incorrect_allowcodebreaks_argument'} = 
'\\texttt{b a}
+$result_converted{'latex_text'}->{'incorrect_allowcodebreaks_argument'} = 
'\\texttt{b a}
 ';
 
 1;
diff --git a/tp/t/results/misc_commands/indent_in_quotation.pl 
b/tp/t/results/misc_commands/indent_in_quotation.pl
index 6b253a5d38..901101b077 100644
--- a/tp/t/results/misc_commands/indent_in_quotation.pl
+++ b/tp/t/results/misc_commands/indent_in_quotation.pl
@@ -143,7 +143,7 @@ $result_converted{'html_text'}->{'indent_in_quotation'} = 
'<blockquote class="qu
 ';
 
 
-$result_converted{'latex'}->{'indent_in_quotation'} = '\\begin{quote}
+$result_converted{'latex_text'}->{'indent_in_quotation'} = '\\begin{quote}
 indent in quotation
 \\end{quote}
 ';
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl 
b/tp/t/results/misc_commands/kbdinputstyle.pl
index b71d9bd451..da2141a2e8 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -2234,7 +2234,7 @@ $result_converted{'html_text'}->{'kbdinputstyle'} = '
 ';
 
 
-$result_converted{'latex'}->{'kbdinputstyle'} = '
+$result_converted{'latex_text'}->{'kbdinputstyle'} = '
 @kbdinputstyle code
 
 
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl 
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index 255ef75f78..3e64db70c4 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -2421,7 +2421,7 @@ 
$result_converted{'html_text'}->{'kbdinputstyle_in_table'} = '
 ';
 
 
-$result_converted{'latex'}->{'kbdinputstyle_in_table'} = '
+$result_converted{'latex_text'}->{'kbdinputstyle_in_table'} = '
 @kbdinputstyle code
 
 
diff --git a/tp/t/results/misc_commands/no_empty_line_between_headings.pl 
b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
index 0b7fe0b0c5..50770fb3b7 100644
--- a/tp/t/results/misc_commands/no_empty_line_between_headings.pl
+++ b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
@@ -248,7 +248,7 @@ 
$result_converted{'html_text'}->{'no_empty_line_between_headings'} = '<div class
 ';
 
 
-$result_converted{'latex'}->{'no_empty_line_between_headings'} = 
'\\part*{{Top}}
+$result_converted{'latex_text'}->{'no_empty_line_between_headings'} = 
'\\part*{{Top}}
 \\GNUTexinfonopagebreakheading{\\subsection*}{{Subheading}}
 \\chapter{{Chapter}}
 \\section{{Section}}
diff --git a/tp/t/results/misc_commands/noindent_after_smallexample.pl 
b/tp/t/results/misc_commands/noindent_after_smallexample.pl
index 96b59e27d8..ac239b6026 100644
--- a/tp/t/results/misc_commands/noindent_after_smallexample.pl
+++ b/tp/t/results/misc_commands/noindent_after_smallexample.pl
@@ -187,7 +187,7 @@ $ wget 
\'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HE
 </p>';
 
 
-$result_converted{'latex'}->{'noindent_after_smallexample'} = 'To obtain.
+$result_converted{'latex_text'}->{'noindent_after_smallexample'} = 'To obtain.
 \\begin{GNUTexinfopreformatted}
 \\ttfamily \\footnotesize \\$ wget 
\'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD\\&content-type=text/plain\'
 \\$ wget 
\'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD\\&content-type=text/plain\'
diff --git a/tp/t/results/misc_commands/noindent_empty_para.pl 
b/tp/t/results/misc_commands/noindent_empty_para.pl
index bfb9edfd3f..ced7e2e3ca 100644
--- a/tp/t/results/misc_commands/noindent_empty_para.pl
+++ b/tp/t/results/misc_commands/noindent_empty_para.pl
@@ -95,7 +95,7 @@ $result_converted{'html_text'}->{'noindent_empty_para'} = '
 </p>';
 
 
-$result_converted{'latex'}->{'noindent_empty_para'} = '\\noindent{}
+$result_converted{'latex_text'}->{'noindent_empty_para'} = '\\noindent{}
 aaa
 ';
 
diff --git a/tp/t/results/misc_commands/noindent_in_paragraph.pl 
b/tp/t/results/misc_commands/noindent_in_paragraph.pl
index 4f89fd50e6..2b8e2b050e 100644
--- a/tp/t/results/misc_commands/noindent_in_paragraph.pl
+++ b/tp/t/results/misc_commands/noindent_in_paragraph.pl
@@ -143,7 +143,7 @@ after noindent2.
 </p>';
 
 
-$result_converted{'latex'}->{'noindent_in_paragraph'} = 'Begin para
+$result_converted{'latex_text'}->{'noindent_in_paragraph'} = 'Begin para
 \\noindent{}after noindent.
 
 Begin para2
diff --git a/tp/t/results/misc_commands/noindent_indent.pl 
b/tp/t/results/misc_commands/noindent_indent.pl
index 7d0eca00ce..6f0c68f484 100644
--- a/tp/t/results/misc_commands/noindent_indent.pl
+++ b/tp/t/results/misc_commands/noindent_indent.pl
@@ -253,7 +253,7 @@ qsd dsq sdq dsq dssdq sdq sdq sdq dsq sdq dsq dsq sdq dsq 
sdqsd q
 </p>';
 
 
-$result_converted{'latex'}->{'noindent_indent'} = '
+$result_converted{'latex_text'}->{'noindent_indent'} = '
 First para
 
 \\noindent{}qsddsqkdsqkkmljsqjsqodmmdsqdsmqj dqs sdq sqd sdq dsq sdq sqd sqd 
sdq sdq 
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index 8b18479241..11c25a9c66 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -531,7 +531,7 @@ $result_converted{'html_text'}->{'ref_in_center'} = '<div 
class="top-level-exten
 ';
 
 
-$result_converted{'latex'}->{'ref_in_center'} = '\\begin{document}
+$result_converted{'latex_text'}->{'ref_in_center'} = '\\begin{document}
 \\label{anchor:Top}%
 \\chapter{{Chapter}}
 \\label{anchor:chap}%
diff --git a/tp/t/results/misc_commands/setfilename.pl 
b/tp/t/results/misc_commands/setfilename.pl
index ef1c31614d..9ff0639c0f 100644
--- a/tp/t/results/misc_commands/setfilename.pl
+++ b/tp/t/results/misc_commands/setfilename.pl
@@ -302,7 +302,7 @@ $result_converted{'html_text'}->{'setfilename'} = '
 ';
 
 
-$result_converted{'latex'}->{'setfilename'} = '
+$result_converted{'latex_text'}->{'setfilename'} = '
 \\begin{document}
 ';
 
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index c8957876f0..52b87e71e4 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -2793,7 +2793,7 @@ anc-hor<a class="anchor" id="A-node2"></a></samp>&rsquo;
 ';
 
 
-$result_converted{'latex'}->{'test_allowcodebreaks'} = '\\begin{document}
+$result_converted{'latex_text'}->{'test_allowcodebreaks'} = '\\begin{document}
 \\label{anchor:Top}%
 ';
 
diff --git a/tp/t/results/misc_commands/vskip.pl 
b/tp/t/results/misc_commands/vskip.pl
index ea49c850a8..59aee0a210 100644
--- a/tp/t/results/misc_commands/vskip.pl
+++ b/tp/t/results/misc_commands/vskip.pl
@@ -57,7 +57,7 @@ $result_converted{'plaintext'}->{'vskip'} = '';
 $result_converted{'html_text'}->{'vskip'} = '';
 
 
-$result_converted{'latex'}->{'vskip'} = '\\vskip 0pt plus 1filll
+$result_converted{'latex_text'}->{'vskip'} = '\\vskip 0pt plus 1filll
 ';
 
 
diff --git a/tp/t/results/preformatted/caption_in_example.pl 
b/tp/t/results/preformatted/caption_in_example.pl
index 67ecc165ff..6551579ae0 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -353,7 +353,7 @@ After caption
 ';
 
 
-$result_converted{'latex'}->{'caption_in_example'} = 
'\\begin{TexinfoFloatfloat}
+$result_converted{'latex_text'}->{'caption_in_example'} = 
'\\begin{TexinfoFloatfloat}
 
 \\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
diff --git a/tp/t/results/preformatted/comment_example_and_blank_lines.pl 
b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
index bf2a88185d..ff4e1647f3 100644
--- a/tp/t/results/preformatted/comment_example_and_blank_lines.pl
+++ b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
@@ -593,7 +593,7 @@ 
$result_converted{'xml'}->{'comment_example_and_blank_lines'} = '<para>Para.
 </para>';
 
 
-$result_converted{'latex'}->{'comment_example_and_blank_lines'} = 'Para.
+$result_converted{'latex_text'}->{'comment_example_and_blank_lines'} = 'Para.
 
 \\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
diff --git a/tp/t/results/preformatted/comments_in_example.pl 
b/tp/t/results/preformatted/comments_in_example.pl
index dbb52df709..bfba796e11 100644
--- a/tp/t/results/preformatted/comments_in_example.pl
+++ b/tp/t/results/preformatted/comments_in_example.pl
@@ -486,7 +486,7 @@ second line
 ';
 
 
-$result_converted{'latex'}->{'comments_in_example'} = 'Example with comments 2 
lines
+$result_converted{'latex_text'}->{'comments_in_example'} = 'Example with 
comments 2 lines
 \\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
 \\ttfamily line second line \\end{GNUTexinfopreformatted}
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index 44df2aa664..88553c18bd 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -318,7 +318,7 @@ $result_converted{'xml'}->{'def_in_example'} = '<example 
endspaces=" ">
 ';
 
 
-$result_converted{'latex'}->{'def_in_example'} = '\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'def_in_example'} = 
'\\begin{GNUTexinfoindented}
 
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill
diff --git a/tp/t/results/preformatted/empty_line.pl 
b/tp/t/results/preformatted/empty_line.pl
index 4e193e4dfa..dd17ad5d62 100644
--- a/tp/t/results/preformatted/empty_line.pl
+++ b/tp/t/results/preformatted/empty_line.pl
@@ -153,7 +153,7 @@ after empty line
 ';
 
 
-$result_converted{'latex'}->{'empty_line'} = '\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'empty_line'} = '\\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
 \\ttfamily example
 
diff --git a/tp/t/results/preformatted/insertcopying_in_example.pl 
b/tp/t/results/preformatted/insertcopying_in_example.pl
index b950c09f7d..939a083fe9 100644
--- a/tp/t/results/preformatted/insertcopying_in_example.pl
+++ b/tp/t/results/preformatted/insertcopying_in_example.pl
@@ -149,7 +149,7 @@ $result_converted{'xml'}->{'insertcopying_in_example'} = 
'<example endspaces=" "
 ';
 
 
-$result_converted{'latex'}->{'insertcopying_in_example'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'insertcopying_in_example'} = 
'\\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
 \\ttfamily text
 \\end{GNUTexinfopreformatted}
diff --git a/tp/t/results/preformatted/nested_example_and_comment.pl 
b/tp/t/results/preformatted/nested_example_and_comment.pl
index c6b2bbb603..c002944c50 100644
--- a/tp/t/results/preformatted/nested_example_and_comment.pl
+++ b/tp/t/results/preformatted/nested_example_and_comment.pl
@@ -743,7 +743,7 @@ $result_converted{'xml'}->{'nested_example_and_comment'} = 
'<example endspaces="
 ';
 
 
-$result_converted{'latex'}->{'nested_example_and_comment'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'nested_example_and_comment'} = 
'\\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
 \\ttfamily First line 0 \\end{GNUTexinfopreformatted}
 \\begin{GNUTexinfoindented}
diff --git a/tp/t/results/preformatted/nested_formats.pl 
b/tp/t/results/preformatted/nested_formats.pl
index 21e2626b28..0d40690aa2 100644
--- a/tp/t/results/preformatted/nested_formats.pl
+++ b/tp/t/results/preformatted/nested_formats.pl
@@ -415,7 +415,7 @@ in -- example/format
 ';
 
 
-$result_converted{'latex'}->{'nested_formats'} = '\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'nested_formats'} = 
'\\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
 \\ttfamily 
 in {-}{-} format/example
diff --git a/tp/t/results/preformatted/page_in_example.pl 
b/tp/t/results/preformatted/page_in_example.pl
index c730245b48..e47ac922b4 100644
--- a/tp/t/results/preformatted/page_in_example.pl
+++ b/tp/t/results/preformatted/page_in_example.pl
@@ -145,7 +145,7 @@ $result_converted{'xml'}->{'page_in_example'} = '<example 
endspaces=" ">
 ';
 
 
-$result_converted{'latex'}->{'page_in_example'} = '\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'page_in_example'} = 
'\\begin{GNUTexinfoindented}
 \\newpage{}%
 \\phantom{blabla}%
 \\begin{GNUTexinfopreformatted}
diff --git a/tp/t/results/preformatted/quote_dash_in_display.pl 
b/tp/t/results/preformatted/quote_dash_in_display.pl
index d7c4dab5d0..9e398fb4dd 100644
--- a/tp/t/results/preformatted/quote_dash_in_display.pl
+++ b/tp/t/results/preformatted/quote_dash_in_display.pl
@@ -153,7 +153,7 @@ $result_converted{'xml'}->{'quote_dash_in_display'} = '
 ';
 
 
-$result_converted{'latex'}->{'quote_dash_in_display'} = '
+$result_converted{'latex_text'}->{'quote_dash_in_display'} = '
 \\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
 and now -- yes---now and ``so\'\'.
diff --git a/tp/t/results/preformatted/quote_dash_in_example.pl 
b/tp/t/results/preformatted/quote_dash_in_example.pl
index de2c836f21..5e751f9220 100644
--- a/tp/t/results/preformatted/quote_dash_in_example.pl
+++ b/tp/t/results/preformatted/quote_dash_in_example.pl
@@ -153,7 +153,7 @@ $result_converted{'xml'}->{'quote_dash_in_example'} = '
 ';
 
 
-$result_converted{'latex'}->{'quote_dash_in_example'} = '
+$result_converted{'latex_text'}->{'quote_dash_in_example'} = '
 \\begin{GNUTexinfoindented}
 \\begin{GNUTexinfopreformatted}
 \\ttfamily and now {-}{-} yes{-}{-}{-}now and {`}{`}so{\'}{\'}.
diff --git a/tp/t/results/preformatted/text_on_display_command_line.pl 
b/tp/t/results/preformatted/text_on_display_command_line.pl
index 450067ad40..8d365ce9d9 100644
--- a/tp/t/results/preformatted/text_on_display_command_line.pl
+++ b/tp/t/results/preformatted/text_on_display_command_line.pl
@@ -481,7 +481,7 @@ $result_converted{'xml'}->{'text_on_display_command_line'} 
= '<display spaces="
 ';
 
 
-$result_converted{'latex'}->{'text_on_display_command_line'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'text_on_display_command_line'} = 
'\\begin{GNUTexinfoindented}
 \\end{GNUTexinfoindented}
 
 \\begin{GNUTexinfoindented}
diff --git a/tp/t/results/preformatted/text_on_example_command_line.pl 
b/tp/t/results/preformatted/text_on_example_command_line.pl
index 09936db0b7..d7e028763e 100644
--- a/tp/t/results/preformatted/text_on_example_command_line.pl
+++ b/tp/t/results/preformatted/text_on_example_command_line.pl
@@ -481,7 +481,7 @@ $result_converted{'xml'}->{'text_on_example_command_line'} 
= '<example spaces="
 ';
 
 
-$result_converted{'latex'}->{'text_on_example_command_line'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'text_on_example_command_line'} = 
'\\begin{GNUTexinfoindented}
 \\end{GNUTexinfoindented}
 
 \\begin{GNUTexinfoindented}
diff --git a/tp/t/results/preformatted/titlefont_in_example.pl 
b/tp/t/results/preformatted/titlefont_in_example.pl
index 2a8b2c5aa3..36c17389d6 100644
--- a/tp/t/results/preformatted/titlefont_in_example.pl
+++ b/tp/t/results/preformatted/titlefont_in_example.pl
@@ -167,7 +167,7 @@ Text.
 ';
 
 
-$result_converted{'latex'}->{'titlefont_in_example'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'titlefont_in_example'} = 
'\\begin{GNUTexinfoindented}
 {\\huge \\bfseries Title}\\begin{GNUTexinfopreformatted}
 \\ttfamily 
 Text.
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index 5b72f4af3a..a8f5c40b94 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -566,7 +566,7 @@ $result_converted_errors{'html'}->{'anchor_in_copying'} = [
 
 
 
-$result_converted{'latex'}->{'anchor_in_copying'} = '
+$result_converted{'latex_text'}->{'anchor_in_copying'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\label{anchor:node}%
diff --git a/tp/t/results/regions/anchor_in_copying_in_footnote.pl 
b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
index dcf5c9de4c..4f1e286503 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -618,7 +618,7 @@ 
$result_converted_errors{'html'}->{'anchor_in_copying_in_footnote'} = [
 
 
 
-$result_converted{'latex'}->{'anchor_in_copying_in_footnote'} = '
+$result_converted{'latex_text'}->{'anchor_in_copying_in_footnote'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\label{anchor:node}%
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index 5a65a02b27..36dc583ab9 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -551,7 +551,7 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">Chapter</a> &nbsp; </p>
 ';
 
 
-$result_converted{'latex'}->{'anchor_in_titlepage'} = '
+$result_converted{'latex_text'}->{'anchor_in_titlepage'} = '
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index 0cbdea7423..0b064dd26a 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -553,7 +553,7 @@ Previous: <a href="#Top" accesskey="p" 
rel="prev">Chapter</a> &nbsp; </p>
 ';
 
 
-$result_converted{'latex'}->{'anchor_in_titlepage_titlepage'} = '
+$result_converted{'latex_text'}->{'anchor_in_titlepage_titlepage'} = '
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git a/tp/t/results/regions/format_in_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage.pl
index a572ee89df..9cead32b35 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -332,7 +332,7 @@ $result_converted_errors{'html'}->{'format_in_titlepage'} = 
[
 
 
 
-$result_converted{'latex'}->{'format_in_titlepage'} = '
+$result_converted{'latex_text'}->{'format_in_titlepage'} = '
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 543d45e10f..0e1083823b 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -343,7 +343,7 @@ 
$result_converted_errors{'html'}->{'format_in_titlepage_titlepage'} = [
 
 
 
-$result_converted{'latex'}->{'format_in_titlepage_titlepage'} = '
+$result_converted{'latex_text'}->{'format_in_titlepage_titlepage'} = '
 \\begin{document}
 
 \\GNUTexinfofrontmatter
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index b7defb58eb..f0813c52a1 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -714,7 +714,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, 
Up: <a href="#Top" ac
 ';
 
 
-$result_converted{'latex'}->{'ref_in_copying'} = '
+$result_converted{'latex_text'}->{'ref_in_copying'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\chapter{{GFDL}}
diff --git a/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl 
b/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
index fd31aff0a3..37b2b919cd 100644
--- a/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
+++ b/tp/t/results/regions/ref_in_copying_insert_in_chapter.pl
@@ -850,7 +850,7 @@ Up: <a href="#Intro" accesskey="u" 
rel="up">Introduction</a> &nbsp; </p>
 ';
 
 
-$result_converted{'latex'}->{'ref_in_copying_insert_in_chapter'} = '
+$result_converted{'latex_text'}->{'ref_in_copying_insert_in_chapter'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\chapter{{Introduction}}
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index 470ed95262..3af42694dc 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -442,7 +442,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top</a> 
&nbsp; </p>
 ';
 
 
-$result_converted{'latex'}->{'today_in_copying'} = '
+$result_converted{'latex_text'}->{'today_in_copying'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\label{anchor:node}%
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index f20a370994..7e07fe5f51 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -847,7 +847,7 @@ $result_converted{'docbook'}->{'chapter_between_nodes'} = 
'<sect1 label="1.1" id
 ';
 
 
-$result_converted{'latex'}->{'chapter_between_nodes'} = '
+$result_converted{'latex_text'}->{'chapter_between_nodes'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\section{{section}}
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs.pl 
b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
index e30f0b1cb2..fca0f56c8d 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -2324,7 +2324,7 @@ 
$result_converted{'docbook'}->{'character_and_spaces_in_refs'} = '<chapter label
 ';
 
 
-$result_converted{'latex'}->{'character_and_spaces_in_refs'} = 
'\\begin{document}
+$result_converted{'latex_text'}->{'character_and_spaces_in_refs'} = 
'\\begin{document}
 \\label{anchor:Top}%
 \\chapter{{first chapter}}
 \\label{anchor:node-to-avoid-DocBook-or-LaTeX-ignored}%
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index a3b8874b03..a3250e98dd 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -572,7 +572,7 @@ $result_directions_text{'lone_Top_node'} = 'element: 
@chapter chap
 ';
 
 
-$result_converted{'latex'}->{'lone_Top_node'} = '
+$result_converted{'latex_text'}->{'lone_Top_node'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\chapter{{chap}}
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index 79791ea608..5f6e1db3c0 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -970,7 +970,7 @@ $result_floats{'loop_nodes'} = {};
 
 
 
-$result_converted{'latex'}->{'loop_nodes'} = '
+$result_converted{'latex_text'}->{'loop_nodes'} = '
 \\begin{document}
 \\label{anchor:Top}%
 \\label{anchor:node-up}%
diff --git a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl 
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
index add7260b97..9ab0642d31 100644
--- a/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
+++ b/tp/t/results/sectioning/node_sectop_before_chapter_no_node.pl
@@ -315,7 +315,7 @@ 
$result_converted{'html'}->{'node_sectop_before_chapter_no_node'} = '<!DOCTYPE h
 $result_converted{'docbook'}->{'node_sectop_before_chapter_no_node'} = '';
 
 
-$result_converted{'latex'}->{'node_sectop_before_chapter_no_node'} = '
+$result_converted{'latex_text'}->{'node_sectop_before_chapter_no_node'} = '
 \\begin{document}
 \\label{anchor:Top}%
 ';
diff --git a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl 
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
index 45b7198794..4f196e4212 100644
--- a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
+++ b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
@@ -569,7 +569,7 @@ 
$result_converted{'docbook'}->{'node_sectop_before_lone_node_Top'} = '<chapter l
 ';
 
 
-$result_converted{'latex'}->{'node_sectop_before_lone_node_Top'} = '
+$result_converted{'latex_text'}->{'node_sectop_before_lone_node_Top'} = '
 \\begin{document}
 \\part*{{top sectionning}}
 \\label{anchor:node-before}%
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 126a42561c..96716660e8 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -573,7 +573,7 @@ $result_floats{'nodes_before_after_top'} = {};
 
 
 
-$result_converted{'latex'}->{'nodes_before_after_top'} = '
+$result_converted{'latex_text'}->{'nodes_before_after_top'} = '
 \\begin{document}
 \\label{anchor:node-before}%
 
diff --git a/tp/t/results/sectioning/nodes_before_after_top_xref.pl 
b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
index 7ce4264c77..8b96d57dca 100644
--- a/tp/t/results/sectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
@@ -841,7 +841,7 @@ $result_floats{'nodes_before_after_top_xref'} = {};
 
 
 
-$result_converted{'latex'}->{'nodes_before_after_top_xref'} = '
+$result_converted{'latex_text'}->{'nodes_before_after_top_xref'} = '
 \\begin{document}
 \\label{anchor:node-before}%
 
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index c9361ec4b3..adf1b694bf 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -911,7 +911,7 @@ $result_floats{'nodes_before_top'} = {};
 
 
 
-$result_converted{'latex'}->{'nodes_before_top'} = '
+$result_converted{'latex_text'}->{'nodes_before_top'} = '
 \\begin{document}
 \\label{anchor:first}%
 
diff --git a/tp/t/results/sectioning/section_before_after_top_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node.pl
index 302bc0563a..b09bf9bebb 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -435,7 +435,7 @@ 
$result_converted{'docbook'}->{'section_before_after_top_node'} = '<chapter labe
 ';
 
 
-$result_converted{'latex'}->{'section_before_after_top_node'} = '
+$result_converted{'latex_text'}->{'section_before_after_top_node'} = '
 \\begin{document}
 \\chapter*{{before}}
 
diff --git a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
index 60e629ec45..154c7d9557 100644
--- a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -522,7 +522,7 @@ 
$result_converted{'docbook'}->{'section_before_after_top_node_last_node'} = '<ch
 ';
 
 
-$result_converted{'latex'}->{'section_before_after_top_node_last_node'} = '
+$result_converted{'latex_text'}->{'section_before_after_top_node_last_node'} = 
'
 \\begin{document}
 \\chapter*{{before}}
 
diff --git a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl 
b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
index d687fd7745..9f88ffe8a4 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -958,7 +958,7 @@ 
$result_converted{'docbook'}->{'section_chapter_before_top_nodes'} = '<sect1 lab
 ';
 
 
-$result_converted{'latex'}->{'section_chapter_before_top_nodes'} = '
+$result_converted{'latex_text'}->{'section_chapter_before_top_nodes'} = '
 \\begin{document}
 \\section{{section}}
 \\label{anchor:section-node}%
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index 9318531d25..8e7565ddd5 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -461,7 +461,7 @@ $result_converted{'docbook'}->{'top_node_part_top'} = 
'<part label="">
 ';
 
 
-$result_converted{'latex'}->{'top_node_part_top'} = '\\begin{document}
+$result_converted{'latex_text'}->{'top_node_part_top'} = '\\begin{document}
 \\part{{part}}
 
 \\part*{{top}}
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end.pl
index df4b612f05..334ff069c2 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -1243,7 +1243,7 @@ Previous: <a href="#node-after-chapter-1" accesskey="p" 
rel="prev">node after ch
 ';
 
 
-$result_converted{'latex'}->{'two_nodes_at_the_end'} = '\\begin{document}
+$result_converted{'latex_text'}->{'two_nodes_at_the_end'} = '\\begin{document}
 \\label{anchor:Top}%
 \\chapter{{chapter c1}}
 \\label{anchor:chapter-1}%
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index d73852e808..0f2ca23ee2 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -1075,7 +1075,7 @@ Up: <a href="dir.html#Top" accesskey="u" 
rel="up">(dir)</a> &nbsp; </p>
 ';
 
 
-$result_converted{'latex'}->{'unnumbered_top_without_node_sections'} = 
'\\begin{document}
+$result_converted{'latex_text'}->{'unnumbered_top_without_node_sections'} = 
'\\begin{document}
 \\chapter*{{unnumbered}}
 \\label{anchor:a-node}%
 
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index 6e361c7b94..0e492097dd 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -145,6 +145,7 @@ my %formats = (
   'file_docbook' => \&convert_to_docbook,
   'docbook_doc' => \&convert_to_docbook,
   'latex' => \&convert_to_latex,
+  'latex_text' => \&convert_to_latex,
   'file_latex' => \&convert_to_latex,
 );
 
@@ -155,6 +156,7 @@ my %extensions = (
   'docbook' => 'dbk',
   'docbook_doc' => 'dbk',
   'latex' => 'tex',
+  'latex_text' => 'tex',
 );
 
 my %xml_converter_defaults
@@ -174,7 +176,7 @@ my %outfile_preamble = (
 ', "</texinfo>\n"],
  # done dynamically for CSS
  'html_text' => \&output_preamble_postamble_html,
- 'latex' => \&output_preamble_postamble_latex,
+ 'latex_text' => \&output_preamble_postamble_latex,
 );
 
 my $arg_generate;
@@ -741,8 +743,7 @@ sub convert_to_latex($$$$$$;$)
                                          'converted_format' => 'latex',
                                           %$converter_options });
   my $result;
-  if (defined($converter_options->{'OUTFILE'})
-      and $converter_options->{'OUTFILE'} eq '') {
+  if ($format eq 'latex_text') {
     $result = $converter->convert($tree);
   } else {
     $result = $converter->output($tree);



reply via email to

[Prev in Thread] Current Thread [Next in Thread]