texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/tests/*/list-of-tests, tp/tests/*/Makefile.a


From: Patrice Dumas
Subject: branch master updated: * tp/tests/*/list-of-tests, tp/tests/*/Makefile.am, autogen.sh, configure.ac, tp/tests/Makefile.am (base_tests_dirs): move init file customization related tests from 'contents' and 'formatting' to a new 'customization' tests directory. Move remaining 'contents' and 'indices' tests to 'formatting'. Move encodings related 'formatting' tests to a new tests directory named 'encoded'. Split 'coverage' tests directory with each output format coverage test out of 'layout'.
Date: Wed, 04 Jan 2023 06:32:46 -0500

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 460e923cc9 * tp/tests/*/list-of-tests, tp/tests/*/Makefile.am, 
autogen.sh, configure.ac, tp/tests/Makefile.am (base_tests_dirs): move init 
file customization related tests from 'contents' and 'formatting' to a new 
'customization' tests directory.  Move remaining 'contents' and 'indices' tests 
to 'formatting'.  Move encodings related 'formatting' tests to a new tests 
directory named 'encoded'.  Split 'coverage' tests directory with each output 
format coverage test out of 'layout'.
460e923cc9 is described below

commit 460e923cc98b4c39af77c2c3245f2c29938f22a0
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jan 4 12:32:33 2023 +0100

    * tp/tests/*/list-of-tests, tp/tests/*/Makefile.am, autogen.sh,
    configure.ac, tp/tests/Makefile.am (base_tests_dirs): move init file
    customization related tests from 'contents' and 'formatting' to a new
    'customization' tests directory.  Move remaining 'contents' and
    'indices' tests to 'formatting'.  Move encodings related 'formatting'
    tests to a new tests directory named 'encoded'.  Split 'coverage'
    tests directory with each output format coverage test out of 'layout'.
---
 ChangeLog                                          |  10 ++++
 autogen.sh                                         |   2 +-
 configure.ac                                       |   6 +--
 tp/t/converters_tests.t                            |   4 +-
 tp/t/html_tests.t                                  |  14 ++---
 tp/t/transformations.t                             |   4 +-
 tp/tests/Makefile.am                               |   2 +-
 tp/tests/contents/list-of-tests                    |  15 ------
 tp/tests/{contents => coverage}/Makefile.am        |   7 +--
 .../double_contents.1 => coverage/f--ile.e--xt}    |   0
 .../double_contents.2 => coverage/f--ile.jpg}      |   0
 .../double_contents.1 => coverage/f--ile.png}      |   0
 tp/tests/coverage/f--ile.txt                       |   2 +
 tp/tests/{layout => coverage}/formatting.texi      |   0
 .../{layout => coverage}/formatting_regions.texi   |   0
 tp/tests/coverage/list-of-tests                    |  29 ++++++++++
 .../res_parser/formatting_chm/anchor.html          |   0
 .../res_parser/formatting_chm/chapter.html         |   0
 .../res_parser/formatting_chm/chapter2.html        |   0
 .../res_parser/formatting_chm/formatting.1         |   0
 .../res_parser/formatting_chm/formatting.2         |   0
 .../res_parser/formatting_chm/formatting.hhc       |   0
 .../res_parser/formatting_chm/formatting.hhk       |   0
 .../res_parser/formatting_chm/formatting.hhp       |   0
 .../res_parser/formatting_chm/formatting.html      |   0
 .../res_parser/formatting_chm/formatting_ovr.html  |   0
 .../res_parser/formatting_chm/formatting_toc.html  |   0
 .../res_parser/formatting_chm/index.html           |   0
 .../formatting_chm/s_002d_002dect_002cion.html     |   0
 .../res_parser/formatting_chm/subsection.html      |   0
 ...tion-_0060_0060simple_002ddouble_002d_002d.html |   0
 ...02d_002dfour_002d_002d_002d_002d_0027_0027.html |   0
 .../res_parser/formatting_docbook/formatting.1     |   0
 .../res_parser/formatting_docbook/formatting.2     |   0
 .../res_parser/formatting_docbook/formatting.xml   |   0
 .../res_parser/formatting_epub/formatting.1        |   0
 .../res_parser/formatting_epub/formatting.2        |   0
 .../formatting_epub_package/EPUB/formatting.opf    |   0
 .../EPUB/images/11-f--ile.e--xt                    |   0
 .../EPUB/images/15-f--ile.png                      |   0
 .../EPUB/images/16-f--ile.png                      |   0
 .../EPUB/images/17-f--ile.e--xt                    |   0
 .../EPUB/images/18-f--ile.png                      |   0
 .../EPUB/images/19-f--ile.png                      |   0
 .../EPUB/images/20-f--ile.e--xt                    |   0
 .../EPUB/images/21-f--ile.png                      |   0
 .../EPUB/images/23-f--ile.e--xt                    |   0
 .../EPUB/images/27-f--ile.png                      |   0
 .../EPUB/images/28-f--ile.png                      |   0
 .../EPUB/images/29-f--ile.e--xt                    |   0
 .../EPUB/images/3-f--ile.png                       |   0
 .../EPUB/images/30-f--ile.png                      |   0
 .../EPUB/images/31-f--ile.png                      |   0
 .../EPUB/images/32-f--ile.e--xt                    |   0
 .../EPUB/images/33-f--ile.png                      |   0
 .../EPUB/images/35-f--ile.e--xt                    |   0
 .../EPUB/images/39-f--ile.png                      |   0
 .../EPUB/images/4-f--ile.png                       |   0
 .../EPUB/images/40-f--ile.png                      |   0
 .../EPUB/images/41-f--ile.e--xt                    |   0
 .../EPUB/images/42-f--ile.png                      |   0
 .../EPUB/images/43-f--ile.png                      |   0
 .../EPUB/images/44-f--ile.e--xt                    |   0
 .../EPUB/images/45-f--ile.png                      |   0
 .../EPUB/images/47-f--ile.e--xt                    |   0
 .../EPUB/images/5-f--ile.e--xt                     |   0
 .../EPUB/images/51-f--ile.png                      |   0
 .../EPUB/images/52-f--ile.png                      |   0
 .../EPUB/images/53-f--ile.e--xt                    |   0
 .../EPUB/images/54-f--ile.png                      |   0
 .../EPUB/images/55-f--ile.png                      |   0
 .../EPUB/images/56-f--ile.e--xt                    |   0
 .../EPUB/images/57-f--ile.png                      |   0
 .../EPUB/images/59-f--ile.e--xt                    |   0
 .../EPUB/images/6-f--ile.png                       |   0
 .../EPUB/images/7-f--ile.png                       |   0
 .../EPUB/images/8-f--ile.e--xt                     |   0
 .../EPUB/images/9-f--ile.png                       |   0
 .../EPUB/xhtml/chapter.xhtml                       |   0
 .../EPUB/xhtml/chapter2.xhtml                      |   0
 .../EPUB/xhtml/formatting.xhtml                    |   0
 .../EPUB/xhtml/nav_toc.xhtml                       |   0
 .../formatting_epub_package/META-INF/container.xml |   0
 .../formatting_epub_package/mimetype               |   0
 .../res_parser/formatting_html32/formatting.1      |   0
 .../res_parser/formatting_html32/formatting.2      |   0
 .../res_parser/formatting_html32/formatting.html   |   0
 .../formatting_html_no_texi2html/formatting.1      |   0
 .../formatting_html_no_texi2html/formatting.2      |   0
 .../formatting_html_no_texi2html/formatting.html   |   0
 .../res_parser/formatting_latex/formatting.1       |   0
 .../res_parser/formatting_latex/formatting.2       |   0
 .../res_parser/formatting_latex/formatting.tex     |   0
 .../formatting_macro_expand/formatting.1           |   0
 .../formatting_macro_expand/formatting.2           |   0
 .../formatting_macro_expand/formatting.texi        |   0
 .../res_parser/formatting_rawtext/formatting.1     |   0
 .../res_parser/formatting_rawtext/formatting.2     |   0
 .../res_parser/formatting_rawtext/formatting.txt   |   0
 .../formatting_regions/formatting_regions.1        |   0
 .../formatting_regions/formatting_regions.2        |   0
 .../formatting_regions/formatting_regions.html     |   0
 .../res_parser/formatting_textcontent/formatting   |   0
 .../res_parser/formatting_textcontent/formatting.1 |   0
 .../res_parser/formatting_textcontent/formatting.2 |   0
 .../res_parser/formatting_xhtml/formatting.1       |   0
 .../res_parser/formatting_xhtml/formatting.2       |   0
 .../res_parser/formatting_xhtml/formatting.html    |   0
 .../res_parser/formatting_xml/formatting.1         |   0
 .../res_parser/formatting_xml/formatting.2         |   0
 .../res_parser/formatting_xml/formatting.xml       |   0
 tp/tests/coverage/simplest.texi                    |  11 ++++
 tp/tests/{sectioning => customization}/Makefile.am |   7 +--
 .../ignore_and_comments.texi                       |   0
 tp/tests/customization/list-of-tests               |  17 ++++++
 .../double_contents.1                              |   0
 .../double_contents.2                              |   0
 .../double_contents.html                           |   0
 .../chapter.html                                   |   0
 .../double_contents.1                              |   0
 .../double_contents.2                              |   0
 .../double_contents_1.html                         |   0
 .../double_contents_top.html                       |   0
 .../index.html                                     |   0
 .../section.html                                   |   0
 .../double_contents_book}/double_contents.1        |   0
 .../double_contents_book}/double_contents.2        |   0
 .../double_contents_book/double_contents.html      |   0
 .../res_parser/sectioning_directions/sectioning.1  |   0
 .../res_parser/sectioning_directions/sectioning.2  |   0
 .../sectioning_directions/sectioning.html          |   0
 .../First-node.html                                |   0
 .../Last-node-no-description.html                  |   0
 .../Second-node.html                               |   0
 .../Third-node-unnumbered.html                     |   0
 .../between-node.html                              |   0
 .../sectioning_directions_split_chapter/index.html |   0
 .../numbered-sub.html                              |   0
 .../numbered-sub2.html                             |   0
 .../numbered-sub3.html                             |   0
 .../numbered.html                                  |   0
 .../sectioning.1                                   |   0
 .../sectioning.2                                   |   0
 .../sectioning_abt.html                            |   0
 .../sectioning_toc.html                            |   0
 .../unnumbered-sub.html                            |   0
 .../unnumbered-sub2.html                           |   0
 .../unnumbered.html                                |   0
 .../unnumbered2.html                               |   0
 .../texi_ignore_and_comments/ignore_and_comments.1 |   0
 .../texi_ignore_and_comments/ignore_and_comments.2 |   0
 .../ignore_and_comments.texi                       |   0
 .../{sectioning => customization}/sectioning.texi  |   0
 .../{formatting => customization}/test_need.texi   |   0
 tp/tests/{contents => encoded}/Makefile.am         |   5 +-
 .../tests/encoded/an_\303\257mage.png"             | Bin
 .../tests/encoded/c\303\252ss.css"                 |   0
 tp/tests/{formatting => encoded}/list-of-tests     |  23 --------
 .../manual_include_accented_file_name_latin1.texi  |   0
 .../tests/encoded/os\303\251_utf8.texi"            |   0
 .../encoded/os\303\251_utf8_no_setfilename.texi"   |   0
 .../manual_include_accented_file_name_latin1.1     |   0
 .../manual_include_accented_file_name_latin1.2     |   0
 .../manual_include_accented_file_name_latin1.info  |   0
 .../manual_include_accented_file_name_latin1.1     |   0
 .../manual_include_accented_file_name_latin1.2     |   0
 .../manual_include_accented_file_name_latin1.info  |   0
 .../manual_include_accented_file_name_latin1.1     |   0
 .../manual_include_accented_file_name_latin1.2     |   0
 .../manual_include_accented_file_name_latin1.info  |   0
 .../non_ascii_command_line/Chapteur.html           |   0
 .../res_parser/non_ascii_command_line/index.html   |   0
 .../non_ascii_command_line/int\303\251rnal.txt"    |   0
 .../os\303\251-texinfo.texi"                       |   0
 .../non_ascii_command_line/os\303\251_utf8.1"      |   0
 .../non_ascii_command_line/os\303\251_utf8.2"      |   0
 .../os\303\251_utf8_abt.html"                      |   0
 .../non_ascii_test_epub/os\303\251_utf8.1"         |   0
 .../non_ascii_test_epub/os\303\251_utf8.2"         |   0
 .../EPUB/images/1-an_image.png"                    | Bin
 .../EPUB/images/2-an_image.png"                    | Bin
 .../EPUB/os\303\251_utf8.opf"                      |   0
 .../EPUB/xhtml/Chapteur.xhtml"                     |   0
 .../EPUB/xhtml/nav_toc.xhtml"                      |   0
 .../EPUB/xhtml/os\303\251_utf8.xhtml"              |   0
 .../META-INF/container.xml"                        |   0
 .../os\303\251_utf8_epub_package/mimetype"         |   0
 .../non_ascii_test_latex/os\303\251_utf8.1"        |   0
 .../non_ascii_test_latex/os\303\251_utf8.2"        |   0
 .../non_ascii_test_latex/os\303\251_utf8.tex"      |   0
 .../non_ascii_test_rawtext/os\303\251_utf8.1"      |   0
 .../non_ascii_test_rawtext/os\303\251_utf8.2"      |   0
 .../non_ascii_test_rawtext/os\303\251_utf8.txt"    |   0
 .../tests/encoded/\303\247ss.css"                  |   0
 tp/tests/formatting/Makefile.am                    |  11 ++--
 .../index_entries_relate_to_item.texi              |   0
 .../indices_in_begin_tables_lists.texi             |   0
 tp/tests/formatting/list-of-tests                  |  51 ++++++------------
 tp/tests/{contents => formatting}/no_content.texi  |   0
 .../index_entries_relate_to_item.1                 |   0
 .../index_entries_relate_to_item.2                 |   0
 .../index_entries_relate_to_item.html              |   0
 .../indices_in_begin_tables_lists.1                |   0
 .../indices_in_begin_tables_lists.2                |   0
 .../indices_in_begin_tables_lists.html             |   0
 .../indices_in_begin_tables_lists.1                |   0
 .../indices_in_begin_tables_lists.2                |   0
 .../indices_in_begin_tables_lists.tex              |   0
 .../res_parser/no_content/no_content.1             |   0
 .../res_parser/no_content/no_content.2             |   0
 .../res_parser/no_content/no_content.html          |   0
 .../res_parser/no_content_do_contents/no_content.1 |   0
 .../res_parser/no_content_do_contents/no_content.2 |   0
 .../no_content_do_contents/no_content.html         |   0
 .../no_content_do_contents_inline/no_content.1     |   0
 .../no_content_do_contents_inline/no_content.2     |   0
 .../no_content_do_contents_inline/no_content.html  |   0
 .../no_content_do_contents_separate/no_content.1   |   0
 .../no_content_do_contents_separate/no_content.2   |   0
 .../no_content.html                                |   0
 .../res_parser/no_content_inline/no_content.1      |   0
 .../res_parser/no_content_inline/no_content.2      |   0
 .../res_parser/no_content_inline/no_content.html   |   0
 .../res_parser/no_content_separate/no_content.1    |   0
 .../res_parser/no_content_separate/no_content.2    |   0
 .../res_parser/no_content_separate/no_content.html |   0
 tp/tests/layout/Makefile.am                        |   4 +-
 tp/tests/layout/list-of-tests                      |  60 +++++++--------------
 tp/tests/other/Makefile.am                         |   6 +--
 tp/tests/sectioning/list-of-tests                  |   4 --
 ...ormatting_chm.sh => coverage_formatting_chm.sh} |   2 +-
 ...g_docbook.sh => coverage_formatting_docbook.sh} |   2 +-
 ...matting_epub.sh => coverage_formatting_epub.sh} |   2 +-
 ...ing_html32.sh => coverage_formatting_html32.sh} |   2 +-
 ...sh => coverage_formatting_html_no_texi2html.sh} |   2 +-
 ...tting_latex.sh => coverage_formatting_latex.sh} |   2 +-
 ...pand.sh => coverage_formatting_macro_expand.sh} |   2 +-
 ...g_rawtext.sh => coverage_formatting_rawtext.sh} |   2 +-
 ...g_regions.sh => coverage_formatting_regions.sh} |   2 +-
 ...ntent.sh => coverage_formatting_textcontent.sh} |   2 +-
 ...tting_xhtml.sh => coverage_formatting_xhtml.sh} |   2 +-
 ...ormatting_xml.sh => coverage_formatting_xml.sh} |   2 +-
 ...tomization_double_contents_after_title_book.sh} |   2 +-
 ...on_double_contents_after_title_book_chapter.sh} |   2 +-
 ...ok.sh => customization_double_contents_book.sh} |   2 +-
 ...=> customization_ignore_and_comments_output.sh} |   2 +-
 ...s.sh => customization_sectioning_directions.sh} |   2 +-
 ...ization_sectioning_directions_split_chapter.sh} |   2 +-
 ...need.sh => customization_test_redefine_need.sh} |   2 +-
 ...h => customization_texi_ignore_and_comments.sh} |   2 +-
 ...ed_manual_include_accented_file_name_latin1.sh} |   2 +-
 ...accented_file_name_latin1_explicit_encoding.sh} |   2 +-
 ...cented_file_name_latin1_use_locale_encoding.sh} |   2 +-
 ...d_line.sh => encoded_non_ascii_command_line.sh} |   2 +-
 ...coded_non_ascii_no_setfilename_test_rawtext.sh} |   2 +-
 ...test_epub.sh => encoded_non_ascii_test_epub.sh} |   2 +-
 ...st_latex.sh => encoded_non_ascii_test_latex.sh} |   2 +-
 ...awtext.sh => encoded_non_ascii_test_rawtext.sh} |   2 +-
 ... => formatting_index_entries_relate_to_item.sh} |   2 +-
 ...=> formatting_indices_in_begin_tables_lists.sh} |   2 +-
 ...matting_indices_in_begin_tables_lists_latex.sh} |   2 +-
 ...ents_no_content.sh => formatting_no_content.sh} |   2 +-
 ...nts.sh => formatting_no_content_do_contents.sh} |   2 +-
 ...=> formatting_no_content_do_contents_inline.sh} |   2 +-
 ... formatting_no_content_do_contents_separate.sh} |   2 +-
 ...t_inline.sh => formatting_no_content_inline.sh} |   2 +-
 ...parate.sh => formatting_no_content_separate.sh} |   2 +-
 267 files changed, 177 insertions(+), 191 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8de328e07a..cac6a188a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-01-04  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/tests/*/list-of-tests, tp/tests/*/Makefile.am, autogen.sh,
+       configure.ac, tp/tests/Makefile.am (base_tests_dirs): move init file
+       customization related tests from 'contents' and 'formatting' to a new
+       'customization' tests directory.  Move remaining 'contents' and
+       'indices' tests to 'formatting'.  Move encodings related 'formatting'
+       tests to a new tests directory named 'encoded'.  Split 'coverage'
+       tests directory with each output format coverage test out of 'layout'.
+
 2023-01-04  Patrice Dumas  <pertusus@free.fr>
 
        * tp/tests/other/list-of-tests: use the default format and not html.
diff --git a/autogen.sh b/autogen.sh
index cd5b69e422..286e5cb76d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,7 +21,7 @@ echo "  $cmd"
 $chicken eval $cmd || exit 1
 
 # Generates an include file for tp/tests/Makefile.am.
-cmd="(cd tp/tests && ../maintain/regenerate_cmd_tests.sh Makefile.onetst . 
-base 'formatting sectioning indices nested_formats contents layout' -tex_html 
'tex_html' -other 'other')"
+cmd="(cd tp/tests && ../maintain/regenerate_cmd_tests.sh Makefile.onetst . 
-base 'formatting encoded nested_formats customization coverage layout' 
-tex_html 'tex_html' -other 'other')"
 echo "  $cmd"
 $chicken eval $cmd || exit 1
 
diff --git a/configure.ac b/configure.ac
index 2f11ff69f9..b8c3f16503 100644
--- a/configure.ac
+++ b/configure.ac
@@ -528,10 +528,10 @@ AC_CONFIG_FILES([\
   tp/Makefile
   tp/tests/Makefile
   tp/tests/many_input_files/Makefile
-  tp/tests/sectioning/Makefile
   tp/tests/formatting/Makefile
-  tp/tests/indices/Makefile
-  tp/tests/contents/Makefile   
+  tp/tests/encoded/Makefile
+  tp/tests/coverage/Makefile
+  tp/tests/customization/Makefile
   tp/tests/nested_formats/Makefile
   tp/tests/layout/Makefile
   tp/tests/tex_html/Makefile
diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index 45df7fe27b..a7a2ef78a1 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -1157,12 +1157,12 @@ undef,{'test_file' => 'simplest.texi',},
 {'SPLIT' => '', 'PREFIX' => 'truc'}
 ],
 ['indices_in_begin_tables_lists',
-undef, {'test_file' => 
'../../tests/indices/indices_in_begin_tables_lists.texi'},
+undef, {'test_file' => 
'../../tests/formatting/indices_in_begin_tables_lists.texi'},
 {'SPLIT' => '', 'USE_NODES', 0}],
 # HTML still different from tests/indices indices_in_begin_tables_lists,
 # as there is no relate_index_entries_to_items tree transformation
 ['indices_in_begin_tables_lists_entries_after_item',
-undef, {'test_file' => 
'../../tests/indices/indices_in_begin_tables_lists.texi',
+undef, {'test_file' => 
'../../tests/formatting/indices_in_begin_tables_lists.texi',
         'TREE_TRANSFORMATIONS' => 'move_index_entries_after_items'},
 {'SPLIT' => '', 'USE_NODES', 0}],
 ['combined_fonts',
diff --git a/tp/t/html_tests.t b/tp/t/html_tests.t
index b1c2b528c5..0c9ac2b30f 100644
--- a/tp/t/html_tests.t
+++ b/tp/t/html_tests.t
@@ -824,7 +824,7 @@ $check_htmlxref_text
 ['sectioning_frames',
   undef,
   # tests for node with directions after section
-  {'test_file' => '../../tests/sectioning/sectioning.texi',
+  {'test_file' => '../../tests/customization/sectioning.texi',
    'CHECK_NORMAL_MENU_STRUCTURE' => 1},
   {'TEXI2HTML' => 1, 'SPLIT' => 'chapter', 'FRAMES' => 1}
 ],
@@ -960,31 +960,31 @@ $check_htmlxref_text
 ],
 # there are the same tests in tests/contents to test the command line
 ['no_content',
-  undef, {'test_file' => '../../tests/contents/no_content.texi'},
+  undef, {'test_file' => '../../tests/formatting/no_content.texi'},
   {'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">'}
 ],
 ['no_content_inline',
-  undef, {'test_file' => '../../tests/contents/no_content.texi'},
+  undef, {'test_file' => '../../tests/formatting/no_content.texi'},
   {'CONTENTS_OUTPUT_LOCATION' => 'inline',
    'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">'}
 ],
 ['no_content_separate_element',
-  undef, {'test_file' => '../../tests/contents/no_content.texi'},
+  undef, {'test_file' => '../../tests/formatting/no_content.texi'},
   {'CONTENTS_OUTPUT_LOCATION' => 'separate_element',
    'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">'}
 ],
 ['no_content_do_contents',
-  undef, {'test_file' => '../../tests/contents/no_content.texi'},
+  undef, {'test_file' => '../../tests/formatting/no_content.texi'},
   {'contents' => 1,
    'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">'}
 ],
 ['no_content_do_contents_inline',
-  undef, {'test_file' => '../../tests/contents/no_content.texi'},
+  undef, {'test_file' => '../../tests/formatting/no_content.texi'},
   {'contents' => 1, 'CONTENTS_OUTPUT_LOCATION' => 'inline',
    'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">'}
 ],
 ['no_content_do_contents_separate_element',
-  undef, {'test_file' => '../../tests/contents/no_content.texi'},
+  undef, {'test_file' => '../../tests/formatting/no_content.texi'},
   {'contents' => 1, 'CONTENTS_OUTPUT_LOCATION' => 'separate_element',
    'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">'}
 ],
diff --git a/tp/t/transformations.t b/tp/t/transformations.t
index 5c9792fb26..29ec33040f 100644
--- a/tp/t/transformations.t
+++ b/tp/t/transformations.t
@@ -21,12 +21,12 @@ my @test_cases = (
 # tests/indices index_entries_relate_to_item).
 ['index_entries_relate_to_item_no_transformation',
   undef,
-  {'test_file' => '../../tests/indices/index_entries_relate_to_item.texi'},
+  {'test_file' => '../../tests/formatting/index_entries_relate_to_item.texi'},
 ],
 # test relate_index_entries_to_items transformation
 ['index_entries_relate_to_item_transformation',
   undef,
-  {'test_file' => '../../tests/indices/index_entries_relate_to_item.texi',
+  {'test_file' => '../../tests/formatting/index_entries_relate_to_item.texi',
    'TREE_TRANSFORMATIONS' => 'relate_index_entries_to_items'},
 ],);
 
diff --git a/tp/tests/Makefile.am b/tp/tests/Makefile.am
index 1973cacd0d..1152d1ceb9 100644
--- a/tp/tests/Makefile.am
+++ b/tp/tests/Makefile.am
@@ -21,7 +21,7 @@ $(srcdir)/Makefile.onetst: \
          -tex_html '$(tex_html_tests_dirs)' \
          -other '$(other_tests_dirs)'
 
-base_tests_dirs = formatting sectioning indices nested_formats contents layout
+base_tests_dirs = formatting encoded nested_formats customization coverage 
layout
 tex_html_tests_dirs = tex_html
 other_tests_dirs = other
 
diff --git a/tp/tests/contents/list-of-tests b/tp/tests/contents/list-of-tests
deleted file mode 100644
index e03e6876a2..0000000000
--- a/tp/tests/contents/list-of-tests
+++ /dev/null
@@ -1,15 +0,0 @@
-# the same tests are in t/*.t to test through code
-no_content no_content.texi --html --no-split -c 'BIG_RULE <hr style="height: 
6px;">'
-no_content_separate no_content.texi --html --no-split -c 'BIG_RULE <hr 
style="height: 6px;">' -c 'CONTENTS_OUTPUT_LOCATION separate_element'
-no_content_do_contents_separate no_content.texi --html --no-split -c 'BIG_RULE 
<hr style="height: 6px;">' -c 'CONTENTS_OUTPUT_LOCATION separate_element' -c 
'contents 1'
-no_content_do_contents no_content.texi --html --no-split -c 'BIG_RULE <hr 
style="height: 6px;">' -c 'contents 1'
-no_content_inline no_content.texi --html --no-split -c 'BIG_RULE <hr 
style="height: 6px;">' -c 'CONTENTS_OUTPUT_LOCATION inline'
-no_content_do_contents_inline no_content.texi --html --no-split -c 'BIG_RULE 
<hr style="height: 6px;">' -c 'CONTENTS_OUTPUT_LOCATION inline' -c 'contents 1'
-
-# many other tests using double_contents.texi are in t/*.t, but customization
-# variables set in init files are not used in the t/*.t test suite, so there 
cannot
-# be proper testing with book.pm
-double_contents_book ../../t/input_files/double_contents.texi --html 
--no-split -c FORMAT_MENU=nomenu --init book.pm
-double_contents_after_title_book ../../t/input_files/double_contents.texi 
--html --no-split --init book.pm -c 'CONTENTS_OUTPUT_LOCATION after_title'
-double_contents_after_title_book_chapter 
../../t/input_files/double_contents.texi --html --init book.pm --split chapter 
-c 'CONTENTS_OUTPUT_LOCATION after_title'
-
diff --git a/tp/tests/contents/Makefile.am b/tp/tests/coverage/Makefile.am
similarity index 51%
copy from tp/tests/contents/Makefile.am
copy to tp/tests/coverage/Makefile.am
index 429d509e60..bdb3914d68 100644
--- a/tp/tests/contents/Makefile.am
+++ b/tp/tests/coverage/Makefile.am
@@ -1,6 +1,7 @@
-EXTRA_DIST = \
- no_content.texi \
- res_parser list-of-tests
+EXTRA_DIST = formatting_regions.texi \
+            formatting.texi list-of-tests res_parser \
+ f--ile.e--xt  f--ile.jpg  f--ile.png  f--ile.txt simplest.texi
+
 
 DISTCLEANFILES = tests.log tests.out
 
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.1
 b/tp/tests/coverage/f--ile.e--xt
similarity index 100%
copy from 
tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.1
copy to tp/tests/coverage/f--ile.e--xt
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.2
 b/tp/tests/coverage/f--ile.jpg
similarity index 100%
copy from 
tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.2
copy to tp/tests/coverage/f--ile.jpg
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/double_contents.1
 b/tp/tests/coverage/f--ile.png
similarity index 100%
rename from 
tp/tests/contents/res_parser/double_contents_after_title_book_chapter/double_contents.1
rename to tp/tests/coverage/f--ile.png
diff --git a/tp/tests/coverage/f--ile.txt b/tp/tests/coverage/f--ile.txt
new file mode 100644
index 0000000000..b31647241b
--- /dev/null
+++ b/tp/tests/coverage/f--ile.txt
@@ -0,0 +1,2 @@
+ggg
+aaa
diff --git a/tp/tests/layout/formatting.texi b/tp/tests/coverage/formatting.texi
similarity index 100%
rename from tp/tests/layout/formatting.texi
rename to tp/tests/coverage/formatting.texi
diff --git a/tp/tests/layout/formatting_regions.texi 
b/tp/tests/coverage/formatting_regions.texi
similarity index 100%
rename from tp/tests/layout/formatting_regions.texi
rename to tp/tests/coverage/formatting_regions.texi
diff --git a/tp/tests/coverage/list-of-tests b/tp/tests/coverage/list-of-tests
new file mode 100644
index 0000000000..98c198ed73
--- /dev/null
+++ b/tp/tests/coverage/list-of-tests
@@ -0,0 +1,29 @@
+
+formatting_macro_expand formatting.texi 
--macro-expand=@OUT_DIR@formatting.texi -c TEXINFO_OUTPUT_FORMAT=structure
+# the output should be the same as just above, but is less interesting
+# to test as above also tests the not otherwise tested 'structure' format
+# and also tests --macro-expand.
+#formatting_macro_expand formatting.texi -c TEXINFO_OUTPUT_FORMAT=plaintexinfo
+formatting_docbook formatting.texi --docbook
+formatting_xml formatting.texi --xml
+formatting_html_no_texi2html formatting.texi -D 'needcollationcompat Need 
collation compatibility' --html --no-split -c TEXI2HTML=undef
+formatting_latex formatting.texi --latex
+formatting_epub formatting.texi -D 'needcollationcompat Need collation 
compatibility' --epub3 -c 'EPUB_CREATE_CONTAINER_FILE 0'
+# formatting_info formatting.texi -D 'needcollationcompat Need collation 
compatibility' --info
+# formatting_plaintext formatting.texi -D 'needcollationcompat Need collation 
compatibility' --plaintext
+
+# used to remove commands, for instance to count words
+formatting_textcontent formatting.texi -c TEXINFO_OUTPUT_FORMAT=textcontent
+# used to format text fragments in converters, minimal formatting
+formatting_rawtext formatting.texi -c TEXINFO_OUTPUT_FORMAT=rawtext
+
+# formats present in the documentation not tested: debugtree and texinfosxml
+#formatting_sxml formatting.texi -c TEXINFO_OUTPUT_FORMAT=texinfosxml
+
+# formats not directly available as command line option
+formatting_html32 formatting.texi -D 'needcollationcompat Need collation 
compatibility' --html --no-split -c FORMAT_MENU=menu -c SHOW_TITLE=1 -c 
DO_ABOUT=1 --init html32.pm
+formatting_xhtml formatting.texi -D 'needcollationcompat Need collation 
compatibility' --html --no-split -c SHOW_TITLE=1 -c DO_ABOUT=1 -c 
DOCTYPE='<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC 
"-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>' -c 
'USE_XML_SYNTAX 1' -c 'NO_CUSTOM_HTML_ATTRIBUTE 1' -c 
'HTML_ROOT_ELEMENT_ATTRIBUTES xmlns="http://www.w3.org/1999/xhtml";'
+formatting_chm formatting.texi -D 'needcollationcompat Need collation 
compatibility' -c USE_NODES=0 -c SHOW_TITLE=1 -c 
CONTENTS_OUTPUT_LOCATION=separate_element -c FORMAT_MENU=nomenu --init chm.pm
+
+# Not sure about the difference
+formatting_regions formatting_regions.texi -D 'needcollationcompat Need 
collation compatibility' --html --no-split -c SHOW_TITLE=1
diff --git a/tp/tests/layout/res_parser/formatting_chm/anchor.html 
b/tp/tests/coverage/res_parser/formatting_chm/anchor.html
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/anchor.html
rename to tp/tests/coverage/res_parser/formatting_chm/anchor.html
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter.html 
b/tp/tests/coverage/res_parser/formatting_chm/chapter.html
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/chapter.html
rename to tp/tests/coverage/res_parser/formatting_chm/chapter.html
diff --git a/tp/tests/layout/res_parser/formatting_chm/chapter2.html 
b/tp/tests/coverage/res_parser/formatting_chm/chapter2.html
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/chapter2.html
rename to tp/tests/coverage/res_parser/formatting_chm/chapter2.html
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.1 
b/tp/tests/coverage/res_parser/formatting_chm/formatting.1
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/formatting.1
rename to tp/tests/coverage/res_parser/formatting_chm/formatting.1
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.2 
b/tp/tests/coverage/res_parser/formatting_chm/formatting.2
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/formatting.2
rename to tp/tests/coverage/res_parser/formatting_chm/formatting.2
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.hhc 
b/tp/tests/coverage/res_parser/formatting_chm/formatting.hhc
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/formatting.hhc
rename to tp/tests/coverage/res_parser/formatting_chm/formatting.hhc
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.hhk 
b/tp/tests/coverage/res_parser/formatting_chm/formatting.hhk
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/formatting.hhk
rename to tp/tests/coverage/res_parser/formatting_chm/formatting.hhk
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.hhp 
b/tp/tests/coverage/res_parser/formatting_chm/formatting.hhp
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/formatting.hhp
rename to tp/tests/coverage/res_parser/formatting_chm/formatting.hhp
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting.html 
b/tp/tests/coverage/res_parser/formatting_chm/formatting.html
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/formatting.html
rename to tp/tests/coverage/res_parser/formatting_chm/formatting.html
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html 
b/tp/tests/coverage/res_parser/formatting_chm/formatting_ovr.html
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
rename to tp/tests/coverage/res_parser/formatting_chm/formatting_ovr.html
diff --git a/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html 
b/tp/tests/coverage/res_parser/formatting_chm/formatting_toc.html
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
rename to tp/tests/coverage/res_parser/formatting_chm/formatting_toc.html
diff --git a/tp/tests/layout/res_parser/formatting_chm/index.html 
b/tp/tests/coverage/res_parser/formatting_chm/index.html
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/index.html
rename to tp/tests/coverage/res_parser/formatting_chm/index.html
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html 
b/tp/tests/coverage/res_parser/formatting_chm/s_002d_002dect_002cion.html
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
rename to 
tp/tests/coverage/res_parser/formatting_chm/s_002d_002dect_002cion.html
diff --git a/tp/tests/layout/res_parser/formatting_chm/subsection.html 
b/tp/tests/coverage/res_parser/formatting_chm/subsection.html
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_chm/subsection.html
rename to tp/tests/coverage/res_parser/formatting_chm/subsection.html
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 
b/tp/tests/coverage/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
rename to 
tp/tests/coverage/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
diff --git 
a/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 
b/tp/tests/coverage/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
rename to 
tp/tests/coverage/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.1 
b/tp/tests/coverage/res_parser/formatting_docbook/formatting.1
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_docbook/formatting.1
rename to tp/tests/coverage/res_parser/formatting_docbook/formatting.1
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.2 
b/tp/tests/coverage/res_parser/formatting_docbook/formatting.2
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_docbook/formatting.2
rename to tp/tests/coverage/res_parser/formatting_docbook/formatting.2
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml 
b/tp/tests/coverage/res_parser/formatting_docbook/formatting.xml
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_docbook/formatting.xml
rename to tp/tests/coverage/res_parser/formatting_docbook/formatting.xml
diff --git a/tp/tests/layout/res_parser/formatting_epub/formatting.1 
b/tp/tests/coverage/res_parser/formatting_epub/formatting.1
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_epub/formatting.1
rename to tp/tests/coverage/res_parser/formatting_epub/formatting.1
diff --git a/tp/tests/layout/res_parser/formatting_epub/formatting.2 
b/tp/tests/coverage/res_parser/formatting_epub/formatting.2
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_epub/formatting.2
rename to tp/tests/coverage/res_parser/formatting_epub/formatting.2
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/formatting.opf
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/formatting.opf
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/formatting.opf
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/formatting.opf
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/11-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/11-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/11-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/11-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/15-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/15-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/15-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/15-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/16-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/16-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/16-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/16-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/17-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/17-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/17-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/17-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/18-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/18-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/18-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/18-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/19-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/19-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/19-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/19-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/20-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/20-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/20-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/20-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/21-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/21-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/21-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/21-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/23-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/23-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/23-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/23-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/27-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/27-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/27-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/27-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/28-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/28-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/28-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/28-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/29-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/29-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/29-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/29-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/3-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/3-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/3-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/3-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/30-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/30-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/30-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/30-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/31-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/31-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/31-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/31-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/32-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/32-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/32-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/32-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/33-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/33-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/33-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/33-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/35-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/35-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/35-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/35-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/39-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/39-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/39-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/39-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/4-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/4-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/4-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/4-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/40-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/40-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/40-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/40-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/41-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/41-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/41-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/41-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/42-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/42-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/42-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/42-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/43-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/43-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/43-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/43-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/44-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/44-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/44-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/44-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/45-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/45-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/45-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/45-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/47-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/47-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/47-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/47-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/5-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/5-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/5-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/5-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/51-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/51-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/51-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/51-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/52-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/52-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/52-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/52-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/53-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/53-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/53-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/53-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/54-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/54-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/54-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/54-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/55-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/55-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/55-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/55-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/56-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/56-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/56-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/56-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/57-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/57-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/57-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/57-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/59-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/59-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/59-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/59-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/6-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/6-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/6-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/6-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/7-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/7-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/7-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/7-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/8-f--ile.e--xt
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/8-f--ile.e--xt
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/8-f--ile.e--xt
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/8-f--ile.e--xt
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/9-f--ile.png
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/9-f--ile.png
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/images/9-f--ile.png
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/images/9-f--ile.png
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter.xhtml
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/formatting.xhtml
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/nav_toc.xhtml
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/nav_toc.xhtml
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/nav_toc.xhtml
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/EPUB/xhtml/nav_toc.xhtml
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/META-INF/container.xml
 
b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/META-INF/container.xml
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/META-INF/container.xml
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/META-INF/container.xml
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/mimetype"
 b/tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/mimetype
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/mimetype"
rename to 
tp/tests/coverage/res_parser/formatting_epub/formatting_epub_package/mimetype
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.1 
b/tp/tests/coverage/res_parser/formatting_html32/formatting.1
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_html32/formatting.1
rename to tp/tests/coverage/res_parser/formatting_html32/formatting.1
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.2 
b/tp/tests/coverage/res_parser/formatting_html32/formatting.2
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_html32/formatting.2
rename to tp/tests/coverage/res_parser/formatting_html32/formatting.2
diff --git a/tp/tests/layout/res_parser/formatting_html32/formatting.html 
b/tp/tests/coverage/res_parser/formatting_html32/formatting.html
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_html32/formatting.html
rename to tp/tests/coverage/res_parser/formatting_html32/formatting.html
diff --git 
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.1 
b/tp/tests/coverage/res_parser/formatting_html_no_texi2html/formatting.1
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.1
rename to tp/tests/coverage/res_parser/formatting_html_no_texi2html/formatting.1
diff --git 
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.2 
b/tp/tests/coverage/res_parser/formatting_html_no_texi2html/formatting.2
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.2
rename to tp/tests/coverage/res_parser/formatting_html_no_texi2html/formatting.2
diff --git 
a/tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html 
b/tp/tests/coverage/res_parser/formatting_html_no_texi2html/formatting.html
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_html_no_texi2html/formatting.html
rename to 
tp/tests/coverage/res_parser/formatting_html_no_texi2html/formatting.html
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.1 
b/tp/tests/coverage/res_parser/formatting_latex/formatting.1
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_latex/formatting.1
rename to tp/tests/coverage/res_parser/formatting_latex/formatting.1
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.2 
b/tp/tests/coverage/res_parser/formatting_latex/formatting.2
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_latex/formatting.2
rename to tp/tests/coverage/res_parser/formatting_latex/formatting.2
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/coverage/res_parser/formatting_latex/formatting.tex
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_latex/formatting.tex
rename to tp/tests/coverage/res_parser/formatting_latex/formatting.tex
diff --git a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.1 
b/tp/tests/coverage/res_parser/formatting_macro_expand/formatting.1
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_macro_expand/formatting.1
rename to tp/tests/coverage/res_parser/formatting_macro_expand/formatting.1
diff --git a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.2 
b/tp/tests/coverage/res_parser/formatting_macro_expand/formatting.2
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_macro_expand/formatting.2
rename to tp/tests/coverage/res_parser/formatting_macro_expand/formatting.2
diff --git a/tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi 
b/tp/tests/coverage/res_parser/formatting_macro_expand/formatting.texi
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_macro_expand/formatting.texi
rename to tp/tests/coverage/res_parser/formatting_macro_expand/formatting.texi
diff --git a/tp/tests/layout/res_parser/formatting_rawtext/formatting.1 
b/tp/tests/coverage/res_parser/formatting_rawtext/formatting.1
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_rawtext/formatting.1
rename to tp/tests/coverage/res_parser/formatting_rawtext/formatting.1
diff --git a/tp/tests/layout/res_parser/formatting_rawtext/formatting.2 
b/tp/tests/coverage/res_parser/formatting_rawtext/formatting.2
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_rawtext/formatting.2
rename to tp/tests/coverage/res_parser/formatting_rawtext/formatting.2
diff --git a/tp/tests/layout/res_parser/formatting_rawtext/formatting.txt 
b/tp/tests/coverage/res_parser/formatting_rawtext/formatting.txt
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_rawtext/formatting.txt
rename to tp/tests/coverage/res_parser/formatting_rawtext/formatting.txt
diff --git a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.1 
b/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.1
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_regions/formatting_regions.1
rename to tp/tests/coverage/res_parser/formatting_regions/formatting_regions.1
diff --git a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2 
b/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.2
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_regions/formatting_regions.2
rename to tp/tests/coverage/res_parser/formatting_regions/formatting_regions.2
diff --git 
a/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html 
b/tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
rename to 
tp/tests/coverage/res_parser/formatting_regions/formatting_regions.html
diff --git a/tp/tests/layout/res_parser/formatting_textcontent/formatting 
b/tp/tests/coverage/res_parser/formatting_textcontent/formatting
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_textcontent/formatting
rename to tp/tests/coverage/res_parser/formatting_textcontent/formatting
diff --git a/tp/tests/layout/res_parser/formatting_textcontent/formatting.1 
b/tp/tests/coverage/res_parser/formatting_textcontent/formatting.1
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_textcontent/formatting.1
rename to tp/tests/coverage/res_parser/formatting_textcontent/formatting.1
diff --git a/tp/tests/layout/res_parser/formatting_textcontent/formatting.2 
b/tp/tests/coverage/res_parser/formatting_textcontent/formatting.2
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_textcontent/formatting.2
rename to tp/tests/coverage/res_parser/formatting_textcontent/formatting.2
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.1 
b/tp/tests/coverage/res_parser/formatting_xhtml/formatting.1
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_xhtml/formatting.1
rename to tp/tests/coverage/res_parser/formatting_xhtml/formatting.1
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.2 
b/tp/tests/coverage/res_parser/formatting_xhtml/formatting.2
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_xhtml/formatting.2
rename to tp/tests/coverage/res_parser/formatting_xhtml/formatting.2
diff --git a/tp/tests/layout/res_parser/formatting_xhtml/formatting.html 
b/tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_xhtml/formatting.html
rename to tp/tests/coverage/res_parser/formatting_xhtml/formatting.html
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.1 
b/tp/tests/coverage/res_parser/formatting_xml/formatting.1
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_xml/formatting.1
rename to tp/tests/coverage/res_parser/formatting_xml/formatting.1
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.2 
b/tp/tests/coverage/res_parser/formatting_xml/formatting.2
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_xml/formatting.2
rename to tp/tests/coverage/res_parser/formatting_xml/formatting.2
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml 
b/tp/tests/coverage/res_parser/formatting_xml/formatting.xml
similarity index 100%
rename from tp/tests/layout/res_parser/formatting_xml/formatting.xml
rename to tp/tests/coverage/res_parser/formatting_xml/formatting.xml
diff --git a/tp/tests/coverage/simplest.texi b/tp/tests/coverage/simplest.texi
new file mode 100644
index 0000000000..291a133195
--- /dev/null
+++ b/tp/tests/coverage/simplest.texi
@@ -0,0 +1,11 @@
+\input texinfo @c -*-texinfo-*-
+
+@c this file is used in tests in @verbatiminclude but not converted
+
+@setfilename simplest.info
+
+@node Top
+
+This is a very simple texi manual @  <>.
+
+@bye
diff --git a/tp/tests/sectioning/Makefile.am 
b/tp/tests/customization/Makefile.am
similarity index 72%
rename from tp/tests/sectioning/Makefile.am
rename to tp/tests/customization/Makefile.am
index 978bcd7367..c3f275218a 100644
--- a/tp/tests/sectioning/Makefile.am
+++ b/tp/tests/customization/Makefile.am
@@ -1,10 +1,7 @@
-# sectioning/Makefile.am - public domain.
- 
 EXTRA_DIST = \
+ ignore_and_comments.texi   test_need.texi \
  sectioning.texi \
- \
- list-of-tests \
- res_parser
+ list-of-tests  res_parser
 
 DISTCLEANFILES = tests.log tests.out
 
diff --git a/tp/tests/formatting/ignore_and_comments.texi 
b/tp/tests/customization/ignore_and_comments.texi
similarity index 100%
rename from tp/tests/formatting/ignore_and_comments.texi
rename to tp/tests/customization/ignore_and_comments.texi
diff --git a/tp/tests/customization/list-of-tests 
b/tp/tests/customization/list-of-tests
new file mode 100644
index 0000000000..0e356b5238
--- /dev/null
+++ b/tp/tests/customization/list-of-tests
@@ -0,0 +1,17 @@
+
+# api
+texi_ignore_and_comments ignore_and_comments.texi --init 
ignore_and_comments_output.init -c TEXINFO_OUTPUT_FORMAT=plaintexinfo
+ignore_and_comments_output ignore_and_comments.texi --html --no-split --init 
ignore_and_comments_output.init
+test_redefine_need test_need.texi --html --no-split --init redefine_need.init
+
+# sectioning.texi also used in t/*.t
+sectioning_directions sectioning.texi --html --no-split -c 'HEADER_IN_TABLE=1' 
-c 'USE_NODES=0' -c 'FORMAT_MENU=menu' -c 'NODE_NAME_IN_MENU=0' -c 
'DO_ABOUT=undef' -c 'CONTENTS_OUTPUT_LOCATION=separate_element' --init 
test_directions.init
+sectioning_directions_split_chapter sectioning.texi --html --split=chapter -c 
'HEADER_IN_TABLE=1' -c 'USE_NODES=0' -c 'FORMAT_MENU=menu' -c 
'NODE_NAME_IN_MENU=0' -c 'DO_ABOUT=undef' -c 
'CONTENTS_OUTPUT_LOCATION=separate_element' --init test_directions.init
+
+# many other tests using double_contents.texi are in t/*.t, but customization
+# variables set in init files are not used in the t/*.t test suite, so there 
cannot
+# be proper testing with book.pm
+double_contents_book ../../t/input_files/double_contents.texi --html 
--no-split -c FORMAT_MENU=nomenu --init book.pm
+double_contents_after_title_book ../../t/input_files/double_contents.texi 
--html --no-split --init book.pm -c 'CONTENTS_OUTPUT_LOCATION after_title'
+double_contents_after_title_book_chapter 
../../t/input_files/double_contents.texi --html --init book.pm --split chapter 
-c 'CONTENTS_OUTPUT_LOCATION after_title'
+
diff --git 
a/tp/tests/contents/res_parser/double_contents_book/double_contents.1 
b/tp/tests/customization/res_parser/double_contents_after_title_book/double_contents.1
similarity index 100%
rename from tp/tests/contents/res_parser/double_contents_book/double_contents.1
rename to 
tp/tests/customization/res_parser/double_contents_after_title_book/double_contents.1
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/double_contents.2
 
b/tp/tests/customization/res_parser/double_contents_after_title_book/double_contents.2
similarity index 100%
rename from 
tp/tests/contents/res_parser/double_contents_after_title_book_chapter/double_contents.2
rename to 
tp/tests/customization/res_parser/double_contents_after_title_book/double_contents.2
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.html
 
b/tp/tests/customization/res_parser/double_contents_after_title_book/double_contents.html
similarity index 100%
rename from 
tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.html
rename to 
tp/tests/customization/res_parser/double_contents_after_title_book/double_contents.html
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/chapter.html
 
b/tp/tests/customization/res_parser/double_contents_after_title_book_chapter/chapter.html
similarity index 100%
rename from 
tp/tests/contents/res_parser/double_contents_after_title_book_chapter/chapter.html
rename to 
tp/tests/customization/res_parser/double_contents_after_title_book_chapter/chapter.html
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.1
 
b/tp/tests/customization/res_parser/double_contents_after_title_book_chapter/double_contents.1
similarity index 100%
copy from 
tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.1
copy to 
tp/tests/customization/res_parser/double_contents_after_title_book_chapter/double_contents.1
diff --git 
a/tp/tests/contents/res_parser/double_contents_book/double_contents.2 
b/tp/tests/customization/res_parser/double_contents_after_title_book_chapter/double_contents.2
similarity index 100%
rename from tp/tests/contents/res_parser/double_contents_book/double_contents.2
rename to 
tp/tests/customization/res_parser/double_contents_after_title_book_chapter/double_contents.2
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/double_contents_1.html
 
b/tp/tests/customization/res_parser/double_contents_after_title_book_chapter/double_contents_1.html
similarity index 100%
rename from 
tp/tests/contents/res_parser/double_contents_after_title_book_chapter/double_contents_1.html
rename to 
tp/tests/customization/res_parser/double_contents_after_title_book_chapter/double_contents_1.html
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/double_contents_top.html
 
b/tp/tests/customization/res_parser/double_contents_after_title_book_chapter/double_contents_top.html
similarity index 100%
rename from 
tp/tests/contents/res_parser/double_contents_after_title_book_chapter/double_contents_top.html
rename to 
tp/tests/customization/res_parser/double_contents_after_title_book_chapter/double_contents_top.html
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/index.html
 
b/tp/tests/customization/res_parser/double_contents_after_title_book_chapter/index.html
similarity index 100%
rename from 
tp/tests/contents/res_parser/double_contents_after_title_book_chapter/index.html
rename to 
tp/tests/customization/res_parser/double_contents_after_title_book_chapter/index.html
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book_chapter/section.html
 
b/tp/tests/customization/res_parser/double_contents_after_title_book_chapter/section.html
similarity index 100%
rename from 
tp/tests/contents/res_parser/double_contents_after_title_book_chapter/section.html
rename to 
tp/tests/customization/res_parser/double_contents_after_title_book_chapter/section.html
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.1
 b/tp/tests/customization/res_parser/double_contents_book/double_contents.1
similarity index 100%
rename from 
tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.1
rename to 
tp/tests/customization/res_parser/double_contents_book/double_contents.1
diff --git 
a/tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.2
 b/tp/tests/customization/res_parser/double_contents_book/double_contents.2
similarity index 100%
rename from 
tp/tests/contents/res_parser/double_contents_after_title_book/double_contents.2
rename to 
tp/tests/customization/res_parser/double_contents_book/double_contents.2
diff --git 
a/tp/tests/contents/res_parser/double_contents_book/double_contents.html 
b/tp/tests/customization/res_parser/double_contents_book/double_contents.html
similarity index 100%
rename from 
tp/tests/contents/res_parser/double_contents_book/double_contents.html
rename to 
tp/tests/customization/res_parser/double_contents_book/double_contents.html
diff --git a/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.1 
b/tp/tests/customization/res_parser/sectioning_directions/sectioning.1
similarity index 100%
rename from tp/tests/sectioning/res_parser/sectioning_directions/sectioning.1
rename to tp/tests/customization/res_parser/sectioning_directions/sectioning.1
diff --git a/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.2 
b/tp/tests/customization/res_parser/sectioning_directions/sectioning.2
similarity index 100%
rename from tp/tests/sectioning/res_parser/sectioning_directions/sectioning.2
rename to tp/tests/customization/res_parser/sectioning_directions/sectioning.2
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html 
b/tp/tests/customization/res_parser/sectioning_directions/sectioning.html
similarity index 100%
rename from tp/tests/sectioning/res_parser/sectioning_directions/sectioning.html
rename to 
tp/tests/customization/res_parser/sectioning_directions/sectioning.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/First-node.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/First-node.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/First-node.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/First-node.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Last-node-no-description.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/Last-node-no-description.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Last-node-no-description.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/Last-node-no-description.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Second-node.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/Second-node.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Second-node.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/Second-node.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Third-node-unnumbered.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/Third-node-unnumbered.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/Third-node-unnumbered.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/Third-node-unnumbered.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/between-node.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/between-node.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/between-node.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/between-node.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/index.html 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/index.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/index.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/index.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/numbered-sub.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/numbered-sub.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/numbered-sub.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/numbered-sub.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/numbered-sub2.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/numbered-sub2.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/numbered-sub2.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/numbered-sub2.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/numbered-sub3.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/numbered-sub3.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/numbered-sub3.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/numbered-sub3.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/numbered.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/numbered.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/numbered.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/numbered.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning.1
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/sectioning.1
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning.1
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/sectioning.1
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning.2
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/sectioning.2
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning.2
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/sectioning.2
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning_abt.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/sectioning_abt.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning_abt.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/sectioning_abt.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning_toc.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/sectioning_toc.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/sectioning_toc.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/sectioning_toc.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/unnumbered-sub.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/unnumbered-sub.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/unnumbered-sub.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/unnumbered-sub.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/unnumbered-sub2.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/unnumbered-sub2.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/unnumbered-sub2.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/unnumbered-sub2.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/unnumbered.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/unnumbered.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/unnumbered.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/unnumbered.html
diff --git 
a/tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/unnumbered2.html
 
b/tp/tests/customization/res_parser/sectioning_directions_split_chapter/unnumbered2.html
similarity index 100%
rename from 
tp/tests/sectioning/res_parser/sectioning_directions_split_chapter/unnumbered2.html
rename to 
tp/tests/customization/res_parser/sectioning_directions_split_chapter/unnumbered2.html
diff --git 
a/tp/tests/formatting/res_parser/texi_ignore_and_comments/ignore_and_comments.1 
b/tp/tests/customization/res_parser/texi_ignore_and_comments/ignore_and_comments.1
similarity index 100%
rename from 
tp/tests/formatting/res_parser/texi_ignore_and_comments/ignore_and_comments.1
rename to 
tp/tests/customization/res_parser/texi_ignore_and_comments/ignore_and_comments.1
diff --git 
a/tp/tests/formatting/res_parser/texi_ignore_and_comments/ignore_and_comments.2 
b/tp/tests/customization/res_parser/texi_ignore_and_comments/ignore_and_comments.2
similarity index 100%
rename from 
tp/tests/formatting/res_parser/texi_ignore_and_comments/ignore_and_comments.2
rename to 
tp/tests/customization/res_parser/texi_ignore_and_comments/ignore_and_comments.2
diff --git 
a/tp/tests/formatting/res_parser/texi_ignore_and_comments/ignore_and_comments.texi
 
b/tp/tests/customization/res_parser/texi_ignore_and_comments/ignore_and_comments.texi
similarity index 100%
rename from 
tp/tests/formatting/res_parser/texi_ignore_and_comments/ignore_and_comments.texi
rename to 
tp/tests/customization/res_parser/texi_ignore_and_comments/ignore_and_comments.texi
diff --git a/tp/tests/sectioning/sectioning.texi 
b/tp/tests/customization/sectioning.texi
similarity index 100%
rename from tp/tests/sectioning/sectioning.texi
rename to tp/tests/customization/sectioning.texi
diff --git a/tp/tests/formatting/test_need.texi 
b/tp/tests/customization/test_need.texi
similarity index 100%
rename from tp/tests/formatting/test_need.texi
rename to tp/tests/customization/test_need.texi
diff --git a/tp/tests/contents/Makefile.am b/tp/tests/encoded/Makefile.am
similarity index 53%
rename from tp/tests/contents/Makefile.am
rename to tp/tests/encoded/Makefile.am
index 429d509e60..e80501dc67 100644
--- a/tp/tests/contents/Makefile.am
+++ b/tp/tests/encoded/Makefile.am
@@ -1,6 +1,7 @@
 EXTRA_DIST = \
- no_content.texi \
- res_parser list-of-tests
+ osé_utf8.texi osé_utf8_no_setfilename.texi \
+ manual_include_accented_file_name_latin1.texi \
+ çss.css cêss.css an_ïmage.png list-of-tests  res_parser
 
 DISTCLEANFILES = tests.log tests.out
 
diff --git "a/tp/tests/formatting/an_\303\257mage.png" 
"b/tp/tests/encoded/an_\303\257mage.png"
similarity index 100%
rename from "tp/tests/formatting/an_\303\257mage.png"
rename to "tp/tests/encoded/an_\303\257mage.png"
diff --git "a/tp/tests/formatting/c\303\252ss.css" 
"b/tp/tests/encoded/c\303\252ss.css"
similarity index 100%
rename from "tp/tests/formatting/c\303\252ss.css"
rename to "tp/tests/encoded/c\303\252ss.css"
diff --git a/tp/tests/formatting/list-of-tests b/tp/tests/encoded/list-of-tests
similarity index 71%
copy from tp/tests/formatting/list-of-tests
copy to tp/tests/encoded/list-of-tests
index a73cfd8aae..2304153758 100644
--- a/tp/tests/formatting/list-of-tests
+++ b/tp/tests/encoded/list-of-tests
@@ -1,23 +1,3 @@
-# api
-texi_ignore_and_comments ignore_and_comments.texi --init 
ignore_and_comments_output.init -c TEXINFO_OUTPUT_FORMAT=plaintexinfo
-ignore_and_comments_output ignore_and_comments.texi --html --no-split --init 
ignore_and_comments_output.init
-test_redefine_need test_need.texi --html --no-split --init redefine_need.init
-
-split_nocopying_split_dev_null split_nocopying.texi --info --split-size 1 -o 
/dev/null
-simplest_test_css simplest.texi --html --no-split --css-include file.css
-
-# already tested in t/*.t.  Here check the command line, for -D
-defcondx_Dbar defxcond.texi --html -D 'bar 1' --no-split -c TEXI2HTML=undef
-defcondx_Ubar defxcond.texi --html --no-split -c TEXI2HTML=undef
-
-# check that command line overrides document.  texi2html style is more
-# interesting to check language change
-documentlanguage_cmdline documentlanguage.texi --html -c TEXI2HTML=1 
--no-split --document-language=fr
-
-# already tested in t/*.t, but here want to have a result with
-# accented characters in error messages
-cpp_lines ../../t/input_files/cpp_lines.texi --html --no-split -c 
MESSAGE_ENCODING=UTF-8
-
 # some command-line arguments when incorrect cause texi2any to die.
 # easily tested by calling directly ./texi2any.pl and checking visually:
 # ./texi2any.pl --footnote-style=bâd
@@ -47,6 +27,3 @@ manual_include_accented_file_name_latin1_explicit_encoding 
manual_include_accent
 # fails to find the latin1 encoded include file as the locale encoding
 # of the test suite is utf8
 manual_include_accented_file_name_latin1_use_locale_encoding 
manual_include_accented_file_name_latin1.texi --info -D 'needrecodedfilenames 
Need recoded file names' -c MESSAGE_ENCODING=UTF-8 -c 
INPUT_FILE_NAME_ENCODING=UTF-8
-
-info_extension_warning foo.info
-
diff --git a/tp/tests/formatting/manual_include_accented_file_name_latin1.texi 
b/tp/tests/encoded/manual_include_accented_file_name_latin1.texi
similarity index 100%
rename from tp/tests/formatting/manual_include_accented_file_name_latin1.texi
rename to tp/tests/encoded/manual_include_accented_file_name_latin1.texi
diff --git "a/tp/tests/formatting/os\303\251_utf8.texi" 
"b/tp/tests/encoded/os\303\251_utf8.texi"
similarity index 100%
rename from "tp/tests/formatting/os\303\251_utf8.texi"
rename to "tp/tests/encoded/os\303\251_utf8.texi"
diff --git "a/tp/tests/formatting/os\303\251_utf8_no_setfilename.texi" 
"b/tp/tests/encoded/os\303\251_utf8_no_setfilename.texi"
similarity index 100%
rename from "tp/tests/formatting/os\303\251_utf8_no_setfilename.texi"
rename to "tp/tests/encoded/os\303\251_utf8_no_setfilename.texi"
diff --git 
a/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.1
 
b/tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.1
similarity index 100%
rename from 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.1
rename to 
tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.1
diff --git 
a/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.2
 
b/tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.2
similarity index 100%
rename from 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.2
rename to 
tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.2
diff --git 
a/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.info
 
b/tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.info
similarity index 100%
rename from 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.info
rename to 
tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1/manual_include_accented_file_name_latin1.info
diff --git 
a/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.1
 
b/tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.1
similarity index 100%
rename from 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.1
rename to 
tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.1
diff --git 
a/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.2
 
b/tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.2
similarity index 100%
rename from 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.2
rename to 
tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.2
diff --git 
a/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.info
 
b/tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.info
similarity index 100%
rename from 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.info
rename to 
tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1_explicit_encoding/manual_include_accented_file_name_latin1.info
diff --git 
a/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.1
 
b/tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.1
similarity index 100%
rename from 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.1
rename to 
tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.1
diff --git 
a/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.2
 
b/tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.2
similarity index 100%
rename from 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.2
rename to 
tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.2
diff --git 
a/tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.info
 
b/tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.info
similarity index 100%
rename from 
tp/tests/formatting/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.info
rename to 
tp/tests/encoded/res_parser/manual_include_accented_file_name_latin1_use_locale_encoding/manual_include_accented_file_name_latin1.info
diff --git 
a/tp/tests/formatting/res_parser/non_ascii_command_line/Chapteur.html 
b/tp/tests/encoded/res_parser/non_ascii_command_line/Chapteur.html
similarity index 100%
rename from tp/tests/formatting/res_parser/non_ascii_command_line/Chapteur.html
rename to tp/tests/encoded/res_parser/non_ascii_command_line/Chapteur.html
diff --git a/tp/tests/formatting/res_parser/non_ascii_command_line/index.html 
b/tp/tests/encoded/res_parser/non_ascii_command_line/index.html
similarity index 100%
rename from tp/tests/formatting/res_parser/non_ascii_command_line/index.html
rename to tp/tests/encoded/res_parser/non_ascii_command_line/index.html
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_command_line/int\303\251rnal.txt" 
"b/tp/tests/encoded/res_parser/non_ascii_command_line/int\303\251rnal.txt"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_command_line/int\303\251rnal.txt"
rename to 
"tp/tests/encoded/res_parser/non_ascii_command_line/int\303\251rnal.txt"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_command_line/os\303\251-texinfo.texi"
 "b/tp/tests/encoded/res_parser/non_ascii_command_line/os\303\251-texinfo.texi"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_command_line/os\303\251-texinfo.texi"
rename to 
"tp/tests/encoded/res_parser/non_ascii_command_line/os\303\251-texinfo.texi"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_command_line/os\303\251_utf8.1" 
"b/tp/tests/encoded/res_parser/non_ascii_command_line/os\303\251_utf8.1"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_command_line/os\303\251_utf8.1"
rename to "tp/tests/encoded/res_parser/non_ascii_command_line/os\303\251_utf8.1"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_command_line/os\303\251_utf8.2" 
"b/tp/tests/encoded/res_parser/non_ascii_command_line/os\303\251_utf8.2"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_command_line/os\303\251_utf8.2"
rename to "tp/tests/encoded/res_parser/non_ascii_command_line/os\303\251_utf8.2"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_command_line/os\303\251_utf8_abt.html"
 "b/tp/tests/encoded/res_parser/non_ascii_command_line/os\303\251_utf8_abt.html"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_command_line/os\303\251_utf8_abt.html"
rename to 
"tp/tests/encoded/res_parser/non_ascii_command_line/os\303\251_utf8_abt.html"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8.1" 
"b/tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8.1"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8.1"
rename to "tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8.1"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8.2" 
"b/tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8.2"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8.2"
rename to "tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8.2"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/images/1-an_image.png"
 
"b/tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/images/1-an_image.png"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/images/1-an_image.png"
rename to 
"tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/images/1-an_image.png"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/images/2-an_image.png"
 
"b/tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/images/2-an_image.png"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/images/2-an_image.png"
rename to 
"tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/images/2-an_image.png"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/os\303\251_utf8.opf"
 
"b/tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/os\303\251_utf8.opf"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/os\303\251_utf8.opf"
rename to 
"tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/os\303\251_utf8.opf"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/Chapteur.xhtml"
 
"b/tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/Chapteur.xhtml"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/Chapteur.xhtml"
rename to 
"tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/Chapteur.xhtml"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/nav_toc.xhtml"
 
"b/tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/nav_toc.xhtml"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/nav_toc.xhtml"
rename to 
"tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/nav_toc.xhtml"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/os\303\251_utf8.xhtml"
 
"b/tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/os\303\251_utf8.xhtml"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/os\303\251_utf8.xhtml"
rename to 
"tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/EPUB/xhtml/os\303\251_utf8.xhtml"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/META-INF/container.xml"
 
"b/tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/META-INF/container.xml"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/META-INF/container.xml"
rename to 
"tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/META-INF/container.xml"
diff --git 
a/tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/mimetype 
"b/tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/mimetype"
similarity index 100%
rename from 
tp/tests/layout/res_parser/formatting_epub/formatting_epub_package/mimetype
rename to 
"tp/tests/encoded/res_parser/non_ascii_test_epub/os\303\251_utf8_epub_package/mimetype"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_latex/os\303\251_utf8.1" 
"b/tp/tests/encoded/res_parser/non_ascii_test_latex/os\303\251_utf8.1"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_latex/os\303\251_utf8.1"
rename to "tp/tests/encoded/res_parser/non_ascii_test_latex/os\303\251_utf8.1"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_latex/os\303\251_utf8.2" 
"b/tp/tests/encoded/res_parser/non_ascii_test_latex/os\303\251_utf8.2"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_latex/os\303\251_utf8.2"
rename to "tp/tests/encoded/res_parser/non_ascii_test_latex/os\303\251_utf8.2"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_latex/os\303\251_utf8.tex" 
"b/tp/tests/encoded/res_parser/non_ascii_test_latex/os\303\251_utf8.tex"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_latex/os\303\251_utf8.tex"
rename to "tp/tests/encoded/res_parser/non_ascii_test_latex/os\303\251_utf8.tex"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_rawtext/os\303\251_utf8.1" 
"b/tp/tests/encoded/res_parser/non_ascii_test_rawtext/os\303\251_utf8.1"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_rawtext/os\303\251_utf8.1"
rename to "tp/tests/encoded/res_parser/non_ascii_test_rawtext/os\303\251_utf8.1"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_rawtext/os\303\251_utf8.2" 
"b/tp/tests/encoded/res_parser/non_ascii_test_rawtext/os\303\251_utf8.2"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_rawtext/os\303\251_utf8.2"
rename to "tp/tests/encoded/res_parser/non_ascii_test_rawtext/os\303\251_utf8.2"
diff --git 
"a/tp/tests/formatting/res_parser/non_ascii_test_rawtext/os\303\251_utf8.txt" 
"b/tp/tests/encoded/res_parser/non_ascii_test_rawtext/os\303\251_utf8.txt"
similarity index 100%
rename from 
"tp/tests/formatting/res_parser/non_ascii_test_rawtext/os\303\251_utf8.txt"
rename to 
"tp/tests/encoded/res_parser/non_ascii_test_rawtext/os\303\251_utf8.txt"
diff --git "a/tp/tests/formatting/\303\247ss.css" 
"b/tp/tests/encoded/\303\247ss.css"
similarity index 100%
rename from "tp/tests/formatting/\303\247ss.css"
rename to "tp/tests/encoded/\303\247ss.css"
diff --git a/tp/tests/formatting/Makefile.am b/tp/tests/formatting/Makefile.am
index 7aa0a14e56..64144b2b92 100644
--- a/tp/tests/formatting/Makefile.am
+++ b/tp/tests/formatting/Makefile.am
@@ -1,12 +1,13 @@
 EXTRA_DIST = \
  simplest.texi documentlanguage.texi \
  defxcond.texi \
- ignore_and_comments.texi   split_nocopying.texi \
- inc_file.texi              test_need.texi \
+ split_nocopying.texi \
+ indices_in_begin_tables_lists.texi \
+ index_entries_relate_to_item.texi \
+ inc_file.texi \
  lightweight_markups.texi   japanese_long_name.texi  \
- osé_utf8.texi osé_utf8_no_setfilename.texi \
- manual_include_accented_file_name_latin1.texi \
- çss.css cêss.css file.css an_ïmage.png list-of-tests  res_parser
+ no_content.texi \
+ file.css list-of-tests  res_parser
 
 DISTCLEANFILES = tests.log tests.out
 
diff --git a/tp/tests/indices/index_entries_relate_to_item.texi 
b/tp/tests/formatting/index_entries_relate_to_item.texi
similarity index 100%
rename from tp/tests/indices/index_entries_relate_to_item.texi
rename to tp/tests/formatting/index_entries_relate_to_item.texi
diff --git a/tp/tests/indices/indices_in_begin_tables_lists.texi 
b/tp/tests/formatting/indices_in_begin_tables_lists.texi
similarity index 100%
rename from tp/tests/indices/indices_in_begin_tables_lists.texi
rename to tp/tests/formatting/indices_in_begin_tables_lists.texi
diff --git a/tp/tests/formatting/list-of-tests 
b/tp/tests/formatting/list-of-tests
index a73cfd8aae..8a6d40cbd4 100644
--- a/tp/tests/formatting/list-of-tests
+++ b/tp/tests/formatting/list-of-tests
@@ -1,8 +1,4 @@
-# api
-texi_ignore_and_comments ignore_and_comments.texi --init 
ignore_and_comments_output.init -c TEXINFO_OUTPUT_FORMAT=plaintexinfo
-ignore_and_comments_output ignore_and_comments.texi --html --no-split --init 
ignore_and_comments_output.init
-test_redefine_need test_need.texi --html --no-split --init redefine_need.init
-
+# also used in t/*.t.
 split_nocopying_split_dev_null split_nocopying.texi --info --split-size 1 -o 
/dev/null
 simplest_test_css simplest.texi --html --no-split --css-include file.css
 
@@ -18,35 +14,22 @@ documentlanguage_cmdline documentlanguage.texi --html -c 
TEXI2HTML=1 --no-split
 # accented characters in error messages
 cpp_lines ../../t/input_files/cpp_lines.texi --html --no-split -c 
MESSAGE_ENCODING=UTF-8
 
-# some command-line arguments when incorrect cause texi2any to die.
-# easily tested by calling directly ./texi2any.pl and checking visually:
-# ./texi2any.pl --footnote-style=bâd
-# ./texi2any.pl --paragraph-indent=ïndent
-# check non ascii command line arguments and css files
-non_ascii_command_line osé_utf8.texi -D 'needcommandlineunicode Need 
command-line unicode' --html --no-split -c DO_ABOUT=1 -c 
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c 
OUTPUT_FILE_NAME_ENCODING=UTF-8 --split=Mekanïk --document-language=Destruktïw 
-c 'Kommandöh vâl' -D TÛT -D 'vùr ké' -U ôndef -c 'FORMAT_MENU mînù' 
--macro-expand=@OUT_DIR@osé-texinfo.texi --internal-links=@OUT_DIR@intérnal.txt 
--css-include çss.css --css-include cêss.css --css-ref=rëf --css-ref=öref
-
-# test for the copying of image with non ascii characters for epub
-non_ascii_test_epub osé_utf8.texi -D 'needcommandlineunicode Need command-line 
unicode' -c COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c 
OUTPUT_FILE_NAME_ENCODING=UTF-8 --init epub3.pm -c 'EPUB_CREATE_CONTAINER_FILE 
0'
-
-# check that the output is right when based on @setfilename
-non_ascii_test_rawtext osé_utf8.texi -D 'needcommandlineunicode Need 
command-line unicode' -c COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 
-c OUTPUT_FILE_NAME_ENCODING=UTF-8 -c INPUT_FILE_NAME_ENCODING=UTF-8 -c 
TEXINFO_OUTPUT_FORMAT=rawtext
-
-# check that the output is right when based on input file name
-non_ascii_no_setfilename_test_rawtext osé_utf8_no_setfilename.texi -D 
'needcommandlineunicode Need command-line unicode' -c 
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c 
OUTPUT_FILE_NAME_ENCODING=UTF-8 -c INPUT_FILE_NAME_ENCODING=UTF-8 -c 
TEXINFO_OUTPUT_FORMAT=rawtext
-
-non_ascii_test_latex osé_utf8.texi -D 'needcommandlineunicode Need 
command-line unicode' -c COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 
-c OUTPUT_FILE_NAME_ENCODING=UTF-8 -c INPUT_FILE_NAME_ENCODING=UTF-8 --latex
-
-# test of non utf8 encoded file name in non utf8 document
-# "Need recoded file names" string is used in test driving script
-# to determine that the recoding of file names need to have
-# succeeded for this test not to be skipped
-manual_include_accented_file_name_latin1 
manual_include_accented_file_name_latin1.texi --info -D 'needrecodedfilenames 
Need recoded file names'
-
-manual_include_accented_file_name_latin1_explicit_encoding 
manual_include_accented_file_name_latin1.texi --info -c 
INPUT_FILE_NAME_ENCODING=ISO-8859-1 -D 'needrecodedfilenames Need recoded file 
names'
-
-# fails to find the latin1 encoded include file as the locale encoding
-# of the test suite is utf8
-manual_include_accented_file_name_latin1_use_locale_encoding 
manual_include_accented_file_name_latin1.texi --info -D 'needrecodedfilenames 
Need recoded file names' -c MESSAGE_ENCODING=UTF-8 -c 
INPUT_FILE_NAME_ENCODING=UTF-8
+# the same tests are in t/*.t to test through code
+no_content no_content.texi --html --no-split -c 'BIG_RULE <hr style="height: 
6px;">'
+no_content_separate no_content.texi --html --no-split -c 'BIG_RULE <hr 
style="height: 6px;">' -c 'CONTENTS_OUTPUT_LOCATION separate_element'
+no_content_do_contents_separate no_content.texi --html --no-split -c 'BIG_RULE 
<hr style="height: 6px;">' -c 'CONTENTS_OUTPUT_LOCATION separate_element' -c 
'contents 1'
+no_content_do_contents no_content.texi --html --no-split -c 'BIG_RULE <hr 
style="height: 6px;">' -c 'contents 1'
+no_content_inline no_content.texi --html --no-split -c 'BIG_RULE <hr 
style="height: 6px;">' -c 'CONTENTS_OUTPUT_LOCATION inline'
+no_content_do_contents_inline no_content.texi --html --no-split -c 'BIG_RULE 
<hr style="height: 6px;">' -c 'CONTENTS_OUTPUT_LOCATION inline' -c 'contents 1'
+
+# Same input file also tested in t/converters_tests.t.  It is interesting to
+# have automatic tree transformations tested here too.
+indices_in_begin_tables_lists indices_in_begin_tables_lists.texi --html 
--no-split -c 'USE_NODES 0'
+indices_in_begin_tables_lists_latex indices_in_begin_tables_lists.texi --latex
+
+# tests of the tree using the same input file are also in t/transformations.t
+# but it is interesting to have automatic tree transformations tested here too.
+index_entries_relate_to_item index_entries_relate_to_item.texi --html 
--no-split
 
 info_extension_warning foo.info
 
diff --git a/tp/tests/contents/no_content.texi 
b/tp/tests/formatting/no_content.texi
similarity index 100%
rename from tp/tests/contents/no_content.texi
rename to tp/tests/formatting/no_content.texi
diff --git 
a/tp/tests/indices/res_parser/index_entries_relate_to_item/index_entries_relate_to_item.1
 
b/tp/tests/formatting/res_parser/index_entries_relate_to_item/index_entries_relate_to_item.1
similarity index 100%
rename from 
tp/tests/indices/res_parser/index_entries_relate_to_item/index_entries_relate_to_item.1
rename to 
tp/tests/formatting/res_parser/index_entries_relate_to_item/index_entries_relate_to_item.1
diff --git 
a/tp/tests/indices/res_parser/index_entries_relate_to_item/index_entries_relate_to_item.2
 
b/tp/tests/formatting/res_parser/index_entries_relate_to_item/index_entries_relate_to_item.2
similarity index 100%
rename from 
tp/tests/indices/res_parser/index_entries_relate_to_item/index_entries_relate_to_item.2
rename to 
tp/tests/formatting/res_parser/index_entries_relate_to_item/index_entries_relate_to_item.2
diff --git 
a/tp/tests/indices/res_parser/index_entries_relate_to_item/index_entries_relate_to_item.html
 
b/tp/tests/formatting/res_parser/index_entries_relate_to_item/index_entries_relate_to_item.html
similarity index 100%
rename from 
tp/tests/indices/res_parser/index_entries_relate_to_item/index_entries_relate_to_item.html
rename to 
tp/tests/formatting/res_parser/index_entries_relate_to_item/index_entries_relate_to_item.html
diff --git 
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.1
 
b/tp/tests/formatting/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.1
similarity index 100%
rename from 
tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.1
rename to 
tp/tests/formatting/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.1
diff --git 
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.2
 
b/tp/tests/formatting/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.2
similarity index 100%
rename from 
tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.2
rename to 
tp/tests/formatting/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.2
diff --git 
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
 
b/tp/tests/formatting/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
similarity index 100%
rename from 
tp/tests/indices/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
rename to 
tp/tests/formatting/res_parser/indices_in_begin_tables_lists/indices_in_begin_tables_lists.html
diff --git 
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.1
 
b/tp/tests/formatting/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.1
similarity index 100%
rename from 
tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.1
rename to 
tp/tests/formatting/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.1
diff --git 
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.2
 
b/tp/tests/formatting/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.2
similarity index 100%
rename from 
tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.2
rename to 
tp/tests/formatting/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.2
diff --git 
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
 
b/tp/tests/formatting/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
similarity index 100%
rename from 
tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
rename to 
tp/tests/formatting/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
diff --git a/tp/tests/contents/res_parser/no_content/no_content.1 
b/tp/tests/formatting/res_parser/no_content/no_content.1
similarity index 100%
rename from tp/tests/contents/res_parser/no_content/no_content.1
rename to tp/tests/formatting/res_parser/no_content/no_content.1
diff --git a/tp/tests/contents/res_parser/no_content/no_content.2 
b/tp/tests/formatting/res_parser/no_content/no_content.2
similarity index 100%
rename from tp/tests/contents/res_parser/no_content/no_content.2
rename to tp/tests/formatting/res_parser/no_content/no_content.2
diff --git a/tp/tests/contents/res_parser/no_content/no_content.html 
b/tp/tests/formatting/res_parser/no_content/no_content.html
similarity index 100%
rename from tp/tests/contents/res_parser/no_content/no_content.html
rename to tp/tests/formatting/res_parser/no_content/no_content.html
diff --git a/tp/tests/contents/res_parser/no_content_do_contents/no_content.1 
b/tp/tests/formatting/res_parser/no_content_do_contents/no_content.1
similarity index 100%
rename from tp/tests/contents/res_parser/no_content_do_contents/no_content.1
rename to tp/tests/formatting/res_parser/no_content_do_contents/no_content.1
diff --git a/tp/tests/contents/res_parser/no_content_do_contents/no_content.2 
b/tp/tests/formatting/res_parser/no_content_do_contents/no_content.2
similarity index 100%
rename from tp/tests/contents/res_parser/no_content_do_contents/no_content.2
rename to tp/tests/formatting/res_parser/no_content_do_contents/no_content.2
diff --git 
a/tp/tests/contents/res_parser/no_content_do_contents/no_content.html 
b/tp/tests/formatting/res_parser/no_content_do_contents/no_content.html
similarity index 100%
rename from tp/tests/contents/res_parser/no_content_do_contents/no_content.html
rename to tp/tests/formatting/res_parser/no_content_do_contents/no_content.html
diff --git 
a/tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.1 
b/tp/tests/formatting/res_parser/no_content_do_contents_inline/no_content.1
similarity index 100%
rename from 
tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.1
rename to 
tp/tests/formatting/res_parser/no_content_do_contents_inline/no_content.1
diff --git 
a/tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.2 
b/tp/tests/formatting/res_parser/no_content_do_contents_inline/no_content.2
similarity index 100%
rename from 
tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.2
rename to 
tp/tests/formatting/res_parser/no_content_do_contents_inline/no_content.2
diff --git 
a/tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.html 
b/tp/tests/formatting/res_parser/no_content_do_contents_inline/no_content.html
similarity index 100%
rename from 
tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.html
rename to 
tp/tests/formatting/res_parser/no_content_do_contents_inline/no_content.html
diff --git 
a/tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.1 
b/tp/tests/formatting/res_parser/no_content_do_contents_separate/no_content.1
similarity index 100%
rename from 
tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.1
rename to 
tp/tests/formatting/res_parser/no_content_do_contents_separate/no_content.1
diff --git 
a/tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.2 
b/tp/tests/formatting/res_parser/no_content_do_contents_separate/no_content.2
similarity index 100%
rename from 
tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.2
rename to 
tp/tests/formatting/res_parser/no_content_do_contents_separate/no_content.2
diff --git 
a/tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.html 
b/tp/tests/formatting/res_parser/no_content_do_contents_separate/no_content.html
similarity index 100%
rename from 
tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.html
rename to 
tp/tests/formatting/res_parser/no_content_do_contents_separate/no_content.html
diff --git a/tp/tests/contents/res_parser/no_content_inline/no_content.1 
b/tp/tests/formatting/res_parser/no_content_inline/no_content.1
similarity index 100%
rename from tp/tests/contents/res_parser/no_content_inline/no_content.1
rename to tp/tests/formatting/res_parser/no_content_inline/no_content.1
diff --git a/tp/tests/contents/res_parser/no_content_inline/no_content.2 
b/tp/tests/formatting/res_parser/no_content_inline/no_content.2
similarity index 100%
rename from tp/tests/contents/res_parser/no_content_inline/no_content.2
rename to tp/tests/formatting/res_parser/no_content_inline/no_content.2
diff --git a/tp/tests/contents/res_parser/no_content_inline/no_content.html 
b/tp/tests/formatting/res_parser/no_content_inline/no_content.html
similarity index 100%
rename from tp/tests/contents/res_parser/no_content_inline/no_content.html
rename to tp/tests/formatting/res_parser/no_content_inline/no_content.html
diff --git a/tp/tests/contents/res_parser/no_content_separate/no_content.1 
b/tp/tests/formatting/res_parser/no_content_separate/no_content.1
similarity index 100%
rename from tp/tests/contents/res_parser/no_content_separate/no_content.1
rename to tp/tests/formatting/res_parser/no_content_separate/no_content.1
diff --git a/tp/tests/contents/res_parser/no_content_separate/no_content.2 
b/tp/tests/formatting/res_parser/no_content_separate/no_content.2
similarity index 100%
rename from tp/tests/contents/res_parser/no_content_separate/no_content.2
rename to tp/tests/formatting/res_parser/no_content_separate/no_content.2
diff --git a/tp/tests/contents/res_parser/no_content_separate/no_content.html 
b/tp/tests/formatting/res_parser/no_content_separate/no_content.html
similarity index 100%
rename from tp/tests/contents/res_parser/no_content_separate/no_content.html
rename to tp/tests/formatting/res_parser/no_content_separate/no_content.html
diff --git a/tp/tests/layout/Makefile.am b/tp/tests/layout/Makefile.am
index 0bfa088f35..7430418417 100644
--- a/tp/tests/layout/Makefile.am
+++ b/tp/tests/layout/Makefile.am
@@ -1,5 +1,5 @@
-EXTRA_DIST = no_monolithic.texi navigation.texi formatting_regions.texi \
-            formatting.texi simplest.texi list-of-tests res_parser \
+EXTRA_DIST = no_monolithic.texi navigation.texi \
+            simplest.texi list-of-tests res_parser \
  f--ile.e--xt  f--ile.jpg  f--ile.png  f--ile.txt
 
 
diff --git a/tp/tests/layout/list-of-tests b/tp/tests/layout/list-of-tests
index 794805eefa..79f72bb99a 100644
--- a/tp/tests/layout/list-of-tests
+++ b/tp/tests/layout/list-of-tests
@@ -1,50 +1,26 @@
 
-formatting_macro_expand formatting.texi 
--macro-expand=@OUT_DIR@formatting.texi -c TEXINFO_OUTPUT_FORMAT=structure
-# the output should be the same as just above, but is less interesting
-# to test as above also tests the not otherwise tested 'structure' format
-# and also tests --macro-expand.
-#formatting_macro_expand formatting.texi -c TEXINFO_OUTPUT_FORMAT=plaintexinfo
-formatting_docbook formatting.texi --docbook
-formatting_xml formatting.texi --xml
-formatting_html formatting.texi -D 'needcollationcompat Need collation 
compatibility' --html -c TEXI2HTML=1 --no-split
-formatting_html_nodes formatting.texi -D 'needcollationcompat Need collation 
compatibility' --html -c TEXI2HTML=1 --split node --node-files -c 'TOP_FILE 
index.html'
-# this is the default html output
-formatting_html_no_texi2html formatting.texi -D 'needcollationcompat Need 
collation compatibility' --html --no-split -c TEXI2HTML=undef
-formatting_info formatting.texi -D 'needcollationcompat Need collation 
compatibility' --info -c ASCII_PUNCTUATION=1
-formatting_info_disable_encoding formatting.texi -D 'needcollationcompat Need 
collation compatibility' --info --disable-encoding
-formatting_plaintext formatting.texi -D 'needcollationcompat Need collation 
compatibility' -c FORMAT_MENU=nomenu --plaintext -c ASCII_PUNCTUATION=1
-formatting_latex formatting.texi --latex
-
-# used to remove commands, for instance to count words
-formatting_textcontent formatting.texi -c TEXINFO_OUTPUT_FORMAT=textcontent
-# used to format text fragments in converters, minimal formatting
-formatting_rawtext formatting.texi -c TEXINFO_OUTPUT_FORMAT=rawtext
+formatting_html ../coverage/formatting.texi -D 'needcollationcompat Need 
collation compatibility' --html -c TEXI2HTML=1 --no-split
+formatting_html_nodes ../coverage/formatting.texi -D 'needcollationcompat Need 
collation compatibility' --html -c TEXI2HTML=1 --split node --node-files -c 
'TOP_FILE index.html'
+formatting_info ../coverage/formatting.texi -D 'needcollationcompat Need 
collation compatibility' --info -c ASCII_PUNCTUATION=1
+formatting_info_disable_encoding ../coverage/formatting.texi -D 
'needcollationcompat Need collation compatibility' --info --disable-encoding
+formatting_plaintext ../coverage/formatting.texi -D 'needcollationcompat Need 
collation compatibility' -c FORMAT_MENU=nomenu --plaintext -c 
ASCII_PUNCTUATION=1
 
 # count words
-formatting_sort_element_counts formatting.texi -D 'needcollationcompat Need 
collation compatibility' --html --no-split -c USE_NODES=0 -c 
SORT_ELEMENT_COUNT=@OUT_DIR@formatting_elt_counts.txt
-
-# formats present in the documentation not tested: debugtree and texinfosxml
-#formatting_sxml formatting.texi -c TEXINFO_OUTPUT_FORMAT=texinfosxml
+formatting_sort_element_counts ../coverage/formatting.texi -D 
'needcollationcompat Need collation compatibility' --html --no-split -c 
USE_NODES=0 -c SORT_ELEMENT_COUNT=@OUT_DIR@formatting_elt_counts.txt
 
 # FIXME exactly the same output than formatting_html_nodes.  Remove?
-formatting_nodes formatting.texi -D 'needcollationcompat Need collation 
compatibility' -c TEXI2HTML=1 --split node
-formatting_mathjax formatting.texi -D 'needcollationcompat Need collation 
compatibility' --html --no-split -c SHOW_TITLE=1 -c HTML_MATH=mathjax
-#formatting_mediawiki formatting.texi --init mediawiki.pm
-formatting_weird_quotes formatting.texi -D 'needcollationcompat Need collation 
compatibility' --html -c FORMAT_MENU=menu -c SHOW_TITLE=1 -c DO_ABOUT=1 
--no-split -c 'OPEN_QUOTE_SYMBOL @' -c "CLOSE_QUOTE_SYMBOL '&lsquo;"
-formatting_html32 formatting.texi -D 'needcollationcompat Need collation 
compatibility' --html --no-split -c FORMAT_MENU=menu -c SHOW_TITLE=1 -c 
DO_ABOUT=1 --init html32.pm
-formatting_regions formatting_regions.texi -D 'needcollationcompat Need 
collation compatibility' --html --no-split -c SHOW_TITLE=1
-formatting_numerical_entities formatting.texi -D 'needcollationcompat Need 
collation compatibility' --html --no-split -c FORMAT_MENU=menu -c SHOW_TITLE=1 
-c DO_ABOUT=1 -c 'USE_NUMERIC_ENTITY 1'
-formatting_enable_encoding formatting.texi -D 'needcollationcompat Need 
collation compatibility' --html --no-split -c FORMAT_MENU=menu -c SHOW_TITLE=1 
-c DO_ABOUT=1 --enable-encoding -c OUTPUT_CHARACTERS=1
-formatting_xhtml formatting.texi -D 'needcollationcompat Need collation 
compatibility' --html --no-split -c SHOW_TITLE=1 -c DO_ABOUT=1 -c 
DOCTYPE='<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC 
"-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>' -c 
'USE_XML_SYNTAX 1' -c 'NO_CUSTOM_HTML_ATTRIBUTE 1' -c 
'HTML_ROOT_ELEMENT_ATTRIBUTES xmlns="http://www.w3.org/1999/xhtml";'
-formatting_exotic formatting.texi -D 'needcollationcompat Need collation 
compatibility' -c TEXI2HTML=1 --split section --no-header --no-number-sections 
-c 'TOC_LINKS 1' -c 'DEF_TABLE 1' -c 'XREF_USE_NODE_NAME_ARG 1' 
--footnote-style=end --css-ref 
http://www.environnement.ens.fr/perso/dumas/background-color.css 
--internal-links=/dev/null -c 'USE_TITLEPAGE_FOR_TITLE 0'
+formatting_nodes ../coverage/formatting.texi -D 'needcollationcompat Need 
collation compatibility' -c TEXI2HTML=1 --split node
+formatting_mathjax ../coverage/formatting.texi -D 'needcollationcompat Need 
collation compatibility' --html --no-split -c SHOW_TITLE=1 -c HTML_MATH=mathjax
+formatting_weird_quotes ../coverage/formatting.texi -D 'needcollationcompat 
Need collation compatibility' --html -c FORMAT_MENU=menu -c SHOW_TITLE=1 -c 
DO_ABOUT=1 --no-split -c 'OPEN_QUOTE_SYMBOL @' -c "CLOSE_QUOTE_SYMBOL '&lsquo;"
+formatting_numerical_entities ../coverage/formatting.texi -D 
'needcollationcompat Need collation compatibility' --html --no-split -c 
FORMAT_MENU=menu -c SHOW_TITLE=1 -c DO_ABOUT=1 -c 'USE_NUMERIC_ENTITY 1'
+formatting_enable_encoding ../coverage/formatting.texi -D 'needcollationcompat 
Need collation compatibility' --html --no-split -c FORMAT_MENU=menu -c 
SHOW_TITLE=1 -c DO_ABOUT=1 --enable-encoding -c OUTPUT_CHARACTERS=1
+formatting_exotic ../coverage/formatting.texi -D 'needcollationcompat Need 
collation compatibility' -c TEXI2HTML=1 --split section --no-header 
--no-number-sections -c 'TOC_LINKS 1' -c 'DEF_TABLE 1' -c 
'XREF_USE_NODE_NAME_ARG 1' --footnote-style=end --css-ref 
http://www.environnement.ens.fr/perso/dumas/background-color.css 
--internal-links=/dev/null -c 'USE_TITLEPAGE_FOR_TITLE 0'
 # use of the doctype is to be able to use W3C old validator, it
 # could be removed when validation can be done differently
-formatting_inline_css formatting.texi -D 'needcollationcompat Need collation 
compatibility' --html --no-split -c SHOW_TITLE=1 -c DO_ABOUT=1 -c 
CONTENTS_OUTPUT_LOCATION=separate_element -c FORMAT_MENU=menu -c 
'INLINE_CSS_STYLE 1' -c DOCTYPE='<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 
Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>'
-formatting_fr formatting.texi -D 'needcollationcompat Need collation 
compatibility' -c TEXI2HTML=1 --document-language fr
-formatting_fr_info formatting.texi -D 'needcollationcompat Need collation 
compatibility' --info --document-language fr
-formatting_fr_icons formatting.texi -D 'needcollationcompat Need collation 
compatibility' -c TEXI2HTML=1 --document-language fr --init icons.init
-formatting_chm formatting.texi -D 'needcollationcompat Need collation 
compatibility' -c USE_NODES=0 -c SHOW_TITLE=1 -c 
CONTENTS_OUTPUT_LOCATION=separate_element -c FORMAT_MENU=nomenu --init chm.pm
-formatting_epub formatting.texi -D 'needcollationcompat Need collation 
compatibility' --epub3 -c 'EPUB_CREATE_CONTAINER_FILE 0'
-formatting_epub_nodes formatting.texi -D 'needcollationcompat Need collation 
compatibility' --split node --init epub3.pm -c 'EPUB_CREATE_CONTAINER_FILE 0' 
-c INFO_JS_DIR=js
-formatting formatting.texi -D 'needcollationcompat Need collation 
compatibility' --html --no-split -c USE_NODES=0 
--internal-links=@OUT_DIR@internal_links_formatting.txt
+formatting_inline_css ../coverage/formatting.texi -D 'needcollationcompat Need 
collation compatibility' --html --no-split -c SHOW_TITLE=1 -c DO_ABOUT=1 -c 
CONTENTS_OUTPUT_LOCATION=separate_element -c FORMAT_MENU=menu -c 
'INLINE_CSS_STYLE 1' -c DOCTYPE='<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 
Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>'
+formatting_fr ../coverage/formatting.texi -D 'needcollationcompat Need 
collation compatibility' -c TEXI2HTML=1 --document-language fr
+formatting_fr_info ../coverage/formatting.texi -D 'needcollationcompat Need 
collation compatibility' --info --document-language fr
+formatting_fr_icons ../coverage/formatting.texi -D 'needcollationcompat Need 
collation compatibility' -c TEXI2HTML=1 --document-language fr --init icons.init
+formatting_epub_nodes ../coverage/formatting.texi -D 'needcollationcompat Need 
collation compatibility' --split node --init epub3.pm -c 
'EPUB_CREATE_CONTAINER_FILE 0' -c INFO_JS_DIR=js
+formatting ../coverage/formatting.texi -D 'needcollationcompat Need collation 
compatibility' --html --no-split -c USE_NODES=0 
--internal-links=@OUT_DIR@internal_links_formatting.txt
 
diff --git a/tp/tests/other/Makefile.am b/tp/tests/other/Makefile.am
index f77ee99a65..afb0927cf2 100644
--- a/tp/tests/other/Makefile.am
+++ b/tp/tests/other/Makefile.am
@@ -1,11 +1,11 @@
 EXTRA_DIST = \
  highlight_example.texi \
- list-of-tests res_parser_html
+ list-of-tests res_parser
 
 DISTCLEANFILES = tests.log tests.out
 
 distclean-local:
-       rm -rf out_parser_html raw_out_parser_html diffs test_log
+       rm -rf out_parser raw_out_parser diffs test_log
 
 dist-hook:
-       rm -rf `find $(distdir)/res_parser_html -name .git`
+       rm -rf `find $(distdir)/res_parser -name .git`
diff --git a/tp/tests/sectioning/list-of-tests 
b/tp/tests/sectioning/list-of-tests
deleted file mode 100644
index b43360135e..0000000000
--- a/tp/tests/sectioning/list-of-tests
+++ /dev/null
@@ -1,4 +0,0 @@
-# Public domain.  Originally created by Patrice Dumas.
-
-sectioning_directions sectioning.texi --html --no-split -c 'HEADER_IN_TABLE=1' 
-c 'USE_NODES=0' -c 'FORMAT_MENU=menu' -c 'NODE_NAME_IN_MENU=0' -c 
'DO_ABOUT=undef' -c 'CONTENTS_OUTPUT_LOCATION=separate_element' --init 
test_directions.init
-sectioning_directions_split_chapter sectioning.texi --html --split=chapter -c 
'HEADER_IN_TABLE=1' -c 'USE_NODES=0' -c 'FORMAT_MENU=menu' -c 
'NODE_NAME_IN_MENU=0' -c 'DO_ABOUT=undef' -c 
'CONTENTS_OUTPUT_LOCATION=separate_element' --init test_directions.init
diff --git a/tp/tests/test_scripts/layout_formatting_chm.sh 
b/tp/tests/test_scripts/coverage_formatting_chm.sh
similarity index 95%
rename from tp/tests/test_scripts/layout_formatting_chm.sh
rename to tp/tests/test_scripts/coverage_formatting_chm.sh
index 6b1d25050c..28fef85010 100755
--- a/tp/tests/test_scripts/layout_formatting_chm.sh
+++ b/tp/tests/test_scripts/coverage_formatting_chm.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=layout
+dir=coverage
 name='formatting_chm'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/layout_formatting_docbook.sh 
b/tp/tests/test_scripts/coverage_formatting_docbook.sh
similarity index 95%
rename from tp/tests/test_scripts/layout_formatting_docbook.sh
rename to tp/tests/test_scripts/coverage_formatting_docbook.sh
index 6527dd8617..704f86c980 100755
--- a/tp/tests/test_scripts/layout_formatting_docbook.sh
+++ b/tp/tests/test_scripts/coverage_formatting_docbook.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=layout
+dir=coverage
 name='formatting_docbook'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/layout_formatting_epub.sh 
b/tp/tests/test_scripts/coverage_formatting_epub.sh
similarity index 95%
rename from tp/tests/test_scripts/layout_formatting_epub.sh
rename to tp/tests/test_scripts/coverage_formatting_epub.sh
index b420196434..45492ed4dd 100755
--- a/tp/tests/test_scripts/layout_formatting_epub.sh
+++ b/tp/tests/test_scripts/coverage_formatting_epub.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=layout
+dir=coverage
 name='formatting_epub'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/layout_formatting_html32.sh 
b/tp/tests/test_scripts/coverage_formatting_html32.sh
similarity index 95%
rename from tp/tests/test_scripts/layout_formatting_html32.sh
rename to tp/tests/test_scripts/coverage_formatting_html32.sh
index 1a201e5758..a8647d7c2b 100755
--- a/tp/tests/test_scripts/layout_formatting_html32.sh
+++ b/tp/tests/test_scripts/coverage_formatting_html32.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=layout
+dir=coverage
 name='formatting_html32'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/layout_formatting_html_no_texi2html.sh 
b/tp/tests/test_scripts/coverage_formatting_html_no_texi2html.sh
similarity index 96%
rename from tp/tests/test_scripts/layout_formatting_html_no_texi2html.sh
rename to tp/tests/test_scripts/coverage_formatting_html_no_texi2html.sh
index 5fdc7d48b5..799816ece3 100755
--- a/tp/tests/test_scripts/layout_formatting_html_no_texi2html.sh
+++ b/tp/tests/test_scripts/coverage_formatting_html_no_texi2html.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=layout
+dir=coverage
 name='formatting_html_no_texi2html'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/layout_formatting_latex.sh 
b/tp/tests/test_scripts/coverage_formatting_latex.sh
similarity index 95%
rename from tp/tests/test_scripts/layout_formatting_latex.sh
rename to tp/tests/test_scripts/coverage_formatting_latex.sh
index e128c93337..7fa879ffb7 100755
--- a/tp/tests/test_scripts/layout_formatting_latex.sh
+++ b/tp/tests/test_scripts/coverage_formatting_latex.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=layout
+dir=coverage
 name='formatting_latex'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/layout_formatting_macro_expand.sh 
b/tp/tests/test_scripts/coverage_formatting_macro_expand.sh
similarity index 95%
rename from tp/tests/test_scripts/layout_formatting_macro_expand.sh
rename to tp/tests/test_scripts/coverage_formatting_macro_expand.sh
index 7b65bd11f3..0b9e768baf 100755
--- a/tp/tests/test_scripts/layout_formatting_macro_expand.sh
+++ b/tp/tests/test_scripts/coverage_formatting_macro_expand.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=layout
+dir=coverage
 name='formatting_macro_expand'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/layout_formatting_rawtext.sh 
b/tp/tests/test_scripts/coverage_formatting_rawtext.sh
similarity index 95%
rename from tp/tests/test_scripts/layout_formatting_rawtext.sh
rename to tp/tests/test_scripts/coverage_formatting_rawtext.sh
index 3024710d24..5ae69ad8b0 100755
--- a/tp/tests/test_scripts/layout_formatting_rawtext.sh
+++ b/tp/tests/test_scripts/coverage_formatting_rawtext.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=layout
+dir=coverage
 name='formatting_rawtext'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/layout_formatting_regions.sh 
b/tp/tests/test_scripts/coverage_formatting_regions.sh
similarity index 95%
rename from tp/tests/test_scripts/layout_formatting_regions.sh
rename to tp/tests/test_scripts/coverage_formatting_regions.sh
index 5876b3a9b4..396417e629 100755
--- a/tp/tests/test_scripts/layout_formatting_regions.sh
+++ b/tp/tests/test_scripts/coverage_formatting_regions.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=layout
+dir=coverage
 name='formatting_regions'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/layout_formatting_textcontent.sh 
b/tp/tests/test_scripts/coverage_formatting_textcontent.sh
similarity index 95%
rename from tp/tests/test_scripts/layout_formatting_textcontent.sh
rename to tp/tests/test_scripts/coverage_formatting_textcontent.sh
index b323d8aaf5..23220bc26a 100755
--- a/tp/tests/test_scripts/layout_formatting_textcontent.sh
+++ b/tp/tests/test_scripts/coverage_formatting_textcontent.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=layout
+dir=coverage
 name='formatting_textcontent'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/layout_formatting_xhtml.sh 
b/tp/tests/test_scripts/coverage_formatting_xhtml.sh
similarity index 95%
rename from tp/tests/test_scripts/layout_formatting_xhtml.sh
rename to tp/tests/test_scripts/coverage_formatting_xhtml.sh
index 6a094bc967..3890f26d99 100755
--- a/tp/tests/test_scripts/layout_formatting_xhtml.sh
+++ b/tp/tests/test_scripts/coverage_formatting_xhtml.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=layout
+dir=coverage
 name='formatting_xhtml'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/layout_formatting_xml.sh 
b/tp/tests/test_scripts/coverage_formatting_xml.sh
similarity index 95%
rename from tp/tests/test_scripts/layout_formatting_xml.sh
rename to tp/tests/test_scripts/coverage_formatting_xml.sh
index 61051c13a6..c4c87b8638 100755
--- a/tp/tests/test_scripts/layout_formatting_xml.sh
+++ b/tp/tests/test_scripts/coverage_formatting_xml.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=layout
+dir=coverage
 name='formatting_xml'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/contents_double_contents_after_title_book.sh 
b/tp/tests/test_scripts/customization_double_contents_after_title_book.sh
similarity index 94%
rename from tp/tests/test_scripts/contents_double_contents_after_title_book.sh
rename to 
tp/tests/test_scripts/customization_double_contents_after_title_book.sh
index 9bc7fbdd88..abd0c5d56a 100755
--- a/tp/tests/test_scripts/contents_double_contents_after_title_book.sh
+++ b/tp/tests/test_scripts/customization_double_contents_after_title_book.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=contents
+dir=customization
 name='double_contents_after_title_book'
 mkdir -p $dir
 
diff --git 
a/tp/tests/test_scripts/contents_double_contents_after_title_book_chapter.sh 
b/tp/tests/test_scripts/customization_double_contents_after_title_book_chapter.sh
similarity index 94%
rename from 
tp/tests/test_scripts/contents_double_contents_after_title_book_chapter.sh
rename to 
tp/tests/test_scripts/customization_double_contents_after_title_book_chapter.sh
index 556d519b20..3a4dd3d1cd 100755
--- a/tp/tests/test_scripts/contents_double_contents_after_title_book_chapter.sh
+++ 
b/tp/tests/test_scripts/customization_double_contents_after_title_book_chapter.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=contents
+dir=customization
 name='double_contents_after_title_book_chapter'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/contents_double_contents_book.sh 
b/tp/tests/test_scripts/customization_double_contents_book.sh
similarity index 94%
rename from tp/tests/test_scripts/contents_double_contents_book.sh
rename to tp/tests/test_scripts/customization_double_contents_book.sh
index 023ee405bd..e7141c57a8 100755
--- a/tp/tests/test_scripts/contents_double_contents_book.sh
+++ b/tp/tests/test_scripts/customization_double_contents_book.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=contents
+dir=customization
 name='double_contents_book'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/formatting_ignore_and_comments_output.sh 
b/tp/tests/test_scripts/customization_ignore_and_comments_output.sh
similarity index 94%
rename from tp/tests/test_scripts/formatting_ignore_and_comments_output.sh
rename to tp/tests/test_scripts/customization_ignore_and_comments_output.sh
index c5ee8a3ff2..15b889cfb7 100755
--- a/tp/tests/test_scripts/formatting_ignore_and_comments_output.sh
+++ b/tp/tests/test_scripts/customization_ignore_and_comments_output.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=formatting
+dir=customization
 name='ignore_and_comments_output'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/sectioning_sectioning_directions.sh 
b/tp/tests/test_scripts/customization_sectioning_directions.sh
similarity index 94%
rename from tp/tests/test_scripts/sectioning_sectioning_directions.sh
rename to tp/tests/test_scripts/customization_sectioning_directions.sh
index b4da46adcd..4813a569db 100755
--- a/tp/tests/test_scripts/sectioning_sectioning_directions.sh
+++ b/tp/tests/test_scripts/customization_sectioning_directions.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=sectioning
+dir=customization
 name='sectioning_directions'
 mkdir -p $dir
 
diff --git 
a/tp/tests/test_scripts/sectioning_sectioning_directions_split_chapter.sh 
b/tp/tests/test_scripts/customization_sectioning_directions_split_chapter.sh
similarity index 94%
rename from 
tp/tests/test_scripts/sectioning_sectioning_directions_split_chapter.sh
rename to 
tp/tests/test_scripts/customization_sectioning_directions_split_chapter.sh
index 5726778d7a..e24a032b78 100755
--- a/tp/tests/test_scripts/sectioning_sectioning_directions_split_chapter.sh
+++ b/tp/tests/test_scripts/customization_sectioning_directions_split_chapter.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=sectioning
+dir=customization
 name='sectioning_directions_split_chapter'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/formatting_test_redefine_need.sh 
b/tp/tests/test_scripts/customization_test_redefine_need.sh
similarity index 94%
rename from tp/tests/test_scripts/formatting_test_redefine_need.sh
rename to tp/tests/test_scripts/customization_test_redefine_need.sh
index be9ed80953..1eca1678a0 100755
--- a/tp/tests/test_scripts/formatting_test_redefine_need.sh
+++ b/tp/tests/test_scripts/customization_test_redefine_need.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=formatting
+dir=customization
 name='test_redefine_need'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/formatting_texi_ignore_and_comments.sh 
b/tp/tests/test_scripts/customization_texi_ignore_and_comments.sh
similarity index 94%
rename from tp/tests/test_scripts/formatting_texi_ignore_and_comments.sh
rename to tp/tests/test_scripts/customization_texi_ignore_and_comments.sh
index 1e4e276b7b..046a85b138 100755
--- a/tp/tests/test_scripts/formatting_texi_ignore_and_comments.sh
+++ b/tp/tests/test_scripts/customization_texi_ignore_and_comments.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=formatting
+dir=customization
 name='texi_ignore_and_comments'
 mkdir -p $dir
 
diff --git 
a/tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1.sh 
b/tp/tests/test_scripts/encoded_manual_include_accented_file_name_latin1.sh
similarity index 95%
rename from 
tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1.sh
rename to 
tp/tests/test_scripts/encoded_manual_include_accented_file_name_latin1.sh
index 7c40daeb17..7d4ac6a510 100755
--- 
a/tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1.sh
+++ b/tp/tests/test_scripts/encoded_manual_include_accented_file_name_latin1.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=formatting
+dir=encoded
 name='manual_include_accented_file_name_latin1'
 mkdir -p $dir
 
diff --git 
a/tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1_explicit_encoding.sh
 
b/tp/tests/test_scripts/encoded_manual_include_accented_file_name_latin1_explicit_encoding.sh
similarity index 95%
rename from 
tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1_explicit_encoding.sh
rename to 
tp/tests/test_scripts/encoded_manual_include_accented_file_name_latin1_explicit_encoding.sh
index afce91ff5b..70d3f8e541 100755
--- 
a/tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1_explicit_encoding.sh
+++ 
b/tp/tests/test_scripts/encoded_manual_include_accented_file_name_latin1_explicit_encoding.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=formatting
+dir=encoded
 name='manual_include_accented_file_name_latin1_explicit_encoding'
 mkdir -p $dir
 
diff --git 
a/tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1_use_locale_encoding.sh
 
b/tp/tests/test_scripts/encoded_manual_include_accented_file_name_latin1_use_locale_encoding.sh
similarity index 95%
rename from 
tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1_use_locale_encoding.sh
rename to 
tp/tests/test_scripts/encoded_manual_include_accented_file_name_latin1_use_locale_encoding.sh
index 555db4f5ee..509bfa3ca7 100755
--- 
a/tp/tests/test_scripts/formatting_manual_include_accented_file_name_latin1_use_locale_encoding.sh
+++ 
b/tp/tests/test_scripts/encoded_manual_include_accented_file_name_latin1_use_locale_encoding.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=formatting
+dir=encoded
 name='manual_include_accented_file_name_latin1_use_locale_encoding'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/formatting_non_ascii_command_line.sh 
b/tp/tests/test_scripts/encoded_non_ascii_command_line.sh
similarity index 95%
rename from tp/tests/test_scripts/formatting_non_ascii_command_line.sh
rename to tp/tests/test_scripts/encoded_non_ascii_command_line.sh
index c83a211a26..f0777f56e8 100755
--- a/tp/tests/test_scripts/formatting_non_ascii_command_line.sh
+++ b/tp/tests/test_scripts/encoded_non_ascii_command_line.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=formatting
+dir=encoded
 name='non_ascii_command_line'
 mkdir -p $dir
 
diff --git 
a/tp/tests/test_scripts/formatting_non_ascii_no_setfilename_test_rawtext.sh 
b/tp/tests/test_scripts/encoded_non_ascii_no_setfilename_test_rawtext.sh
similarity index 95%
rename from 
tp/tests/test_scripts/formatting_non_ascii_no_setfilename_test_rawtext.sh
rename to tp/tests/test_scripts/encoded_non_ascii_no_setfilename_test_rawtext.sh
index 452ca6eeab..d28cd45928 100755
--- a/tp/tests/test_scripts/formatting_non_ascii_no_setfilename_test_rawtext.sh
+++ b/tp/tests/test_scripts/encoded_non_ascii_no_setfilename_test_rawtext.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=formatting
+dir=encoded
 name='non_ascii_no_setfilename_test_rawtext'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/formatting_non_ascii_test_epub.sh 
b/tp/tests/test_scripts/encoded_non_ascii_test_epub.sh
similarity index 95%
rename from tp/tests/test_scripts/formatting_non_ascii_test_epub.sh
rename to tp/tests/test_scripts/encoded_non_ascii_test_epub.sh
index d035ed9369..666ab197d8 100755
--- a/tp/tests/test_scripts/formatting_non_ascii_test_epub.sh
+++ b/tp/tests/test_scripts/encoded_non_ascii_test_epub.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=formatting
+dir=encoded
 name='non_ascii_test_epub'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/formatting_non_ascii_test_latex.sh 
b/tp/tests/test_scripts/encoded_non_ascii_test_latex.sh
similarity index 95%
rename from tp/tests/test_scripts/formatting_non_ascii_test_latex.sh
rename to tp/tests/test_scripts/encoded_non_ascii_test_latex.sh
index fe199f2e09..fadb969eb4 100755
--- a/tp/tests/test_scripts/formatting_non_ascii_test_latex.sh
+++ b/tp/tests/test_scripts/encoded_non_ascii_test_latex.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=formatting
+dir=encoded
 name='non_ascii_test_latex'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/formatting_non_ascii_test_rawtext.sh 
b/tp/tests/test_scripts/encoded_non_ascii_test_rawtext.sh
similarity index 95%
rename from tp/tests/test_scripts/formatting_non_ascii_test_rawtext.sh
rename to tp/tests/test_scripts/encoded_non_ascii_test_rawtext.sh
index 271a74e1cd..311699ef81 100755
--- a/tp/tests/test_scripts/formatting_non_ascii_test_rawtext.sh
+++ b/tp/tests/test_scripts/encoded_non_ascii_test_rawtext.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=formatting
+dir=encoded
 name='non_ascii_test_rawtext'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/indices_index_entries_relate_to_item.sh 
b/tp/tests/test_scripts/formatting_index_entries_relate_to_item.sh
similarity index 95%
rename from tp/tests/test_scripts/indices_index_entries_relate_to_item.sh
rename to tp/tests/test_scripts/formatting_index_entries_relate_to_item.sh
index 2395e45f39..21f5eefae4 100755
--- a/tp/tests/test_scripts/indices_index_entries_relate_to_item.sh
+++ b/tp/tests/test_scripts/formatting_index_entries_relate_to_item.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=indices
+dir=formatting
 name='index_entries_relate_to_item'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/indices_indices_in_begin_tables_lists.sh 
b/tp/tests/test_scripts/formatting_indices_in_begin_tables_lists.sh
similarity index 95%
rename from tp/tests/test_scripts/indices_indices_in_begin_tables_lists.sh
rename to tp/tests/test_scripts/formatting_indices_in_begin_tables_lists.sh
index 6a8a942414..b1cce14947 100755
--- a/tp/tests/test_scripts/indices_indices_in_begin_tables_lists.sh
+++ b/tp/tests/test_scripts/formatting_indices_in_begin_tables_lists.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=indices
+dir=formatting
 name='indices_in_begin_tables_lists'
 mkdir -p $dir
 
diff --git 
a/tp/tests/test_scripts/indices_indices_in_begin_tables_lists_latex.sh 
b/tp/tests/test_scripts/formatting_indices_in_begin_tables_lists_latex.sh
similarity index 95%
rename from tp/tests/test_scripts/indices_indices_in_begin_tables_lists_latex.sh
rename to 
tp/tests/test_scripts/formatting_indices_in_begin_tables_lists_latex.sh
index 5d6599e1cf..ee2cf8cb7e 100755
--- a/tp/tests/test_scripts/indices_indices_in_begin_tables_lists_latex.sh
+++ b/tp/tests/test_scripts/formatting_indices_in_begin_tables_lists_latex.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=indices
+dir=formatting
 name='indices_in_begin_tables_lists_latex'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/contents_no_content.sh 
b/tp/tests/test_scripts/formatting_no_content.sh
similarity index 95%
rename from tp/tests/test_scripts/contents_no_content.sh
rename to tp/tests/test_scripts/formatting_no_content.sh
index ea2b75ccce..858e1fa6eb 100755
--- a/tp/tests/test_scripts/contents_no_content.sh
+++ b/tp/tests/test_scripts/formatting_no_content.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=contents
+dir=formatting
 name='no_content'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/contents_no_content_do_contents.sh 
b/tp/tests/test_scripts/formatting_no_content_do_contents.sh
similarity index 95%
rename from tp/tests/test_scripts/contents_no_content_do_contents.sh
rename to tp/tests/test_scripts/formatting_no_content_do_contents.sh
index 5716a7b0bd..a8cdd0a73b 100755
--- a/tp/tests/test_scripts/contents_no_content_do_contents.sh
+++ b/tp/tests/test_scripts/formatting_no_content_do_contents.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=contents
+dir=formatting
 name='no_content_do_contents'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/contents_no_content_do_contents_inline.sh 
b/tp/tests/test_scripts/formatting_no_content_do_contents_inline.sh
similarity index 95%
rename from tp/tests/test_scripts/contents_no_content_do_contents_inline.sh
rename to tp/tests/test_scripts/formatting_no_content_do_contents_inline.sh
index 5080a2cec6..695df4fd6b 100755
--- a/tp/tests/test_scripts/contents_no_content_do_contents_inline.sh
+++ b/tp/tests/test_scripts/formatting_no_content_do_contents_inline.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=contents
+dir=formatting
 name='no_content_do_contents_inline'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/contents_no_content_do_contents_separate.sh 
b/tp/tests/test_scripts/formatting_no_content_do_contents_separate.sh
similarity index 95%
rename from tp/tests/test_scripts/contents_no_content_do_contents_separate.sh
rename to tp/tests/test_scripts/formatting_no_content_do_contents_separate.sh
index 61772f1567..f1daf05b3b 100755
--- a/tp/tests/test_scripts/contents_no_content_do_contents_separate.sh
+++ b/tp/tests/test_scripts/formatting_no_content_do_contents_separate.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=contents
+dir=formatting
 name='no_content_do_contents_separate'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/contents_no_content_inline.sh 
b/tp/tests/test_scripts/formatting_no_content_inline.sh
similarity index 95%
rename from tp/tests/test_scripts/contents_no_content_inline.sh
rename to tp/tests/test_scripts/formatting_no_content_inline.sh
index cf7f88695f..73577afadc 100755
--- a/tp/tests/test_scripts/contents_no_content_inline.sh
+++ b/tp/tests/test_scripts/formatting_no_content_inline.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=contents
+dir=formatting
 name='no_content_inline'
 mkdir -p $dir
 
diff --git a/tp/tests/test_scripts/contents_no_content_separate.sh 
b/tp/tests/test_scripts/formatting_no_content_separate.sh
similarity index 95%
rename from tp/tests/test_scripts/contents_no_content_separate.sh
rename to tp/tests/test_scripts/formatting_no_content_separate.sh
index a70e33752b..acccbe4888 100755
--- a/tp/tests/test_scripts/contents_no_content_separate.sh
+++ b/tp/tests/test_scripts/formatting_no_content_separate.sh
@@ -8,7 +8,7 @@ fi
 one_test_logs_dir=test_log
 
 
-dir=contents
+dir=formatting
 name='no_content_separate'
 mkdir -p $dir
 



reply via email to

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