[Boost-commit] svn:boost r70868 - in branches/quickbook-dev/tools/quickbook/test: . include

Subject: [Boost-commit] svn:boost r70868 - in branches/quickbook-dev/tools/quickbook/test: . include
From: dnljms_at_[hidden]
Date: 2011-04-02 13:43:56

Author: danieljames
Date: 2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
New Revision: 70868
URL: http://svn.boost.org/trac/boost/changeset/70868

Log:
Quickbook: New tests. Mostly state tracking.
Added:
   branches/quickbook-dev/tools/quickbook/test/heading-1.1.gold   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/heading-1.1.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/heading-1.5.gold   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/heading-1.5.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/heading-1.6.gold   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/heading-1.6.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/doc-title1-1.5.gold   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/doc-title1-1.5.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/doc-title1-inc1.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/doc-title1-inc2.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/doc-title1-inc3.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/doc-title1a-1.5.gold   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/doc-title1a-1.5.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/section-fail1.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/section-fail2.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/section-inc1.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/section-inc2.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/section-unclosed.gold   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/section-unclosed.quickbook   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/section.gold   (contents, props changed)
   branches/quickbook-dev/tools/quickbook/test/include/section.quickbook   (contents, props changed)
Removed:
   branches/quickbook-dev/tools/quickbook/test/heading.gold
   branches/quickbook-dev/tools/quickbook/test/heading.quickbook
   branches/quickbook-dev/tools/quickbook/test/heading_1_6.gold
   branches/quickbook-dev/tools/quickbook/test/heading_1_6.quickbook
Text files modified: 
   branches/quickbook-dev/tools/quickbook/test/Jamfile.v2         |     5 +++--                                   
   branches/quickbook-dev/tools/quickbook/test/include/Jamfile.v2 |     8 +++++++-                                
   2 files changed, 10 insertions(+), 3 deletions(-)

Modified: branches/quickbook-dev/tools/quickbook/test/Jamfile.v2
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/Jamfile.v2	(original)
+++ branches/quickbook-dev/tools/quickbook/test/Jamfile.v2	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -44,8 +44,9 @@
     [ quickbook-test include_1_6-2 ]
     [ quickbook-test section_1_4 ]
     [ quickbook-test section_1_5 ]
-    [ quickbook-test heading ]
-    [ quickbook-test heading_1_6 ]
+    [ quickbook-test heading-1.1 ]
+    [ quickbook-test heading-1.5 ]
+    [ quickbook-test heading-1.6 ]
     [ quickbook-test identifier_1_5 ]
     [ quickbook-test identifier_1_6 ]
     [ quickbook-test para-test ]

Added: branches/quickbook-dev/tools/quickbook/test/heading-1.1.gold
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/heading-1.1.gold	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,83 @@
+<?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="heading_test_1_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Heading Test 1.1</title> <anchor id="heading_test_1_1.generic_header"/>
+  <bridgehead renderas="sect2" id="heading_test_1_1.generic_header-heading">
+    <link linkend="heading_test_1_1.generic_header">Generic header</link>
+  </bridgehead>
+  <anchor id=".level_1"/>
+  <bridgehead renderas="sect1" id=".level_1-heading">
+    Level 1
+  </bridgehead>
+  <anchor id=".level_2"/>
+  <bridgehead renderas="sect2" id=".level_2-heading">
+    Level 2
+  </bridgehead>
+  <anchor id=".level_3"/>
+  <bridgehead renderas="sect3" id=".level_3-heading">
+    Level 3
+  </bridgehead>
+  <anchor id=".level_4"/>
+  <bridgehead renderas="sect4" id=".level_4-heading">
+    Level 4
+  </bridgehead>
+  <anchor id=".level_5"/>
+  <bridgehead renderas="sect5" id=".level_5-heading">
+    Level 5
+  </bridgehead>
+  <anchor id=".level_6"/>
+  <bridgehead renderas="sect6" id=".level_6-heading">
+    Level 6
+  </bridgehead>
+  <anchor id="._emphasis_role__bold__bold__emphasis_"/>
+  <bridgehead renderas="sect1" id="._emphasis_role__bold__bold__emphasis_-heading">
+    <emphasis role="bold">Bold</emphasis>
+  </bridgehead>
+  <anchor id=".comment"/>
+  <bridgehead renderas="sect1" id=".comment-heading">
+    Comment
+  </bridgehead>
+  <anchor id="._notanid"/>
+  <bridgehead renderas="sect1" id="._notanid-heading">
+    :notanid
+  </bridgehead>
+  <anchor id="._also_not_an_id"/>
+  <bridgehead renderas="sect1" id="._also_not_an_id-heading">
+    :also not an id
+  </bridgehead>
+  <anchor id=".h1"/>
+  <bridgehead renderas="sect1" id=".h1-heading">
+    H1
+  </bridgehead>
+  <section id="heading_test_1_1.s1">
+    <title>S1</title> <anchor id="s1.h2"/>
+    <bridgehead renderas="sect2" id="s1.h2-heading">
+      H2
+    </bridgehead>
+    <section id="heading_test_1_1.s2">
+      <title>S2</title> <anchor id="s2.h3"/>
+      <bridgehead renderas="sect3" id="s2.h3-heading">
+        H3
+      </bridgehead>
+    </section>
+    <anchor id="heading_test_1_1.s1.h4"/>
+    <bridgehead renderas="sect3" id="heading_test_1_1.s1.h4-heading">
+      <link linkend="heading_test_1_1.s1.h4">H4</link>
+    </bridgehead>
+    <section id="heading_test_1_1.s3">
+      <title>S3</title> <anchor id="s3.h5"/>
+      <bridgehead renderas="sect3" id="s3.h5-heading">
+        H5
+      </bridgehead>
+    </section>
+    <anchor id="heading_test_1_1.s1.h6"/>
+    <bridgehead renderas="sect3" id="heading_test_1_1.s1.h6-heading">
+      <link linkend="heading_test_1_1.s1.h6">H6</link>
+    </bridgehead>
+  </section>
+  <anchor id="s3.h7"/>
+  <bridgehead renderas="sect1" id="s3.h7-heading">
+    H7
+  </bridgehead>
+</article>

Added: branches/quickbook-dev/tools/quickbook/test/heading-1.1.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/heading-1.1.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,50 @@
+[article Heading Test 1.1
+]
+
+[/ Basic headers ]
+
+[heading Generic header]
+[h1 Level 1]
+[h2 Level 2]
+[h3 Level 3]
+[h4 Level 4]
+[h5 Level 5]
+[h6 Level 6]
+
+[/ Test how heading ids are generated when different types of markup are present]
+
+[h1 *Bold*]
+[h1 [/]Comment[/]]
+
+[/ Headings that look like ids]
+
+[h1:notanid]
+[h1:also not an id]
+
+[/ Test how heading ids are generated inside sections]
+
+[h1 H1]
+
+[section:s1 S1]
+
+[h2 H2]
+
+[section:s2 S2]
+
+[h3 H3]
+
+[endsect]
+
+[heading H4]
+
+[section:s3 S3]
+
+[h3 H5]
+
+[endsect]
+
+[heading H6]
+
+[endsect]
+
+[h1 H7]

Added: branches/quickbook-dev/tools/quickbook/test/heading-1.5.gold
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/heading-1.5.gold	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,84 @@
+<?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="heading_test_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Heading Test 1.5</title> <anchor id="heading_test_1_5.generic_header"/>
+  <bridgehead renderas="sect2" id="heading_test_1_5.generic_header-heading">
+    <link linkend="heading_test_1_5.generic_header">Generic header</link>
+  </bridgehead>
+  <anchor id="heading_test_1_5.level_1"/>
+  <bridgehead renderas="sect1" id="heading_test_1_5.level_1-heading">
+    <link linkend="heading_test_1_5.level_1">Level 1</link>
+  </bridgehead>
+  <anchor id="heading_test_1_5.level_2"/>
+  <bridgehead renderas="sect2" id="heading_test_1_5.level_2-heading">
+    <link linkend="heading_test_1_5.level_2">Level 2</link>
+  </bridgehead>
+  <anchor id="heading_test_1_5.level_3"/>
+  <bridgehead renderas="sect3" id="heading_test_1_5.level_3-heading">
+    <link linkend="heading_test_1_5.level_3">Level 3</link>
+  </bridgehead>
+  <anchor id="heading_test_1_5.level_4"/>
+  <bridgehead renderas="sect4" id="heading_test_1_5.level_4-heading">
+    <link linkend="heading_test_1_5.level_4">Level 4</link>
+  </bridgehead>
+  <anchor id="heading_test_1_5.level_5"/>
+  <bridgehead renderas="sect5" id="heading_test_1_5.level_5-heading">
+    <link linkend="heading_test_1_5.level_5">Level 5</link>
+  </bridgehead>
+  <anchor id="heading_test_1_5.level_6"/>
+  <bridgehead renderas="sect6" id="heading_test_1_5.level_6-heading">
+    <link linkend="heading_test_1_5.level_6">Level 6</link>
+  </bridgehead>
+  <anchor id="heading_test_1_5._emphasis_role__bold__bold__emphasis_"/>
+  <bridgehead renderas="sect1" id="heading_test_1_5._emphasis_role__bold__bold__emphasis_-heading">
+    <link linkend="heading_test_1_5._emphasis_role__bold__bold__emphasis_"><emphasis
+    role="bold">Bold</emphasis></link>
+  </bridgehead>
+  <anchor id="heading_test_1_5.comment"/>
+  <bridgehead renderas="sect1" id="heading_test_1_5.comment-heading">
+    <link linkend="heading_test_1_5.comment">Comment</link>
+  </bridgehead>
+  <anchor id="heading_test_1_5._notanid"/>
+  <bridgehead renderas="sect1" id="heading_test_1_5._notanid-heading">
+    <link linkend="heading_test_1_5._notanid">:notanid</link>
+  </bridgehead>
+  <anchor id="heading_test_1_5._also_not_an_id"/>
+  <bridgehead renderas="sect1" id="heading_test_1_5._also_not_an_id-heading">
+    <link linkend="heading_test_1_5._also_not_an_id">:also not an id</link>
+  </bridgehead>
+  <anchor id="heading_test_1_5.h1"/>
+  <bridgehead renderas="sect2" id="heading_test_1_5.h1-heading">
+    <link linkend="heading_test_1_5.h1">H1</link>
+  </bridgehead>
+  <section id="heading_test_1_5.s1">
+    <title><link linkend="heading_test_1_5.s1">S1</link></title> <anchor id="heading_test_1_5.s1.h2"/>
+    <bridgehead renderas="sect2" id="heading_test_1_5.s1.h2-heading">
+      <link linkend="heading_test_1_5.s1.h2">H2</link>
+    </bridgehead>
+    <section id="heading_test_1_5.s1.s2">
+      <title><link linkend="heading_test_1_5.s1.s2">S2</link></title> <anchor id="heading_test_1_5.s1.s2.h3"/>
+      <bridgehead renderas="sect3" id="heading_test_1_5.s1.s2.h3-heading">
+        <link linkend="heading_test_1_5.s1.s2.h3">H3</link>
+      </bridgehead>
+    </section>
+    <anchor id="heading_test_1_5.s1.h4"/>
+    <bridgehead renderas="sect2" id="heading_test_1_5.s1.h4-heading">
+      <link linkend="heading_test_1_5.s1.h4">H4</link>
+    </bridgehead>
+    <section id="heading_test_1_5.s1.s3">
+      <title><link linkend="heading_test_1_5.s1.s3">S3</link></title> <anchor id="heading_test_1_5.s1.s3.h5"/>
+      <bridgehead renderas="sect4" id="heading_test_1_5.s1.s3.h5-heading">
+        <link linkend="heading_test_1_5.s1.s3.h5">H5</link>
+      </bridgehead>
+    </section>
+    <anchor id="heading_test_1_5.s1.h6"/>
+    <bridgehead renderas="sect2" id="heading_test_1_5.s1.h6-heading">
+      <link linkend="heading_test_1_5.s1.h6">H6</link>
+    </bridgehead>
+  </section>
+  <anchor id="heading_test_1_5.h7"/>
+  <bridgehead renderas="sect1" id="heading_test_1_5.h7-heading">
+    <link linkend="heading_test_1_5.h7">H7</link>
+  </bridgehead>
+</article>

Added: branches/quickbook-dev/tools/quickbook/test/heading-1.5.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/heading-1.5.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,51 @@
+[article Heading Test 1.5
+[quickbook 1.5]
+]
+
+[/ Basic headers ]
+
+[heading Generic header]
+[h1 Level 1]
+[h2 Level 2]
+[h3 Level 3]
+[h4 Level 4]
+[h5 Level 5]
+[h6 Level 6]
+
+[/ Test how heading ids are generated when different types of markup are present]
+
+[h1 *Bold*]
+[h1 [/]Comment[/]]
+
+[/ Headings that look like ids]
+
+[h1:notanid]
+[h1:also not an id]
+
+[/ Test how heading ids are generated inside sections]
+
+[heading H1]
+
+[section:s1 S1]
+
+[h2 H2]
+
+[section:s2 S2]
+
+[h3 H3]
+
+[endsect]
+
+[h2 H4]
+
+[section:s3 S3]
+
+[heading H5]
+
+[endsect]
+
+[h2 H6]
+
+[endsect]
+
+[h1 H7]

Added: branches/quickbook-dev/tools/quickbook/test/heading-1.6.gold
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/heading-1.6.gold	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,109 @@
+<?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="heading_test_1_6" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Heading Test 1.6</title> <anchor id="heading_test_1_6.generic_header"/>
+  <bridgehead renderas="sect2" id="heading_test_1_6.generic_header-heading">
+    <link linkend="heading_test_1_6.generic_header">Generic header</link>
+  </bridgehead>
+  <anchor id="heading_test_1_6.level_1"/>
+  <bridgehead renderas="sect1" id="heading_test_1_6.level_1-heading">
+    <link linkend="heading_test_1_6.level_1">Level 1</link>
+  </bridgehead>
+  <anchor id="heading_test_1_6.level_2"/>
+  <bridgehead renderas="sect2" id="heading_test_1_6.level_2-heading">
+    <link linkend="heading_test_1_6.level_2">Level 2</link>
+  </bridgehead>
+  <anchor id="heading_test_1_6.level_3"/>
+  <bridgehead renderas="sect3" id="heading_test_1_6.level_3-heading">
+    <link linkend="heading_test_1_6.level_3">Level 3</link>
+  </bridgehead>
+  <anchor id="heading_test_1_6.level_4"/>
+  <bridgehead renderas="sect4" id="heading_test_1_6.level_4-heading">
+    <link linkend="heading_test_1_6.level_4">Level 4</link>
+  </bridgehead>
+  <anchor id="heading_test_1_6.level_5"/>
+  <bridgehead renderas="sect5" id="heading_test_1_6.level_5-heading">
+    <link linkend="heading_test_1_6.level_5">Level 5</link>
+  </bridgehead>
+  <anchor id="heading_test_1_6.level_6"/>
+  <bridgehead renderas="sect6" id="heading_test_1_6.level_6-heading">
+    <link linkend="heading_test_1_6.level_6">Level 6</link>
+  </bridgehead>
+  <anchor id="heading_test_1_6._bold_"/>
+  <bridgehead renderas="sect1" id="heading_test_1_6._bold_-heading">
+    <link linkend="heading_test_1_6._bold_"><emphasis role="bold">Bold</emphasis></link>
+  </bridgehead>
+  <anchor id="heading_test_1_6.comment___"/>
+  <bridgehead renderas="sect1" id="heading_test_1_6.comment___-heading">
+    <link linkend="heading_test_1_6.comment___">Comment</link>
+  </bridgehead>
+  <anchor id="heading_test_1_6.h1"/>
+  <bridgehead renderas="sect1" id="heading_test_1_6.h1-heading">
+    <link linkend="heading_test_1_6.h1">H1</link>
+  </bridgehead>
+  <section id="heading_test_1_6.s1">
+    <title><link linkend="heading_test_1_6.s1">S1</link></title> <anchor id="heading_test_1_6.s1.h2"/>
+    <bridgehead renderas="sect3" id="heading_test_1_6.s1.h2-heading">
+      <link linkend="heading_test_1_6.s1.h2">H2</link>
+    </bridgehead>
+    <section id="heading_test_1_6.s1.s2">
+      <title><link linkend="heading_test_1_6.s1.s2">S2</link></title> <anchor id="heading_test_1_6.s1.s2.h3"/>
+      <bridgehead renderas="sect3" id="heading_test_1_6.s1.s2.h3-heading">
+        <link linkend="heading_test_1_6.s1.s2.h3">H3</link>
+      </bridgehead>
+    </section>
+    <anchor id="heading_test_1_6.s1.h4"/>
+    <bridgehead renderas="sect2" id="heading_test_1_6.s1.h4-heading">
+      <link linkend="heading_test_1_6.s1.h4">H4</link>
+    </bridgehead>
+    <section id="heading_test_1_6.s1.s3">
+      <title><link linkend="heading_test_1_6.s1.s3">S3</link></title> <anchor id="heading_test_1_6.s1.s3.h5"/>
+      <bridgehead renderas="sect4" id="heading_test_1_6.s1.s3.h5-heading">
+        <link linkend="heading_test_1_6.s1.s3.h5">H5</link>
+      </bridgehead>
+    </section>
+    <anchor id="heading_test_1_6.s1.h6"/>
+    <bridgehead renderas="sect2" id="heading_test_1_6.s1.h6-heading">
+      <link linkend="heading_test_1_6.s1.h6">H6</link>
+    </bridgehead>
+  </section>
+  <anchor id="heading_test_1_6.h7"/>
+  <bridgehead renderas="sect1" id="heading_test_1_6.h7-heading">
+    <link linkend="heading_test_1_6.h7">H7</link>
+  </bridgehead>
+  <anchor id="heading_test_1_6.a1"/>
+  <bridgehead renderas="sect1" id="heading_test_1_6.a1-heading">
+    <link linkend="heading_test_1_6.a1">H1</link>
+  </bridgehead>
+  <section id="heading_test_1_6.s1">
+    <title><link linkend="heading_test_1_6.s1">S1</link></title> <anchor id="heading_test_1_6.s1.a2"/>
+    <bridgehead renderas="sect2" id="heading_test_1_6.s1.a2-heading">
+      <link linkend="heading_test_1_6.s1.a2">H2</link>
+    </bridgehead>
+    <section id="heading_test_1_6.s1.s2">
+      <title><link linkend="heading_test_1_6.s1.s2">S2</link></title> <anchor id="heading_test_1_6.s1.s2.a3"/>
+      <bridgehead renderas="sect3" id="heading_test_1_6.s1.s2.a3-heading">
+        <link linkend="heading_test_1_6.s1.s2.a3">H3</link>
+      </bridgehead>
+    </section>
+    <anchor id="heading_test_1_6.s1.a4"/>
+    <bridgehead renderas="sect2" id="heading_test_1_6.s1.a4-heading">
+      <link linkend="heading_test_1_6.s1.a4">H4</link>
+    </bridgehead>
+    <section id="heading_test_1_6.s1.s3">
+      <title><link linkend="heading_test_1_6.s1.s3">S3</link></title> <anchor id="heading_test_1_6.s1.s3.a5"/>
+      <bridgehead renderas="sect3" id="heading_test_1_6.s1.s3.a5-heading">
+        <link linkend="heading_test_1_6.s1.s3.a5">H5</link>
+      </bridgehead>
+    </section>
+    <anchor id="heading_test_1_6.s1.a6"/>
+    <bridgehead renderas="sect3" id="heading_test_1_6.s1.a6-heading">
+      <link linkend="heading_test_1_6.s1.a6">H6</link>
+    </bridgehead>
+  </section>
+  <anchor id="heading_test_1_6.a7"/>
+  <bridgehead renderas="sect1" id="heading_test_1_6.a7-heading">
+    <link linkend="heading_test_1_6.a7">H7</link>
+  </bridgehead>
+</article>

Added: branches/quickbook-dev/tools/quickbook/test/heading-1.6.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/heading-1.6.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,74 @@
+[article Heading Test 1.6
+[quickbook 1.6]
+]
+
+[/ Basic headers ]
+
+[heading Generic header]
+[h1 Level 1]
+[h2 Level 2]
+[h3 Level 3]
+[h4 Level 4]
+[h5 Level 5]
+[h6 Level 6]
+
+[/ Test how heading ids are generated when different types of markup are present]
+
+[h1 *Bold*]
+[h1 [/]Comment[/]]
+
+[/ Test how heading ids are generated inside sections]
+
+[h1 H1]
+
+[section:s1 S1]
+
+[heading H2]
+
+[section:s2 S2]
+
+[h3 H3]
+
+[endsect]
+
+[h2 H4]
+
+[section:s3 S3]
+
+[heading H5]
+
+[endsect]
+
+[h2 H6]
+
+[endsect]
+
+[h1 H7]
+
+[/ Repeat with explicit ids]
+
+[h1:a1 H1]
+
+[section:s1 S1]
+
+[h2:a2 H2]
+
+[section:s2 S2]
+
+[h3:a3 H3]
+
+[endsect]
+
+[h2:a4 H4]
+
+[section:s3 S3]
+
+[h3:a5 H5]
+
+[endsect]
+
+[heading:a6 H6]
+
+[endsect]
+
+[h1:a7 H7]

Deleted: branches/quickbook-dev/tools/quickbook/test/heading.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/heading.gold	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
+++ (empty file)
@@ -1,25 +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="header" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Header</title> <anchor id="header.header_test"/>
-  <bridgehead renderas="sect2" id="header.header_test-heading">
-    <link linkend="header.header_test">Header Test</link>
-  </bridgehead>
-  <para>
-    Testing headers without sections.
-  </para>
-  <anchor id="header._not_an_id"/>
-  <bridgehead renderas="sect2" id="header._not_an_id-heading">
-    <link linkend="header._not_an_id">:Not an Id</link>
-  </bridgehead>
-  <para>
-    Paragraph.
-  </para>
-  <anchor id="header._not_an_id_again"/>
-  <bridgehead renderas="sect3" id="header._not_an_id_again-heading">
-    <link linkend="header._not_an_id_again">:Not an Id again</link>
-  </bridgehead>
-  <para>
-    Paragraph.
-  </para>
-</article>

Deleted: branches/quickbook-dev/tools/quickbook/test/heading.quickbook
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/heading.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
+++ (empty file)
@@ -1,16 +0,0 @@
-[article Header
-    [quickbook 1.5]
-    [id header]
-]
-
-[heading Header Test]
-
-Testing headers without sections.
-
-[heading:Not an Id]
-
-Paragraph.
-
-[h3:Not an Id again]
-
-Paragraph.
\ No newline at end of file

Deleted: branches/quickbook-dev/tools/quickbook/test/heading_1_6.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/heading_1_6.gold	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
+++ (empty file)
@@ -1,25 +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="header" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Header</title> <anchor id="header.header_test"/>
-  <bridgehead renderas="sect2" id="header.header_test-heading">
-    <link linkend="header.header_test">Header Test</link>
-  </bridgehead>
-  <para>
-    Paragraph.
-  </para>
-  <anchor id="header.heading_id"/>
-  <bridgehead renderas="sect2" id="header.heading_id-heading">
-    <link linkend="header.heading_id">Heading with an id</link>
-  </bridgehead>
-  <para>
-    Paragraph.
-  </para>
-  <anchor id="header.heading_id2"/>
-  <bridgehead renderas="sect3" id="header.heading_id2-heading">
-    <link linkend="header.heading_id2">Heading with an id</link>
-  </bridgehead>
-  <para>
-    Paragraph.
-  </para>
-</article>

Deleted: branches/quickbook-dev/tools/quickbook/test/heading_1_6.quickbook
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/heading_1_6.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
+++ (empty file)
@@ -1,16 +0,0 @@
-[article Header
-    [quickbook 1.6]
-    [id header]
-]
-
-[heading Header Test]
-
-Paragraph.
-
-[heading:heading_id Heading with an id]
-
-Paragraph.
-
-[h3:heading_id2 Heading with an id]
-
-Paragraph.

Modified: branches/quickbook-dev/tools/quickbook/test/include/Jamfile.v2
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/include/Jamfile.v2	(original)
+++ branches/quickbook-dev/tools/quickbook/test/include/Jamfile.v2	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -16,4 +16,10 @@
 test-suite quickbook.test :
     [ quickbook-test filename ]
     [ quickbook-test filename-path : : : <quickbook-test-include>sub ]
-    ;
\ No newline at end of file
+    [ quickbook-test doc-title1-1.5 ]
+    [ quickbook-test doc-title1a-1.5 ]
+    [ quickbook-test section ]
+    [ quickbook-test section-unclosed ]
+    [ quickbook-error-test section-fail1 ]
+    [ quickbook-error-test section-fail2 ]
+    ;

Added: branches/quickbook-dev/tools/quickbook/test/include/doc-title1-1.5.gold
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/doc-title1-1.5.gold	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,33 @@
+<?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="doc_title_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Doc Title 1</title> <anchor id="doc_title_1.a1"/>
+  <bridgehead renderas="sect2" id="doc_title_1.a1-heading">
+    <link linkend="doc_title_1.a1">a1</link>
+  </bridgehead>
+  <anchor id="doc_title_1.inc1"/>
+  <bridgehead renderas="sect2" id="doc_title_1.inc1-heading">
+    <link linkend="doc_title_1.inc1">inc1</link>
+  </bridgehead>
+  <anchor id="doc_title_1.a2"/>
+  <bridgehead renderas="sect2" id="doc_title_1.a2-heading">
+    <link linkend="doc_title_1.a2">a2</link>
+  </bridgehead>
+  <anchor id="doc_title_1_inc2.inc2"/>
+  <bridgehead renderas="sect2" id="doc_title_1_inc2.inc2-heading">
+    <link linkend="doc_title_1_inc2.inc2">inc2</link>
+  </bridgehead>
+  <anchor id="doc_title_1.a3"/>
+  <bridgehead renderas="sect2" id="doc_title_1.a3-heading">
+    <link linkend="doc_title_1.a3">a3</link>
+  </bridgehead>
+  <anchor id="doc_title_1_inc2.inc3"/>
+  <bridgehead renderas="sect2" id="doc_title_1_inc2.inc3-heading">
+    <link linkend="doc_title_1_inc2.inc3">inc3</link>
+  </bridgehead>
+  <anchor id="doc_title_1.a4"/>
+  <bridgehead renderas="sect2" id="doc_title_1.a4-heading">
+    <link linkend="doc_title_1.a4">a4</link>
+  </bridgehead>
+</article>

Added: branches/quickbook-dev/tools/quickbook/test/include/doc-title1-1.5.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/doc-title1-1.5.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,27 @@
+[article Doc Title 1
+[quickbook 1.5]
+]
+
+[/ Doc Titles for included files is a little odd. You generally don't see
+   titles in them, the only way to detect them is through the generated ids.
+   So that's what this test is for.
+   
+   The second include has a title, because that isn't scoped by file it will
+   continue to be used to generated ids for the following included files -
+   but not in this document as the document id for the file is generated
+   for the whole file at the start.
+   ]
+
+[heading a1]
+
+[include doc-title1-inc1.quickbook]
+
+[heading a2]
+
+[include doc-title1-inc2.quickbook]
+
+[heading a3]
+
+[include doc-title1-inc3.quickbook]
+
+[heading a4]

Added: branches/quickbook-dev/tools/quickbook/test/include/doc-title1-inc1.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/doc-title1-inc1.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1 @@
+[heading inc1]

Added: branches/quickbook-dev/tools/quickbook/test/include/doc-title1-inc2.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/doc-title1-inc2.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,4 @@
+[article Doc Title 1 Inc2
+]
+
+[heading inc2]

Added: branches/quickbook-dev/tools/quickbook/test/include/doc-title1-inc3.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/doc-title1-inc3.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1 @@
+[heading inc3]

Added: branches/quickbook-dev/tools/quickbook/test/include/doc-title1a-1.5.gold
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/doc-title1a-1.5.gold	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,32 @@
+<?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="doc-title" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Doc Title 1a</title> <anchor id="doc-title.a1"/>
+  <bridgehead renderas="sect2" id="doc-title.a1-heading">
+    <link linkend="doc-title.a1">a1</link>
+  </bridgehead>
+  <anchor id="doc_title_1a.inc1"/>
+  <bridgehead renderas="sect2" id="doc_title_1a.inc1-heading">
+    <link linkend="doc_title_1a.inc1">inc1</link>
+  </bridgehead>
+  <anchor id="doc-title.a2"/>
+  <bridgehead renderas="sect2" id="doc-title.a2-heading">
+    <link linkend="doc-title.a2">a2</link>
+  </bridgehead>
+  <anchor id="doc_title_1_inc2.inc2"/>
+  <bridgehead renderas="sect2" id="doc_title_1_inc2.inc2-heading">
+    <link linkend="doc_title_1_inc2.inc2">inc2</link>
+  </bridgehead>
+  <anchor id="doc-title.a3"/>
+  <bridgehead renderas="sect2" id="doc-title.a3-heading">
+    <link linkend="doc-title.a3">a3</link>
+  </bridgehead>
+  <anchor id="doc_title_1_inc2.inc3"/>
+  <bridgehead renderas="sect2" id="doc_title_1_inc2.inc3-heading">
+    <link linkend="doc_title_1_inc2.inc3">inc3</link>
+  </bridgehead>
+  <anchor id="doc-title.a4"/>
+  <bridgehead renderas="sect2" id="doc-title.a4-heading">
+    <link linkend="doc-title.a4">a4</link>
+  </bridgehead>
+</article>

Added: branches/quickbook-dev/tools/quickbook/test/include/doc-title1a-1.5.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/doc-title1a-1.5.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,20 @@
+[article Doc Title 1a
+[quickbook 1.5]
+[id doc-title]
+]
+
+[/ A repeat of doc-title1, but with an explicit id. ]
+
+[heading a1]
+
+[include doc-title1-inc1.quickbook]
+
+[heading a2]
+
+[include doc-title1-inc2.quickbook]
+
+[heading a3]
+
+[include doc-title1-inc3.quickbook]
+
+[heading a4]

Added: branches/quickbook-dev/tools/quickbook/test/include/section-fail1.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/section-fail1.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,6 @@
+[article Include Section Test
+[quickbook 1.5]
+]
+
+[include section-inc2.quickbook]
+[include section-inc1.quickbook]

Added: branches/quickbook-dev/tools/quickbook/test/include/section-fail2.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/section-fail2.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,5 @@
+[article Include Section Test
+[quickbook 1.5]
+]
+
+[include section-inc2.quickbook]

Added: branches/quickbook-dev/tools/quickbook/test/include/section-inc1.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/section-inc1.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1 @@
+[section Mulitple file section]

Added: branches/quickbook-dev/tools/quickbook/test/include/section-inc2.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/section-inc2.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1 @@
+[endsect]

Added: branches/quickbook-dev/tools/quickbook/test/include/section-unclosed.gold
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/section-unclosed.gold	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,10 @@
+<?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="include_section_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Include Section Test</title>
+  <section id="include_section_test.mulitple_file_section">
+    <title><link linkend="include_section_test.mulitple_file_section">Mulitple file
+    section</link></title>
+  </article>
+  
\ No newline at end of file

Added: branches/quickbook-dev/tools/quickbook/test/include/section-unclosed.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/section-unclosed.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,5 @@
+[article Include Section Test
+[quickbook 1.5]
+]
+
+[include section-inc1.quickbook]

Added: branches/quickbook-dev/tools/quickbook/test/include/section.gold
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/section.gold	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,10 @@
+<?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="include_section_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Include Section Test</title>
+  <section id="include_section_test.mulitple_file_section">
+    <title><link linkend="include_section_test.mulitple_file_section">Mulitple file
+    section</link></title>
+  </section>
+</article>

Added: branches/quickbook-dev/tools/quickbook/test/include/section.quickbook
==============================================================================
--- (empty file)
+++ branches/quickbook-dev/tools/quickbook/test/include/section.quickbook	2011-04-02 13:43:52 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,6 @@
+[article Include Section Test
+[quickbook 1.5]
+]
+
+[include section-inc1.quickbook]
+[include section-inc2.quickbook]