From 152fe4fa5d113daf4e8d07ee61020873d4e41d59 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Tue, 1 Nov 2011 19:20:46 +0000
Subject: [PATCH] Quickbook: Rename and rearrange some tests.

- More consistent names.
- Not using `.` in basename.
- Run the quickbook manual test last (as when there's an error, the more
  specific tests are more informative).
- Combine some of the code tests.

[SVN r75235]
---
 test/Jamfile.v2                               | 147 +++++++++---------
 test/{anchor.gold => anchor-1_1.gold}         |   0
 ...{anchor.quickbook => anchor-1_1.quickbook} |   3 +-
 test/{blocks.gold => blocks-1_5.gold}         |   0
 ...{blocks.quickbook => blocks-1_5.quickbook} |   0
 test/{callouts.gold => callouts-1_5.gold}     |   0
 ...louts.quickbook => callouts-1_5.quickbook} |   0
 test/code-1_1.gold                            |  52 +++++++
 test/code-1_1.quickbook                       |  51 ++++++
 test/{code-block.gold => code-1_5.gold}       |   0
 ...ode-block.quickbook => code-1_5.quickbook} |   0
 test/code-block-1.gold                        |  20 ---
 test/code-block-1.quickbook                   |  16 --
 test/code-block-2.gold                        |  22 ---
 test/code-block-2.quickbook                   |  18 ---
 test/code-block-3.gold                        |  23 ---
 test/code-block-3.quickbook                   |  21 ---
 ...{code-block-cpp.gold => code_cpp-1_5.gold} |   0
 ...k-cpp.quickbook => code_cpp-1_5.quickbook} |   0
 ..._cpp_mismatched_escape-1_4-fail.quickbook} |   0
 ...block-python.gold => code_python-1_5.gold} |   0
 ...on.quickbook => code_python-1_5.quickbook} |   0
 ...thon_mismatched_escape-1_4-fail.quickbook} |   0
 ...ode-snippet.gold => code_snippet-1_1.gold} |   0
 ...t.quickbook => code_snippet-1_1.quickbook} |   0
 ...k-teletype.gold => code_teletype-1_5.gold} |   0
 ....quickbook => code_teletype-1_5.quickbook} |   3 +-
 ...macro.gold => command_line_macro-1_1.gold} |   0
 ...kbook => command_line_macro-1_1.quickbook} |   0
 ...{cond_phrase.gold => cond_phrase-1_5.gold} |   0
 ...se.quickbook => cond_phrase-1_5.quickbook} |   0
 test/{elements_1_5.gold => elements-1_5.gold} |   0
 ...s_1_5.quickbook => elements-1_5.quickbook} |   0
 test/{elements_1_6.gold => elements-1_6.gold} |   0
 ...s_1_6.quickbook => elements-1_6.quickbook} |   0
 test/{empty.quickbook => empty.qbk}           |   0
 test/{escape.gold => escape-1_1.gold}         |   0
 ...{escape.quickbook => escape-1_1.quickbook} |   1 -
 ...k => escape-mismatched-1_5-fail.quickbook} |   0
 test/{heading_1_1.gold => heading-1_1.gold}   |   0
 ...ng_1_1.quickbook => heading-1_1.quickbook} |   3 +-
 test/{heading_1_3.gold => heading-1_3.gold}   |   0
 ...ng_1_3.quickbook => heading-1_3.quickbook} |   0
 test/{heading_1_5.gold => heading-1_5.gold}   |   0
 ...ng_1_5.quickbook => heading-1_5.quickbook} |   0
 test/{heading_1_6.gold => heading-1_6.gold}   |   0
 ...ng_1_6.quickbook => heading-1_6.quickbook} |   0
 ...ok => heading_unclosed-1_4-fail.quickbook} |   0
 ...dentifier_1_5.gold => identifier-1_5.gold} |   0
 ...1_5.quickbook => identifier-1_5.quickbook} |   0
 ...dentifier_1_6.gold => identifier-1_6.gold} |   0
 ...1_6.quickbook => identifier-1_6.quickbook} |   0
 test/{image_1_5.gold => image-1_5.gold}       |   0
 ...mage_1_5.quickbook => image-1_5.quickbook} |   0
 ...rt.quickbook => import-1_1-fail.quickbook} |   3 -
 ...e.quickbook => include-1_1-fail.quickbook} |   3 -
 test/{include_1_5.gold => include-1_5.gold}   |   0
 test/include-1_5.quickbook                    |  17 ++
 test/{include_1_6.gold => include-1_6.gold}   |   0
 ...de_1_6.quickbook => include-1_6.quickbook} |   9 +-
 .../{include_1_6-2.gold => include2-1_6.gold} |   0
 test/include2-1_6.quickbook                   |   8 +
 test/include_1_5.quickbook                    |  16 --
 test/include_1_6-2.quickbook                  |   8 -
 ...lude-sub.quickbook => include_sub-1_5.qbk} |   0
 ...include-sub2.quickbook => include_sub.qbk} |   0
 test/{link.gold => link-1_1.gold}             |   0
 test/{link.quickbook => link-1_1.quickbook}   |   0
 test/{list_test.gold => list_test-1_5.gold}   |   0
 ...test.quickbook => list_test-1_5.quickbook} |   2 +-
 test/{macro-1.5.gold => macro-1_5.gold}       |   0
 ...acro-1.5.quickbook => macro-1_5.quickbook} |   0
 test/{macro-1.6.gold => macro-1_6.gold}       |   0
 ...acro-1.6.quickbook => macro-1_6.quickbook} |   0
 ...=> mismatched_brackets-1_1-fail.quickbook} |   0
 ...s-1.gold => mismatched_brackets1-1_1.gold} |   0
 ...ook => mismatched_brackets1-1_1.quickbook} |   0
 ...s-2.gold => mismatched_brackets2-1_1.gold} |   0
 ...ook => mismatched_brackets2-1_1.quickbook} |   0
 test/{newline.gold => newline-1_1.gold}       |   0
 ...ewline.quickbook => newline-1_1.quickbook} |   0
 test/{para-test.gold => para_test-1_5.gold}   |   0
 ...test.quickbook => para_test-1_5.quickbook} |   0
 ....quickbook => post_process-fail.quickbook} |   0
 ...reformatted.gold => preformatted-1_1.gold} |   0
 ...d.quickbook => preformatted-1_1.quickbook} |   0
 ...-manual.gold => quickbook_manual-1_4.gold} |   2 +-
 ...ickbook => quickbook_manual-1_4.quickbook} |   0
 test/{section_1_4.gold => section-1_4.gold}   |   0
 ...on_1_4.quickbook => section-1_4.quickbook} |   0
 ...nclosed.gold => section-1_5-unclosed.gold} |   0
 ...ickbook => section-1_5-unclosed.quickbook} |   0
 test/{section_1_5.gold => section-1_5.gold}   |   0
 ...on_1_5.quickbook => section-1_5.quickbook} |   0
 ...ple_markup.gold => simple_markup-1_5.gold} |   0
 ....quickbook => simple_markup-1_5.quickbook} |   0
 test/{table_1_3.gold => table-1_3.gold}       |   0
 ...able_1_3.quickbook => table-1_3.quickbook} |   4 +-
 test/{table_1_5.gold => table-1_5.gold}       |   0
 ...able_1_5.quickbook => table-1_5.quickbook} |   4 +-
 ...=> template_arguments1-1_1-fail.quickbook} |   3 -
 ...=> template_arguments2-1_1-fail.quickbook} |   3 -
 ...=> template_arguments3-1_1-fail.quickbook} |   0
 ...ok => template_lookup1-1_5-fail.quickbook} |   0
 ...section.gold => template_section-1_5.gold} |   0
 ...ickbook => template_section-1_5.quickbook} |   0
 ...k => template_section1-1_5-fail.quickbook} |   0
 ...k => template_section2-1_5-fail.quickbook} |   0
 ...k => template_section3-1_5-fail.quickbook} |   0
 test/{templates.gold => templates-1_3.gold}   |   0
 ...ates.quickbook => templates-1_3.quickbook} |   0
 ...{templates_1_4.gold => templates-1_4.gold} |   0
 ..._1_4.quickbook => templates-1_4.quickbook} |   0
 ...{templates_1_5.gold => templates-1_5.gold} |   0
 ..._1_5.quickbook => templates-1_5.quickbook} |   0
 ...de-escape.gold => unicode_escape-1_5.gold} |   0
 ...quickbook => unicode_escape-1_5.quickbook} |   0
 ...ickbook => utf16be_bom-1_5-fail.quickbook} | Bin
 ...ickbook => utf16le_bom-1_5-fail.quickbook} | Bin
 test/{utf-8-bom.gold => utf8-1_5.gold}        |   0
 test/{utf-8.quickbook => utf8-1_5.quickbook}  |   0
 test/{utf-8.gold => utf8_bom-1_5.gold}        |   0
 ...8-bom.quickbook => utf8_bom-1_5.quickbook} |   0
 ...ckbook => variablelist-1_5-fail.quickbook} |   0
 ...ariablelist.gold => variablelist-1_5.gold} |   0
 ...t.quickbook => variablelist-1_5.quickbook} |   3 +-
 ...3.quickbook => version-0_1-fail.quickbook} |   0
 ...1.quickbook => version-1_7-fail.quickbook} |   0
 ...2.quickbook => version-2_0-fail.quickbook} |   0
 test/{xinclude.gold => xinclude-1_1.gold}     |   0
 ...clude.quickbook => xinclude-1_1.quickbook} |   1 -
 ...ml-escape_1_2.gold => xml_escape-1_2.gold} |   0
 ...1_2.quickbook => xml_escape-1_2.quickbook} |   0
 ...ml-escape_1_5.gold => xml_escape-1_5.gold} |   0
 ...1_5.quickbook => xml_escape-1_5.quickbook} |   0
 135 files changed, 216 insertions(+), 250 deletions(-)
 rename test/{anchor.gold => anchor-1_1.gold} (100%)
 rename test/{anchor.quickbook => anchor-1_1.quickbook} (96%)
 rename test/{blocks.gold => blocks-1_5.gold} (100%)
 rename test/{blocks.quickbook => blocks-1_5.quickbook} (100%)
 rename test/{callouts.gold => callouts-1_5.gold} (100%)
 rename test/{callouts.quickbook => callouts-1_5.quickbook} (100%)
 create mode 100644 test/code-1_1.gold
 create mode 100644 test/code-1_1.quickbook
 rename test/{code-block.gold => code-1_5.gold} (100%)
 rename test/{code-block.quickbook => code-1_5.quickbook} (100%)
 delete mode 100644 test/code-block-1.gold
 delete mode 100644 test/code-block-1.quickbook
 delete mode 100644 test/code-block-2.gold
 delete mode 100644 test/code-block-2.quickbook
 delete mode 100644 test/code-block-3.gold
 delete mode 100644 test/code-block-3.quickbook
 rename test/{code-block-cpp.gold => code_cpp-1_5.gold} (100%)
 rename test/{code-block-cpp.quickbook => code_cpp-1_5.quickbook} (100%)
 rename test/{fail-cpp-mismatched-escape.quickbook => code_cpp_mismatched_escape-1_4-fail.quickbook} (100%)
 rename test/{code-block-python.gold => code_python-1_5.gold} (100%)
 rename test/{code-block-python.quickbook => code_python-1_5.quickbook} (100%)
 rename test/{fail-python-mismatched-escape.quickbook => code_python_mismatched_escape-1_4-fail.quickbook} (100%)
 rename test/{code-snippet.gold => code_snippet-1_1.gold} (100%)
 rename test/{code-snippet.quickbook => code_snippet-1_1.quickbook} (100%)
 rename test/{code-block-teletype.gold => code_teletype-1_5.gold} (100%)
 rename test/{code-block-teletype.quickbook => code_teletype-1_5.quickbook} (87%)
 rename test/{command_line_macro.gold => command_line_macro-1_1.gold} (100%)
 rename test/{command_line_macro.quickbook => command_line_macro-1_1.quickbook} (100%)
 rename test/{cond_phrase.gold => cond_phrase-1_5.gold} (100%)
 rename test/{cond_phrase.quickbook => cond_phrase-1_5.quickbook} (100%)
 rename test/{elements_1_5.gold => elements-1_5.gold} (100%)
 rename test/{elements_1_5.quickbook => elements-1_5.quickbook} (100%)
 rename test/{elements_1_6.gold => elements-1_6.gold} (100%)
 rename test/{elements_1_6.quickbook => elements-1_6.quickbook} (100%)
 rename test/{empty.quickbook => empty.qbk} (100%)
 rename test/{escape.gold => escape-1_1.gold} (100%)
 rename test/{escape.quickbook => escape-1_1.quickbook} (99%)
 rename test/{fail-mismatched-boostbook-escape.quickbook => escape-mismatched-1_5-fail.quickbook} (100%)
 rename test/{heading_1_1.gold => heading-1_1.gold} (100%)
 rename test/{heading_1_1.quickbook => heading-1_1.quickbook} (94%)
 rename test/{heading_1_3.gold => heading-1_3.gold} (100%)
 rename test/{heading_1_3.quickbook => heading-1_3.quickbook} (100%)
 rename test/{heading_1_5.gold => heading-1_5.gold} (100%)
 rename test/{heading_1_5.quickbook => heading-1_5.quickbook} (100%)
 rename test/{heading_1_6.gold => heading-1_6.gold} (100%)
 rename test/{heading_1_6.quickbook => heading-1_6.quickbook} (100%)
 rename test/{fail-parse-error1.quickbook => heading_unclosed-1_4-fail.quickbook} (100%)
 rename test/{identifier_1_5.gold => identifier-1_5.gold} (100%)
 rename test/{identifier_1_5.quickbook => identifier-1_5.quickbook} (100%)
 rename test/{identifier_1_6.gold => identifier-1_6.gold} (100%)
 rename test/{identifier_1_6.quickbook => identifier-1_6.quickbook} (100%)
 rename test/{image_1_5.gold => image-1_5.gold} (100%)
 rename test/{image_1_5.quickbook => image-1_5.quickbook} (100%)
 rename test/{fail-import.quickbook => import-1_1-fail.quickbook} (92%)
 rename test/{fail-include.quickbook => include-1_1-fail.quickbook} (92%)
 rename test/{include_1_5.gold => include-1_5.gold} (100%)
 create mode 100644 test/include-1_5.quickbook
 rename test/{include_1_6.gold => include-1_6.gold} (100%)
 rename test/{include_1_6.quickbook => include-1_6.quickbook} (53%)
 rename test/{include_1_6-2.gold => include2-1_6.gold} (100%)
 create mode 100644 test/include2-1_6.quickbook
 delete mode 100644 test/include_1_5.quickbook
 delete mode 100644 test/include_1_6-2.quickbook
 rename test/{include-sub.quickbook => include_sub-1_5.qbk} (100%)
 rename test/{include-sub2.quickbook => include_sub.qbk} (100%)
 rename test/{link.gold => link-1_1.gold} (100%)
 rename test/{link.quickbook => link-1_1.quickbook} (100%)
 rename test/{list_test.gold => list_test-1_5.gold} (100%)
 rename test/{list_test.quickbook => list_test-1_5.quickbook} (99%)
 rename test/{macro-1.5.gold => macro-1_5.gold} (100%)
 rename test/{macro-1.5.quickbook => macro-1_5.quickbook} (100%)
 rename test/{macro-1.6.gold => macro-1_6.gold} (100%)
 rename test/{macro-1.6.quickbook => macro-1_6.quickbook} (100%)
 rename test/{mismatched-brackets-3.quickbook => mismatched_brackets-1_1-fail.quickbook} (100%)
 rename test/{mismatched-brackets-1.gold => mismatched_brackets1-1_1.gold} (100%)
 rename test/{mismatched-brackets-1.quickbook => mismatched_brackets1-1_1.quickbook} (100%)
 rename test/{mismatched-brackets-2.gold => mismatched_brackets2-1_1.gold} (100%)
 rename test/{mismatched-brackets-2.quickbook => mismatched_brackets2-1_1.quickbook} (100%)
 rename test/{newline.gold => newline-1_1.gold} (100%)
 rename test/{newline.quickbook => newline-1_1.quickbook} (100%)
 rename test/{para-test.gold => para_test-1_5.gold} (100%)
 rename test/{para-test.quickbook => para_test-1_5.quickbook} (100%)
 rename test/{fail-post-process.quickbook => post_process-fail.quickbook} (100%)
 rename test/{preformatted.gold => preformatted-1_1.gold} (100%)
 rename test/{preformatted.quickbook => preformatted-1_1.quickbook} (100%)
 rename test/{quickbook-manual.gold => quickbook_manual-1_4.gold} (99%)
 rename test/{quickbook-manual.quickbook => quickbook_manual-1_4.quickbook} (100%)
 rename test/{section_1_4.gold => section-1_4.gold} (100%)
 rename test/{section_1_4.quickbook => section-1_4.quickbook} (100%)
 rename test/{section_1_5-unclosed.gold => section-1_5-unclosed.gold} (100%)
 rename test/{section_1_5-unclosed.quickbook => section-1_5-unclosed.quickbook} (100%)
 rename test/{section_1_5.gold => section-1_5.gold} (100%)
 rename test/{section_1_5.quickbook => section-1_5.quickbook} (100%)
 rename test/{simple_markup.gold => simple_markup-1_5.gold} (100%)
 rename test/{simple_markup.quickbook => simple_markup-1_5.quickbook} (100%)
 rename test/{table_1_3.gold => table-1_3.gold} (100%)
 rename test/{table_1_3.quickbook => table-1_3.quickbook} (98%)
 rename test/{table_1_5.gold => table-1_5.gold} (100%)
 rename test/{table_1_5.quickbook => table-1_5.quickbook} (99%)
 rename test/{fail-template-arguments1.quickbook => template_arguments1-1_1-fail.quickbook} (94%)
 rename test/{fail-template-arguments2.quickbook => template_arguments2-1_1-fail.quickbook} (95%)
 rename test/{fail-template-arguments3.quickbook => template_arguments3-1_1-fail.quickbook} (100%)
 rename test/{fail-template-lookup1.quickbook => template_lookup1-1_5-fail.quickbook} (100%)
 rename test/{template-section.gold => template_section-1_5.gold} (100%)
 rename test/{template-section.quickbook => template_section-1_5.quickbook} (100%)
 rename test/{fail-template-section-1.quickbook => template_section1-1_5-fail.quickbook} (100%)
 rename test/{fail-template-section-2.quickbook => template_section2-1_5-fail.quickbook} (100%)
 rename test/{fail-template-section-3.quickbook => template_section3-1_5-fail.quickbook} (100%)
 rename test/{templates.gold => templates-1_3.gold} (100%)
 rename test/{templates.quickbook => templates-1_3.quickbook} (100%)
 rename test/{templates_1_4.gold => templates-1_4.gold} (100%)
 rename test/{templates_1_4.quickbook => templates-1_4.quickbook} (100%)
 rename test/{templates_1_5.gold => templates-1_5.gold} (100%)
 rename test/{templates_1_5.quickbook => templates-1_5.quickbook} (100%)
 rename test/{unicode-escape.gold => unicode_escape-1_5.gold} (100%)
 rename test/{unicode-escape.quickbook => unicode_escape-1_5.quickbook} (100%)
 rename test/{utf-16be-bom.quickbook => utf16be_bom-1_5-fail.quickbook} (100%)
 rename test/{utf-16le-bom.quickbook => utf16le_bom-1_5-fail.quickbook} (100%)
 rename test/{utf-8-bom.gold => utf8-1_5.gold} (100%)
 rename test/{utf-8.quickbook => utf8-1_5.quickbook} (100%)
 rename test/{utf-8.gold => utf8_bom-1_5.gold} (100%)
 rename test/{utf-8-bom.quickbook => utf8_bom-1_5.quickbook} (100%)
 rename test/{fail-parse-error2.quickbook => variablelist-1_5-fail.quickbook} (100%)
 rename test/{variablelist.gold => variablelist-1_5.gold} (100%)
 rename test/{variablelist.quickbook => variablelist-1_5.quickbook} (97%)
 rename test/{fail-unknown-quickbook-3.quickbook => version-0_1-fail.quickbook} (100%)
 rename test/{fail-unknown-quickbook-1.quickbook => version-1_7-fail.quickbook} (100%)
 rename test/{fail-unknown-quickbook-2.quickbook => version-2_0-fail.quickbook} (100%)
 rename test/{xinclude.gold => xinclude-1_1.gold} (100%)
 rename test/{xinclude.quickbook => xinclude-1_1.quickbook} (97%)
 rename test/{xml-escape_1_2.gold => xml_escape-1_2.gold} (100%)
 rename test/{xml-escape_1_2.quickbook => xml_escape-1_2.quickbook} (100%)
 rename test/{xml-escape_1_5.gold => xml_escape-1_5.gold} (100%)
 rename test/{xml-escape_1_5.quickbook => xml_escape-1_5.quickbook} (100%)

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 84817eb..0f03d1b 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -20,78 +20,77 @@ build-project "include" ;
 import quickbook-testing : quickbook-test quickbook-error-test ;
 
 test-suite quickbook.test :
-    [ quickbook-test quickbook-manual ]
-    [ quickbook-test code-block ]
-    [ quickbook-test code-block-1 ]
-    [ quickbook-test code-block-2 ]
-    [ quickbook-test code-block-3 ]
-    [ quickbook-test code-block-teletype ]
-    [ quickbook-test code-block-cpp ]
-    [ quickbook-test code-block-python ]
-    [ quickbook-test code-snippet ]
-    [ quickbook-test preformatted ]
-    [ quickbook-test link ]
-    [ quickbook-test escape ]
-    [ quickbook-test templates ]
-    [ quickbook-test templates_1_4 ]
-    [ quickbook-test templates_1_5 ]
-    [ quickbook-test template-section ]
-    [ quickbook-test mismatched-brackets-1 ]
-    [ quickbook-test mismatched-brackets-2 ]
-    [ quickbook-error-test mismatched-brackets-3 ]
-    [ quickbook-test xinclude : : : <quickbook-xinclude-base>../src ]
-    [ quickbook-test include_1_5 ]
-    [ quickbook-test include_1_6 ]
-    [ quickbook-test include_1_6-2 ]
-    [ quickbook-test section_1_4 ]
-    [ quickbook-test section_1_5 ]
-    [ quickbook-test section_1_5-unclosed ]
-    [ quickbook-test heading_1_1 ]
-    [ quickbook-test heading_1_3 ]
-    [ quickbook-test heading_1_5 ]
-    [ quickbook-test heading_1_6 ]
-    [ quickbook-test identifier_1_5 ]
-    [ quickbook-test identifier_1_6 ]
-    [ quickbook-test para-test ]
-    [ quickbook-test variablelist ]
-    [ quickbook-test table_1_3 ]
-    [ quickbook-test table_1_5 ]
-    [ quickbook-test image_1_5 ]
-    [ quickbook-test list_test ]
-    [ quickbook-test cond_phrase ]
-    [ quickbook-test macro-1.5 ]
-    [ quickbook-test macro-1.6 ]
-    [ quickbook-test callouts ]
-    [ quickbook-test simple_markup ]
-    [ quickbook-test xml-escape_1_2 ]
-    [ quickbook-test xml-escape_1_5 ]
-    [ quickbook-test blocks ]
-    [ quickbook-test elements_1_5 ]
-    [ quickbook-test elements_1_6 ]
-    [ quickbook-test newline ]
-    [ quickbook-test anchor ]
-    [ quickbook-test command_line_macro : : : <quickbook-test-define>__macro__=*bold* ]
-    [ quickbook-error-test fail-include ]
-    [ quickbook-error-test fail-import ]
-    [ quickbook-error-test fail-template-arguments1 ]
-    [ quickbook-error-test fail-template-arguments2 ]
-    [ quickbook-error-test fail-template-arguments3 ]
-    [ quickbook-error-test fail-cpp-mismatched-escape ]
-    [ quickbook-error-test fail-python-mismatched-escape ]
-    [ quickbook-error-test fail-post-process ]
-    [ quickbook-error-test fail-parse-error1 ]
-    [ quickbook-error-test fail-parse-error2 ]
-    [ quickbook-error-test fail-template-lookup1 ]
-    [ quickbook-error-test fail-template-section-1 ]
-    [ quickbook-error-test fail-template-section-2 ]
-    [ quickbook-error-test fail-template-section-3 ]
-    [ quickbook-error-test fail-unknown-quickbook-1 ]
-    [ quickbook-error-test fail-unknown-quickbook-2 ]
-    [ quickbook-error-test fail-unknown-quickbook-3 ]
-    [ quickbook-error-test fail-mismatched-boostbook-escape ]
-    [ quickbook-test utf-8 ]
-    [ quickbook-test utf-8-bom ]
-    [ quickbook-test unicode-escape ]
-    [ quickbook-error-test utf-16be-bom ]
-    [ quickbook-error-test utf-16le-bom ]
+    [ quickbook-test anchor-1_1 ]
+    [ quickbook-test blocks-1_5 ]
+    [ quickbook-test callouts-1_5 ]
+    [ quickbook-test code-1_1 ]
+    [ quickbook-test code-1_5 ]
+    [ quickbook-test code_cpp-1_5 ]
+    [ quickbook-error-test code_cpp_mismatched_escape-1_4-fail ]
+    [ quickbook-test code_python-1_5 ]
+    [ quickbook-error-test code_python_mismatched_escape-1_4-fail ]
+    [ quickbook-test code_snippet-1_1 ]
+    [ quickbook-test code_teletype-1_5 ]
+    [ quickbook-test command_line_macro-1_1 : : : <quickbook-test-define>__macro__=*bold* ]
+    [ quickbook-test cond_phrase-1_5 ]
+    [ quickbook-test elements-1_5 ]
+    [ quickbook-test elements-1_6 ]
+    [ quickbook-test escape-1_1 ]
+    [ quickbook-error-test escape-mismatched-1_5-fail ]
+    [ quickbook-test heading-1_1 ]
+    [ quickbook-test heading-1_3 ]
+    [ quickbook-test heading-1_5 ]
+    [ quickbook-test heading-1_6 ]
+    [ quickbook-error-test heading_unclosed-1_4-fail ]
+    [ quickbook-test identifier-1_5 ]
+    [ quickbook-test identifier-1_6 ]
+    [ quickbook-test image-1_5 ]
+    [ quickbook-error-test import-1_1-fail ]
+    [ quickbook-error-test include-1_1-fail ]
+    [ quickbook-test include-1_5 ]
+    [ quickbook-test include-1_6 ]
+    [ quickbook-test include2-1_6 ]
+    [ quickbook-test link-1_1 ]
+    [ quickbook-test list_test-1_5 ]
+    [ quickbook-test macro-1_5 ]
+    [ quickbook-test macro-1_6 ]
+    [ quickbook-error-test mismatched_brackets-1_1-fail ]
+    [ quickbook-test mismatched_brackets1-1_1 ]
+    [ quickbook-test mismatched_brackets2-1_1 ]
+    [ quickbook-test newline-1_1 ]
+    [ quickbook-test para_test-1_5 ]
+    [ quickbook-error-test post_process-fail ]
+    [ quickbook-test preformatted-1_1 ]
+    [ quickbook-test section-1_4 ]
+    [ quickbook-test section-1_5-unclosed ]
+    [ quickbook-test section-1_5 ]
+    [ quickbook-test simple_markup-1_5 ]
+    [ quickbook-test table-1_3 ]
+    [ quickbook-test table-1_5 ]
+    [ quickbook-error-test template_arguments1-1_1-fail ]
+    [ quickbook-error-test template_arguments2-1_1-fail ]
+    [ quickbook-error-test template_arguments3-1_1-fail ]
+    [ quickbook-error-test template_lookup1-1_5-fail ]
+    [ quickbook-test template_section-1_5 ]
+    [ quickbook-error-test template_section1-1_5-fail ]
+    [ quickbook-error-test template_section2-1_5-fail ]
+    [ quickbook-error-test template_section3-1_5-fail ]
+    [ quickbook-test templates-1_3 ]
+    [ quickbook-test templates-1_4 ]
+    [ quickbook-test templates-1_5 ]
+    [ quickbook-test unicode_escape-1_5 ]
+    [ quickbook-error-test utf16be_bom-1_5-fail ]
+    [ quickbook-error-test utf16le_bom-1_5-fail ]
+    [ quickbook-test utf8-1_5 ]
+    [ quickbook-test utf8_bom-1_5 ]
+    [ quickbook-error-test variablelist-1_5-fail ]
+    [ quickbook-test variablelist-1_5 ]
+    [ quickbook-error-test version-0_1-fail ]
+    [ quickbook-error-test version-1_7-fail ]
+    [ quickbook-error-test version-2_0-fail ]
+    [ quickbook-test xinclude-1_1 : : : <quickbook-xinclude-base>../src ]
+    [ quickbook-test xml_escape-1_2 ]
+    [ quickbook-test xml_escape-1_5 ]
+
+    [ quickbook-test quickbook_manual-1_4 ]
     ;
diff --git a/test/anchor.gold b/test/anchor-1_1.gold
similarity index 100%
rename from test/anchor.gold
rename to test/anchor-1_1.gold
diff --git a/test/anchor.quickbook b/test/anchor-1_1.quickbook
similarity index 96%
rename from test/anchor.quickbook
rename to test/anchor-1_1.quickbook
index ff0806d..f19ca59 100644
--- a/test/anchor.quickbook
+++ b/test/anchor-1_1.quickbook
@@ -1,5 +1,4 @@
-[article Anchor Test
-]
+[article Anchor Test]
 
 [section Anchors]
 
diff --git a/test/blocks.gold b/test/blocks-1_5.gold
similarity index 100%
rename from test/blocks.gold
rename to test/blocks-1_5.gold
diff --git a/test/blocks.quickbook b/test/blocks-1_5.quickbook
similarity index 100%
rename from test/blocks.quickbook
rename to test/blocks-1_5.quickbook
diff --git a/test/callouts.gold b/test/callouts-1_5.gold
similarity index 100%
rename from test/callouts.gold
rename to test/callouts-1_5.gold
diff --git a/test/callouts.quickbook b/test/callouts-1_5.quickbook
similarity index 100%
rename from test/callouts.quickbook
rename to test/callouts-1_5.quickbook
diff --git a/test/code-1_1.gold b/test/code-1_1.gold
new file mode 100644
index 0000000..d738259
--- /dev/null
+++ b/test/code-1_1.gold
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<article id="code_block" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Code Block</title>
+  <section id="code_block.test_1">
+    <title>Test 1</title>
+    <para>
+      A code block with proper indentation ;-)
+    </para>
+<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special">&lt;</phrase><phrase role="identifier">iostream</phrase><phrase role="special">&gt;</phrase>
+
+<phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
+<phrase role="special">{</phrase>
+    <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">cout</phrase> <phrase role="special">&lt;&lt;</phrase> <phrase role="string">&quot;Hello, World!&quot;</phrase> <phrase role="special">&lt;&lt;</phrase> <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">endl</phrase><phrase role="special">;</phrase>
+    <phrase role="keyword">return</phrase> <phrase role="number">0</phrase><phrase role="special">;</phrase>
+<phrase role="special">}</phrase>
+</programlisting>
+  </section>
+  <section id="code_block.test_2">
+    <title>Test 2</title>
+    <para>
+      A code block with proper indentation ;-)
+    </para>
+    <para>
+<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special">&lt;</phrase><phrase role="identifier">iostream</phrase><phrase role="special">&gt;</phrase>
+
+<phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
+<phrase role="special">{</phrase>
+    <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">cout</phrase> <phrase role="special">&lt;&lt;</phrase> <phrase role="string">&quot;Hello, World!&quot;</phrase> <phrase role="special">&lt;&lt;</phrase> <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">endl</phrase><phrase role="special">;</phrase>
+    <phrase role="keyword">return</phrase> <phrase role="number">0</phrase><phrase role="special">;</phrase>
+<phrase role="special">}</phrase>
+</programlisting>
+    </para>
+  </section>
+  <section id="code_block.test_3">
+    <title>Test 3</title>
+    <para>
+<programlisting><phrase role="keyword">print</phrase> <phrase role="string">&quot;\xfabln\xeck&quot;</phrase>
+</programlisting>
+    </para>
+  </section>
+  <section id="code_block.test_4">
+    <title>Test 4</title>
+    <para>
+      This isn't valid C++ but I think we should accept it;
+    </para>
+    <para>
+<programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">cout</phrase><phrase role="special">&lt;&lt;</phrase><phrase role="string">&quot;\xfabln\xeck&quot;</phrase><phrase role="special">&lt;&lt;</phrase><phrase role="string">&quot;\n&quot;</phrase><phrase role="special">;</phrase>
+</programlisting>
+    </para>
+  </section>
+</article>
diff --git a/test/code-1_1.quickbook b/test/code-1_1.quickbook
new file mode 100644
index 0000000..8c80091
--- /dev/null
+++ b/test/code-1_1.quickbook
@@ -0,0 +1,51 @@
+[article Code Block]
+
+[section Test 1]
+
+A code block with proper indentation ;-)
+
+    #include <iostream>
+
+    int main()
+    {
+        std::cout << "Hello, World!" << std::endl;
+        return 0;
+    }
+
+[endsect]
+
+[section Test 2]
+
+A code block with proper indentation ;-)
+
+``
+    #include <iostream>
+
+    int main()
+    {
+        std::cout << "Hello, World!" << std::endl;
+        return 0;
+    }
+``
+
+[endsect]
+
+[section Test 3]
+
+[python]
+``
+    print "\xfabln\xeck"
+``
+
+[endsect]
+
+[section Test 4]
+
+This isn't valid C++ but I think we should accept it;
+
+[c++]
+``
+    std::cout<<"\xfabln\xeck"<<"\n";
+``
+
+[endsect]
diff --git a/test/code-block.gold b/test/code-1_5.gold
similarity index 100%
rename from test/code-block.gold
rename to test/code-1_5.gold
diff --git a/test/code-block.quickbook b/test/code-1_5.quickbook
similarity index 100%
rename from test/code-block.quickbook
rename to test/code-1_5.quickbook
diff --git a/test/code-block-1.gold b/test/code-block-1.gold
deleted file mode 100644
index 7ee1588..0000000
--- a/test/code-block-1.gold
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="code_block_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
- xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Code Block 1</title>
-  <section id="code_block_1.a_code_block">
-    <title>A code block</title>
-    <para>
-      A code block with proper indentation ;-)
-    </para>
-<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special">&lt;</phrase><phrase role="identifier">iostream</phrase><phrase role="special">&gt;</phrase>
-
-<phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
-<phrase role="special">{</phrase>
-    <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">cout</phrase> <phrase role="special">&lt;&lt;</phrase> <phrase role="string">&quot;Hello, World!&quot;</phrase> <phrase role="special">&lt;&lt;</phrase> <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">endl</phrase><phrase role="special">;</phrase>
-    <phrase role="keyword">return</phrase> <phrase role="number">0</phrase><phrase role="special">;</phrase>
-<phrase role="special">}</phrase>
-</programlisting>
-  </section>
-</article>
diff --git a/test/code-block-1.quickbook b/test/code-block-1.quickbook
deleted file mode 100644
index 416655f..0000000
--- a/test/code-block-1.quickbook
+++ /dev/null
@@ -1,16 +0,0 @@
-[article Code Block 1
-]
-
-[section A code block]
-
-A code block with proper indentation ;-)
-
-    #include <iostream>
-
-    int main()
-    {
-        std::cout << "Hello, World!" << std::endl;
-        return 0;
-    }
-
-[endsect]
diff --git a/test/code-block-2.gold b/test/code-block-2.gold
deleted file mode 100644
index d42c1a7..0000000
--- a/test/code-block-2.gold
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="code_block_2" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
- xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Code Block 2</title>
-  <section id="code_block_2.a_code_block">
-    <title>A code block</title>
-    <para>
-      A code block with proper indentation ;-)
-    </para>
-    <para>
-<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special">&lt;</phrase><phrase role="identifier">iostream</phrase><phrase role="special">&gt;</phrase>
-
-<phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
-<phrase role="special">{</phrase>
-    <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">cout</phrase> <phrase role="special">&lt;&lt;</phrase> <phrase role="string">&quot;Hello, World!&quot;</phrase> <phrase role="special">&lt;&lt;</phrase> <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">endl</phrase><phrase role="special">;</phrase>
-    <phrase role="keyword">return</phrase> <phrase role="number">0</phrase><phrase role="special">;</phrase>
-<phrase role="special">}</phrase>
-</programlisting>
-    </para>
-  </section>
-</article>
diff --git a/test/code-block-2.quickbook b/test/code-block-2.quickbook
deleted file mode 100644
index 39d8020..0000000
--- a/test/code-block-2.quickbook
+++ /dev/null
@@ -1,18 +0,0 @@
-[article Code Block 2
-]
-
-[section A code block]
-
-A code block with proper indentation ;-)
-
-``
-    #include <iostream>
-
-    int main()
-    {
-        std::cout << "Hello, World!" << std::endl;
-        return 0;
-    }
-``
-
-[endsect]
diff --git a/test/code-block-3.gold b/test/code-block-3.gold
deleted file mode 100644
index 308b86e..0000000
--- a/test/code-block-3.gold
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="code_block_3" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
- xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Code Block 3</title>
-  <section id="code_block_3.python_code_block">
-    <title>Python code block</title>
-    <para>
-<programlisting><phrase role="keyword">print</phrase> <phrase role="string">&quot;\xfabln\xeck&quot;</phrase>
-</programlisting>
-    </para>
-  </section>
-  <section id="code_block_3.c___code_block">
-    <title>C++ code block</title>
-    <para>
-      This isn't valid C++ but I think we should accept it;
-    </para>
-    <para>
-<programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">cout</phrase><phrase role="special">&lt;&lt;</phrase><phrase role="string">&quot;\xfabln\xeck&quot;</phrase><phrase role="special">&lt;&lt;</phrase><phrase role="string">&quot;\n&quot;</phrase><phrase role="special">;</phrase>
-</programlisting>
-    </para>
-  </section>
-</article>
diff --git a/test/code-block-3.quickbook b/test/code-block-3.quickbook
deleted file mode 100644
index 54c4bf5..0000000
--- a/test/code-block-3.quickbook
+++ /dev/null
@@ -1,21 +0,0 @@
-[article Code Block 3]
-
-[section Python code block]
-
-[python]
-``
-    print "\xfabln\xeck"
-``
-
-[endsect]
-
-[section C++ code block]
-
-This isn't valid C++ but I think we should accept it;
-
-[c++]
-``
-    std::cout<<"\xfabln\xeck"<<"\n";
-``
-
-[endsect]
diff --git a/test/code-block-cpp.gold b/test/code_cpp-1_5.gold
similarity index 100%
rename from test/code-block-cpp.gold
rename to test/code_cpp-1_5.gold
diff --git a/test/code-block-cpp.quickbook b/test/code_cpp-1_5.quickbook
similarity index 100%
rename from test/code-block-cpp.quickbook
rename to test/code_cpp-1_5.quickbook
diff --git a/test/fail-cpp-mismatched-escape.quickbook b/test/code_cpp_mismatched_escape-1_4-fail.quickbook
similarity index 100%
rename from test/fail-cpp-mismatched-escape.quickbook
rename to test/code_cpp_mismatched_escape-1_4-fail.quickbook
diff --git a/test/code-block-python.gold b/test/code_python-1_5.gold
similarity index 100%
rename from test/code-block-python.gold
rename to test/code_python-1_5.gold
diff --git a/test/code-block-python.quickbook b/test/code_python-1_5.quickbook
similarity index 100%
rename from test/code-block-python.quickbook
rename to test/code_python-1_5.quickbook
diff --git a/test/fail-python-mismatched-escape.quickbook b/test/code_python_mismatched_escape-1_4-fail.quickbook
similarity index 100%
rename from test/fail-python-mismatched-escape.quickbook
rename to test/code_python_mismatched_escape-1_4-fail.quickbook
diff --git a/test/code-snippet.gold b/test/code_snippet-1_1.gold
similarity index 100%
rename from test/code-snippet.gold
rename to test/code_snippet-1_1.gold
diff --git a/test/code-snippet.quickbook b/test/code_snippet-1_1.quickbook
similarity index 100%
rename from test/code-snippet.quickbook
rename to test/code_snippet-1_1.quickbook
diff --git a/test/code-block-teletype.gold b/test/code_teletype-1_5.gold
similarity index 100%
rename from test/code-block-teletype.gold
rename to test/code_teletype-1_5.gold
diff --git a/test/code-block-teletype.quickbook b/test/code_teletype-1_5.quickbook
similarity index 87%
rename from test/code-block-teletype.quickbook
rename to test/code_teletype-1_5.quickbook
index cf22ab3..841de3e 100644
--- a/test/code-block-teletype.quickbook
+++ b/test/code_teletype-1_5.quickbook
@@ -1,9 +1,8 @@
 [article Code Block Teletype 1
     [quickbook 1.5]
+    [source-mode teletype]
 ]
 
-[teletype]
-
 [section A code block]
 
 [def __text__ text]
diff --git a/test/command_line_macro.gold b/test/command_line_macro-1_1.gold
similarity index 100%
rename from test/command_line_macro.gold
rename to test/command_line_macro-1_1.gold
diff --git a/test/command_line_macro.quickbook b/test/command_line_macro-1_1.quickbook
similarity index 100%
rename from test/command_line_macro.quickbook
rename to test/command_line_macro-1_1.quickbook
diff --git a/test/cond_phrase.gold b/test/cond_phrase-1_5.gold
similarity index 100%
rename from test/cond_phrase.gold
rename to test/cond_phrase-1_5.gold
diff --git a/test/cond_phrase.quickbook b/test/cond_phrase-1_5.quickbook
similarity index 100%
rename from test/cond_phrase.quickbook
rename to test/cond_phrase-1_5.quickbook
diff --git a/test/elements_1_5.gold b/test/elements-1_5.gold
similarity index 100%
rename from test/elements_1_5.gold
rename to test/elements-1_5.gold
diff --git a/test/elements_1_5.quickbook b/test/elements-1_5.quickbook
similarity index 100%
rename from test/elements_1_5.quickbook
rename to test/elements-1_5.quickbook
diff --git a/test/elements_1_6.gold b/test/elements-1_6.gold
similarity index 100%
rename from test/elements_1_6.gold
rename to test/elements-1_6.gold
diff --git a/test/elements_1_6.quickbook b/test/elements-1_6.quickbook
similarity index 100%
rename from test/elements_1_6.quickbook
rename to test/elements-1_6.quickbook
diff --git a/test/empty.quickbook b/test/empty.qbk
similarity index 100%
rename from test/empty.quickbook
rename to test/empty.qbk
diff --git a/test/escape.gold b/test/escape-1_1.gold
similarity index 100%
rename from test/escape.gold
rename to test/escape-1_1.gold
diff --git a/test/escape.quickbook b/test/escape-1_1.quickbook
similarity index 99%
rename from test/escape.quickbook
rename to test/escape-1_1.quickbook
index 9cd786f..ed90eff 100644
--- a/test/escape.quickbook
+++ b/test/escape-1_1.quickbook
@@ -25,4 +25,3 @@ Some other problematic links:
 '''
 
 [endsect]
-
diff --git a/test/fail-mismatched-boostbook-escape.quickbook b/test/escape-mismatched-1_5-fail.quickbook
similarity index 100%
rename from test/fail-mismatched-boostbook-escape.quickbook
rename to test/escape-mismatched-1_5-fail.quickbook
diff --git a/test/heading_1_1.gold b/test/heading-1_1.gold
similarity index 100%
rename from test/heading_1_1.gold
rename to test/heading-1_1.gold
diff --git a/test/heading_1_1.quickbook b/test/heading-1_1.quickbook
similarity index 94%
rename from test/heading_1_1.quickbook
rename to test/heading-1_1.quickbook
index 21f0195..1e7ec1d 100644
--- a/test/heading_1_1.quickbook
+++ b/test/heading-1_1.quickbook
@@ -1,5 +1,4 @@
-[article Heading Test 1.1
-]
+[article Heading Test 1.1]
 
 [/ Basic headers ]
 
diff --git a/test/heading_1_3.gold b/test/heading-1_3.gold
similarity index 100%
rename from test/heading_1_3.gold
rename to test/heading-1_3.gold
diff --git a/test/heading_1_3.quickbook b/test/heading-1_3.quickbook
similarity index 100%
rename from test/heading_1_3.quickbook
rename to test/heading-1_3.quickbook
diff --git a/test/heading_1_5.gold b/test/heading-1_5.gold
similarity index 100%
rename from test/heading_1_5.gold
rename to test/heading-1_5.gold
diff --git a/test/heading_1_5.quickbook b/test/heading-1_5.quickbook
similarity index 100%
rename from test/heading_1_5.quickbook
rename to test/heading-1_5.quickbook
diff --git a/test/heading_1_6.gold b/test/heading-1_6.gold
similarity index 100%
rename from test/heading_1_6.gold
rename to test/heading-1_6.gold
diff --git a/test/heading_1_6.quickbook b/test/heading-1_6.quickbook
similarity index 100%
rename from test/heading_1_6.quickbook
rename to test/heading-1_6.quickbook
diff --git a/test/fail-parse-error1.quickbook b/test/heading_unclosed-1_4-fail.quickbook
similarity index 100%
rename from test/fail-parse-error1.quickbook
rename to test/heading_unclosed-1_4-fail.quickbook
diff --git a/test/identifier_1_5.gold b/test/identifier-1_5.gold
similarity index 100%
rename from test/identifier_1_5.gold
rename to test/identifier-1_5.gold
diff --git a/test/identifier_1_5.quickbook b/test/identifier-1_5.quickbook
similarity index 100%
rename from test/identifier_1_5.quickbook
rename to test/identifier-1_5.quickbook
diff --git a/test/identifier_1_6.gold b/test/identifier-1_6.gold
similarity index 100%
rename from test/identifier_1_6.gold
rename to test/identifier-1_6.gold
diff --git a/test/identifier_1_6.quickbook b/test/identifier-1_6.quickbook
similarity index 100%
rename from test/identifier_1_6.quickbook
rename to test/identifier-1_6.quickbook
diff --git a/test/image_1_5.gold b/test/image-1_5.gold
similarity index 100%
rename from test/image_1_5.gold
rename to test/image-1_5.gold
diff --git a/test/image_1_5.quickbook b/test/image-1_5.quickbook
similarity index 100%
rename from test/image_1_5.quickbook
rename to test/image-1_5.quickbook
diff --git a/test/fail-import.quickbook b/test/import-1_1-fail.quickbook
similarity index 92%
rename from test/fail-import.quickbook
rename to test/import-1_1-fail.quickbook
index d3bd31f..ea60df8 100644
--- a/test/fail-import.quickbook
+++ b/test/import-1_1-fail.quickbook
@@ -6,6 +6,3 @@
 [import this-is-not-a-file.cpp]
 
 [endsect]
-
-     
-
diff --git a/test/fail-include.quickbook b/test/include-1_1-fail.quickbook
similarity index 92%
rename from test/fail-include.quickbook
rename to test/include-1_1-fail.quickbook
index 2268a1e..adb990e 100644
--- a/test/fail-include.quickbook
+++ b/test/include-1_1-fail.quickbook
@@ -6,6 +6,3 @@
 [include this-is-not-a-file.qbk]
 
 [endsect]
-
-     
-
diff --git a/test/include_1_5.gold b/test/include-1_5.gold
similarity index 100%
rename from test/include_1_5.gold
rename to test/include-1_5.gold
diff --git a/test/include-1_5.quickbook b/test/include-1_5.quickbook
new file mode 100644
index 0000000..93dc2fa
--- /dev/null
+++ b/test/include-1_5.quickbook
@@ -0,0 +1,17 @@
+[article Include Test
+    [quickbook 1.5]
+    [id include-test]
+]
+
+[include include_sub-1_5.qbk]
+[include include_sub.qbk]
+[include:foo include_sub.qbk]
+[include empty.qbk]
+
+[def __defined__]
+
+[? __undefined__ [include:foo1 include_sub.qbk] ]
+[? __undefined__ [include:foo1 not_a_file.qbk] ]
+[? __defined__
+  Just trying including in a conditional macro. [include:foo2 include_sub.qbk]
+  With some text around it.]
diff --git a/test/include_1_6.gold b/test/include-1_6.gold
similarity index 100%
rename from test/include_1_6.gold
rename to test/include-1_6.gold
diff --git a/test/include_1_6.quickbook b/test/include-1_6.quickbook
similarity index 53%
rename from test/include_1_6.quickbook
rename to test/include-1_6.quickbook
index 2770a21..00d6033 100644
--- a/test/include_1_6.quickbook
+++ b/test/include-1_6.quickbook
@@ -3,12 +3,13 @@
     [id include-test]
 ]
 
-[include include-sub2.quickbook]
-[include:foo include-sub2.quickbook]
+[include include_sub.qbk]
+[include:foo include_sub.qbk]
 
 [def __defined__]
 
-[? __undefined__ [include:foo1 include-sub2.quickbook] ]
+[? __undefined__ [include:foo1 include_sub.qbk] ]
+[? __undefined__ [include:foo1 not-a-file.qbk] ]
 [? __defined__
-  Just trying including in a conditional macro. [include:foo2 include-sub2.quickbook]
+  Just trying including in a conditional macro. [include:foo2 include_sub.qbk]
   With some text around it.]
diff --git a/test/include_1_6-2.gold b/test/include2-1_6.gold
similarity index 100%
rename from test/include_1_6-2.gold
rename to test/include2-1_6.gold
diff --git a/test/include2-1_6.quickbook b/test/include2-1_6.quickbook
new file mode 100644
index 0000000..be78fcc
--- /dev/null
+++ b/test/include2-1_6.quickbook
@@ -0,0 +1,8 @@
+[article Include Test
+    [quickbook 1.6]
+    [id include-test]
+]
+
+[include include_sub-1_5.qbk]
+[include include_sub.qbk]
+[include:foo include_sub.qbk]
diff --git a/test/include_1_5.quickbook b/test/include_1_5.quickbook
deleted file mode 100644
index 864e8e7..0000000
--- a/test/include_1_5.quickbook
+++ /dev/null
@@ -1,16 +0,0 @@
-[article Include Test
-    [quickbook 1.5]
-    [id include-test]
-]
-
-[include include-sub.quickbook]
-[include include-sub2.quickbook]
-[include:foo include-sub2.quickbook]
-[include empty.quickbook]
-
-[def __defined__]
-
-[? __undefined__ [include:foo1 include-sub2.quickbook] ]
-[? __defined__
-  Just trying including in a conditional macro. [include:foo2 include-sub2.quickbook]
-  With some text around it.]
diff --git a/test/include_1_6-2.quickbook b/test/include_1_6-2.quickbook
deleted file mode 100644
index 1a59dcf..0000000
--- a/test/include_1_6-2.quickbook
+++ /dev/null
@@ -1,8 +0,0 @@
-[article Include Test
-    [quickbook 1.6]
-    [id include-test]
-]
-
-[include include-sub.quickbook]
-[include include-sub2.quickbook]
-[include:foo include-sub2.quickbook]
diff --git a/test/include-sub.quickbook b/test/include_sub-1_5.qbk
similarity index 100%
rename from test/include-sub.quickbook
rename to test/include_sub-1_5.qbk
diff --git a/test/include-sub2.quickbook b/test/include_sub.qbk
similarity index 100%
rename from test/include-sub2.quickbook
rename to test/include_sub.qbk
diff --git a/test/link.gold b/test/link-1_1.gold
similarity index 100%
rename from test/link.gold
rename to test/link-1_1.gold
diff --git a/test/link.quickbook b/test/link-1_1.quickbook
similarity index 100%
rename from test/link.quickbook
rename to test/link-1_1.quickbook
diff --git a/test/list_test.gold b/test/list_test-1_5.gold
similarity index 100%
rename from test/list_test.gold
rename to test/list_test-1_5.gold
diff --git a/test/list_test.quickbook b/test/list_test-1_5.quickbook
similarity index 99%
rename from test/list_test.quickbook
rename to test/list_test-1_5.quickbook
index 71833eb..3c54935 100644
--- a/test/list_test.quickbook
+++ b/test/list_test-1_5.quickbook
@@ -29,7 +29,7 @@ Two level list:
 # B
   * A
   * B
-  
+
 Three level list:
 
 # A
diff --git a/test/macro-1.5.gold b/test/macro-1_5.gold
similarity index 100%
rename from test/macro-1.5.gold
rename to test/macro-1_5.gold
diff --git a/test/macro-1.5.quickbook b/test/macro-1_5.quickbook
similarity index 100%
rename from test/macro-1.5.quickbook
rename to test/macro-1_5.quickbook
diff --git a/test/macro-1.6.gold b/test/macro-1_6.gold
similarity index 100%
rename from test/macro-1.6.gold
rename to test/macro-1_6.gold
diff --git a/test/macro-1.6.quickbook b/test/macro-1_6.quickbook
similarity index 100%
rename from test/macro-1.6.quickbook
rename to test/macro-1_6.quickbook
diff --git a/test/mismatched-brackets-3.quickbook b/test/mismatched_brackets-1_1-fail.quickbook
similarity index 100%
rename from test/mismatched-brackets-3.quickbook
rename to test/mismatched_brackets-1_1-fail.quickbook
diff --git a/test/mismatched-brackets-1.gold b/test/mismatched_brackets1-1_1.gold
similarity index 100%
rename from test/mismatched-brackets-1.gold
rename to test/mismatched_brackets1-1_1.gold
diff --git a/test/mismatched-brackets-1.quickbook b/test/mismatched_brackets1-1_1.quickbook
similarity index 100%
rename from test/mismatched-brackets-1.quickbook
rename to test/mismatched_brackets1-1_1.quickbook
diff --git a/test/mismatched-brackets-2.gold b/test/mismatched_brackets2-1_1.gold
similarity index 100%
rename from test/mismatched-brackets-2.gold
rename to test/mismatched_brackets2-1_1.gold
diff --git a/test/mismatched-brackets-2.quickbook b/test/mismatched_brackets2-1_1.quickbook
similarity index 100%
rename from test/mismatched-brackets-2.quickbook
rename to test/mismatched_brackets2-1_1.quickbook
diff --git a/test/newline.gold b/test/newline-1_1.gold
similarity index 100%
rename from test/newline.gold
rename to test/newline-1_1.gold
diff --git a/test/newline.quickbook b/test/newline-1_1.quickbook
similarity index 100%
rename from test/newline.quickbook
rename to test/newline-1_1.quickbook
diff --git a/test/para-test.gold b/test/para_test-1_5.gold
similarity index 100%
rename from test/para-test.gold
rename to test/para_test-1_5.gold
diff --git a/test/para-test.quickbook b/test/para_test-1_5.quickbook
similarity index 100%
rename from test/para-test.quickbook
rename to test/para_test-1_5.quickbook
diff --git a/test/fail-post-process.quickbook b/test/post_process-fail.quickbook
similarity index 100%
rename from test/fail-post-process.quickbook
rename to test/post_process-fail.quickbook
diff --git a/test/preformatted.gold b/test/preformatted-1_1.gold
similarity index 100%
rename from test/preformatted.gold
rename to test/preformatted-1_1.gold
diff --git a/test/preformatted.quickbook b/test/preformatted-1_1.quickbook
similarity index 100%
rename from test/preformatted.quickbook
rename to test/preformatted-1_1.quickbook
diff --git a/test/quickbook-manual.gold b/test/quickbook_manual-1_4.gold
similarity index 99%
rename from test/quickbook-manual.gold
rename to test/quickbook_manual-1_4.gold
index bf2ed6c..ff75786 100644
--- a/test/quickbook-manual.gold
+++ b/test/quickbook_manual-1_4.gold
@@ -1887,7 +1887,7 @@ sf_logo
                 </entry>
                 <entry>
                   <para>
-                    quickbook-manual.quickbook
+                    quickbook_manual-1_4.quickbook
                   </para>
                 </entry>
               </row>
diff --git a/test/quickbook-manual.quickbook b/test/quickbook_manual-1_4.quickbook
similarity index 100%
rename from test/quickbook-manual.quickbook
rename to test/quickbook_manual-1_4.quickbook
diff --git a/test/section_1_4.gold b/test/section-1_4.gold
similarity index 100%
rename from test/section_1_4.gold
rename to test/section-1_4.gold
diff --git a/test/section_1_4.quickbook b/test/section-1_4.quickbook
similarity index 100%
rename from test/section_1_4.quickbook
rename to test/section-1_4.quickbook
diff --git a/test/section_1_5-unclosed.gold b/test/section-1_5-unclosed.gold
similarity index 100%
rename from test/section_1_5-unclosed.gold
rename to test/section-1_5-unclosed.gold
diff --git a/test/section_1_5-unclosed.quickbook b/test/section-1_5-unclosed.quickbook
similarity index 100%
rename from test/section_1_5-unclosed.quickbook
rename to test/section-1_5-unclosed.quickbook
diff --git a/test/section_1_5.gold b/test/section-1_5.gold
similarity index 100%
rename from test/section_1_5.gold
rename to test/section-1_5.gold
diff --git a/test/section_1_5.quickbook b/test/section-1_5.quickbook
similarity index 100%
rename from test/section_1_5.quickbook
rename to test/section-1_5.quickbook
diff --git a/test/simple_markup.gold b/test/simple_markup-1_5.gold
similarity index 100%
rename from test/simple_markup.gold
rename to test/simple_markup-1_5.gold
diff --git a/test/simple_markup.quickbook b/test/simple_markup-1_5.quickbook
similarity index 100%
rename from test/simple_markup.quickbook
rename to test/simple_markup-1_5.quickbook
diff --git a/test/table_1_3.gold b/test/table-1_3.gold
similarity index 100%
rename from test/table_1_3.gold
rename to test/table-1_3.gold
diff --git a/test/table_1_3.quickbook b/test/table-1_3.quickbook
similarity index 98%
rename from test/table_1_3.quickbook
rename to test/table-1_3.quickbook
index 3125fa4..d35ebee 100644
--- a/test/table_1_3.quickbook
+++ b/test/table-1_3.quickbook
@@ -62,7 +62,7 @@ comment]
   [
     [
       Header 1. Paragraph 1
-      
+
       Header 1. Paragraph 2
     ]
     [
@@ -75,7 +75,7 @@ comment]
     ]
     [
       Row 1. Cell 2.
-      
+
       Row 1. Cell 2. Paragraph 2.
     ]
   ]
diff --git a/test/table_1_5.gold b/test/table-1_5.gold
similarity index 100%
rename from test/table_1_5.gold
rename to test/table-1_5.gold
diff --git a/test/table_1_5.quickbook b/test/table-1_5.quickbook
similarity index 99%
rename from test/table_1_5.quickbook
rename to test/table-1_5.quickbook
index ac1dec9..d8196e7 100644
--- a/test/table_1_5.quickbook
+++ b/test/table-1_5.quickbook
@@ -82,7 +82,7 @@ comment]
   [
     [
       Header 1. Paragraph 1
-      
+
       Header 1. Paragraph 2
     ]
     [
@@ -95,7 +95,7 @@ comment]
     ]
     [
       Row 1. Cell 2.
-      
+
       Row 1. Cell 2. Paragraph 2.
     ]
   ]
diff --git a/test/fail-template-arguments1.quickbook b/test/template_arguments1-1_1-fail.quickbook
similarity index 94%
rename from test/fail-template-arguments1.quickbook
rename to test/template_arguments1-1_1-fail.quickbook
index de54836..d262237 100644
--- a/test/fail-template-arguments1.quickbook
+++ b/test/template_arguments1-1_1-fail.quickbook
@@ -8,6 +8,3 @@
 [unary a..b ]
 
 [endsect]
-
-     
-
diff --git a/test/fail-template-arguments2.quickbook b/test/template_arguments2-1_1-fail.quickbook
similarity index 95%
rename from test/fail-template-arguments2.quickbook
rename to test/template_arguments2-1_1-fail.quickbook
index 6de33fe..4f81337 100644
--- a/test/fail-template-arguments2.quickbook
+++ b/test/template_arguments2-1_1-fail.quickbook
@@ -8,6 +8,3 @@
 [ternary a b ]
 
 [endsect]
-
-     
-
diff --git a/test/fail-template-arguments3.quickbook b/test/template_arguments3-1_1-fail.quickbook
similarity index 100%
rename from test/fail-template-arguments3.quickbook
rename to test/template_arguments3-1_1-fail.quickbook
diff --git a/test/fail-template-lookup1.quickbook b/test/template_lookup1-1_5-fail.quickbook
similarity index 100%
rename from test/fail-template-lookup1.quickbook
rename to test/template_lookup1-1_5-fail.quickbook
diff --git a/test/template-section.gold b/test/template_section-1_5.gold
similarity index 100%
rename from test/template-section.gold
rename to test/template_section-1_5.gold
diff --git a/test/template-section.quickbook b/test/template_section-1_5.quickbook
similarity index 100%
rename from test/template-section.quickbook
rename to test/template_section-1_5.quickbook
diff --git a/test/fail-template-section-1.quickbook b/test/template_section1-1_5-fail.quickbook
similarity index 100%
rename from test/fail-template-section-1.quickbook
rename to test/template_section1-1_5-fail.quickbook
diff --git a/test/fail-template-section-2.quickbook b/test/template_section2-1_5-fail.quickbook
similarity index 100%
rename from test/fail-template-section-2.quickbook
rename to test/template_section2-1_5-fail.quickbook
diff --git a/test/fail-template-section-3.quickbook b/test/template_section3-1_5-fail.quickbook
similarity index 100%
rename from test/fail-template-section-3.quickbook
rename to test/template_section3-1_5-fail.quickbook
diff --git a/test/templates.gold b/test/templates-1_3.gold
similarity index 100%
rename from test/templates.gold
rename to test/templates-1_3.gold
diff --git a/test/templates.quickbook b/test/templates-1_3.quickbook
similarity index 100%
rename from test/templates.quickbook
rename to test/templates-1_3.quickbook
diff --git a/test/templates_1_4.gold b/test/templates-1_4.gold
similarity index 100%
rename from test/templates_1_4.gold
rename to test/templates-1_4.gold
diff --git a/test/templates_1_4.quickbook b/test/templates-1_4.quickbook
similarity index 100%
rename from test/templates_1_4.quickbook
rename to test/templates-1_4.quickbook
diff --git a/test/templates_1_5.gold b/test/templates-1_5.gold
similarity index 100%
rename from test/templates_1_5.gold
rename to test/templates-1_5.gold
diff --git a/test/templates_1_5.quickbook b/test/templates-1_5.quickbook
similarity index 100%
rename from test/templates_1_5.quickbook
rename to test/templates-1_5.quickbook
diff --git a/test/unicode-escape.gold b/test/unicode_escape-1_5.gold
similarity index 100%
rename from test/unicode-escape.gold
rename to test/unicode_escape-1_5.gold
diff --git a/test/unicode-escape.quickbook b/test/unicode_escape-1_5.quickbook
similarity index 100%
rename from test/unicode-escape.quickbook
rename to test/unicode_escape-1_5.quickbook
diff --git a/test/utf-16be-bom.quickbook b/test/utf16be_bom-1_5-fail.quickbook
similarity index 100%
rename from test/utf-16be-bom.quickbook
rename to test/utf16be_bom-1_5-fail.quickbook
diff --git a/test/utf-16le-bom.quickbook b/test/utf16le_bom-1_5-fail.quickbook
similarity index 100%
rename from test/utf-16le-bom.quickbook
rename to test/utf16le_bom-1_5-fail.quickbook
diff --git a/test/utf-8-bom.gold b/test/utf8-1_5.gold
similarity index 100%
rename from test/utf-8-bom.gold
rename to test/utf8-1_5.gold
diff --git a/test/utf-8.quickbook b/test/utf8-1_5.quickbook
similarity index 100%
rename from test/utf-8.quickbook
rename to test/utf8-1_5.quickbook
diff --git a/test/utf-8.gold b/test/utf8_bom-1_5.gold
similarity index 100%
rename from test/utf-8.gold
rename to test/utf8_bom-1_5.gold
diff --git a/test/utf-8-bom.quickbook b/test/utf8_bom-1_5.quickbook
similarity index 100%
rename from test/utf-8-bom.quickbook
rename to test/utf8_bom-1_5.quickbook
diff --git a/test/fail-parse-error2.quickbook b/test/variablelist-1_5-fail.quickbook
similarity index 100%
rename from test/fail-parse-error2.quickbook
rename to test/variablelist-1_5-fail.quickbook
diff --git a/test/variablelist.gold b/test/variablelist-1_5.gold
similarity index 100%
rename from test/variablelist.gold
rename to test/variablelist-1_5.gold
diff --git a/test/variablelist.quickbook b/test/variablelist-1_5.quickbook
similarity index 97%
rename from test/variablelist.quickbook
rename to test/variablelist-1_5.quickbook
index 0aed118..cb68a6d 100644
--- a/test/variablelist.quickbook
+++ b/test/variablelist-1_5.quickbook
@@ -3,7 +3,7 @@
 ]
 
 [variablelist Empty
-] 
+]
 
 [variablelist One entry
     [[a][b]]
@@ -28,4 +28,3 @@
     [[#id4]b[#id5]]
     ]
 ]
-    
diff --git a/test/fail-unknown-quickbook-3.quickbook b/test/version-0_1-fail.quickbook
similarity index 100%
rename from test/fail-unknown-quickbook-3.quickbook
rename to test/version-0_1-fail.quickbook
diff --git a/test/fail-unknown-quickbook-1.quickbook b/test/version-1_7-fail.quickbook
similarity index 100%
rename from test/fail-unknown-quickbook-1.quickbook
rename to test/version-1_7-fail.quickbook
diff --git a/test/fail-unknown-quickbook-2.quickbook b/test/version-2_0-fail.quickbook
similarity index 100%
rename from test/fail-unknown-quickbook-2.quickbook
rename to test/version-2_0-fail.quickbook
diff --git a/test/xinclude.gold b/test/xinclude-1_1.gold
similarity index 100%
rename from test/xinclude.gold
rename to test/xinclude-1_1.gold
diff --git a/test/xinclude.quickbook b/test/xinclude-1_1.quickbook
similarity index 97%
rename from test/xinclude.quickbook
rename to test/xinclude-1_1.quickbook
index e2a455e..7b0911d 100644
--- a/test/xinclude.quickbook
+++ b/test/xinclude-1_1.quickbook
@@ -1,4 +1,3 @@
 [article Include]
 
 [xinclude stub.xml]
-
diff --git a/test/xml-escape_1_2.gold b/test/xml_escape-1_2.gold
similarity index 100%
rename from test/xml-escape_1_2.gold
rename to test/xml_escape-1_2.gold
diff --git a/test/xml-escape_1_2.quickbook b/test/xml_escape-1_2.quickbook
similarity index 100%
rename from test/xml-escape_1_2.quickbook
rename to test/xml_escape-1_2.quickbook
diff --git a/test/xml-escape_1_5.gold b/test/xml_escape-1_5.gold
similarity index 100%
rename from test/xml-escape_1_5.gold
rename to test/xml_escape-1_5.gold
diff --git a/test/xml-escape_1_5.quickbook b/test/xml_escape-1_5.quickbook
similarity index 100%
rename from test/xml-escape_1_5.quickbook
rename to test/xml_escape-1_5.quickbook