[Boost-commit] svn:boost r84252 - in trunk/tools/quickbook/test: . include versions

Subject: [Boost-commit] svn:boost r84252 - in trunk/tools/quickbook/test: . include versions
From: dnljms_at_[hidden]
Date: 2013-05-12 10:34:33

Author: danieljames
Date: 2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
New Revision: 84252
URL: http://svn.boost.org/trac/boost/changeset/84252

Log:
Use .quickbook extension for all test files.
Added:
   trunk/tools/quickbook/test/empty-inc.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/empty.qbk
   trunk/tools/quickbook/test/include-inc-1_5.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include_sub-1_5.qbk
   trunk/tools/quickbook/test/include-inc.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include_sub.qbk
   trunk/tools/quickbook/test/include/compatibility-inc.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/compatibility-inc.qbk
   trunk/tools/quickbook/test/include/compatibility-inc_1_1.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/compatibility-inc_1_1.qbk
   trunk/tools/quickbook/test/include/compatibility-inc_1_5.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/compatibility-inc_1_5.qbk
   trunk/tools/quickbook/test/include/compatibility-inc_1_6.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/compatibility-inc_1_6.qbk
   trunk/tools/quickbook/test/include/in_section-inc1.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/in_section-include1.qbk
   trunk/tools/quickbook/test/include/in_section-inc2.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/in_section-include2.qbk
   trunk/tools/quickbook/test/include/include_id_unbalanced-inc1.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/include_id_unbalanced-inc1.qbk
   trunk/tools/quickbook/test/include/include_id_unbalanced-inc1a.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/include_id_unbalanced-inc1a.qbk
   trunk/tools/quickbook/test/include/include_id_unbalanced-inc2.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/include_id_unbalanced-inc2.qbk
   trunk/tools/quickbook/test/include/include_id_unbalanced-inc2a.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/include_id_unbalanced-inc2a.qbk
   trunk/tools/quickbook/test/include/nested_compatibility-inc-1_5.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/nested_compatibility_inc-1_5.qbk
   trunk/tools/quickbook/test/include/nested_compatibility-inc-1_6.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/nested_compatibility_inc-1_6.qbk
   trunk/tools/quickbook/test/include/source_mode-inc1.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/include/source_mode-inc1.qbk
   trunk/tools/quickbook/test/versions/invalid_macro-inc-1_1.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/versions/invalid_macro-inc-1_1.qbk
   trunk/tools/quickbook/test/versions/templates-inc-1_1.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/versions/templates-1_1.qbk
   trunk/tools/quickbook/test/versions/templates-inc-1_4.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/versions/templates-1_4.qbk
   trunk/tools/quickbook/test/versions/templates-inc-1_5.quickbook   (contents, props changed)
      - copied, changed from r84251, /trunk/tools/quickbook/test/versions/templates-1_5.qbk
Removed:
   trunk/tools/quickbook/test/empty.qbk
   trunk/tools/quickbook/test/include/compatibility-inc.qbk
   trunk/tools/quickbook/test/include/compatibility-inc_1_1.qbk
   trunk/tools/quickbook/test/include/compatibility-inc_1_5.qbk
   trunk/tools/quickbook/test/include/compatibility-inc_1_6.qbk
   trunk/tools/quickbook/test/include/in_section-include1.qbk
   trunk/tools/quickbook/test/include/in_section-include2.qbk
   trunk/tools/quickbook/test/include/include_id_unbalanced-inc1.qbk
   trunk/tools/quickbook/test/include/include_id_unbalanced-inc1a.qbk
   trunk/tools/quickbook/test/include/include_id_unbalanced-inc2.qbk
   trunk/tools/quickbook/test/include/include_id_unbalanced-inc2a.qbk
   trunk/tools/quickbook/test/include/nested_compatibility_inc-1_5.qbk
   trunk/tools/quickbook/test/include/nested_compatibility_inc-1_6.qbk
   trunk/tools/quickbook/test/include/source_mode-inc1.qbk
   trunk/tools/quickbook/test/include_sub-1_5.qbk
   trunk/tools/quickbook/test/include_sub.qbk
   trunk/tools/quickbook/test/versions/invalid_macro-inc-1_1.qbk
   trunk/tools/quickbook/test/versions/templates-1_1.qbk
   trunk/tools/quickbook/test/versions/templates-1_4.qbk
   trunk/tools/quickbook/test/versions/templates-1_5.qbk
Text files modified: 
   trunk/tools/quickbook/test/include-1_5.quickbook                        |    14 +++++++-------                          
   trunk/tools/quickbook/test/include-1_6.quickbook                        |    10 +++++-----                              
   trunk/tools/quickbook/test/include/compatibility-1_1.quickbook          |     8 ++++----                                
   trunk/tools/quickbook/test/include/compatibility-1_5.quickbook          |     8 ++++----                                
   trunk/tools/quickbook/test/include/compatibility-1_6.quickbook          |     8 ++++----                                
   trunk/tools/quickbook/test/include/in_section-1_5.quickbook             |    12 ++++++------                            
   trunk/tools/quickbook/test/include/in_section-1_6.quickbook             |    12 ++++++------                            
   trunk/tools/quickbook/test/include/include_id_unbalanced-1_6.quickbook  |     4 ++--                                    
   trunk/tools/quickbook/test/include/include_id_unbalanced-inc1.quickbook |     2 +-                                      
   trunk/tools/quickbook/test/include/include_id_unbalanced-inc2.quickbook |     2 +-                                      
   trunk/tools/quickbook/test/include/nested_compatibility-1_5.quickbook   |     8 ++++----                                
   trunk/tools/quickbook/test/include/nested_compatibility-1_6.quickbook   |     8 ++++----                                
   trunk/tools/quickbook/test/include/source_mode-1_5.quickbook            |     2 +-                                      
   trunk/tools/quickbook/test/include/source_mode-1_6.quickbook            |     2 +-                                      
   trunk/tools/quickbook/test/include2-1_6.quickbook                       |     6 +++---                                  
   trunk/tools/quickbook/test/include_win_path-1_6-fail.quickbook          |     2 +-                                      
   trunk/tools/quickbook/test/versions/invalid_macro-1_6.quickbook         |     4 ++--                                    
   trunk/tools/quickbook/test/versions/versions-1_6.quickbook              |    12 ++++++------                            
   18 files changed, 62 insertions(+), 62 deletions(-)

Copied: trunk/tools/quickbook/test/empty-inc.quickbook (from r84251, /trunk/tools/quickbook/test/empty.qbk)
==============================================================================

Deleted: trunk/tools/quickbook/test/empty.qbk
==============================================================================

Modified: trunk/tools/quickbook/test/include-1_5.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include-1_5.quickbook	(original)
+++ trunk/tools/quickbook/test/include-1_5.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -3,15 +3,15 @@
     [id include-test]
 ]
 
-[include include_sub-1_5.qbk]
-[include .\include_sub.qbk]
-[include:foo include_sub.qbk]
-[include empty.qbk]
+[include include-inc-1_5.quickbook]
+[include .\include-inc.quickbook]
+[include:foo include-inc.quickbook]
+[include empty-inc.quickbook]
 
 [def __defined__]
 
-[? __undefined__ [include:foo1 include_sub.qbk] ]
-[? __undefined__ [include:foo1 not_a_file.qbk] ]
+[? __undefined__ [include:foo1 include-inc.quickbook] ]
+[? __undefined__ [include:foo1 not_a_file.quickbook] ]
 [? __defined__
-  Just trying including in a conditional macro. [include:foo2 include_sub.qbk]
+  Just trying including in a conditional macro. [include:foo2 include-inc.quickbook]
   With some text around it.]

Modified: trunk/tools/quickbook/test/include-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include-1_6.quickbook	(original)
+++ trunk/tools/quickbook/test/include-1_6.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -3,13 +3,13 @@
     [id include-test]
 ]
 
-[include include_sub.qbk]
-[include:foo include_sub.qbk]
+[include include-inc.quickbook]
+[include:foo include-inc.quickbook]
 
 [def __defined__]
 
-[? __undefined__ [include:foo1 include_sub.qbk] ]
-[? __undefined__ [include:foo1 not-a-file.qbk] ]
+[? __undefined__ [include:foo1 include-inc.quickbook] ]
+[? __undefined__ [include:foo1 not-a-file.quickbook] ]
 [? __defined__
-  Just trying including in a conditional macro. [include:foo2 include_sub.qbk]
+  Just trying including in a conditional macro. [include:foo2 include-inc.quickbook]
   With some text around it.]

Copied: trunk/tools/quickbook/test/include-inc-1_5.quickbook (from r84251, /trunk/tools/quickbook/test/include_sub-1_5.qbk)
==============================================================================

Copied: trunk/tools/quickbook/test/include-inc.quickbook (from r84251, /trunk/tools/quickbook/test/include_sub.qbk)
==============================================================================

Modified: trunk/tools/quickbook/test/include/compatibility-1_1.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include/compatibility-1_1.quickbook	(original)
+++ trunk/tools/quickbook/test/include/compatibility-1_1.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -5,14 +5,14 @@
 ]
 
 [section:collision Outer]
-[include compatibility-inc.qbk]
+[include compatibility-inc.quickbook]
 [endsect]
 [section:collision Include compatibility 1.1]
-[include compatibility-inc_1_1.qbk]
+[include compatibility-inc_1_1.quickbook]
 [endsect]
 [section:collision Include compatibility 1.5]
-[include compatibility-inc_1_5.qbk]
+[include compatibility-inc_1_5.quickbook]
 [endsect]
 [section:collision Include compatibility 1.6]
-[include compatibility-inc_1_6.qbk]
+[include compatibility-inc_1_6.quickbook]
 [endsect]

Modified: trunk/tools/quickbook/test/include/compatibility-1_5.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include/compatibility-1_5.quickbook	(original)
+++ trunk/tools/quickbook/test/include/compatibility-1_5.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -5,14 +5,14 @@
 ]
 
 [section:collision Outer]
-[include compatibility-inc.qbk]
+[include compatibility-inc.quickbook]
 [endsect]
 [section:collision Include compatibility 1.1]
-[include compatibility-inc_1_1.qbk]
+[include compatibility-inc_1_1.quickbook]
 [endsect]
 [section:collision Include compatibility 1.5]
-[include compatibility-inc_1_5.qbk]
+[include compatibility-inc_1_5.quickbook]
 [endsect]
 [section:collision Include compatibility 1.6]
-[include compatibility-inc_1_6.qbk]
+[include compatibility-inc_1_6.quickbook]
 [endsect]

Modified: trunk/tools/quickbook/test/include/compatibility-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include/compatibility-1_6.quickbook	(original)
+++ trunk/tools/quickbook/test/include/compatibility-1_6.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -4,14 +4,14 @@
 ]
 
 [section:collision Outer]
-[include compatibility-inc.qbk]
+[include compatibility-inc.quickbook]
 [endsect]
 [section:collision Include compatibility 1.1]
-[include compatibility-inc_1_1.qbk]
+[include compatibility-inc_1_1.quickbook]
 [endsect]
 [section:collision Include compatibility 1.5]
-[include compatibility-inc_1_5.qbk]
+[include compatibility-inc_1_5.quickbook]
 [endsect]
 [section:collision Include compatibility 1.6]
-[include compatibility-inc_1_6.qbk]
+[include compatibility-inc_1_6.quickbook]
 [endsect]

Deleted: trunk/tools/quickbook/test/include/compatibility-inc.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/compatibility-inc.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,31 +0,0 @@
-[section Inner]
-
-[heading Header]
-
-[h1 Heading1]
-
-[heading:x1 Header with id]
-
-[h1:x2 Heading1 with id]
-
-[table
-[[]][[]]
-]
-
-[table:withid
-[[]][[]]
-]
-
-[table With Title
-[[]][[]]
-]
-
-[table:x Id and Title
-[[]][[]]
-]
-
-
-[endsect]
-
-[section:x Inner with id]
-[endsect]

Copied: trunk/tools/quickbook/test/include/compatibility-inc.quickbook (from r84251, /trunk/tools/quickbook/test/include/compatibility-inc.qbk)
==============================================================================

Deleted: trunk/tools/quickbook/test/include/compatibility-inc_1_1.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/compatibility-inc_1_1.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,33 +0,0 @@
-[compatibility-mode 1.1]
-
-[section Inner]
-
-[heading Header]
-
-[h1 Heading1]
-
-[heading:x1 Header with id]
-
-[h1:x2 Heading1 with id]
-
-[table
-[[]][[]]
-]
-
-[table:withid
-[[]][[]]
-]
-
-[table With Title
-[[]][[]]
-]
-
-[table:x Id and Title
-[[]][[]]
-]
-
-
-[endsect]
-
-[section:x Inner with id]
-[endsect]

Copied: trunk/tools/quickbook/test/include/compatibility-inc_1_1.quickbook (from r84251, /trunk/tools/quickbook/test/include/compatibility-inc_1_1.qbk)
==============================================================================

Deleted: trunk/tools/quickbook/test/include/compatibility-inc_1_5.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/compatibility-inc_1_5.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,33 +0,0 @@
-[compatibility-mode 1.5]
-
-[section Inner]
-
-[heading Header]
-
-[h1 Heading1]
-
-[heading:x1 Header with id]
-
-[h1:x2 Heading1 with id]
-
-[table
-[[]][[]]
-]
-
-[table:withid
-[[]][[]]
-]
-
-[table With Title
-[[]][[]]
-]
-
-[table:x Id and Title
-[[]][[]]
-]
-
-
-[endsect]
-
-[section:x Inner with id]
-[endsect]

Copied: trunk/tools/quickbook/test/include/compatibility-inc_1_5.quickbook (from r84251, /trunk/tools/quickbook/test/include/compatibility-inc_1_5.qbk)
==============================================================================

Deleted: trunk/tools/quickbook/test/include/compatibility-inc_1_6.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/compatibility-inc_1_6.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,33 +0,0 @@
-[compatibility-mode 1.6]
-
-[section Inner]
-
-[heading Header]
-
-[h1 Heading1]
-
-[heading:x1 Header with id]
-
-[h1:x2 Heading1 with id]
-
-[table
-[[]][[]]
-]
-
-[table:withid
-[[]][[]]
-]
-
-[table With Title
-[[]][[]]
-]
-
-[table:x Id and Title
-[[]][[]]
-]
-
-
-[endsect]
-
-[section:x Inner with id]
-[endsect]

Copied: trunk/tools/quickbook/test/include/compatibility-inc_1_6.quickbook (from r84251, /trunk/tools/quickbook/test/include/compatibility-inc_1_6.qbk)
==============================================================================

Modified: trunk/tools/quickbook/test/include/in_section-1_5.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include/in_section-1_5.quickbook	(original)
+++ trunk/tools/quickbook/test/include/in_section-1_5.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -3,14 +3,14 @@
 ]
 
 [section:container Container]
-[include in_section-include1.qbk]
-[include in_section-include2.qbk]
+[include in_section-inc1.quickbook]
+[include in_section-inc2.quickbook]
 [endsect]
 
-[include in_section-include1.qbk]
-[include in_section-include2.qbk]
+[include in_section-inc1.quickbook]
+[include in_section-inc2.quickbook]
 
 [section:container2 Container2]
-[include in_section-include1.qbk]
-[include in_section-include2.qbk]
+[include in_section-inc1.quickbook]
+[include in_section-inc2.quickbook]
 [endsect]

Modified: trunk/tools/quickbook/test/include/in_section-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include/in_section-1_6.quickbook	(original)
+++ trunk/tools/quickbook/test/include/in_section-1_6.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -3,14 +3,14 @@
 ]
 
 [section:container Container]
-[include in_section-include1.qbk]
-[include in_section-include2.qbk]
+[include in_section-inc1.quickbook]
+[include in_section-inc2.quickbook]
 [endsect]
 
-[include in_section-include1.qbk]
-[include in_section-include2.qbk]
+[include in_section-inc1.quickbook]
+[include in_section-inc2.quickbook]
 
 [section:container2 Container2]
-[include in_section-include1.qbk]
-[include in_section-include2.qbk]
+[include in_section-inc1.quickbook]
+[include in_section-inc2.quickbook]
 [endsect]

Copied: trunk/tools/quickbook/test/include/in_section-inc1.quickbook (from r84251, /trunk/tools/quickbook/test/include/in_section-include1.qbk)
==============================================================================

Copied: trunk/tools/quickbook/test/include/in_section-inc2.quickbook (from r84251, /trunk/tools/quickbook/test/include/in_section-include2.qbk)
==============================================================================

Deleted: trunk/tools/quickbook/test/include/in_section-include1.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/in_section-include1.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,11 +0,0 @@
-[article Include in section include 1
-[quickbook 1.6]
-]
-
-[h1 Test1]
-
-[section:inner]
-
-[h1 Test2]
-
-[endsect]
\ No newline at end of file

Deleted: trunk/tools/quickbook/test/include/in_section-include2.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/in_section-include2.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,12 +0,0 @@
-[article Include in section include 2
-[quickbook 1.6]
-[id section_include]
-]
-
-[h1 Test1]
-
-[section:inner]
-
-[h1 Test2]
-
-[endsect]
\ No newline at end of file

Modified: trunk/tools/quickbook/test/include/include_id_unbalanced-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include/include_id_unbalanced-1_6.quickbook	(original)
+++ trunk/tools/quickbook/test/include/include_id_unbalanced-1_6.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -5,7 +5,7 @@
 
 [/ Sections start in included files ]
 
-[include:include1 include_id_unbalanced-inc1.qbk]
+[include:include1 include_id_unbalanced-inc1.quickbook]
 [heading:x1 X1]
 [endsect]
 [heading:x2 X2]
@@ -16,4 +16,4 @@
 [heading:x1 X1]
 [section:sect2 Section 2]
 [heading:x2 X2]
-[include:include2 include_id_unbalanced-inc2.qbk]
+[include:include2 include_id_unbalanced-inc2.quickbook]

Deleted: trunk/tools/quickbook/test/include/include_id_unbalanced-inc1.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/include_id_unbalanced-inc1.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,4 +0,0 @@
-[section:inc1 Include 1]
-[heading:inc1_1 Heading 1]
-[include:include1a include_id_unbalanced-inc1a.qbk]
-[heading:inc1_2 Heading 2]

Copied: trunk/tools/quickbook/test/include/include_id_unbalanced-inc1.quickbook (from r84251, /trunk/tools/quickbook/test/include/include_id_unbalanced-inc1.qbk)
==============================================================================
--- /trunk/tools/quickbook/test/include/include_id_unbalanced-inc1.qbk	(original)
+++ trunk/tools/quickbook/test/include/include_id_unbalanced-inc1.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -1,4 +1,4 @@
 [section:inc1 Include 1]
 [heading:inc1_1 Heading 1]
-[include:include1a include_id_unbalanced-inc1a.qbk]
+[include:include1a include_id_unbalanced-inc1a.quickbook]
 [heading:inc1_2 Heading 2]

Deleted: trunk/tools/quickbook/test/include/include_id_unbalanced-inc1a.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/include_id_unbalanced-inc1a.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,3 +0,0 @@
-[heading:inc1a_1 Heading 1]
-[section:inc1a Include 1a]
-[heading:inc1a_2 Heading 2]

Copied: trunk/tools/quickbook/test/include/include_id_unbalanced-inc1a.quickbook (from r84251, /trunk/tools/quickbook/test/include/include_id_unbalanced-inc1a.qbk)
==============================================================================

Deleted: trunk/tools/quickbook/test/include/include_id_unbalanced-inc2.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/include_id_unbalanced-inc2.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,5 +0,0 @@
-[heading:inc2_1 Heading 1]
-[endsect]
-[heading:inc2_2 Heading 2]
-[include:include2a include_id_unbalanced-inc2a.qbk]
-[heading:inc2_3 Heading 3]

Copied: trunk/tools/quickbook/test/include/include_id_unbalanced-inc2.quickbook (from r84251, /trunk/tools/quickbook/test/include/include_id_unbalanced-inc2.qbk)
==============================================================================
--- /trunk/tools/quickbook/test/include/include_id_unbalanced-inc2.qbk	(original)
+++ trunk/tools/quickbook/test/include/include_id_unbalanced-inc2.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -1,5 +1,5 @@
 [heading:inc2_1 Heading 1]
 [endsect]
 [heading:inc2_2 Heading 2]
-[include:include2a include_id_unbalanced-inc2a.qbk]
+[include:include2a include_id_unbalanced-inc2a.quickbook]
 [heading:inc2_3 Heading 3]

Deleted: trunk/tools/quickbook/test/include/include_id_unbalanced-inc2a.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/include_id_unbalanced-inc2a.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,3 +0,0 @@
-[heading:inc2a_1 Heading 1]
-[endsect]
-[heading:inc2a_2 Heading 2]

Copied: trunk/tools/quickbook/test/include/include_id_unbalanced-inc2a.quickbook (from r84251, /trunk/tools/quickbook/test/include/include_id_unbalanced-inc2a.qbk)
==============================================================================

Modified: trunk/tools/quickbook/test/include/nested_compatibility-1_5.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include/nested_compatibility-1_5.quickbook	(original)
+++ trunk/tools/quickbook/test/include/nested_compatibility-1_5.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -2,11 +2,11 @@
 [article Nested Compatibility Test]
 
 [section Duplicate Name]
-[include nested_compatibility_inc-1_5.qbk]
-[include nested_compatibility_inc-1_6.qbk]
+[include nested_compatibility-inc-1_5.quickbook]
+[include nested_compatibility-inc-1_6.quickbook]
 [endsect]
 
 [section Duplicate Name]
-[include nested_compatibility_inc-1_5.qbk]
-[include nested_compatibility_inc-1_6.qbk]
+[include nested_compatibility-inc-1_5.quickbook]
+[include nested_compatibility-inc-1_6.quickbook]
 [endsect]

Modified: trunk/tools/quickbook/test/include/nested_compatibility-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include/nested_compatibility-1_6.quickbook	(original)
+++ trunk/tools/quickbook/test/include/nested_compatibility-1_6.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -2,11 +2,11 @@
 [article Nested Compatibility Test]
 
 [section Duplicate Name]
-[include nested_compatibility_inc-1_5.qbk]
-[include nested_compatibility_inc-1_6.qbk]
+[include nested_compatibility-inc-1_5.quickbook]
+[include nested_compatibility-inc-1_6.quickbook]
 [endsect]
 
 [section Duplicate Name]
-[include nested_compatibility_inc-1_5.qbk]
-[include nested_compatibility_inc-1_6.qbk]
+[include nested_compatibility-inc-1_5.quickbook]
+[include nested_compatibility-inc-1_6.quickbook]
 [endsect]

Copied: trunk/tools/quickbook/test/include/nested_compatibility-inc-1_5.quickbook (from r84251, /trunk/tools/quickbook/test/include/nested_compatibility_inc-1_5.qbk)
==============================================================================

Copied: trunk/tools/quickbook/test/include/nested_compatibility-inc-1_6.quickbook (from r84251, /trunk/tools/quickbook/test/include/nested_compatibility_inc-1_6.qbk)
==============================================================================

Deleted: trunk/tools/quickbook/test/include/nested_compatibility_inc-1_5.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/nested_compatibility_inc-1_5.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,5 +0,0 @@
-[compatibility-mode 1.5]
-
-[section:nested Nested Section 1.5]
-[heading Nested Heading 1.5]
-[endsect]

Deleted: trunk/tools/quickbook/test/include/nested_compatibility_inc-1_6.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/nested_compatibility_inc-1_6.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,5 +0,0 @@
-[compatibility-mode 1.6]
-
-[section:nested Nested Section 1.6]
-[heading Nested Heading 1.6]
-[endsect]

Modified: trunk/tools/quickbook/test/include/source_mode-1_5.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include/source_mode-1_5.quickbook	(original)
+++ trunk/tools/quickbook/test/include/source_mode-1_5.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -1,3 +1,3 @@
 [article Souce Mode Include [source-mode teletype][quickbook 1.5]]
 
-[include source_mode-inc1.qbk]
\ No newline at end of file
+[include source_mode-inc1.quickbook]
\ No newline at end of file

Modified: trunk/tools/quickbook/test/include/source_mode-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include/source_mode-1_6.quickbook	(original)
+++ trunk/tools/quickbook/test/include/source_mode-1_6.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -1,4 +1,4 @@
 [source-mode teletype][quickbook 1.6]
 [article Souce Mode Include]
 
-[include source_mode-inc1.qbk]
\ No newline at end of file
+[include source_mode-inc1.quickbook]
\ No newline at end of file

Deleted: trunk/tools/quickbook/test/include/source_mode-inc1.qbk
==============================================================================
--- trunk/tools/quickbook/test/include/source_mode-inc1.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,3 +0,0 @@
-[article Source include with no source-mode]
-
-    void main() {}
\ No newline at end of file

Copied: trunk/tools/quickbook/test/include/source_mode-inc1.quickbook (from r84251, /trunk/tools/quickbook/test/include/source_mode-inc1.qbk)
==============================================================================

Modified: trunk/tools/quickbook/test/include2-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include2-1_6.quickbook	(original)
+++ trunk/tools/quickbook/test/include2-1_6.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -3,6 +3,6 @@
     [id include-test]
 ]
 
-[include include_sub-1_5.qbk]
-[include include_sub.qbk]
-[include:foo include_sub.qbk]
+[include include-inc-1_5.quickbook]
+[include include-inc.quickbook]
+[include:foo include-inc.quickbook]

Deleted: trunk/tools/quickbook/test/include_sub-1_5.qbk
==============================================================================
--- trunk/tools/quickbook/test/include_sub-1_5.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,6 +0,0 @@
-[article Include Test Sub Document
-    [quickbook 1.5]
-    [id include-sub]
-]
-
-[/ Empty. Shouldn't really need this comment.]

Deleted: trunk/tools/quickbook/test/include_sub.qbk
==============================================================================
--- trunk/tools/quickbook/test/include_sub.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,9 +0,0 @@
-[/ I'm trying not to break existing behaviour even when buggy.
-   In this case, this section will get an id using the title from
-   the previous 'include'.]
-
-[section:test Test]
-
-Just testing.
-
-[endsect]
\ No newline at end of file

Modified: trunk/tools/quickbook/test/include_win_path-1_6-fail.quickbook
==============================================================================
--- trunk/tools/quickbook/test/include_win_path-1_6-fail.quickbook	(original)
+++ trunk/tools/quickbook/test/include_win_path-1_6-fail.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -2,4 +2,4 @@
 [quickbook 1.6]
 ]
 
-[include .\empty.qbk]
+[include .\empty-inc.quickbook]

Modified: trunk/tools/quickbook/test/versions/invalid_macro-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/versions/invalid_macro-1_6.quickbook	(original)
+++ trunk/tools/quickbook/test/versions/invalid_macro-1_6.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -4,11 +4,11 @@
 
 Import:
 
-[import invalid_macro-inc-1_1.qbk]
+[import invalid_macro-inc-1_1.quickbook]
 
 * __valid__
 * __invalid\macro__
 
 Include:
 
-[include invalid_macro-inc-1_1.qbk]
+[include invalid_macro-inc-1_1.quickbook]

Deleted: trunk/tools/quickbook/test/versions/invalid_macro-inc-1_1.qbk
==============================================================================
--- trunk/tools/quickbook/test/versions/invalid_macro-inc-1_1.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,7 +0,0 @@
-[quickbook 1.1]
-
-[def __valid__ okay]
-[def __invalid\macro__ bad]
-
-* __valid__
-* __invalid\macro__

Copied: trunk/tools/quickbook/test/versions/invalid_macro-inc-1_1.quickbook (from r84251, /trunk/tools/quickbook/test/versions/invalid_macro-inc-1_1.qbk)
==============================================================================

Deleted: trunk/tools/quickbook/test/versions/templates-1_1.qbk
==============================================================================
--- trunk/tools/quickbook/test/versions/templates-1_1.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,15 +0,0 @@
-[article 1.1 Templates
-[quickbook 1.1]
-]
-
-[template section_1_1[]
-[section In a 1.1 template]
-Some text
-[endsect]
-]
-
-[section 1.1 Document]
-[section_1_1]
-[section_1_4]
-[section_1_5]
-[endsect]

Deleted: trunk/tools/quickbook/test/versions/templates-1_4.qbk
==============================================================================
--- trunk/tools/quickbook/test/versions/templates-1_4.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,20 +0,0 @@
-[article 1.4 Templates
-[quickbook 1.4]
-]
-
-[template section_1_4[]
-[section In a 1.4 template]
-Some text
-[endsect]
-]
-
-[section 1.4 Document]
-[section_1_1]
-[section_1_4]
-[section_1_5]
-[endsect]
-
-[/ Odd test for calling 1.4 -> 1.5 -> 1.4 template]
-
-[template skip_1_5[a] [skip_1_5_2 wrong]]
-[template skip_1_5_3[] [a]]

Deleted: trunk/tools/quickbook/test/versions/templates-1_5.qbk
==============================================================================
--- trunk/tools/quickbook/test/versions/templates-1_5.qbk	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
+++ (empty file)
@@ -1,19 +0,0 @@
-[article 1.5 Templates
-[quickbook 1.5]
-]
-
-[template section_1_5[]
-[section In a 1.5 template]
-Some text
-[endsect]
-]
-
-[section 1.5 Document]
-[section_1_1]
-[section_1_4]
-[section_1_5]
-[endsect]
-
-[/ Odd test for calling 1.4 -> 1.5 -> 1.4 template]
-
-[template skip_1_5_2[a] [skip_1_5_3]]

Copied: trunk/tools/quickbook/test/versions/templates-inc-1_1.quickbook (from r84251, /trunk/tools/quickbook/test/versions/templates-1_1.qbk)
==============================================================================

Copied: trunk/tools/quickbook/test/versions/templates-inc-1_4.quickbook (from r84251, /trunk/tools/quickbook/test/versions/templates-1_4.qbk)
==============================================================================

Copied: trunk/tools/quickbook/test/versions/templates-inc-1_5.quickbook (from r84251, /trunk/tools/quickbook/test/versions/templates-1_5.qbk)
==============================================================================

Modified: trunk/tools/quickbook/test/versions/versions-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/versions/versions-1_6.quickbook	(original)
+++ trunk/tools/quickbook/test/versions/versions-1_6.quickbook	2013-05-12 10:34:27 EDT (Sun, 12 May 2013)
@@ -1,9 +1,9 @@
 [quickbook 1.6]
 [article Mixed version tests]
 
-[import templates-1_1.qbk]
-[import templates-1_4.qbk]
-[import templates-1_5.qbk]
+[import templates-inc-1_1.quickbook]
+[import templates-inc-1_4.quickbook]
+[import templates-inc-1_5.quickbook]
 
 [/ This test calls a 1.4 template -> 1.5 template -> 1.4 template.
    The name lookup in the 1.4 template should skip the 1.5 template
@@ -21,6 +21,6 @@
 
 [/ For comparison]
 
-[include templates-1_1.qbk]
-[include templates-1_4.qbk]
-[include templates-1_5.qbk]
+[include templates-inc-1_1.quickbook]
+[include templates-inc-1_4.quickbook]
+[include templates-inc-1_5.quickbook]