[Boost-commit] svn:boost r74769 - in branches/release/tools/quickbook: . doc src test test/doc-info test/snippets

Subject: [Boost-commit] svn:boost r74769 - in branches/release/tools/quickbook: . doc src test test/doc-info test/snippets
From: dnljms_at_[hidden]
Date: 2011-10-06 18:10:32

Author: danieljames
Date: 2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
New Revision: 74769
URL: http://svn.boost.org/trac/boost/changeset/74769

Log:
Quickbook: Merge from trunk.

- Qualify footnote and callout ids.
- Close open sections at end of document.
- New markup for anchors in headers.
- Clean up some whitespace in generated xml.
- Fix double addition of anchor ids.
- A couple of doc changes from Beman.

Added:
   branches/release/tools/quickbook/test/heading_1_5.gold
      - copied unchanged from r74355, /trunk/tools/quickbook/test/heading_1_5.gold
   branches/release/tools/quickbook/test/section_1_5-unclosed.gold
      - copied unchanged from r74355, /trunk/tools/quickbook/test/section_1_5-unclosed.gold
   branches/release/tools/quickbook/test/section_1_5-unclosed.quickbook
      - copied unchanged from r74355, /trunk/tools/quickbook/test/section_1_5-unclosed.quickbook
Properties modified: 
   branches/release/tools/quickbook/   (props changed)
Text files modified: 
   branches/release/tools/quickbook/doc/quickbook.qbk                  |    14 +                                       
   branches/release/tools/quickbook/src/actions.cpp                    |    80 +++--                                   
   branches/release/tools/quickbook/src/doc_info_actions.cpp           |    14 +                                       
   branches/release/tools/quickbook/src/post_process.cpp               |    13                                         
   branches/release/tools/quickbook/src/quickbook.cpp                  |     6                                         
   branches/release/tools/quickbook/test/Jamfile.v2                    |     1                                         
   branches/release/tools/quickbook/test/anchor.gold                   |    23 +                                       
   branches/release/tools/quickbook/test/blocks.gold                   |    15                                         
   branches/release/tools/quickbook/test/callouts.gold                 |   130 ++++++++++                              
   branches/release/tools/quickbook/test/callouts.quickbook            |    25 ++                                      
   branches/release/tools/quickbook/test/code-block-1.gold             |     1                                         
   branches/release/tools/quickbook/test/code-block-2.gold             |     1                                         
   branches/release/tools/quickbook/test/code-block-3.gold             |     2                                         
   branches/release/tools/quickbook/test/code-block-3.quickbook        |     2                                         
   branches/release/tools/quickbook/test/code-block-cpp.gold           |     4                                         
   branches/release/tools/quickbook/test/code-block-python.gold        |     2                                         
   branches/release/tools/quickbook/test/code-block-teletype.gold      |     1                                         
   branches/release/tools/quickbook/test/code-block.gold               |    10                                         
   branches/release/tools/quickbook/test/doc-info/source-mode-1.4.gold |     5                                         
   branches/release/tools/quickbook/test/doc-info/source-mode-1.5.gold |     7                                         
   branches/release/tools/quickbook/test/doc-info/source-mode-1.6.gold |     7                                         
   branches/release/tools/quickbook/test/heading_1_1.gold              |     8                                         
   branches/release/tools/quickbook/test/heading_1_3.gold              |    11                                         
   branches/release/tools/quickbook/test/heading_1_6.gold              |    12                                         
   branches/release/tools/quickbook/test/identifier_1_5.gold           |   462 +++++++++++++++++++-------------------  
   branches/release/tools/quickbook/test/identifier_1_6.gold           |   463 +++++++++++++++++++-------------------- 
   branches/release/tools/quickbook/test/import.gold                   |    50 ++++                                    
   branches/release/tools/quickbook/test/import.quickbook              |     1                                         
   branches/release/tools/quickbook/test/preformatted.gold             |     1                                         
   branches/release/tools/quickbook/test/quickbook-manual.gold         |   195 +++-------------                        
   branches/release/tools/quickbook/test/snippets/pass_thru.gold       |     3                                         
   branches/release/tools/quickbook/test/template-section.gold         |     3                                         
   branches/release/tools/quickbook/test/templates.gold                |     3                                         
   branches/release/tools/quickbook/test/unicode-escape.gold           |     5                                         
   branches/release/tools/quickbook/test/utf-8-bom.gold                |     4                                         
   branches/release/tools/quickbook/test/utf-8.gold                    |     4                                         
   36 files changed, 835 insertions(+), 753 deletions(-)

Modified: branches/release/tools/quickbook/doc/quickbook.qbk
==============================================================================
--- branches/release/tools/quickbook/doc/quickbook.qbk	(original)
+++ branches/release/tools/quickbook/doc/quickbook.qbk	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -90,6 +90,12 @@
 is an extension of __docbook__, an SGML or XML based format for describing
 documentation.
 
+[tip You don't need to know anything about __boostbook__ or __docbook__
+to use QuickBook. A basic understanding of __docbook__ might help, but
+shouldn't be necessary. For really advanced stuff you will need to know
+__docbook__, but you can ignore it at first, and maybe continue to do so.
+]
+
 QuickBook is a WikiWiki style documentation tool geared towards C++
 documentation using simple rules and markup for simple formatting tasks.
 QuickBook extends the WikiWiki concept. Like the WikiWiki, QuickBook documents are
@@ -297,6 +303,10 @@
 [heading Version 1.5.6 - Boost 1.48]
 
 * Xml encode escaped punctuation (eg. `\<` is correctly encodes to \<).
+* Rename duplicate generated ids.
+* Close open sections at end of document (still warns about them).
+* New anchor markup for headers, will hopefully generate better pdfs.
+* Remove some whitespace around code from post processed output.
 
 [endsect] [/Change log]
 
@@ -2180,12 +2190,12 @@
 
 [endsect] [/ macosx]
 
-[section:windows Windows 2000, XP, 2003, Vista]
+[section:windows Windows 2000, XP, 2003, Vista, 7]
 
 [:['Section contributed by Julio M. Merino Vidal]]
 
 The following instructions apply to any Windows system based on Windows
-2000, including Windows XP, Windows 2003 Server and Windows Vista. The
+2000, including Windows XP, Windows 2003 Server, Windows Vista, and Windows 7. The
 paths shown below are taken from a Windows Vista machine; you will need to
 adjust them to match your system in case you are running an older version.
 

Modified: branches/release/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/release/tools/quickbook/src/actions.cpp	(original)
+++ branches/release/tools/quickbook/src/actions.cpp	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -59,9 +59,7 @@
                 it != end; ++it)
             {
                 tgt << "<anchor id=\"";
-                detail::print_string(
-                    actions.ids.add(*it, id_generator::explicit_id),
-                    tgt.get());
+                detail::print_string(*it, tgt.get());
                 tgt << "\"/>";
             }
             
@@ -280,7 +278,9 @@
         value_consumer values = phrase;
         actions.phrase
             << "<footnote id=\""
-            << actions.ids.add(actions.doc_id + ".f", id_generator::numbered)
+            << actions.ids.add(fully_qualified_id(actions.doc_id,
+                    actions.qualified_section_id, "f"),
+                    id_generator::numbered)
             << "\"><para>"
             << values.consume().get_boostbook()
             << "</para></footnote>";
@@ -318,16 +318,32 @@
     }
     
     namespace {
-        void write_bridgehead(collector& out, int level,
-            std::string const& str, std::string const& id, std::string const& linkend)
+        void write_bridgehead(quickbook::actions& actions, int level,
+            std::string const& str, std::string const& id, bool self_link)
         {
-            out << "<bridgehead renderas=\"sect" << level << "\"";
-            if(!id.empty()) out << " id=\"" << id << "\"";
-            out << ">";
-            if(!linkend.empty()) out << "<link linkend=\"" << linkend << "\">";
-            out << str;
-            if(!linkend.empty()) out << "</link>";
-            out << "</bridgehead>";
+            if (self_link && !id.empty())
+            {
+                actions.out << "<bridgehead renderas=\"sect" << level << "\"";
+                actions.out << " id=\"";
+                actions.out << actions.ids.add(
+                    fully_qualified_id(actions.doc_id,
+                        actions.qualified_section_id, "h"),
+                    id_generator::numbered),
+                actions.out << "\">";
+                actions.out << "<phrase id=\"" << id << "\"/>";
+                actions.out << "<link linkend=\"" << id << "\">";
+                actions.out << str;
+                actions.out << "</link>";
+                actions.out << "</bridgehead>";
+            }
+            else
+            {
+                actions.out << "<bridgehead renderas=\"sect" << level << "\"";
+                if(!id.empty()) actions.out << " id=\"" << id << "\"";
+                actions.out << ">";
+                actions.out << str;
+                actions.out << "</bridgehead>";
+            }
         }
     }
 
@@ -358,14 +374,17 @@
             level = heading_list.get_tag() - block_tags::heading1 + 1;
         }
 
-        std::string linkend;
+        write_anchors(actions, actions.out);
 
         if (!generic && qbk_version_n < 103) // version 1.2 and below
         {
-            add_anchor(actions,
+            std::string anchor = actions.ids.add(
                 actions.section_id + '.' +
                     detail::make_identifier(content.get_boostbook()),
                 id_generator::generated_heading);
+
+            write_bridgehead(actions, level,
+                content.get_boostbook(), anchor, false);
         }
         else
         {
@@ -383,20 +402,14 @@
                             content.get_boostbook()
                     );
 
-            linkend = add_anchor(actions,
+            std::string anchor = actions.ids.add(
                 fully_qualified_id(actions.doc_id,
                     actions.qualified_section_id, id),
-                category);
-        }
+                category);;
 
-        write_anchors(actions, actions.out);        
-        write_bridgehead(actions.out, level,
-            content.get_boostbook(),
-            actions.ids.add(
-                fully_qualified_id(actions.doc_id,
-                    actions.qualified_section_id, "h"),
-                id_generator::numbered),
-            linkend);
+            write_bridgehead(actions, level,
+                content.get_boostbook(), anchor, true);
+        }
     }
 
     void simple_phrase_action::operator()(char mark) const
@@ -1258,17 +1271,16 @@
                 }
 
                 unsigned int size = symbol->params.size();
+                std::string callout_base_id =
+                    fully_qualified_id(actions.doc_id,
+                        actions.qualified_section_id, "c");
 
                 for(unsigned int i = 0; i < size; ++i)
                 {
-                    std::string callout_id1 =
-                        actions.ids.add(
-                            actions.doc_id + ".c",
-                            id_generator::numbered);
-                    std::string callout_id2 =
-                        actions.ids.add(
-                            actions.doc_id + ".c",
-                            id_generator::numbered);
+                    std::string callout_id1 = actions.ids.add(
+                        callout_base_id, id_generator::numbered);
+                    std::string callout_id2 = actions.ids.add(
+                        callout_base_id, id_generator::numbered);
 
                     std::string code;
                     code += "<co id=\"" + callout_id1 + "\" ";

Modified: branches/release/tools/quickbook/src/doc_info_actions.cpp
==============================================================================
--- branches/release/tools/quickbook/src/doc_info_actions.cpp	(original)
+++ branches/release/tools/quickbook/src/doc_info_actions.cpp	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -407,6 +407,20 @@
             return;
         } 
 
+        // Close any open sections.
+        if (actions.section_level != 0) {
+            detail::outwarn(actions.filename)
+                << "Warning missing [endsect] detected at end of file."
+                << std::endl;
+
+            while(actions.section_level > 0) {
+                out << "</section>";
+                --actions.section_level;
+            }
+
+            actions.qualified_section_id.clear();
+        }
+
         // We've finished generating our output. Here's what we'll do
         // *after* everything else.
         out << "\n</" << actions.doc_type << ">\n\n";

Modified: branches/release/tools/quickbook/src/post_process.cpp
==============================================================================
--- branches/release/tools/quickbook/src/post_process.cpp	(original)
+++ branches/release/tools/quickbook/src/post_process.cpp	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -32,9 +32,14 @@
             column = current_indent;
         }
 
-        void break_line()
+        void trim_spaces()
         {
             out.erase(out.find_last_not_of(' ')+1); // trim trailing spaces
+        }
+
+        void break_line()
+        {
+            trim_spaces();
             out += '\n';
             indent();
         }
@@ -338,13 +343,16 @@
 
         void do_code(iter_type f, iter_type l) const
         {
-            state.out += '\n';
+            state.printer_.trim_spaces();
+            if (state.out[state.out.size() - 1] != '\n')
+                state.out += '\n';
             // print the string taking care of line
             // ending CR/LF platform issues
             for (iter_type i = f; i != l; ++i)
             {
                 if (*i == '\n')
                 {
+                    state.printer_.trim_spaces();
                     state.out += '\n';
                     ++i;
                     if (i != l && *i != '\r')
@@ -352,6 +360,7 @@
                 }
                 else if (*i == '\r')
                 {
+                    state.printer_.trim_spaces();
                     state.out += '\n';
                     ++i;
                     if (i != l && *i != '\n')

Modified: branches/release/tools/quickbook/src/quickbook.cpp
==============================================================================
--- branches/release/tools/quickbook/src/quickbook.cpp	(original)
+++ branches/release/tools/quickbook/src/quickbook.cpp	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -35,7 +35,7 @@
 #pragma warning(disable:4355)
 #endif
 
-#define QUICKBOOK_VERSION "Quickbook Version 1.5.6 (release)"
+#define QUICKBOOK_VERSION "Quickbook Version 1.5.6"
 
 namespace quickbook
 {
@@ -116,10 +116,6 @@
         actions& actor)
     {        
         bool r = parse_file(filein_, actor);
-        if (actor.section_level != 0)
-            detail::outwarn(filein_)
-                << "Warning missing [endsect] detected at end of file."
-                << std::endl;
 
         if(actor.error_count)
         {

Modified: branches/release/tools/quickbook/test/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/test/Jamfile.v2	(original)
+++ branches/release/tools/quickbook/test/Jamfile.v2	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -46,6 +46,7 @@
     [ 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_6 ]

Modified: branches/release/tools/quickbook/test/anchor.gold
==============================================================================
--- branches/release/tools/quickbook/test/anchor.gold	(original)
+++ branches/release/tools/quickbook/test/anchor.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -9,26 +9,29 @@
       <anchor id="a1"/>A paragraph containing several anchors. <anchor id="a2"/>We
       want to make sure they appear in the correct place. <anchor id="a3"/>
     </para>
-    <anchor id="anchor_test.anchors.this_heading_shouldn_t_pick_up_the_previous_anchor"/>
     <bridgehead renderas="sect3" id="anchor_test.anchors.h0">
-      <link linkend="anchor_test.anchors.this_heading_shouldn_t_pick_up_the_previous_anchor">This
+      <phrase id="anchor_test.anchors.this_heading_shouldn_t_pick_up_the_previous_anchor"/><link
+      linkend="anchor_test.anchors.this_heading_shouldn_t_pick_up_the_previous_anchor">This
       heading shouldn't pick up the previous anchor</link>
     </bridgehead>
-    <anchor id="a4"/><anchor id="anchor_test.anchors.this_heading_should_pick_up_the_previous_anchor"/>
+    <anchor id="a4"/>
     <bridgehead renderas="sect3" id="anchor_test.anchors.h1">
-      <link linkend="anchor_test.anchors.this_heading_should_pick_up_the_previous_anchor">This
+      <phrase id="anchor_test.anchors.this_heading_should_pick_up_the_previous_anchor"/><link
+      linkend="anchor_test.anchors.this_heading_should_pick_up_the_previous_anchor">This
       heading should pick up the previous anchor</link>
     </bridgehead>
-    <anchor id="a5"/><anchor id="anchor_test.anchors.and_this_one"/>
+    <anchor id="a5"/>
     <bridgehead renderas="sect3" id="anchor_test.anchors.h2">
-      <link linkend="anchor_test.anchors.and_this_one">And this one</link>
+      <phrase id="anchor_test.anchors.and_this_one"/><link linkend="anchor_test.anchors.and_this_one">And
+      this one</link>
     </bridgehead>
-    <anchor id="a6"/><anchor id="anchor_test.anchors.also_this_one"/>
+    <anchor id="a6"/>
     <bridgehead renderas="sect3" id="anchor_test.anchors.h3">
-      <link linkend="anchor_test.anchors.also_this_one">Also this one</link>
+      <phrase id="anchor_test.anchors.also_this_one"/><link linkend="anchor_test.anchors.also_this_one">Also
+      this one</link>
     </bridgehead>
-    <anchor id="a7"/><anchor id="anchors.finally_this"/>
-    <bridgehead renderas="sect3" id="anchor_test.anchors.h4">
+    <anchor id="a7"/>
+    <bridgehead renderas="sect3" id="anchors.finally_this">
       Finally this
     </bridgehead>
     <anchor id="a8"/>

Modified: branches/release/tools/quickbook/test/blocks.gold
==============================================================================
--- branches/release/tools/quickbook/test/blocks.gold	(original)
+++ branches/release/tools/quickbook/test/blocks.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -2,9 +2,9 @@
 <!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="various_blocks" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Various blocks</title> <anchor id="various_blocks.blockquotes"/>
+  <title>Various blocks</title>
   <bridgehead renderas="sect2" id="various_blocks.h0">
-    <link linkend="various_blocks.blockquotes">Blockquotes</link>
+    <phrase id="various_blocks.blockquotes"/><link linkend="various_blocks.blockquotes">Blockquotes</link>
   </bridgehead>
   <para>
     Here's a blockquote:
@@ -25,9 +25,8 @@
       Blockquote second paragraph.
     </para>
   </blockquote>
-  <anchor id="various_blocks.admonitions"/>
   <bridgehead renderas="sect2" id="various_blocks.h1">
-    <link linkend="various_blocks.admonitions">Admonitions</link>
+    <phrase id="various_blocks.admonitions"/><link linkend="various_blocks.admonitions">Admonitions</link>
   </bridgehead>
   <warning>
     <para>
@@ -62,17 +61,17 @@
       Warning second paragraph.
     </para>
   </warning>
-  <anchor id="various_blocks.blurb"/>
   <bridgehead renderas="sect2" id="various_blocks.h2">
-    <link linkend="various_blocks.blurb">Blurb</link>
+    <phrase id="various_blocks.blurb"/><link linkend="various_blocks.blurb">Blurb</link>
   </bridgehead>
   <sidebar role="blurb">
   <para>
     Blurb
   </para>
-  </sidebar> <anchor id="various_blocks.inline_blocks"/>
+  </sidebar>
   <bridgehead renderas="sect2" id="various_blocks.h3">
-    <link linkend="various_blocks.inline_blocks">Inline blocks</link>
+    <phrase id="various_blocks.inline_blocks"/><link linkend="various_blocks.inline_blocks">Inline
+    blocks</link>
   </bridgehead>
   <blockquote>
     <para>

Modified: branches/release/tools/quickbook/test/callouts.gold
==============================================================================
--- branches/release/tools/quickbook/test/callouts.gold	(original)
+++ branches/release/tools/quickbook/test/callouts.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -10,7 +10,6 @@
     Now we can define a function that simulates an ordinary six-sided die.
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
   <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <co id="callout_tests.c0" linkends="callout_tests.c1" />
 <phrase role="special">}</phrase>
@@ -28,7 +27,6 @@
     Example 2:
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
   <co id="callout_tests.c2" linkends="callout_tests.c3" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special">&lt;</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&amp;,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="special">&gt;</phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
 <phrase role="special">}</phrase>
@@ -48,7 +46,6 @@
     Example 3:
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
   <co id="callout_tests.c4" linkends="callout_tests.c5" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special">&lt;</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&amp;,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="special">&gt;</phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
 <phrase role="special">}</phrase>
@@ -68,7 +65,6 @@
     Example 3 (again!):
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
   <co id="callout_tests.c6" linkends="callout_tests.c7" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special">&lt;</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&amp;,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="special">&gt;</phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
 <phrase role="special">}</phrase>
@@ -88,7 +84,6 @@
     Example 4:
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
   <co id="callout_tests.c8" linkends="callout_tests.c9" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special">&lt;</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&amp;,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="special">&gt;</phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
 <co id="callout_tests.c10" linkends="callout_tests.c11" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <co id="callout_tests.c12" linkends="callout_tests.c13" />
@@ -114,7 +109,6 @@
     </callout>
   </calloutlist>
   <para>
-    
 <programlisting><co id="callout_tests.c14" linkends="callout_tests.c15" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <co id="callout_tests.c16" linkends="callout_tests.c17" />
 </programlisting>
   </para>
@@ -130,4 +124,128 @@
       </para>
     </callout>
   </calloutlist>
+  <section id="callout_tests.test_section">
+    <title><link linkend="callout_tests.test_section">Try callouts in a section</link></title>
+    <para>
+      Example 1:
+    </para>
+    <para>
+      Now we can define a function that simulates an ordinary six-sided die.
+    </para>
+    <para>
+<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
+  <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <co id="callout_tests.test_section.c0" linkends="callout_tests.test_section.c1" />
+<phrase role="special">}</phrase>
+
+</programlisting>
+    </para>
+    <calloutlist>
+      <callout arearefs="callout_tests.test_section.c0" id="callout_tests.test_section.c1">
+        <para>
+          create a uniform_int distribution
+        </para>
+      </callout>
+    </calloutlist>
+    <para>
+      Example 2:
+    </para>
+    <para>
+<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
+  <co id="callout_tests.test_section.c2" linkends="callout_tests.test_section.c3" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special">&lt;</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&amp;,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="special">&gt;</phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
+<phrase role="special">}</phrase>
+
+</programlisting>
+    </para>
+    <calloutlist>
+      <callout arearefs="callout_tests.test_section.c2" id="callout_tests.test_section.c3">
+        <important>
+          <para>
+            test
+          </para>
+        </important>
+      </callout>
+    </calloutlist>
+    <para>
+      Example 3:
+    </para>
+    <para>
+<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
+  <co id="callout_tests.test_section.c4" linkends="callout_tests.test_section.c5" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special">&lt;</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&amp;,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="special">&gt;</phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
+<phrase role="special">}</phrase>
+
+</programlisting>
+    </para>
+    <calloutlist>
+      <callout arearefs="callout_tests.test_section.c4" id="callout_tests.test_section.c5">
+        <important>
+          <para>
+            test
+          </para>
+        </important>
+      </callout>
+    </calloutlist>
+    <para>
+      Example 3 (again!):
+    </para>
+    <para>
+<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
+  <co id="callout_tests.test_section.c6" linkends="callout_tests.test_section.c7" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special">&lt;</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&amp;,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="special">&gt;</phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
+<phrase role="special">}</phrase>
+
+</programlisting>
+    </para>
+    <calloutlist>
+      <callout arearefs="callout_tests.test_section.c6" id="callout_tests.test_section.c7">
+        <important>
+          <para>
+            test
+          </para>
+        </important>
+      </callout>
+    </calloutlist>
+    <para>
+      Example 4:
+    </para>
+    <para>
+<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
+  <co id="callout_tests.test_section.c8" linkends="callout_tests.test_section.c9" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special">&lt;</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&amp;,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="special">&gt;</phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
+<co id="callout_tests.test_section.c10" linkends="callout_tests.test_section.c11" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <co id="callout_tests.test_section.c12" linkends="callout_tests.test_section.c13" />
+<phrase role="special">}</phrase>
+
+</programlisting>
+    </para>
+    <calloutlist>
+      <callout arearefs="callout_tests.test_section.c8" id="callout_tests.test_section.c9">
+        <para>
+          callout 1
+        </para>
+      </callout>
+      <callout arearefs="callout_tests.test_section.c10" id="callout_tests.test_section.c11">
+        <para>
+          callout 2
+        </para>
+      </callout>
+      <callout arearefs="callout_tests.test_section.c12" id="callout_tests.test_section.c13">
+        <para>
+          create a uniform_int distribution
+        </para>
+      </callout>
+    </calloutlist>
+    <para>
+<programlisting><co id="callout_tests.test_section.c14" linkends="callout_tests.test_section.c15" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <co id="callout_tests.test_section.c16" linkends="callout_tests.test_section.c17" />
+</programlisting>
+    </para>
+    <calloutlist>
+      <callout arearefs="callout_tests.test_section.c14" id="callout_tests.test_section.c15">
+        <para>
+          callout 2
+        </para>
+      </callout>
+      <callout arearefs="callout_tests.test_section.c16" id="callout_tests.test_section.c17">
+        <para>
+          create a uniform_int distribution
+        </para>
+      </callout>
+    </calloutlist>
+  </section>
 </article>

Modified: branches/release/tools/quickbook/test/callouts.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/callouts.quickbook	(original)
+++ branches/release/tools/quickbook/test/callouts.quickbook	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -24,3 +24,28 @@
 
 [example4]
 [example4a]
+
+[section:test_section Try callouts in a section]
+
+Example 1:
+
+[example1]
+
+Example 2:
+
+[example2]
+
+Example 3:
+
+[example3]
+
+Example 3 (again!):
+
+[example3]
+
+Example 4:
+
+[example4]
+[example4a]
+
+[endsect]
\ No newline at end of file

Modified: branches/release/tools/quickbook/test/code-block-1.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-block-1.gold	(original)
+++ branches/release/tools/quickbook/test/code-block-1.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -8,7 +8,6 @@
     <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>

Modified: branches/release/tools/quickbook/test/code-block-2.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-block-2.gold	(original)
+++ branches/release/tools/quickbook/test/code-block-2.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -9,7 +9,6 @@
       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>

Modified: branches/release/tools/quickbook/test/code-block-3.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-block-3.gold	(original)
+++ branches/release/tools/quickbook/test/code-block-3.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -6,7 +6,6 @@
   <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>
@@ -17,7 +16,6 @@
       This isn't valid C++ but I think we should accept it;
     </para>
     <para>
-      [cpp] 
 <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>

Modified: branches/release/tools/quickbook/test/code-block-3.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/code-block-3.quickbook	(original)
+++ branches/release/tools/quickbook/test/code-block-3.quickbook	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -13,7 +13,7 @@
 
 This isn't valid C++ but I think we should accept it;
 
-[cpp]
+[c++]
 ``
     std::cout<<"\xfabln\xeck"<<"\n";
 ``

Modified: branches/release/tools/quickbook/test/code-block-cpp.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-block-cpp.gold	(original)
+++ branches/release/tools/quickbook/test/code-block-cpp.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -2,7 +2,7 @@
 <!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="c___code_blocks" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>C++ Code Blocks</title> 
+  <title>C++ Code Blocks</title>
 <programlisting><phrase role="comment">// No escape</phrase>
 <phrase role="comment">/* No escape */</phrase>
 <phrase role="comment">/* No escape
@@ -17,13 +17,11 @@
   <para>
     A badly formed comment:
   </para>
-  
 <programlisting><phrase role="comment">/* Oh dear
 </phrase></programlisting>
   <para>
     A badly formed comment with an escape:
   </para>
-  
 <programlisting><phrase role="comment">/* Oh dear <emphasis role="bold">bold</emphasis>
 </phrase></programlisting>
 </article>

Modified: branches/release/tools/quickbook/test/code-block-python.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-block-python.gold	(original)
+++ branches/release/tools/quickbook/test/code-block-python.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -2,7 +2,7 @@
 <!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="python_code_blocks" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Python Code Blocks</title> 
+  <title>Python Code Blocks</title>
 <programlisting><phrase role="comment"># No escape</phrase>
 <phrase role="comment"># Escape: <emphasis role="bold">bold</emphasis></phrase>
 <phrase role="comment"># Escape: <emphasis role="underline">underline</emphasis><emphasis>italic</emphasis></phrase>

Modified: branches/release/tools/quickbook/test/code-block-teletype.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-block-teletype.gold	(original)
+++ branches/release/tools/quickbook/test/code-block-teletype.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -5,7 +5,6 @@
   <title>Code Block Teletype 1</title>
   <section id="code_block_teletype_1.a_code_block">
     <title><link linkend="code_block_teletype_1.a_code_block">A code block</link></title>
-    
 <programlisting>Just some plain text.
 With some <emphasis role="bold">quickbook</emphasis> thrown in?
 </programlisting>

Modified: branches/release/tools/quickbook/test/code-block.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-block.gold	(original)
+++ branches/release/tools/quickbook/test/code-block.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -6,13 +6,11 @@
   <para>
     In a paragraph. Still in a paragraph.
   </para>
-  
 <programlisting>In a code block.
 </programlisting>
   <para>
     Back in a paragraph.
   </para>
-  
 <programlisting>   Code block line 1.
 Code block line 2.
        Code block line 3.
@@ -20,21 +18,17 @@
   <para>
     Paragraph.
   </para>
-  
 <programlisting>Code block with no trailing blank lines.
 </programlisting>
   <para>
     Paragraph.
   </para>
-  <anchor id="indented_code_blocks.code_blocks_separated_by_comment"/>
   <bridgehead renderas="sect2" id="indented_code_blocks.h0">
-    <link linkend="indented_code_blocks.code_blocks_separated_by_comment">Code blocks
-    separated by comment</link>
+    <phrase id="indented_code_blocks.code_blocks_separated_by_comment"/><link linkend="indented_code_blocks.code_blocks_separated_by_comment">Code
+    blocks separated by comment</link>
   </bridgehead>
-  
 <programlisting>First code block.
 </programlisting>
-  
 <programlisting>Second code block.
 [/ Comment in second code block]
 Still second code block.

Modified: branches/release/tools/quickbook/test/doc-info/source-mode-1.4.gold
==============================================================================
--- branches/release/tools/quickbook/test/doc-info/source-mode-1.4.gold	(original)
+++ branches/release/tools/quickbook/test/doc-info/source-mode-1.4.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -16,23 +16,18 @@
     </articlepurpose>
   </articleinfo>
   <para>
-    
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">():</phrase></programlisting>
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">(</phrase><phrase role="identifier">x</phrase><phrase role="special">):</phrase></programlisting>
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
   </para>
 </article>

Modified: branches/release/tools/quickbook/test/doc-info/source-mode-1.5.gold
==============================================================================
--- branches/release/tools/quickbook/test/doc-info/source-mode-1.5.gold	(original)
+++ branches/release/tools/quickbook/test/doc-info/source-mode-1.5.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -15,31 +15,24 @@
     </articlepurpose>
   </articleinfo>
   <para>
-    
 <programlisting>This shouldn't be highlighted.</programlisting>
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">():</phrase></programlisting>
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">(</phrase><phrase role="identifier">x</phrase><phrase role="special">):</phrase></programlisting>
   </para>
   <para>
-    
 <programlisting>This shouldn't be highlighted</programlisting>
   </para>
   <para>
-    
 <programlisting>This shouldn't be highlighted.</programlisting>
   </para>
 </article>

Modified: branches/release/tools/quickbook/test/doc-info/source-mode-1.6.gold
==============================================================================
--- branches/release/tools/quickbook/test/doc-info/source-mode-1.6.gold	(original)
+++ branches/release/tools/quickbook/test/doc-info/source-mode-1.6.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -15,31 +15,24 @@
     </articlepurpose>
   </articleinfo>
   <para>
-    
 <programlisting>This shouldn't be highlighted.</programlisting>
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
   </para>
   <para>
-    
 <programlisting>This shouldn't be highlighted.</programlisting>
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">():</phrase></programlisting>
   </para>
   <para>
-    
 <programlisting>This shouldn't be highlighted.</programlisting>
   </para>
   <para>
-    
 <programlisting>This shouldn't be highlighted</programlisting>
   </para>
   <para>
-    
 <programlisting>This shouldn't be highlighted.</programlisting>
   </para>
 </article>

Modified: branches/release/tools/quickbook/test/heading_1_1.gold
==============================================================================
--- branches/release/tools/quickbook/test/heading_1_1.gold	(original)
+++ branches/release/tools/quickbook/test/heading_1_1.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -2,13 +2,13 @@
 <!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="heading_1_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Heading 1.1</title> <anchor id=".first_heading"/>
-  <bridgehead renderas="sect1" id="heading_1_1.h0">
+  <title>Heading 1.1</title>
+  <bridgehead renderas="sect1" id=".first_heading">
     First heading
   </bridgehead>
   <section id="heading_1_1.section">
-    <title>Section</title> <anchor id="section.second_heading"/>
-    <bridgehead renderas="sect2" id="heading_1_1.section.h0">
+    <title>Section</title>
+    <bridgehead renderas="sect2" id="section.second_heading">
       Second heading
     </bridgehead>
   </section>

Modified: branches/release/tools/quickbook/test/heading_1_3.gold
==============================================================================
--- branches/release/tools/quickbook/test/heading_1_3.gold	(original)
+++ branches/release/tools/quickbook/test/heading_1_3.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -1,23 +1,22 @@
 <?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"/>
+  <title>Header</title>
   <bridgehead renderas="sect2" id="header.h0">
-    <link linkend="header.header_test">Header Test</link>
+    <phrase id="header.header_test"/><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.h1">
-    <link linkend="header._not_an_id">:Not an Id</link>
+    <phrase id="header._not_an_id"/><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.h2">
-    <link linkend="header._not_an_id_again">:Not an Id again</link>
+    <phrase id="header._not_an_id_again"/><link linkend="header._not_an_id_again">:Not
+    an Id again</link>
   </bridgehead>
   <para>
     Paragraph.

Modified: branches/release/tools/quickbook/test/heading_1_6.gold
==============================================================================
--- branches/release/tools/quickbook/test/heading_1_6.gold	(original)
+++ branches/release/tools/quickbook/test/heading_1_6.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -1,23 +1,23 @@
 <?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"/>
+  <title>Header</title>
   <bridgehead renderas="sect2" id="header.h0">
-    <link linkend="header.header_test">Header Test</link>
+    <phrase id="header.header_test"/><link linkend="header.header_test">Header Test</link>
   </bridgehead>
   <para>
     Paragraph.
   </para>
-  <anchor id="header.heading_id"/>
   <bridgehead renderas="sect2" id="header.h1">
-    <link linkend="header.heading_id">Heading with an id</link>
+    <phrase id="header.heading_id"/><link linkend="header.heading_id">Heading with
+    an id</link>
   </bridgehead>
   <para>
     Paragraph.
   </para>
-  <anchor id="header.heading_id2"/>
   <bridgehead renderas="sect3" id="header.h2">
-    <link linkend="header.heading_id2">Heading with an id</link>
+    <phrase id="header.heading_id2"/><link linkend="header.heading_id2">Heading with
+    an id</link>
   </bridgehead>
   <para>
     Paragraph.

Modified: branches/release/tools/quickbook/test/identifier_1_5.gold
==============================================================================
--- branches/release/tools/quickbook/test/identifier_1_5.gold	(original)
+++ branches/release/tools/quickbook/test/identifier_1_5.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -2,18 +2,19 @@
 <!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="identifiers_in_quickbook_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Identifiers in quickbook 1.5</title> <anchor id="identifiers_in_quickbook_1_5.test_heading_with__code__phrase_role__identifier__code__phrase___code_"/>
+  <title>Identifiers in quickbook 1.5</title>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h0">
-    <link linkend="identifiers_in_quickbook_1_5.test_heading_with__code__phrase_role__identifier__code__phrase___code_">Test
+    <phrase id="identifiers_in_quickbook_1_5.test_heading_with__code__phrase_role__identifier__code__phrase___code_"/><link
+    linkend="identifiers_in_quickbook_1_5.test_heading_with__code__phrase_role__identifier__code__phrase___code_">Test
     heading with <code><phrase role="identifier">code</phrase></code></link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.identifier_10_0"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h1">
-    <link linkend="identifiers_in_quickbook_1_5.identifier_10_0">Identifier 10</link>
+    <phrase id="identifiers_in_quickbook_1_5.identifier_10_0"/><link linkend="identifiers_in_quickbook_1_5.identifier_10_0">Identifier
+    10</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.identifier_10_1"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h2">
-    <link linkend="identifiers_in_quickbook_1_5.identifier_10_1">Identifier 10</link>
+    <phrase id="identifiers_in_quickbook_1_5.identifier_10_1"/><link linkend="identifiers_in_quickbook_1_5.identifier_10_1">Identifier
+    10</link>
   </bridgehead>
   <table frame="all" id="identifiers_in_quickbook_1_5.identifier_10_2">
     <title>Identifier 10</title>
@@ -26,549 +27,548 @@
       </tbody>
     </tgroup>
   </table>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_several_headers"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h3">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_several_headers">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_several_headers"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_several_headers">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d0"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h4">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d0">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d0"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d0">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h5">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers">Generate
     a really long id and duplicate it by having lots of headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d1"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h6">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d1">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d1"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d1">Generate
     a really long id and duplicate it by having lots of headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d2"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h7">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d2">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d2"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d2">Generate
     a really long id and duplicate it by having lots of headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d3"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h8">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d3">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d3"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d3">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d5"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h9">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d5">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d5"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d5">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d6"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h10">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d6">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d6"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d6">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d7"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h11">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d7">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d7"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d7">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h12">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d8"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h13">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d8">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d8"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d8">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d9"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h14">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d9">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d9"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d9">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_0"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h15">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_0">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_0"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_0">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_1"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h16">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_1">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_1"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_1">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_2"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h17">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_2">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_2"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_2">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_3"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h18">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_3">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_3"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_3">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_4"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h19">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_4">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_4"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_4">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_5"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h20">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_5">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_5"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_5">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_6"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h21">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_6">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_6"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_6">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_7"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h22">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_7">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_7"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_7">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_8"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h23">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_8">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_8"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_8">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_9"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h24">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_9">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_9"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_9">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_10"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h25">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_10">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_10"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_10">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_11"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h26">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_11">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_11"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_11">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_12"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h27">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_12">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_12"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_12">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_13"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h28">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_13">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_13"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_13">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_14"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h29">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_14">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_14"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_14">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_16"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h30">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_16">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_16"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_16">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_17"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h31">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_17">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_17"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_17">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_18"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h32">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_18">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_18"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_18">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_19"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h33">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_19">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_19"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_19">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_20"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h34">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_20">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_20"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_20">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_21"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h35">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_21">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_21"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_21">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_22"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h36">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_22">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_22"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_22">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_23"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h37">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_23">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_23"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_23">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_24"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h38">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_24">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_24"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_24">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_25"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h39">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_25">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_25"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_25">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_26"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h40">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_26">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_26"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_26">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h41">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers">Generate
     a really long id and duplicate it by having even more headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_27"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h42">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_27">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_27"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_27">Generate
     a really long id and duplicate it by having even more headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_28"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h43">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_28">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_28"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_28">Generate
     a really long id and duplicate it by having even more headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_29"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h44">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_29">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_29"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_29">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d4"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h45">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d4">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d4"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_d4">Generate
     a really long id and d4</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_15"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h46">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_15">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_15"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_15">Generate
     a really long id and 15</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_30"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h47">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_30">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_30"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_30">Generate
     a really long id and d4</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_31"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h48">
-    <link linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_31">Generate
+    <phrase id="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_31"/><link
+    linkend="identifiers_in_quickbook_1_5.generate_a_really_long_id_and_31">Generate
     a really long id and 15</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.a2345678901234567890123456789012"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h49">
-    <link linkend="identifiers_in_quickbook_1_5.a2345678901234567890123456789012">a2345678901234567890123456789012</link>
+    <phrase id="identifiers_in_quickbook_1_5.a2345678901234567890123456789012"/><link
+    linkend="identifiers_in_quickbook_1_5.a2345678901234567890123456789012">a2345678901234567890123456789012</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.a0"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h50">
-    <link linkend="identifiers_in_quickbook_1_5.a0">a2345678901234567890123456789012</link>
+    <phrase id="identifiers_in_quickbook_1_5.a0"/><link linkend="identifiers_in_quickbook_1_5.a0">a2345678901234567890123456789012</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcdef"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h51">
-    <link linkend="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcdef">abcdefghijklmnopqrstuvwxyzabcdef</link>
+    <phrase id="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcdef"/><link
+    linkend="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcdef">abcdefghijklmnopqrstuvwxyzabcdef</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcde0"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h52">
-    <link linkend="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcde0">abcdefghijklmnopqrstuvwxyzabcdef</link>
+    <phrase id="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcde0"/><link
+    linkend="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcde0">abcdefghijklmnopqrstuvwxyzabcdef</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcde1"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h53">
-    <link linkend="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcde1">abcdefghijklmnopqrstuvwxyzabcdef</link>
+    <phrase id="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcde1"/><link
+    linkend="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcde1">abcdefghijklmnopqrstuvwxyzabcdef</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcde2"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h54">
-    <link linkend="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcde2">abcdefghijklmnopqrstuvwxyzabcdef</link>
+    <phrase id="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcde2"/><link
+    linkend="identifiers_in_quickbook_1_5.abcdefghijklmnopqrstuvwxyzabcde2">abcdefghijklmnopqrstuvwxyzabcdef</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.markup_in__code__phrase_role__identifier__heading__phrase___code___in__emphasis_role__bold__order__emphasis__to_test_normalization"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h55">
-    <link linkend="identifiers_in_quickbook_1_5.markup_in__code__phrase_role__identifier__heading__phrase___code___in__emphasis_role__bold__order__emphasis__to_test_normalization">Markup
+    <phrase id="identifiers_in_quickbook_1_5.markup_in__code__phrase_role__identifier__heading__phrase___code___in__emphasis_role__bold__order__emphasis__to_test_normalization"/><link
+    linkend="identifiers_in_quickbook_1_5.markup_in__code__phrase_role__identifier__heading__phrase___code___in__emphasis_role__bold__order__emphasis__to_test_normalization">Markup
     in <code><phrase role="identifier">heading</phrase></code> in <emphasis role="bold">order</emphasis>
     to test normalization</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.markup_in_code_phrase_role_iden0"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h56">
-    <link linkend="identifiers_in_quickbook_1_5.markup_in_code_phrase_role_iden0">Markup
+    <phrase id="identifiers_in_quickbook_1_5.markup_in_code_phrase_role_iden0"/><link
+    linkend="identifiers_in_quickbook_1_5.markup_in_code_phrase_role_iden0">Markup
     in <code><phrase role="identifier">heading</phrase></code> in <emphasis role="bold">order</emphasis>
     to test normalization</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_5.markup_in_code_phrase_role_iden1"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_5.h57">
-    <link linkend="identifiers_in_quickbook_1_5.markup_in_code_phrase_role_iden1">Markup
+    <phrase id="identifiers_in_quickbook_1_5.markup_in_code_phrase_role_iden1"/><link
+    linkend="identifiers_in_quickbook_1_5.markup_in_code_phrase_role_iden1">Markup
     in <code><phrase role="identifier">heading</phrase></code> in <emphasis role="bold">order</emphasis>
     to test normalization</link>
   </bridgehead>
   <section id="identifiers_in_quickbook_1_5.identifier_10">
     <title><link linkend="identifiers_in_quickbook_1_5.identifier_10">Identifier
-    10</link></title> <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_several_headers"/>
+    10</link></title>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h0">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_several_headers">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_several_headers"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_several_headers">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d0"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h1">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d0">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d0"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d0">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h2">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers">Generate
       a really long id and duplicate it by having lots of headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d1"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h4">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d1">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d1"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d1">Generate
       a really long id and duplicate it by having lots of headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d2"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h5">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d2">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d2"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d2">Generate
       a really long id and duplicate it by having lots of headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d3"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h6">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d3">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d3"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d3">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d5"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h7">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d5">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d5"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d5">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d6"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h8">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d6">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d6"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d6">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d7"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h9">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d7">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d7"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d7">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h10">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d8"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h11">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d8">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d8"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d8">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d9"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h12">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d9">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d9"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d9">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_0"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h13">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_0">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_0"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_0">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_1"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h14">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_1">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_1"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_1">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_2"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h15">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_2">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_2"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_2">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_3"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h16">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_3">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_3"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_3">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_4"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h17">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_4">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_4"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_4">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_5"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h18">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_5">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_5"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_5">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_6"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h19">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_6">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_6"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_6">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_7"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h20">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_7">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_7"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_7">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_8"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h21">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_8">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_8"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_8">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_9"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h22">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_9">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_9"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_9">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_10"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h23">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_10">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_10"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_10">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_11"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h24">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_11">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_11"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_11">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_12"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h25">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_12">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_12"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_12">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_13"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h26">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_13">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_13"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_13">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_14"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h27">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_14">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_14"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_14">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_16"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h28">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_16">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_16"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_16">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_17"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h29">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_17">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_17"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_17">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_18"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h30">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_18">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_18"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_18">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_19"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h31">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_19">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_19"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_19">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_20"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h32">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_20">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_20"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_20">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_21"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h33">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_21">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_21"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_21">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_22"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h34">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_22">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_22"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_22">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_23"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h35">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_23">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_23"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_23">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_24"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h36">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_24">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_24"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_24">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_25"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h37">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_25">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_25"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_25">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_26"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h38">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_26">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_26"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_26">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h39">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers">Generate
       a really long id and duplicate it by having even more headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_27"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h40">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_27">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_27"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_27">Generate
       a really long id and duplicate it by having even more headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_28"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h41">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_28">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_28"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_28">Generate
       a really long id and duplicate it by having even more headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_29"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h42">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_29">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_29"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_29">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d4"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h43">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d4">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d4"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_d4">Generate
       a really long id and d4</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_15"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h44">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_15">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_15"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_15">Generate
       a really long id and 15</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_30"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h45">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_30">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_30"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_30">Generate
       a really long id and d4</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_31"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h46">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_31">Generate
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_31"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.generate_a_really_long_id_and_31">Generate
       a really long id and 15</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.a2345678901234567890123456789012"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h47">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.a2345678901234567890123456789012">a2345678901234567890123456789012</link>
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.a2345678901234567890123456789012"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.a2345678901234567890123456789012">a2345678901234567890123456789012</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.a0"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h48">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.a0">a2345678901234567890123456789012</link>
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.a0"/><link linkend="identifiers_in_quickbook_1_5.identifier_10.a0">a2345678901234567890123456789012</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcdef"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h49">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcdef">abcdefghijklmnopqrstuvwxyzabcdef</link>
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcdef"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcdef">abcdefghijklmnopqrstuvwxyzabcdef</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcde0"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h50">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcde0">abcdefghijklmnopqrstuvwxyzabcdef</link>
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcde0"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcde0">abcdefghijklmnopqrstuvwxyzabcdef</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcde1"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h51">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcde1">abcdefghijklmnopqrstuvwxyzabcdef</link>
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcde1"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcde1">abcdefghijklmnopqrstuvwxyzabcdef</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcde2"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h52">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcde2">abcdefghijklmnopqrstuvwxyzabcdef</link>
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcde2"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.abcdefghijklmnopqrstuvwxyzabcde2">abcdefghijklmnopqrstuvwxyzabcdef</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.markup_in__code__phrase_role__identifier__heading__phrase___code___in__emphasis_role__bold__order__emphasis__to_test_normalization"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h53">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.markup_in__code__phrase_role__identifier__heading__phrase___code___in__emphasis_role__bold__order__emphasis__to_test_normalization">Markup
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.markup_in__code__phrase_role__identifier__heading__phrase___code___in__emphasis_role__bold__order__emphasis__to_test_normalization"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.markup_in__code__phrase_role__identifier__heading__phrase___code___in__emphasis_role__bold__order__emphasis__to_test_normalization">Markup
       in <code><phrase role="identifier">heading</phrase></code> in <emphasis role="bold">order</emphasis>
       to test normalization</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.markup_in_code_phrase_role_iden0"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h54">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.markup_in_code_phrase_role_iden0">Markup
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.markup_in_code_phrase_role_iden0"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.markup_in_code_phrase_role_iden0">Markup
       in <code><phrase role="identifier">heading</phrase></code> in <emphasis role="bold">order</emphasis>
       to test normalization</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.identifier_10.markup_in_code_phrase_role_iden1"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.identifier_10.h55">
-      <link linkend="identifiers_in_quickbook_1_5.identifier_10.markup_in_code_phrase_role_iden1">Markup
+      <phrase id="identifiers_in_quickbook_1_5.identifier_10.markup_in_code_phrase_role_iden1"/><link
+      linkend="identifiers_in_quickbook_1_5.identifier_10.markup_in_code_phrase_role_iden1">Markup
       in <code><phrase role="identifier">heading</phrase></code> in <emphasis role="bold">order</emphasis>
       to test normalization</link>
     </bridgehead>
@@ -597,14 +597,14 @@
   </section>
   <section id="identifiers_in_quickbook_1_5.punctuation___stuff">
     <title><link linkend="identifiers_in_quickbook_1_5.punctuation___stuff">Punctuation
-    &amp; stuff</link></title> <anchor id="identifiers_in_quickbook_1_5.punctuation___stuff.a___b"/>
+    &amp; stuff</link></title>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.punctuation___stuff.h0">
-      <link linkend="identifiers_in_quickbook_1_5.punctuation___stuff.a___b">A +
-      B</link>
+      <phrase id="identifiers_in_quickbook_1_5.punctuation___stuff.a___b"/><link
+      linkend="identifiers_in_quickbook_1_5.punctuation___stuff.a___b">A + B</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_5.punctuation___stuff.a_b0"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_5.punctuation___stuff.h1">
-      <link linkend="identifiers_in_quickbook_1_5.punctuation___stuff.a_b0">A + B</link>
+      <phrase id="identifiers_in_quickbook_1_5.punctuation___stuff.a_b0"/><link linkend="identifiers_in_quickbook_1_5.punctuation___stuff.a_b0">A
+      + B</link>
     </bridgehead>
   </section>
 </article>

Modified: branches/release/tools/quickbook/test/identifier_1_6.gold
==============================================================================
--- branches/release/tools/quickbook/test/identifier_1_6.gold	(original)
+++ branches/release/tools/quickbook/test/identifier_1_6.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -2,18 +2,18 @@
 <!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="identifiers_in_quickbook_1_6" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Identifiers in quickbook 1.6</title> <anchor id="identifiers_in_quickbook_1_6.test_heading_with__code_"/>
+  <title>Identifiers in quickbook 1.6</title>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h0">
-    <link linkend="identifiers_in_quickbook_1_6.test_heading_with__code_">Test heading
-    with <code><phrase role="identifier">code</phrase></code></link>
+    <phrase id="identifiers_in_quickbook_1_6.test_heading_with__code_"/><link linkend="identifiers_in_quickbook_1_6.test_heading_with__code_">Test
+    heading with <code><phrase role="identifier">code</phrase></code></link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.identifier_10_0"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h1">
-    <link linkend="identifiers_in_quickbook_1_6.identifier_10_0">Identifier 10</link>
+    <phrase id="identifiers_in_quickbook_1_6.identifier_10_0"/><link linkend="identifiers_in_quickbook_1_6.identifier_10_0">Identifier
+    10</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.identifier_10_1"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h2">
-    <link linkend="identifiers_in_quickbook_1_6.identifier_10_1">Identifier 10</link>
+    <phrase id="identifiers_in_quickbook_1_6.identifier_10_1"/><link linkend="identifiers_in_quickbook_1_6.identifier_10_1">Identifier
+    10</link>
   </bridgehead>
   <table frame="all" id="identifiers_in_quickbook_1_6.identifier_10_2">
     <title>Identifier 10</title>
@@ -26,549 +26,548 @@
       </tbody>
     </tgroup>
   </table>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_several_headers"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h3">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_several_headers">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_several_headers"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_several_headers">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d0"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h4">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d0">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d0"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d0">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h5">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers">Generate
     a really long id and duplicate it by having lots of headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d1"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h6">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d1">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d1"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d1">Generate
     a really long id and duplicate it by having lots of headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d2"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h7">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d2">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d2"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d2">Generate
     a really long id and duplicate it by having lots of headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d3"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h8">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d3">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d3"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d3">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d5"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h9">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d5">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d5"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d5">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d6"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h10">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d6">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d6"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d6">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d7"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h11">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d7">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d7"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d7">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h12">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d8"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h13">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d8">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d8"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d8">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d9"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h14">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d9">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d9"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d9">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_0"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h15">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_0">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_0"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_0">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_1"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h16">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_1">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_1"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_1">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_2"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h17">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_2">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_2"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_2">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_3"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h18">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_3">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_3"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_3">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_4"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h19">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_4">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_4"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_4">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_5"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h20">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_5">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_5"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_5">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_6"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h21">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_6">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_6"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_6">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_7"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h22">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_7">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_7"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_7">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_8"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h23">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_8">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_8"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_8">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_9"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h24">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_9">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_9"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_9">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_10"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h25">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_10">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_10"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_10">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_11"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h26">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_11">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_11"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_11">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_12"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h27">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_12">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_12"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_12">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_13"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h28">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_13">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_13"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_13">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_14"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h29">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_14">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_14"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_14">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_16"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h30">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_16">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_16"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_16">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_17"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h31">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_17">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_17"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_17">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_18"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h32">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_18">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_18"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_18">Generate
     a really long id and duplicate it by having too many headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_19"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h33">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_19">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_19"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_19">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_20"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h34">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_20">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_20"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_20">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_21"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h35">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_21">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_21"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_21">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_22"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h36">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_22">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_22"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_22">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_23"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h37">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_23">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_23"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_23">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_24"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h38">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_24">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_24"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_24">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_25"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h39">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_25">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_25"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_25">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_26"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h40">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_26">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_26"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_26">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h41">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers">Generate
     a really long id and duplicate it by having even more headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_27"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h42">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_27">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_27"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_27">Generate
     a really long id and duplicate it by having even more headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_28"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h43">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_28">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_28"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_28">Generate
     a really long id and duplicate it by having even more headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_29"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h44">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_29">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_29"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_29">Generate
     a really long id and duplicate it by having several headers</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d4"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h45">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d4">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d4"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_d4">Generate
     a really long id and d4</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_15"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h46">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_15">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_15"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_15">Generate
     a really long id and 15</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_30"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h47">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_30">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_30"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_30">Generate
     a really long id and d4</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_31"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h48">
-    <link linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_31">Generate
+    <phrase id="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_31"/><link
+    linkend="identifiers_in_quickbook_1_6.generate_a_really_long_id_and_31">Generate
     a really long id and 15</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.a2345678901234567890123456789012"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h49">
-    <link linkend="identifiers_in_quickbook_1_6.a2345678901234567890123456789012">a2345678901234567890123456789012</link>
+    <phrase id="identifiers_in_quickbook_1_6.a2345678901234567890123456789012"/><link
+    linkend="identifiers_in_quickbook_1_6.a2345678901234567890123456789012">a2345678901234567890123456789012</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.a0"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h50">
-    <link linkend="identifiers_in_quickbook_1_6.a0">a2345678901234567890123456789012</link>
+    <phrase id="identifiers_in_quickbook_1_6.a0"/><link linkend="identifiers_in_quickbook_1_6.a0">a2345678901234567890123456789012</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcdef"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h51">
-    <link linkend="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcdef">abcdefghijklmnopqrstuvwxyzabcdef</link>
+    <phrase id="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcdef"/><link
+    linkend="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcdef">abcdefghijklmnopqrstuvwxyzabcdef</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcde0"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h52">
-    <link linkend="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcde0">abcdefghijklmnopqrstuvwxyzabcdef</link>
+    <phrase id="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcde0"/><link
+    linkend="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcde0">abcdefghijklmnopqrstuvwxyzabcdef</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcde1"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h53">
-    <link linkend="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcde1">abcdefghijklmnopqrstuvwxyzabcdef</link>
+    <phrase id="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcde1"/><link
+    linkend="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcde1">abcdefghijklmnopqrstuvwxyzabcdef</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcde2"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h54">
-    <link linkend="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcde2">abcdefghijklmnopqrstuvwxyzabcdef</link>
+    <phrase id="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcde2"/><link
+    linkend="identifiers_in_quickbook_1_6.abcdefghijklmnopqrstuvwxyzabcde2">abcdefghijklmnopqrstuvwxyzabcdef</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.markup_in__heading___in__order__to_test_normalization"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h55">
-    <link linkend="identifiers_in_quickbook_1_6.markup_in__heading___in__order__to_test_normalization">Markup
+    <phrase id="identifiers_in_quickbook_1_6.markup_in__heading___in__order__to_test_normalization"/><link
+    linkend="identifiers_in_quickbook_1_6.markup_in__heading___in__order__to_test_normalization">Markup
     in <code><phrase role="identifier">heading</phrase></code> in <emphasis role="bold">order</emphasis>
     to test normalization</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.markup_in_heading_in_order_to_t0"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h56">
-    <link linkend="identifiers_in_quickbook_1_6.markup_in_heading_in_order_to_t0">Markup
+    <phrase id="identifiers_in_quickbook_1_6.markup_in_heading_in_order_to_t0"/><link
+    linkend="identifiers_in_quickbook_1_6.markup_in_heading_in_order_to_t0">Markup
     in <code><phrase role="identifier">heading</phrase></code> in <emphasis role="bold">order</emphasis>
     to test normalization</link>
   </bridgehead>
-  <anchor id="identifiers_in_quickbook_1_6.markup_in_heading_in_order_to_t1"/>
   <bridgehead renderas="sect2" id="identifiers_in_quickbook_1_6.h57">
-    <link linkend="identifiers_in_quickbook_1_6.markup_in_heading_in_order_to_t1">Markup
+    <phrase id="identifiers_in_quickbook_1_6.markup_in_heading_in_order_to_t1"/><link
+    linkend="identifiers_in_quickbook_1_6.markup_in_heading_in_order_to_t1">Markup
     in <code><phrase role="identifier">heading</phrase></code> in <emphasis role="bold">order</emphasis>
     to test normalization</link>
   </bridgehead>
   <section id="identifiers_in_quickbook_1_6.identifier_10">
     <title><link linkend="identifiers_in_quickbook_1_6.identifier_10">Identifier
-    10</link></title> <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_several_headers"/>
+    10</link></title>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h0">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_several_headers">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_several_headers"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_several_headers">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d0"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h1">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d0">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d0"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d0">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h2">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_lots_of_headers">Generate
       a really long id and duplicate it by having lots of headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d1"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h4">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d1">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d1"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d1">Generate
       a really long id and duplicate it by having lots of headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d2"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h5">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d2">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d2"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d2">Generate
       a really long id and duplicate it by having lots of headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d3"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h6">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d3">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d3"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d3">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d5"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h7">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d5">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d5"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d5">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d6"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h8">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d6">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d6"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d6">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d7"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h9">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d7">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d7"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d7">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h10">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_too_many_headers">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d8"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h11">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d8">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d8"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d8">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d9"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h12">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d9">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d9"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d9">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_0"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h13">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_0">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_0"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_0">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_1"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h14">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_1">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_1"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_1">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_2"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h15">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_2">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_2"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_2">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_3"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h16">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_3">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_3"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_3">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_4"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h17">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_4">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_4"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_4">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_5"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h18">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_5">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_5"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_5">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_6"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h19">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_6">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_6"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_6">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_7"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h20">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_7">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_7"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_7">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_8"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h21">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_8">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_8"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_8">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_9"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h22">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_9">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_9"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_9">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_10"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h23">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_10">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_10"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_10">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_11"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h24">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_11">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_11"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_11">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_12"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h25">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_12">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_12"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_12">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_13"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h26">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_13">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_13"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_13">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_14"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h27">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_14">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_14"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_14">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_16"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h28">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_16">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_16"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_16">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_17"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h29">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_17">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_17"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_17">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_18"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h30">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_18">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_18"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_18">Generate
       a really long id and duplicate it by having too many headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_19"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h31">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_19">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_19"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_19">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_20"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h32">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_20">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_20"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_20">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_21"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h33">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_21">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_21"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_21">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_22"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h34">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_22">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_22"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_22">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_23"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h35">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_23">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_23"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_23">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_24"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h36">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_24">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_24"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_24">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_25"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h37">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_25">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_25"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_25">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_26"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h38">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_26">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_26"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_26">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h39">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_duplicate_it_by_having_even_more_headers">Generate
       a really long id and duplicate it by having even more headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_27"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h40">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_27">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_27"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_27">Generate
       a really long id and duplicate it by having even more headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_28"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h41">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_28">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_28"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_28">Generate
       a really long id and duplicate it by having even more headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_29"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h42">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_29">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_29"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_29">Generate
       a really long id and duplicate it by having several headers</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d4"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h43">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d4">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d4"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_d4">Generate
       a really long id and d4</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_15"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h44">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_15">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_15"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_15">Generate
       a really long id and 15</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_30"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h45">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_30">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_30"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_30">Generate
       a really long id and d4</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_31"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h46">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_31">Generate
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_31"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.generate_a_really_long_id_and_31">Generate
       a really long id and 15</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.a2345678901234567890123456789012"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h47">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.a2345678901234567890123456789012">a2345678901234567890123456789012</link>
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.a2345678901234567890123456789012"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.a2345678901234567890123456789012">a2345678901234567890123456789012</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.a0"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h48">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.a0">a2345678901234567890123456789012</link>
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.a0"/><link linkend="identifiers_in_quickbook_1_6.identifier_10.a0">a2345678901234567890123456789012</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcdef"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h49">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcdef">abcdefghijklmnopqrstuvwxyzabcdef</link>
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcdef"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcdef">abcdefghijklmnopqrstuvwxyzabcdef</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcde0"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h50">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcde0">abcdefghijklmnopqrstuvwxyzabcdef</link>
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcde0"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcde0">abcdefghijklmnopqrstuvwxyzabcdef</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcde1"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h51">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcde1">abcdefghijklmnopqrstuvwxyzabcdef</link>
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcde1"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcde1">abcdefghijklmnopqrstuvwxyzabcdef</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcde2"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h52">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcde2">abcdefghijklmnopqrstuvwxyzabcdef</link>
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcde2"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.abcdefghijklmnopqrstuvwxyzabcde2">abcdefghijklmnopqrstuvwxyzabcdef</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.markup_in__heading___in__order__to_test_normalization"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h53">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.markup_in__heading___in__order__to_test_normalization">Markup
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.markup_in__heading___in__order__to_test_normalization"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.markup_in__heading___in__order__to_test_normalization">Markup
       in <code><phrase role="identifier">heading</phrase></code> in <emphasis role="bold">order</emphasis>
       to test normalization</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.markup_in_heading_in_order_to_t0"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h54">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.markup_in_heading_in_order_to_t0">Markup
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.markup_in_heading_in_order_to_t0"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.markup_in_heading_in_order_to_t0">Markup
       in <code><phrase role="identifier">heading</phrase></code> in <emphasis role="bold">order</emphasis>
       to test normalization</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.identifier_10.markup_in_heading_in_order_to_t1"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.identifier_10.h55">
-      <link linkend="identifiers_in_quickbook_1_6.identifier_10.markup_in_heading_in_order_to_t1">Markup
+      <phrase id="identifiers_in_quickbook_1_6.identifier_10.markup_in_heading_in_order_to_t1"/><link
+      linkend="identifiers_in_quickbook_1_6.identifier_10.markup_in_heading_in_order_to_t1">Markup
       in <code><phrase role="identifier">heading</phrase></code> in <emphasis role="bold">order</emphasis>
       to test normalization</link>
     </bridgehead>
@@ -597,14 +596,14 @@
   </section>
   <section id="identifiers_in_quickbook_1_6.punctuation___stuff">
     <title><link linkend="identifiers_in_quickbook_1_6.punctuation___stuff">Punctuation
-    &amp; stuff</link></title> <anchor id="identifiers_in_quickbook_1_6.punctuation___stuff.a___b"/>
+    &amp; stuff</link></title>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.punctuation___stuff.h0">
-      <link linkend="identifiers_in_quickbook_1_6.punctuation___stuff.a___b">A +
-      B</link>
+      <phrase id="identifiers_in_quickbook_1_6.punctuation___stuff.a___b"/><link
+      linkend="identifiers_in_quickbook_1_6.punctuation___stuff.a___b">A + B</link>
     </bridgehead>
-    <anchor id="identifiers_in_quickbook_1_6.punctuation___stuff.a_b0"/>
     <bridgehead renderas="sect3" id="identifiers_in_quickbook_1_6.punctuation___stuff.h1">
-      <link linkend="identifiers_in_quickbook_1_6.punctuation___stuff.a_b0">A + B</link>
+      <phrase id="identifiers_in_quickbook_1_6.punctuation___stuff.a_b0"/><link linkend="identifiers_in_quickbook_1_6.punctuation___stuff.a_b0">A
+      + B</link>
     </bridgehead>
   </section>
 </article>

Modified: branches/release/tools/quickbook/test/import.gold
==============================================================================
--- branches/release/tools/quickbook/test/import.gold	(original)
+++ branches/release/tools/quickbook/test/import.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -24,7 +24,6 @@
     And any quickbook block markup.
   </para>
   <para>
-    
 <programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">string</phrase> <phrase role="identifier">foo</phrase><phrase role="special">()</phrase>
 <phrase role="special">{</phrase>
     <phrase role="comment">// return 'em, foo man!</phrase>
@@ -55,7 +54,6 @@
     And any quickbook block markup.
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">():</phrase>
     <phrase role="comment"># return 'em, foo man!</phrase>
     <phrase role="keyword">return</phrase> <phrase role="string">&quot;foo&quot;</phrase>
@@ -84,7 +82,6 @@
     And any quickbook block markup.
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">char</phrase><phrase role="special">*</phrase> <phrase role="identifier">foo</phrase><phrase role="special">()</phrase>
 <phrase role="special">{</phrase>
     <phrase role="comment">// return 'em, foo man!</phrase>
@@ -92,4 +89,51 @@
 <phrase role="special">}</phrase>
 </programlisting>
   </para>
+  <para>
+<programlisting><phrase role="keyword">class</phrase> <phrase role="identifier">x</phrase>
+<phrase role="special">{</phrase>
+<phrase role="keyword">public</phrase><phrase role="special">:</phrase>
+
+    <co id="import.c0" linkends="import.c1" /><phrase role="identifier">x</phrase><phrase role="special">()</phrase> <phrase role="special">:</phrase> <phrase role="identifier">n</phrase><phrase role="special">(</phrase><phrase role="number">0</phrase><phrase role="special">)</phrase>
+    <phrase role="special">{</phrase>
+    <phrase role="special">}</phrase>
+
+    <co id="import.c2" linkends="import.c3" /><phrase role="special">~</phrase><phrase role="identifier">x</phrase><phrase role="special">()</phrase>
+    <phrase role="special">{</phrase>
+    <phrase role="special">}</phrase>
+
+    <co id="import.c4" linkends="import.c5" /><phrase role="keyword">int</phrase> <phrase role="identifier">get</phrase><phrase role="special">()</phrase> <phrase role="keyword">const</phrase>
+    <phrase role="special">{</phrase>
+        <phrase role="keyword">return</phrase> <phrase role="identifier">n</phrase><phrase role="special">;</phrase>
+    <phrase role="special">}</phrase>
+
+    <co id="import.c6" linkends="import.c7" /><phrase role="keyword">void</phrase> <phrase role="identifier">set</phrase><phrase role="special">(</phrase><phrase role="keyword">int</phrase> <phrase role="identifier">n_</phrase><phrase role="special">)</phrase>
+    <phrase role="special">{</phrase>
+        <phrase role="identifier">n</phrase> <phrase role="special">=</phrase> <phrase role="identifier">n_</phrase><phrase role="special">;</phrase>
+    <phrase role="special">}</phrase>
+<phrase role="special">};</phrase>
+</programlisting>
+  </para>
+  <calloutlist>
+    <callout arearefs="import.c0" id="import.c1">
+      <para>
+        Constructor
+      </para>
+    </callout>
+    <callout arearefs="import.c2" id="import.c3">
+      <para>
+        Destructor
+      </para>
+    </callout>
+    <callout arearefs="import.c4" id="import.c5">
+      <para>
+        Get the <code><phrase role="identifier">n</phrase></code> member variable
+      </para>
+    </callout>
+    <callout arearefs="import.c6" id="import.c7">
+      <para>
+        Set the <code><phrase role="identifier">n</phrase></code> member variable
+      </para>
+    </callout>
+  </calloutlist>
 </article>

Modified: branches/release/tools/quickbook/test/import.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/import.quickbook	(original)
+++ branches/release/tools/quickbook/test/import.quickbook	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -10,3 +10,4 @@
 
 [foo_c]
 
+[class_]
\ No newline at end of file

Modified: branches/release/tools/quickbook/test/preformatted.gold
==============================================================================
--- branches/release/tools/quickbook/test/preformatted.gold	(original)
+++ branches/release/tools/quickbook/test/preformatted.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -8,7 +8,6 @@
     <para>
       Here's the ubiquitous <emphasis>Hello World</emphasis> program in C++.
     </para>
-    
 <programlisting>#include &lt;iostream&gt;
 
 int main()

Modified: branches/release/tools/quickbook/test/quickbook-manual.gold
==============================================================================
--- branches/release/tools/quickbook/test/quickbook-manual.gold	(original)
+++ branches/release/tools/quickbook/test/quickbook-manual.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -102,10 +102,10 @@
     </itemizedlist>
   </section>
   <section id="quickbook.change_log">
-    <title><link linkend="quickbook.change_log">Change Log</link></title> <anchor
-    id="quickbook.change_log.version_1_3"/>
+    <title><link linkend="quickbook.change_log">Change Log</link></title>
     <bridgehead renderas="sect3" id="quickbook.change_log.h0">
-      <link linkend="quickbook.change_log.version_1_3">Version 1.3</link>
+      <phrase id="quickbook.change_log.version_1_3"/><link linkend="quickbook.change_log.version_1_3">Version
+      1.3</link>
     </bridgehead>
     <itemizedlist>
       <listitem>
@@ -300,13 +300,10 @@
       <para>
         Can be placed anywhere.
       </para>
-      
 <programlisting><!--quickbook-escape-prefix-->[/ comment (no output generated) ]<!--quickbook-escape-postfix-->
 </programlisting>
-      
 <programlisting><!--quickbook-escape-prefix-->[/ comments can be nested [/ some more here] ]<!--quickbook-escape-postfix-->
 </programlisting>
-      
 <programlisting><!--quickbook-escape-prefix-->[/ Quickbook blocks can nest inside comments. [*Comment this out too!] ]<!--quickbook-escape-postfix-->
 </programlisting>
     </section>
@@ -314,7 +311,6 @@
       <title><link linkend="quickbook.syntax.phrase">Phrase Level Elements</link></title>
       <section id="quickbook.syntax.phrase.font_styles">
         <title><link linkend="quickbook.syntax.phrase.font_styles">Font Styles</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->['italic], [*bold], [_underline], [^teletype], [-strikethrough]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -328,7 +324,6 @@
         <para>
           Like all non-terminal phrase level elements, this can of course be nested:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[*['bold-italic]]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -344,7 +339,6 @@
           When you want content that may or must be replaced by the user, use the
           syntax:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[~replacement]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -356,7 +350,6 @@
       </section>
       <section id="quickbook.syntax.phrase.quotations">
         <title><link linkend="quickbook.syntax.phrase.quotations">Quotations</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->["A question that sometimes drives me hazy: am I or are the others crazy?]--Einstein
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -374,7 +367,6 @@
         <para>
           Like all phrase elements, quotations may be nested. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->["Here's the rule for bargains: ["Do other men, for they would do you.] That's
 the true business precept.]
 <!--quickbook-escape-postfix--></programlisting>
@@ -392,7 +384,6 @@
           Simple markup for formatting text, common in many applications, is now
           supported:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->/italic/, *bold*, _underline_, =teletype=
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -404,7 +395,7 @@
         </para>
         <para>
           Unlike QuickBook's standard formatting scheme, the rules for simpler alternatives
-          are much stricter<footnote id="quickbook.f0">
+          are much stricter<footnote id="quickbook.syntax.phrase.simple_formatting.f0">
           <para>
             Thanks to David Barrett, author of <ulink url="http://quinthar.com/qwikiwiki/index.php?page=Home">Qwiki</ulink>,
             for sharing these samples and teaching me these obscure formatting rules.
@@ -656,7 +647,6 @@
           &quot;have&quot; to &quot;full&quot; in the following paragraph will be
           rendered as bold:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->Baa baa black sheep, *have you any wool?
 Yes sir, yes sir, three bags full!*
 One for the master, one for the dame,
@@ -670,7 +660,6 @@
         <para>
           But in the following paragraph, bold is not applied:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->Baa baa black sheep, *have you any wool?
 Yes sir, yes sir, three bags full!
 One for the master, one for the dame,
@@ -688,7 +677,6 @@
           Inlining code in paragraphs is quite common when writing C++ documentation.
           We provide a very simple markup for this. For example, this:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->This text has inlined code `int main() { return 0; }` in it.
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -725,7 +713,6 @@
           the double-tick, instead of the single-tick, we are telling QuickBook to
           use preformatted blocks of code. Example:
         </para>
-        
 <programlisting>``
     #include &lt;iostream&gt;
 
@@ -740,7 +727,6 @@
           will generate:
         </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>
@@ -765,7 +751,6 @@
           where <literal>source-mode</literal> is one of the supported modes. For
           example, this:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->Python's [python] `import` is rather like C++'s [c++] `#include`. A
 C++ comment `// looks like this` whereas a Python comment [python]
 `# looks like this`.
@@ -832,7 +817,6 @@
       </section>
       <section id="quickbook.syntax.phrase.line_break">
         <title><link linkend="quickbook.syntax.phrase.line_break">line-break</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->[br]
 <!--quickbook-escape-postfix--></programlisting>
         <warning>
@@ -847,7 +831,6 @@
       </section>
       <section id="quickbook.syntax.phrase.anchors">
         <title><link linkend="quickbook.syntax.phrase.anchors">Anchors</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->[#named_anchor]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -861,7 +844,6 @@
       </section>
       <section id="quickbook.syntax.phrase.links">
         <title><link linkend="quickbook.syntax.phrase.links">Links</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->[@http://www.boost.org this is [*boost's] website....]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -874,13 +856,11 @@
         <para>
           URL links where the link text is the link itself is common. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->see http://spirit.sourceforge.net/
 <!--quickbook-escape-postfix--></programlisting>
         <para>
           so, when the text is absent in a link markup, the URL is assumed. Example:
         </para>
-        
 <programlisting>see <!--quickbook-escape-prefix-->[@http://spirit.sourceforge.net/]<!--quickbook-escape-postfix-->
 </programlisting>
         <para>
@@ -895,7 +875,6 @@
         <para>
           You can link within a document using:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[link section_id.normalized_header_text The link text]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -909,7 +888,6 @@
         <para>
           In addition, you can link internally to an XML refentry like:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[link xml.refentry The link text]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -920,7 +898,6 @@
           Like URLs, the link text is optional. If this is not present, the link
           text will automatically be the refentry. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[link xml.refentry]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -933,7 +910,6 @@
           If you want to link to a function, class, member, enum, concept or header
           in the reference section, you can use:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[funcref fully::qualified::function_name The link text]
 [classref fully::qualified::class_name The link text]
 [memberref fully::qualified::member_name The link text]
@@ -947,7 +923,6 @@
           will automatically be the function, class, member, enum, macro, concept
           or header. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[classref boost::bar::baz]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -959,7 +934,6 @@
         <para>
           The escape mark-up is used when we don't want to do any processing.
         </para>
-        
 <programlisting>'''
 escape (no processing/formatting)
 '''
@@ -968,7 +942,6 @@
           Escaping allows us to pass XML markup to <ulink url="http://www.boost.org/doc/html/boostbook.html">BoostBook</ulink>
           or <ulink url="http://www.docbook.org/">DocBook</ulink>. For example:
         </para>
-        
 <programlisting>'''
 &lt;emphasis role=&quot;bold&quot;&gt;This is direct XML markup&lt;/emphasis&gt;
 '''
@@ -1014,7 +987,6 @@
       </section>
       <section id="quickbook.syntax.phrase.images">
         <title><link linkend="quickbook.syntax.phrase.images">Images</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->[$image.jpg]
 <!--quickbook-escape-postfix--></programlisting>
       </section>
@@ -1026,11 +998,10 @@
           role="special">]</phrase></code> block, and the text will be put at the
           bottom of the current page. For example, this:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[footnote A sample footnote]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
-          will generate this<footnote id="quickbook.f1">
+          will generate this<footnote id="quickbook.syntax.phrase.footnotes.f0">
           <para>
             A sample footnote
           </para>
@@ -1038,7 +1009,7 @@
         </para>
         <section id="quickbook.syntax.phrase.footnotes.macro_expansion">
           <title><link linkend="quickbook.syntax.phrase.footnotes.macro_expansion">Macro
-          Expansion</link></title> 
+          Expansion</link></title>
 <programlisting><!--quickbook-escape-prefix-->__a_macro_identifier__
 <!--quickbook-escape-postfix--></programlisting>
           <para>
@@ -1047,7 +1018,7 @@
         </section>
         <section id="quickbook.syntax.phrase.footnotes.template_expansion">
           <title><link linkend="quickbook.syntax.phrase.footnotes.template_expansion">Template
-          Expansion</link></title> 
+          Expansion</link></title>
 <programlisting><!--quickbook-escape-prefix-->[a_template_identifier]
 <!--quickbook-escape-postfix--></programlisting>
           <para>
@@ -1065,7 +1036,6 @@
           Every document must begin with a Document Info section, which should look
           like this:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[document-type The Document Title
     [quickbook 1.3]
     [version 1.0]
@@ -1161,7 +1131,6 @@
         <para>
           Starting a new section is accomplished with:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[section:id The Section Title]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -1176,7 +1145,6 @@
         <para>
           End a section with:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[endsect]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -1188,7 +1156,6 @@
         <para>
           You can include another XML file with:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[xinclude file.xml]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -1210,7 +1177,7 @@
         <title><link linkend="quickbook.syntax.block.lists">Lists</link></title>
         <section id="quickbook.syntax.block.lists.ordered_lists">
           <title><link linkend="quickbook.syntax.block.lists.ordered_lists">Ordered
-          lists</link></title> 
+          lists</link></title>
 <programlisting># One
 # Two
 # Three
@@ -1242,7 +1209,6 @@
           <para>
             List hierarchies are supported. Example:
           </para>
-          
 <programlisting># One
 # Two
 # Three
@@ -1328,7 +1294,6 @@
           <para>
             Long lines will be wrapped appropriately. Example:
           </para>
-          
 <programlisting># A short item.
 # A very long item. A very long item. A very long item.
   A very long item. A very long item. A very long item.
@@ -1361,7 +1326,7 @@
         </section>
         <section id="quickbook.syntax.block.lists.unordered_lists">
           <title><link linkend="quickbook.syntax.block.lists.unordered_lists">Unordered
-          lists</link></title> 
+          lists</link></title>
 <programlisting><!--quickbook-escape-prefix-->* First
 * Second
 * Third
@@ -1392,7 +1357,6 @@
           <para>
             Mixed lists (ordered and unordered) are supported. Example:
           </para>
-          
 <programlisting><!--quickbook-escape-prefix--># One
 # Two
 # Three
@@ -1446,7 +1410,6 @@
           <para>
             And...
           </para>
-          
 <programlisting><!--quickbook-escape-prefix--># 1
     * 1.a
         # 1.a.1
@@ -1544,7 +1507,6 @@
           highlighted according to the current <link linkend="quickbook.syntax.phrase.source_mode">Source
           Mode</link>:
         </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>
@@ -1554,7 +1516,6 @@
     <phrase role="keyword">return</phrase> <phrase role="number">0</phrase><phrase role="special">;</phrase>
 <phrase role="special">}</phrase>
 </programlisting>
-        
 <programlisting><phrase role="keyword">import</phrase> <phrase role="identifier">cgi</phrase>
 
 <phrase role="keyword">def</phrase> <phrase role="identifier">cookForHtml</phrase><phrase role="special">(</phrase><phrase role="identifier">text</phrase><phrase role="special">):</phrase>
@@ -1565,7 +1526,6 @@
         <para>
           Macros that are already defined are expanded in source code. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[def __array__ [@http://www.boost.org/doc/html/array/reference.html array]]
 [def __boost__ [@http://www.boost.org/libs/libraries.htm boost]]
 
@@ -1574,7 +1534,6 @@
         <para>
           Generates:
         </para>
-        
 <programlisting><phrase role="keyword">using</phrase> <ulink url="http://www.boost.org/libs/libraries.htm">boost</ulink><phrase role="special">::</phrase><ulink url="http://www.boost.org/doc/html/array/reference.html">array</ulink><phrase role="special">;</phrase>
 </programlisting>
       </section>
@@ -1589,7 +1548,6 @@
           and Python, the delimiter is the double tick (back-quote): &quot;``&quot;
           and &quot;``&quot;. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->void ``[@http://en.wikipedia.org/wiki/Foo#Foo.2C_Bar_and_Baz foo]``()
 {
 }
@@ -1597,7 +1555,6 @@
         <para>
           Will generate:
         </para>
-        
 <programlisting><phrase role="keyword">void</phrase> <ulink url="http://en.wikipedia.org/wiki/Foo#Foo.2C_Bar_and_Baz">foo</ulink><phrase role="special">()</phrase>
 <phrase role="special">{</phrase>
 <phrase role="special">}</phrase>
@@ -1613,7 +1570,6 @@
           Sometimes, you don't want some preformatted text to be parsed as C++. In
           such cases, use the <literal>[pre ... ]</literal> markup block.
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[pre
 
     Some *preformatted* text                    Some *preformatted* text
@@ -1629,7 +1585,6 @@
           level markup, pre (and Code) are the only ones that allow multiple newlines.
           The markup above will generate:
         </para>
-        
 <programlisting>Some <emphasis role="bold">preformatted</emphasis> text                    Some <emphasis role="bold">preformatted</emphasis> text
 
     Some <emphasis role="bold">preformatted</emphasis> text            Some <emphasis role="bold">preformatted</emphasis> text
@@ -1644,7 +1599,6 @@
       </section>
       <section id="quickbook.syntax.block.blockquote">
         <title><link linkend="quickbook.syntax.block.blockquote">Blockquote</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->[:sometext...]<!--quickbook-escape-postfix-->
 </programlisting>
         <blockquote>
@@ -1655,7 +1609,6 @@
       </section>
       <section id="quickbook.syntax.block.admonitions">
         <title><link linkend="quickbook.syntax.block.admonitions">Admonitions</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->[note This is a note]
 [tip This is a tip]
 [important This is important]
@@ -1698,7 +1651,6 @@
       </section>
       <section id="quickbook.syntax.block.headings">
         <title><link linkend="quickbook.syntax.block.headings">Headings</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->[h1 Heading 1]
 [h2 Heading 2]
 [h3 Heading 3]
@@ -1706,29 +1658,29 @@
 [h5 Heading 5]
 [h6 Heading 6]
 <!--quickbook-escape-postfix--></programlisting>
-        <anchor id="quickbook.syntax.block.headings.heading_1"/>
         <bridgehead renderas="sect1" id="quickbook.syntax.block.headings.h0">
-          <link linkend="quickbook.syntax.block.headings.heading_1">Heading 1</link>
+          <phrase id="quickbook.syntax.block.headings.heading_1"/><link linkend="quickbook.syntax.block.headings.heading_1">Heading
+          1</link>
         </bridgehead>
-        <anchor id="quickbook.syntax.block.headings.heading_2"/>
         <bridgehead renderas="sect2" id="quickbook.syntax.block.headings.h1">
-          <link linkend="quickbook.syntax.block.headings.heading_2">Heading 2</link>
+          <phrase id="quickbook.syntax.block.headings.heading_2"/><link linkend="quickbook.syntax.block.headings.heading_2">Heading
+          2</link>
         </bridgehead>
-        <anchor id="quickbook.syntax.block.headings.heading_3"/>
         <bridgehead renderas="sect3" id="quickbook.syntax.block.headings.h2">
-          <link linkend="quickbook.syntax.block.headings.heading_3">Heading 3</link>
+          <phrase id="quickbook.syntax.block.headings.heading_3"/><link linkend="quickbook.syntax.block.headings.heading_3">Heading
+          3</link>
         </bridgehead>
-        <anchor id="quickbook.syntax.block.headings.heading_4"/>
         <bridgehead renderas="sect4" id="quickbook.syntax.block.headings.h3">
-          <link linkend="quickbook.syntax.block.headings.heading_4">Heading 4</link>
+          <phrase id="quickbook.syntax.block.headings.heading_4"/><link linkend="quickbook.syntax.block.headings.heading_4">Heading
+          4</link>
         </bridgehead>
-        <anchor id="quickbook.syntax.block.headings.heading_5"/>
         <bridgehead renderas="sect5" id="quickbook.syntax.block.headings.h4">
-          <link linkend="quickbook.syntax.block.headings.heading_5">Heading 5</link>
+          <phrase id="quickbook.syntax.block.headings.heading_5"/><link linkend="quickbook.syntax.block.headings.heading_5">Heading
+          5</link>
         </bridgehead>
-        <anchor id="quickbook.syntax.block.headings.heading_6"/>
         <bridgehead renderas="sect6" id="quickbook.syntax.block.headings.h5">
-          <link linkend="quickbook.syntax.block.headings.heading_6">Heading 6</link>
+          <phrase id="quickbook.syntax.block.headings.heading_6"/><link linkend="quickbook.syntax.block.headings.heading_6">Heading
+          6</link>
         </bridgehead>
         <para>
           Headings 1-3 [h1 h2 and h3] will automatically have anchors with normalized
@@ -1739,7 +1691,6 @@
           For example: Heading 1 in section Section 2 will be normalized to <literal>section_2.heading_1</literal>).
           You can use:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[link section_id.normalized_header_text The link text]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -1754,7 +1705,6 @@
           In cases when you don't want to care about the heading level (1 to 6),
           you can use the <emphasis>Generic Heading</emphasis>:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[heading Heading]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -1767,7 +1717,6 @@
           if you do not want to start a new section. In many cases, however, headings
           in a particular section is just flat. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[section A]
 [h2 X]
 [h2 Y]
@@ -1781,7 +1730,6 @@
           is rather tedious, however, to scan the section level everytime. If you
           rewrite the example above as shown below, this will be automatic:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[section A]
 [heading X]
 [heading Y]
@@ -1799,7 +1747,6 @@
       </section>
       <section id="quickbook.syntax.block.macros">
         <title><link linkend="quickbook.syntax.block.macros">Macros</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->[def macro_identifier some text]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -1809,7 +1756,6 @@
           character or the underscore. The replacement text can be any phrase (even
           marked up). Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[def sf_logo [$http://sourceforge.net/sflogo.php?group_id=28447&amp;type=1]]
 sf_logo
 <!--quickbook-escape-postfix--></programlisting>
@@ -1841,7 +1787,6 @@
         <para>
           Some more examples:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[def :-)            [$theme/smiley.png]]
 [def __spirit__     [@http://spirit.sourceforge.net Spirit]]
 <!--quickbook-escape-postfix--></programlisting>
@@ -1852,7 +1797,6 @@
         <para>
           Invoking these macros:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->Hi __spirit__  :-)
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -1964,16 +1908,15 @@
         <para>
           Example template:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[template person[name age what]
 
 Hi, my name is [name]. I am [age] years old. I am a [what].
 
 ]
 <!--quickbook-escape-postfix--></programlisting>
-        <anchor id="quickbook.syntax.block.templates.template_identifier"/>
         <bridgehead renderas="sect5" id="quickbook.syntax.block.templates.h0">
-          <link linkend="quickbook.syntax.block.templates.template_identifier">Template
+          <phrase id="quickbook.syntax.block.templates.template_identifier"/><link
+          linkend="quickbook.syntax.block.templates.template_identifier">Template
           Identifier</link>
         </bridgehead>
         <para>
@@ -1993,9 +1936,9 @@
             </simpara>
           </listitem>
         </itemizedlist>
-        <anchor id="quickbook.syntax.block.templates.formal_template_arguments"/>
         <bridgehead renderas="sect5" id="quickbook.syntax.block.templates.h1">
-          <link linkend="quickbook.syntax.block.templates.formal_template_arguments">Formal
+          <phrase id="quickbook.syntax.block.templates.formal_template_arguments"/><link
+          linkend="quickbook.syntax.block.templates.formal_template_arguments">Formal
           Template Arguments</link>
         </bridgehead>
         <para>
@@ -2013,9 +1956,8 @@
           and <literal>what</literal> are actually templates that exist in the duration
           of the template call.
         </para>
-        <anchor id="quickbook.syntax.block.templates.template_body"/>
         <bridgehead renderas="sect5" id="quickbook.syntax.block.templates.h2">
-          <link linkend="quickbook.syntax.block.templates.template_body">Template
+          <phrase id="quickbook.syntax.block.templates.template_body"/><link linkend="quickbook.syntax.block.templates.template_body">Template
           Body</link>
         </bridgehead>
         <para>
@@ -2023,13 +1965,11 @@
           are actually two forms. Templates may be phrase or block level. Phrase
           templates are of the form:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[template sample[arg1 arg2...argN] replacement text... ]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
           Block templates are of the form:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[template sample[arg1 arg2...argN]
 replacement text...
 ]
@@ -2040,22 +1980,20 @@
           Phrase templates are typically expanded as part of phrases. Like macros,
           block level elements are not allowed in phrase templates.
         </para>
-        <anchor id="quickbook.syntax.block.templates.template_expansion"/>
         <bridgehead renderas="sect5" id="quickbook.syntax.block.templates.h3">
-          <link linkend="quickbook.syntax.block.templates.template_expansion">Template
+          <phrase id="quickbook.syntax.block.templates.template_expansion"/><link
+          linkend="quickbook.syntax.block.templates.template_expansion">Template
           Expansion</link>
         </bridgehead>
         <para>
           You expand a template this way:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[template_identifier arg1..arg2..arg3]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
           At template expansion, you supply the actual arguments. The template will
           be expanded with your supplied arguments. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[person James Bond..39..Spy]
 [person Santa Clause..87..Big Red Fatso]
 <!--quickbook-escape-postfix--></programlisting>
@@ -2083,22 +2021,19 @@
           are separated by the double dot <literal>&quot;..&quot;</literal> and terminated
           by the close parenthesis.
         </para>
-        <anchor id="quickbook.syntax.block.templates.nullary_templates"/>
         <bridgehead renderas="sect5" id="quickbook.syntax.block.templates.h4">
-          <link linkend="quickbook.syntax.block.templates.nullary_templates">Nullary
-          Templates</link>
+          <phrase id="quickbook.syntax.block.templates.nullary_templates"/><link
+          linkend="quickbook.syntax.block.templates.nullary_templates">Nullary Templates</link>
         </bridgehead>
         <para>
           Nullary templates look and act like simple macros. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[template alpha[]&apos;&apos;&apos;&amp;#945;&apos;&apos;&apos;]
 [template beta[]&apos;&apos;&apos;&amp;#946;&apos;&apos;&apos;]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
           Expanding:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->Some squigles...[*[alpha][beta]]<!--quickbook-escape-postfix--></programlisting>
         <para>
           We have:
@@ -2132,14 +2067,12 @@
           indicates no arguments. If the template body does not look like a template
           argument list, we can elide the empty brackets. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[template aristotle_quote Aristotle: [*['Education is the best provision
 for the journey to old age.]]]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
           Expanding:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->Here's a quote from [aristotle_quote].
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -2157,13 +2090,11 @@
           use the space escape: &quot;<code><phrase role="special">\</phrase> </code>&quot;.
           Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[template tag\ _tag]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
           Then expanding:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->`struct` x[tag];
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -2176,9 +2107,8 @@
           You have a couple of ways to do it. I personally prefer the explicit empty
           brackets, though.
         </para>
-        <anchor id="quickbook.syntax.block.templates.simple_arguments"/>
         <bridgehead renderas="sect5" id="quickbook.syntax.block.templates.h5">
-          <link linkend="quickbook.syntax.block.templates.simple_arguments">Simple
+          <phrase id="quickbook.syntax.block.templates.simple_arguments"/><link linkend="quickbook.syntax.block.templates.simple_arguments">Simple
           Arguments</link>
         </bridgehead>
         <para>
@@ -2203,7 +2133,6 @@
         <para>
           For example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[template simple[a b c d] [a][b][c][d]]
 [simple w x y z]
 <!--quickbook-escape-postfix--></programlisting>
@@ -2223,7 +2152,6 @@
         <para>
           QuickBook only tries to get the arguments it needs. For example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[simple w x y z trail]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -2242,7 +2170,6 @@
           separators. It is possible to combine <literal>&quot;..&quot;</literal>
           separators with the argument passing simplification presented above. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[simple what do you think ..m a n?]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -2251,9 +2178,9 @@
         <para>
           what do you think man?
         </para>
-        <anchor id="quickbook.syntax.block.templates.punctuation_templates"/>
         <bridgehead renderas="sect5" id="quickbook.syntax.block.templates.h6">
-          <link linkend="quickbook.syntax.block.templates.punctuation_templates">Punctuation
+          <phrase id="quickbook.syntax.block.templates.punctuation_templates"/><link
+          linkend="quickbook.syntax.block.templates.punctuation_templates">Punctuation
           Templates</link>
         </bridgehead>
         <para>
@@ -2264,25 +2191,21 @@
           <link linkend="quickbook.syntax.block.templates.template_identifier">template
           identifiers</link>. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[template ![bar] <!--quickbook-escape-postfix-->&lt;hey&gt;<!--quickbook-escape-prefix-->[bar]<!--quickbook-escape-postfix-->&lt;/hey&gt;<!--quickbook-escape-prefix-->]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
           Now, expanding this:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[!baz]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
           We will have:
         </para>
-        
 <programlisting>&lt;hey&gt;baz&lt;/hey&gt;
 </programlisting>
       </section>
       <section id="quickbook.syntax.block.blurbs">
         <title><link linkend="quickbook.syntax.block.blurbs">Blurbs</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->[blurb :-) [*An eye catching advertisement or note...]
 
     __spirit__ is an object-oriented recursive-descent parser generator framework
@@ -2319,7 +2242,6 @@
       </section>
       <section id="quickbook.syntax.block.tables">
         <title><link linkend="quickbook.syntax.block.tables">Tables</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->[table A Simple Table
     [[Heading 1] [Heading 2] [Heading 3]]
     [[R0-C0]     [R0-C1]     [R0-C2]]
@@ -2414,7 +2336,6 @@
           in [ cells... ]. The syntax is free-format and allows big cells to be formatted
           nicely. Example:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[table Table with fat cells
     [[Heading 1] [Heading 2]]
     [
@@ -2496,7 +2417,6 @@
         <para>
           Here's how to have preformatted blocks of code in a table cell:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[table Table with code
     [[Comment] [Code]]
     [
@@ -2539,7 +2459,6 @@
                 </entry>
                 <entry>
                   <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>
@@ -2557,7 +2476,6 @@
       </section>
       <section id="quickbook.syntax.block.variable_lists">
         <title><link linkend="quickbook.syntax.block.variable_lists">Variable Lists</link></title>
-        
 <programlisting><!--quickbook-escape-prefix-->[variablelist A Variable List
     [[term 1] [The definition of term 1]]
     [[term 2] [The definition of term 2]]
@@ -2606,7 +2524,6 @@
         <para>
           You can include one QuickBook file from another. The syntax is simply:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[include someother.qbk]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -2632,7 +2549,6 @@
           the id defaults to the filename (&quot;someother&quot;, in the example
           above). You can specify the id like this:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[include:someid someother.qbk]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -2655,15 +2571,13 @@
         <para>
           QuickBook's import facility provides a nice solution.
         </para>
-        <anchor id="quickbook.syntax.block.import.example"/>
         <bridgehead renderas="sect5" id="quickbook.syntax.block.import.h0">
-          <link linkend="quickbook.syntax.block.import.example">Example</link>
+          <phrase id="quickbook.syntax.block.import.example"/><link linkend="quickbook.syntax.block.import.example">Example</link>
         </bridgehead>
         <para>
           You can effortlessly import code snippets from source code into your QuickBook.
           The following illustrates how this is done:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[import ../test/stub.cpp]
 [foo]
 [bar]
@@ -2671,7 +2585,6 @@
         <para>
           The first line:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[import ../test/stub.cpp]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
@@ -2682,7 +2595,6 @@
           above). This shall be the template identifier for that particular code
           snippet. The second and third line above does the actual template expansion:
         </para>
-        
 <programlisting><!--quickbook-escape-prefix-->[foo]
 [bar]
 <!--quickbook-escape-postfix--></programlisting>
@@ -2711,7 +2623,6 @@
           And any quickbook block markup.
         </para>
         <para>
-          
 <programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">string</phrase> <phrase role="identifier">foo</phrase><phrase role="special">()</phrase>
 <phrase role="special">{</phrase>
     <phrase role="comment">// return 'em, foo man!</phrase>
@@ -2723,7 +2634,6 @@
           This is the <emphasis role="bold"><emphasis>bar</emphasis></emphasis> function
         </para>
         <para>
-          
 <programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">string</phrase> <phrase role="identifier">bar</phrase><phrase role="special">()</phrase>
 <phrase role="special">{</phrase>
     <phrase role="comment">// return 'em, bar man!</phrase>
@@ -2733,16 +2643,14 @@
         <para>
           Some trailing text here
         </para>
-        <anchor id="quickbook.syntax.block.import.code_snippet_markup"/>
         <bridgehead renderas="sect5" id="quickbook.syntax.block.import.h1">
-          <link linkend="quickbook.syntax.block.import.code_snippet_markup">Code
+          <phrase id="quickbook.syntax.block.import.code_snippet_markup"/><link linkend="quickbook.syntax.block.import.code_snippet_markup">Code
           Snippet Markup</link>
         </bridgehead>
         <para>
           Note how the code snippets in <ulink url="../../test/stub.cpp">stub.cpp</ulink>
           get marked up. We use distinguishable comments following the form:
         </para>
-        
 <programlisting><phrase role="comment">//[id</phrase>
 <phrase role="identifier">some</phrase> <phrase role="identifier">code</phrase> <phrase role="identifier">here</phrase>
 <phrase role="comment">//]</phrase>
@@ -2755,21 +2663,18 @@
           The comment <code><phrase role="comment">//]</phrase></code> ends a code-snippet
           This too will not be visible in quickbook.
         </para>
-        <anchor id="quickbook.syntax.block.import.special_comments"/>
         <bridgehead renderas="sect5" id="quickbook.syntax.block.import.h2">
-          <link linkend="quickbook.syntax.block.import.special_comments">Special
+          <phrase id="quickbook.syntax.block.import.special_comments"/><link linkend="quickbook.syntax.block.import.special_comments">Special
           Comments</link>
         </bridgehead>
         <para>
           Special comments of the form:
         </para>
-        
 <programlisting><phrase role="comment">//` some [*quickbook] markup here</phrase>
 </programlisting>
         <para>
           and:
         </para>
-        
 <programlisting><phrase role="comment">/*` some [*quickbook] markup here */</phrase>
 </programlisting>
         <para>
@@ -2778,14 +2683,12 @@
           slash-slash, tick and white-space shall be ignored. In the second, the
           initial slash-star-tick and the final star-slash shall be ignored.
         </para>
-        <anchor id="quickbook.syntax.block.import.callouts"/>
         <bridgehead renderas="sect5" id="quickbook.syntax.block.import.h3">
-          <link linkend="quickbook.syntax.block.import.callouts">Callouts</link>
+          <phrase id="quickbook.syntax.block.import.callouts"/><link linkend="quickbook.syntax.block.import.callouts">Callouts</link>
         </bridgehead>
         <para>
           Special comments of the form:
         </para>
-        
 <programlisting><phrase role="comment">/*&lt; some [*quickbook] markup here &gt;*/</phrase>
 </programlisting>
         <para>
@@ -2795,21 +2698,20 @@
           for details. Example:
         </para>
         <para>
-          
-<programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">string</phrase> <phrase role="identifier">foo_bar</phrase><phrase role="special">()</phrase> <co id="quickbook.c0" linkends="quickbook.c1" />
+<programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">string</phrase> <phrase role="identifier">foo_bar</phrase><phrase role="special">()</phrase> <co id="quickbook.syntax.block.import.c0" linkends="quickbook.syntax.block.import.c1" />
 <phrase role="special">{</phrase>
-    <phrase role="keyword">return</phrase> <phrase role="string">&quot;foo-bar&quot;</phrase><phrase role="special">;</phrase> <co id="quickbook.c2" linkends="quickbook.c3" />
+    <phrase role="keyword">return</phrase> <phrase role="string">&quot;foo-bar&quot;</phrase><phrase role="special">;</phrase> <co id="quickbook.syntax.block.import.c2" linkends="quickbook.syntax.block.import.c3" />
 <phrase role="special">}</phrase>
 </programlisting>
         </para>
         <calloutlist>
-          <callout arearefs="quickbook.c0" id="quickbook.c1">
+          <callout arearefs="quickbook.syntax.block.import.c0" id="quickbook.syntax.block.import.c1">
             <para>
               The <emphasis>Mythical</emphasis> FooBar. See <ulink url="http://en.wikipedia.org/wiki/Foobar">Foobar
               for details</ulink>
             </para>
           </callout>
-          <callout arearefs="quickbook.c2" id="quickbook.c3">
+          <callout arearefs="quickbook.syntax.block.import.c2" id="quickbook.syntax.block.import.c3">
             <para>
               return 'em, foo-bar man!
             </para>
@@ -2927,7 +2829,6 @@
           </simpara>
         </listitem>
       </orderedlist>
-      
 <programlisting><phrase role="identifier">using</phrase> <phrase role="identifier">xsltproc</phrase>
     <phrase role="special">:</phrase> <phrase role="string">&quot;C:/Users/example/Documents/boost/xml/bin/xsltproc.exe&quot;</phrase>
     <phrase role="special">;</phrase>
@@ -2981,7 +2882,6 @@
           </simpara>
         </listitem>
       </orderedlist>
-      
 <programlisting><phrase role="identifier">using</phrase> <phrase role="identifier">quickbook</phrase>
     <phrase role="special">:</phrase> <phrase role="string">&quot;C:/Users/example/Documents/boost/xml/bin/quickbook.exe&quot;</phrase>
     <phrase role="special">;</phrase>
@@ -3001,7 +2901,6 @@
         role="identifier">xml</phrase></code> packages. For example, using <code><phrase
         role="identifier">apt</phrase><phrase role="special">-</phrase><phrase role="identifier">get</phrase></code>:
       </para>
-      
 <programlisting><phrase role="identifier">sudo</phrase> <phrase role="identifier">apt</phrase><phrase role="special">-</phrase><phrase role="identifier">get</phrase> <phrase role="identifier">install</phrase> <phrase role="identifier">xsltprc</phrase> <phrase role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase role="identifier">xsl</phrase> <phrase role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase role="identifier">xml</phrase>
 </programlisting>
       <para>
@@ -3021,7 +2920,6 @@
         the <ulink url="http://boost.org/boost-build2/doc/html/bbv2/advanced/configuration.html">Boost
         Build documentation</ulink>.
       </para>
-      
 <programlisting><phrase role="identifier">using</phrase> <phrase role="identifier">xsltproc</phrase> <phrase role="special">;</phrase>
 
 <phrase role="identifier">using</phrase> <phrase role="identifier">boostbook</phrase>
@@ -3071,7 +2969,6 @@
           </simpara>
         </listitem>
       </orderedlist>
-      
 <programlisting><phrase role="identifier">using</phrase> <phrase role="identifier">quickbook</phrase>
     <phrase role="special">:</phrase> <phrase role="special">/</phrase><phrase role="identifier">usr</phrase><phrase role="special">/</phrase><phrase role="identifier">local</phrase><phrase role="special">/</phrase><phrase role="identifier">bin</phrase><phrase role="special">/</phrase><phrase role="identifier">quickbook</phrase>
     <phrase role="special">;</phrase>
@@ -3120,7 +3017,6 @@
         You can use the following settings to highlight quickbook tags when editing
         quickbook files.
       </para>
-      
 <programlisting><!--quickbook-escape-prefix-->qbk=*.qbk
 lexer.*.qbk=props
 use.tabs.$(qbk)=0
@@ -3146,9 +3042,9 @@
   </section>
   <section id="quickbook.faq">
     <title><link linkend="quickbook.faq">Frequently Asked Questions</link></title>
-    <anchor id="quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_"/>
     <bridgehead renderas="sect3" id="quickbook.faq.h0">
-      <link linkend="quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_">Can
+      <phrase id="quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_"/><link
+      linkend="quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_">Can
       I use QuickBook for non-Boost documentation?</link>
     </bridgehead>
     <para>
@@ -3169,7 +3065,6 @@
     <para>
       For example:
     </para>
-    
 <programlisting>using quickbook ;
 
 xml my_doc : my_doc.qbk ;
@@ -3735,7 +3630,6 @@
               </para>
             </entry>
             <entry>
-              
 <programlisting><!--quickbook-escape-prefix--># one
 # two
 # three
@@ -3755,7 +3649,6 @@
               </para>
             </entry>
             <entry>
-              
 <programlisting><!--quickbook-escape-prefix-->* one
 * two
 * three
@@ -3996,7 +3889,6 @@
               </para>
             </entry>
             <entry>
-              
 <programlisting><!--quickbook-escape-prefix-->[table Title
 [[a][b][c]]
 [[a][b][c]]
@@ -4016,7 +3908,6 @@
               </para>
             </entry>
             <entry>
-              
 <programlisting><!--quickbook-escape-prefix-->[variablelist Title
 [[a][b]]
 [[a][b]]

Modified: branches/release/tools/quickbook/test/snippets/pass_thru.gold
==============================================================================
--- branches/release/tools/quickbook/test/snippets/pass_thru.gold	(original)
+++ branches/release/tools/quickbook/test/snippets/pass_thru.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -4,7 +4,6 @@
  xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>Pass thru test</title>
   <para>
-    
 <programlisting><phrase role="comment">/*=============================================================================
     Copyright (c) 2011 Daniel James
 
@@ -15,7 +14,6 @@
 </programlisting>
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">struct</phrase> <phrase role="identifier">Foo</phrase><phrase role="special">{</phrase>
 
   <phrase role="identifier">Foo</phrase><phrase role="special">();</phrase>
@@ -31,7 +29,6 @@
 </programlisting>
   </para>
   <para>
-    
 <programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">:</phrase>
     <phrase role="keyword">print</phrase><phrase role="special">(</phrase><phrase role="string">'foo'</phrase><phrase role="special">)</phrase>
 </programlisting>

Modified: branches/release/tools/quickbook/test/template-section.gold
==============================================================================
--- branches/release/tools/quickbook/test/template-section.gold	(original)
+++ branches/release/tools/quickbook/test/template-section.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -11,9 +11,8 @@
     <para>
       Hello.
     </para>
-    <anchor id="section_in_a_template.test.just_to_test_id_generation"/>
     <bridgehead renderas="sect3" id="section_in_a_template.test.h0">
-      <link linkend="section_in_a_template.test.just_to_test_id_generation">Just
+      <phrase id="section_in_a_template.test.just_to_test_id_generation"/><link linkend="section_in_a_template.test.just_to_test_id_generation">Just
       to test id generation</link>
     </bridgehead>
     <para>

Modified: branches/release/tools/quickbook/test/templates.gold
==============================================================================
--- branches/release/tools/quickbook/test/templates.gold	(original)
+++ branches/release/tools/quickbook/test/templates.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -36,7 +36,6 @@
     <para>
       wxyz wxyz trail
     </para>
-    
 <programlisting><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> &quot;Hello, World&quot; <phrase role="special">&lt;&lt;</phrase> <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">endl</phrase><phrase role="special">;</phrase>
@@ -143,7 +142,6 @@
       </listitem>
     </itemizedlist>
     <para/>
-    
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase>
 </programlisting>
     <para>
@@ -176,7 +174,6 @@
       </listitem>
       <listitem>
         <simpara>
-          
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase>
 </programlisting>
         </simpara>

Modified: branches/release/tools/quickbook/test/unicode-escape.gold
==============================================================================
--- branches/release/tools/quickbook/test/unicode-escape.gold	(original)
+++ branches/release/tools/quickbook/test/unicode-escape.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -1,9 +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="utf_8_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>UTF-8 test</title> <anchor id="utf_8_test.i__xf1_t__xeb_rn__xe2_ti__xf4_n__xe0_liz__xe6_ti__xf8_n"/>
+  <title>UTF-8 test</title>
   <bridgehead renderas="sect2" id="utf_8_test.h0">
-    <link linkend="utf_8_test.i__xf1_t__xeb_rn__xe2_ti__xf4_n__xe0_liz__xe6_ti__xf8_n">I&#xF1;t&#xEB;rn&#xE2;ti&#xF4;n&#xE0;liz&#xE6;ti&#xF8;n</link>
+    <phrase id="utf_8_test.i__xf1_t__xeb_rn__xe2_ti__xf4_n__xe0_liz__xe6_ti__xf8_n"/><link
+    linkend="utf_8_test.i__xf1_t__xeb_rn__xe2_ti__xf4_n__xe0_liz__xe6_ti__xf8_n">I&#xF1;t&#xEB;rn&#xE2;ti&#xF4;n&#xE0;liz&#xE6;ti&#xF8;n</link>
   </bridgehead>
   <itemizedlist>
     <listitem>

Modified: branches/release/tools/quickbook/test/utf-8-bom.gold
==============================================================================
--- branches/release/tools/quickbook/test/utf-8-bom.gold	(original)
+++ branches/release/tools/quickbook/test/utf-8-bom.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -1,9 +1,9 @@
 <?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="utf_8_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>UTF-8 test</title> <anchor id="utf_8_test.i__t__rn__ti__n__liz__ti__n"/>
+  <title>UTF-8 test</title>
   <bridgehead renderas="sect2" id="utf_8_test.h0">
-    <link linkend="utf_8_test.i__t__rn__ti__n__liz__ti__n">Iñtërnâtiônà lizætiøn</link>
+    <phrase id="utf_8_test.i__t__rn__ti__n__liz__ti__n"/><link linkend="utf_8_test.i__t__rn__ti__n__liz__ti__n">Iñtërnâtiônà lizætiøn</link>
   </bridgehead>
   <itemizedlist>
     <listitem>

Modified: branches/release/tools/quickbook/test/utf-8.gold
==============================================================================
--- branches/release/tools/quickbook/test/utf-8.gold	(original)
+++ branches/release/tools/quickbook/test/utf-8.gold	2011-10-06 18:10:28 EDT (Thu, 06 Oct 2011)
@@ -1,9 +1,9 @@
 <?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="utf_8_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>UTF-8 test</title> <anchor id="utf_8_test.i__t__rn__ti__n__liz__ti__n"/>
+  <title>UTF-8 test</title>
   <bridgehead renderas="sect2" id="utf_8_test.h0">
-    <link linkend="utf_8_test.i__t__rn__ti__n__liz__ti__n">Iñtërnâtiônà lizætiøn</link>
+    <phrase id="utf_8_test.i__t__rn__ti__n__liz__ti__n"/><link linkend="utf_8_test.i__t__rn__ti__n__liz__ti__n">Iñtërnâtiônà lizætiøn</link>
   </bridgehead>
   <itemizedlist>
     <listitem>