|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r72723 - in branches/quickbook-dev/tools/quickbook: src test test/include
From: dnljms_at_[hidden]
Date: 2011-06-23 13:46:08
Author: danieljames
Date: 2011-06-23 13:46:05 EDT (Thu, 23 Jun 2011)
New Revision: 72723
URL: http://svn.boost.org/trac/boost/changeset/72723
Log:
Quickbook: Change the anchor markup for headers.
Use a phrase with an id inside the header.
Using an anchor before the heading was causing problems when the heading
wasn't inside a section.
We can't use an anchor inside the header when it links to itself, as it
messes up getting the title for the link. Using an empty phrase means
that it will just get the empty title for the phrase. Thanks to John
Maddock for the idea.
This does generate slightly odd markup. We could possibly use the old
style markup whenever section depth > 0, since we would know that we're
inside a section, but that seems like an unnecessary complication.
Text files modified:
branches/quickbook-dev/tools/quickbook/src/actions.cpp | 46 ++++++++++++++-------
branches/quickbook-dev/tools/quickbook/test/anchor.gold | 23 ++++++----
branches/quickbook-dev/tools/quickbook/test/blocks.gold | 15 +++---
branches/quickbook-dev/tools/quickbook/test/code-block.gold | 5 -
branches/quickbook-dev/tools/quickbook/test/heading-1.1.gold | 59 ++++++++++-----------------
branches/quickbook-dev/tools/quickbook/test/heading-1.5.gold | 66 ++++++++++++++-----------------
branches/quickbook-dev/tools/quickbook/test/heading-1.6.gold | 84 ++++++++++++++++++---------------------
branches/quickbook-dev/tools/quickbook/test/identifier_1_5.gold | 5 +
branches/quickbook-dev/tools/quickbook/test/identifier_1_6.gold | 6 +-
branches/quickbook-dev/tools/quickbook/test/include/doc-title1-1.5.gold | 22 +++------
branches/quickbook-dev/tools/quickbook/test/include/doc-title1a-1.5.gold | 22 +++------
branches/quickbook-dev/tools/quickbook/test/include/include-id-1.5.gold | 21 ++++-----
branches/quickbook-dev/tools/quickbook/test/include/include-id-1.6.gold | 23 +++++-----
branches/quickbook-dev/tools/quickbook/test/quickbook-manual.gold | 73 +++++++++++++++-------------------
branches/quickbook-dev/tools/quickbook/test/template-section.gold | 3
branches/quickbook-dev/tools/quickbook/test/unicode-escape.gold | 5 +
branches/quickbook-dev/tools/quickbook/test/utf-8-bom.gold | 4
branches/quickbook-dev/tools/quickbook/test/utf-8.gold | 4
18 files changed, 226 insertions(+), 260 deletions(-)
Modified: branches/quickbook-dev/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions.cpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/actions.cpp 2011-06-23 13:46:05 EDT (Thu, 23 Jun 2011)
@@ -281,15 +281,27 @@
namespace {
void write_bridgehead(collector& out, int level,
- std::string const& str, std::string const& id, std::string const& linkend)
+ 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())
+ {
+ out << "<bridgehead renderas=\"sect" << level << "\"";
+ out << " id=\"" << id << "-heading\"";
+ out << ">";
+ out << "<phrase id=\"" << id << "\"/>";
+ out << "<link linkend=\"" << id << "\">";
+ out << str;
+ out << "</link>";
+ out << "</bridgehead>";
+ }
+ else
+ {
+ out << "<bridgehead renderas=\"sect" << level << "\"";
+ if(!id.empty()) out << " id=\"" << id << "\"";
+ out << ">";
+ out << str;
+ out << "</bridgehead>";
+ }
}
}
@@ -319,12 +331,16 @@
}
std::string anchor;
- std::string linkend;
+
+ write_anchors(actions, actions.out);
if (!generic && qbk_version_n < 103) // version 1.2 and below
{
anchor = actions.section_id + '.' +
detail::make_identifier(content.get_boostbook());
+
+ write_bridgehead(actions.out, level,
+ content.get_boostbook(), anchor, false);
}
else
{
@@ -337,15 +353,13 @@
content.get_boostbook()
);
- linkend = anchor =
- fully_qualified_id(actions.doc_id, actions.qualified_section_id, id);
+ anchor = fully_qualified_id(actions.doc_id,
+ actions.qualified_section_id, id);
+
+ write_bridgehead(actions.out, level,
+ content.get_boostbook(), anchor, true);
}
- actions.anchors.push_back(anchor);
- write_anchors(actions, actions.out);
-
- write_bridgehead(actions.out, level,
- content.get_boostbook(), anchor + "-heading", linkend);
}
void simple_phrase_action::operator()(char mark) const
Modified: branches/quickbook-dev/tools/quickbook/test/anchor.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/anchor.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/anchor.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 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.this_heading_shouldn_t_pick_up_the_previous_anchor-heading">
- <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.this_heading_should_pick_up_the_previous_anchor-heading">
- <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.and_this_one-heading">
- <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.also_this_one-heading">
- <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="anchors.finally_this-heading">
+ <anchor id="a7"/>
+ <bridgehead renderas="sect3" id="anchors.finally_this">
Finally this
</bridgehead>
<anchor id="a8"/>
Modified: branches/quickbook-dev/tools/quickbook/test/blocks.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/blocks.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/blocks.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 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.blockquotes-heading">
- <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.admonitions-heading">
- <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.blurb-heading">
- <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.inline_blocks-heading">
- <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/quickbook-dev/tools/quickbook/test/code-block.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/code-block.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/code-block.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 2011)
@@ -26,10 +26,9 @@
<para>
Paragraph.
</para>
- <anchor id="indented_code_blocks.code_blocks_separated_by_comment"/>
<bridgehead renderas="sect2" id="indented_code_blocks.code_blocks_separated_by_comment-heading">
- <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.
Modified: branches/quickbook-dev/tools/quickbook/test/heading-1.1.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/heading-1.1.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/heading-1.1.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 2011)
@@ -2,82 +2,69 @@
<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="heading_test_1_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Heading Test 1.1</title> <anchor id="heading_test_1_1.generic_header"/>
+ <title>Heading Test 1.1</title>
<bridgehead renderas="sect2" id="heading_test_1_1.generic_header-heading">
- <link linkend="heading_test_1_1.generic_header">Generic header</link>
+ <phrase id="heading_test_1_1.generic_header"/><link linkend="heading_test_1_1.generic_header">Generic
+ header</link>
</bridgehead>
- <anchor id=".level_1"/>
- <bridgehead renderas="sect1" id=".level_1-heading">
+ <bridgehead renderas="sect1" id=".level_1">
Level 1
</bridgehead>
- <anchor id=".level_2"/>
- <bridgehead renderas="sect2" id=".level_2-heading">
+ <bridgehead renderas="sect2" id=".level_2">
Level 2
</bridgehead>
- <anchor id=".level_3"/>
- <bridgehead renderas="sect3" id=".level_3-heading">
+ <bridgehead renderas="sect3" id=".level_3">
Level 3
</bridgehead>
- <anchor id=".level_4"/>
- <bridgehead renderas="sect4" id=".level_4-heading">
+ <bridgehead renderas="sect4" id=".level_4">
Level 4
</bridgehead>
- <anchor id=".level_5"/>
- <bridgehead renderas="sect5" id=".level_5-heading">
+ <bridgehead renderas="sect5" id=".level_5">
Level 5
</bridgehead>
- <anchor id=".level_6"/>
- <bridgehead renderas="sect6" id=".level_6-heading">
+ <bridgehead renderas="sect6" id=".level_6">
Level 6
</bridgehead>
- <anchor id="._emphasis_role__bold__bold__emphasis_"/>
- <bridgehead renderas="sect1" id="._emphasis_role__bold__bold__emphasis_-heading">
+ <bridgehead renderas="sect1" id="._emphasis_role__bold__bold__emphasis_">
<emphasis role="bold">Bold</emphasis>
</bridgehead>
- <anchor id=".comment"/>
- <bridgehead renderas="sect1" id=".comment-heading">
+ <bridgehead renderas="sect1" id=".comment">
Comment
</bridgehead>
- <anchor id="._notanid"/>
- <bridgehead renderas="sect1" id="._notanid-heading">
+ <bridgehead renderas="sect1" id="._notanid">
:notanid
</bridgehead>
- <anchor id="._also_not_an_id"/>
- <bridgehead renderas="sect1" id="._also_not_an_id-heading">
+ <bridgehead renderas="sect1" id="._also_not_an_id">
:also not an id
</bridgehead>
- <anchor id=".h1"/>
- <bridgehead renderas="sect1" id=".h1-heading">
+ <bridgehead renderas="sect1" id=".h1">
H1
</bridgehead>
<section id="heading_test_1_1.s1">
- <title>S1</title> <anchor id="s1.h2"/>
- <bridgehead renderas="sect2" id="s1.h2-heading">
+ <title>S1</title>
+ <bridgehead renderas="sect2" id="s1.h2">
H2
</bridgehead>
<section id="heading_test_1_1.s2">
- <title>S2</title> <anchor id="s2.h3"/>
- <bridgehead renderas="sect3" id="s2.h3-heading">
+ <title>S2</title>
+ <bridgehead renderas="sect3" id="s2.h3">
H3
</bridgehead>
</section>
- <anchor id="heading_test_1_1.s1.h4"/>
<bridgehead renderas="sect3" id="heading_test_1_1.s1.h4-heading">
- <link linkend="heading_test_1_1.s1.h4">H4</link>
+ <phrase id="heading_test_1_1.s1.h4"/><link linkend="heading_test_1_1.s1.h4">H4</link>
</bridgehead>
<section id="heading_test_1_1.s3">
- <title>S3</title> <anchor id="s3.h5"/>
- <bridgehead renderas="sect3" id="s3.h5-heading">
+ <title>S3</title>
+ <bridgehead renderas="sect3" id="s3.h5">
H5
</bridgehead>
</section>
- <anchor id="heading_test_1_1.s1.h6"/>
<bridgehead renderas="sect3" id="heading_test_1_1.s1.h6-heading">
- <link linkend="heading_test_1_1.s1.h6">H6</link>
+ <phrase id="heading_test_1_1.s1.h6"/><link linkend="heading_test_1_1.s1.h6">H6</link>
</bridgehead>
</section>
- <anchor id="s3.h7"/>
- <bridgehead renderas="sect1" id="s3.h7-heading">
+ <bridgehead renderas="sect1" id="s3.h7">
H7
</bridgehead>
</article>
Modified: branches/quickbook-dev/tools/quickbook/test/heading-1.5.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/heading-1.5.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/heading-1.5.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 2011)
@@ -2,83 +2,77 @@
<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="heading_test_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Heading Test 1.5</title> <anchor id="heading_test_1_5.generic_header"/>
+ <title>Heading Test 1.5</title>
<bridgehead renderas="sect2" id="heading_test_1_5.generic_header-heading">
- <link linkend="heading_test_1_5.generic_header">Generic header</link>
+ <phrase id="heading_test_1_5.generic_header"/><link linkend="heading_test_1_5.generic_header">Generic
+ header</link>
</bridgehead>
- <anchor id="heading_test_1_5.level_1"/>
<bridgehead renderas="sect1" id="heading_test_1_5.level_1-heading">
- <link linkend="heading_test_1_5.level_1">Level 1</link>
+ <phrase id="heading_test_1_5.level_1"/><link linkend="heading_test_1_5.level_1">Level
+ 1</link>
</bridgehead>
- <anchor id="heading_test_1_5.level_2"/>
<bridgehead renderas="sect2" id="heading_test_1_5.level_2-heading">
- <link linkend="heading_test_1_5.level_2">Level 2</link>
+ <phrase id="heading_test_1_5.level_2"/><link linkend="heading_test_1_5.level_2">Level
+ 2</link>
</bridgehead>
- <anchor id="heading_test_1_5.level_3"/>
<bridgehead renderas="sect3" id="heading_test_1_5.level_3-heading">
- <link linkend="heading_test_1_5.level_3">Level 3</link>
+ <phrase id="heading_test_1_5.level_3"/><link linkend="heading_test_1_5.level_3">Level
+ 3</link>
</bridgehead>
- <anchor id="heading_test_1_5.level_4"/>
<bridgehead renderas="sect4" id="heading_test_1_5.level_4-heading">
- <link linkend="heading_test_1_5.level_4">Level 4</link>
+ <phrase id="heading_test_1_5.level_4"/><link linkend="heading_test_1_5.level_4">Level
+ 4</link>
</bridgehead>
- <anchor id="heading_test_1_5.level_5"/>
<bridgehead renderas="sect5" id="heading_test_1_5.level_5-heading">
- <link linkend="heading_test_1_5.level_5">Level 5</link>
+ <phrase id="heading_test_1_5.level_5"/><link linkend="heading_test_1_5.level_5">Level
+ 5</link>
</bridgehead>
- <anchor id="heading_test_1_5.level_6"/>
<bridgehead renderas="sect6" id="heading_test_1_5.level_6-heading">
- <link linkend="heading_test_1_5.level_6">Level 6</link>
+ <phrase id="heading_test_1_5.level_6"/><link linkend="heading_test_1_5.level_6">Level
+ 6</link>
</bridgehead>
- <anchor id="heading_test_1_5._emphasis_role__bold__bold__emphasis_"/>
<bridgehead renderas="sect1" id="heading_test_1_5._emphasis_role__bold__bold__emphasis_-heading">
- <link linkend="heading_test_1_5._emphasis_role__bold__bold__emphasis_"><emphasis
+ <phrase id="heading_test_1_5._emphasis_role__bold__bold__emphasis_"/><link linkend="heading_test_1_5._emphasis_role__bold__bold__emphasis_"><emphasis
role="bold">Bold</emphasis></link>
</bridgehead>
- <anchor id="heading_test_1_5.comment"/>
<bridgehead renderas="sect1" id="heading_test_1_5.comment-heading">
- <link linkend="heading_test_1_5.comment">Comment</link>
+ <phrase id="heading_test_1_5.comment"/><link linkend="heading_test_1_5.comment">Comment</link>
</bridgehead>
- <anchor id="heading_test_1_5._notanid"/>
<bridgehead renderas="sect1" id="heading_test_1_5._notanid-heading">
- <link linkend="heading_test_1_5._notanid">:notanid</link>
+ <phrase id="heading_test_1_5._notanid"/><link linkend="heading_test_1_5._notanid">:notanid</link>
</bridgehead>
- <anchor id="heading_test_1_5._also_not_an_id"/>
<bridgehead renderas="sect1" id="heading_test_1_5._also_not_an_id-heading">
- <link linkend="heading_test_1_5._also_not_an_id">:also not an id</link>
+ <phrase id="heading_test_1_5._also_not_an_id"/><link linkend="heading_test_1_5._also_not_an_id">:also
+ not an id</link>
</bridgehead>
- <anchor id="heading_test_1_5.h1"/>
<bridgehead renderas="sect2" id="heading_test_1_5.h1-heading">
- <link linkend="heading_test_1_5.h1">H1</link>
+ <phrase id="heading_test_1_5.h1"/><link linkend="heading_test_1_5.h1">H1</link>
</bridgehead>
<section id="heading_test_1_5.s1">
- <title><link linkend="heading_test_1_5.s1">S1</link></title> <anchor id="heading_test_1_5.s1.h2"/>
+ <title><link linkend="heading_test_1_5.s1">S1</link></title>
<bridgehead renderas="sect2" id="heading_test_1_5.s1.h2-heading">
- <link linkend="heading_test_1_5.s1.h2">H2</link>
+ <phrase id="heading_test_1_5.s1.h2"/><link linkend="heading_test_1_5.s1.h2">H2</link>
</bridgehead>
<section id="heading_test_1_5.s1.s2">
- <title><link linkend="heading_test_1_5.s1.s2">S2</link></title> <anchor id="heading_test_1_5.s1.s2.h3"/>
+ <title><link linkend="heading_test_1_5.s1.s2">S2</link></title>
<bridgehead renderas="sect3" id="heading_test_1_5.s1.s2.h3-heading">
- <link linkend="heading_test_1_5.s1.s2.h3">H3</link>
+ <phrase id="heading_test_1_5.s1.s2.h3"/><link linkend="heading_test_1_5.s1.s2.h3">H3</link>
</bridgehead>
</section>
- <anchor id="heading_test_1_5.s1.h4"/>
<bridgehead renderas="sect2" id="heading_test_1_5.s1.h4-heading">
- <link linkend="heading_test_1_5.s1.h4">H4</link>
+ <phrase id="heading_test_1_5.s1.h4"/><link linkend="heading_test_1_5.s1.h4">H4</link>
</bridgehead>
<section id="heading_test_1_5.s1.s3">
- <title><link linkend="heading_test_1_5.s1.s3">S3</link></title> <anchor id="heading_test_1_5.s1.s3.h5"/>
+ <title><link linkend="heading_test_1_5.s1.s3">S3</link></title>
<bridgehead renderas="sect4" id="heading_test_1_5.s1.s3.h5-heading">
- <link linkend="heading_test_1_5.s1.s3.h5">H5</link>
+ <phrase id="heading_test_1_5.s1.s3.h5"/><link linkend="heading_test_1_5.s1.s3.h5">H5</link>
</bridgehead>
</section>
- <anchor id="heading_test_1_5.s1.h6"/>
<bridgehead renderas="sect2" id="heading_test_1_5.s1.h6-heading">
- <link linkend="heading_test_1_5.s1.h6">H6</link>
+ <phrase id="heading_test_1_5.s1.h6"/><link linkend="heading_test_1_5.s1.h6">H6</link>
</bridgehead>
</section>
- <anchor id="heading_test_1_5.h7"/>
<bridgehead renderas="sect1" id="heading_test_1_5.h7-heading">
- <link linkend="heading_test_1_5.h7">H7</link>
+ <phrase id="heading_test_1_5.h7"/><link linkend="heading_test_1_5.h7">H7</link>
</bridgehead>
</article>
Modified: branches/quickbook-dev/tools/quickbook/test/heading-1.6.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/heading-1.6.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/heading-1.6.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 2011)
@@ -2,108 +2,100 @@
<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="heading_test_1_6" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Heading Test 1.6</title> <anchor id="heading_test_1_6.generic_header"/>
+ <title>Heading Test 1.6</title>
<bridgehead renderas="sect2" id="heading_test_1_6.generic_header-heading">
- <link linkend="heading_test_1_6.generic_header">Generic header</link>
+ <phrase id="heading_test_1_6.generic_header"/><link linkend="heading_test_1_6.generic_header">Generic
+ header</link>
</bridgehead>
- <anchor id="heading_test_1_6.level_1"/>
<bridgehead renderas="sect1" id="heading_test_1_6.level_1-heading">
- <link linkend="heading_test_1_6.level_1">Level 1</link>
+ <phrase id="heading_test_1_6.level_1"/><link linkend="heading_test_1_6.level_1">Level
+ 1</link>
</bridgehead>
- <anchor id="heading_test_1_6.level_2"/>
<bridgehead renderas="sect2" id="heading_test_1_6.level_2-heading">
- <link linkend="heading_test_1_6.level_2">Level 2</link>
+ <phrase id="heading_test_1_6.level_2"/><link linkend="heading_test_1_6.level_2">Level
+ 2</link>
</bridgehead>
- <anchor id="heading_test_1_6.level_3"/>
<bridgehead renderas="sect3" id="heading_test_1_6.level_3-heading">
- <link linkend="heading_test_1_6.level_3">Level 3</link>
+ <phrase id="heading_test_1_6.level_3"/><link linkend="heading_test_1_6.level_3">Level
+ 3</link>
</bridgehead>
- <anchor id="heading_test_1_6.level_4"/>
<bridgehead renderas="sect4" id="heading_test_1_6.level_4-heading">
- <link linkend="heading_test_1_6.level_4">Level 4</link>
+ <phrase id="heading_test_1_6.level_4"/><link linkend="heading_test_1_6.level_4">Level
+ 4</link>
</bridgehead>
- <anchor id="heading_test_1_6.level_5"/>
<bridgehead renderas="sect5" id="heading_test_1_6.level_5-heading">
- <link linkend="heading_test_1_6.level_5">Level 5</link>
+ <phrase id="heading_test_1_6.level_5"/><link linkend="heading_test_1_6.level_5">Level
+ 5</link>
</bridgehead>
- <anchor id="heading_test_1_6.level_6"/>
<bridgehead renderas="sect6" id="heading_test_1_6.level_6-heading">
- <link linkend="heading_test_1_6.level_6">Level 6</link>
+ <phrase id="heading_test_1_6.level_6"/><link linkend="heading_test_1_6.level_6">Level
+ 6</link>
</bridgehead>
- <anchor id="heading_test_1_6._bold_"/>
<bridgehead renderas="sect1" id="heading_test_1_6._bold_-heading">
- <link linkend="heading_test_1_6._bold_"><emphasis role="bold">Bold</emphasis></link>
+ <phrase id="heading_test_1_6._bold_"/><link linkend="heading_test_1_6._bold_"><emphasis
+ role="bold">Bold</emphasis></link>
</bridgehead>
- <anchor id="heading_test_1_6.comment___"/>
<bridgehead renderas="sect1" id="heading_test_1_6.comment___-heading">
- <link linkend="heading_test_1_6.comment___">Comment</link>
+ <phrase id="heading_test_1_6.comment___"/><link linkend="heading_test_1_6.comment___">Comment</link>
</bridgehead>
- <anchor id="heading_test_1_6.h1"/>
<bridgehead renderas="sect1" id="heading_test_1_6.h1-heading">
- <link linkend="heading_test_1_6.h1">H1</link>
+ <phrase id="heading_test_1_6.h1"/><link linkend="heading_test_1_6.h1">H1</link>
</bridgehead>
<section id="heading_test_1_6.s1">
- <title><link linkend="heading_test_1_6.s1">S1</link></title> <anchor id="heading_test_1_6.s1.h2"/>
+ <title><link linkend="heading_test_1_6.s1">S1</link></title>
<bridgehead renderas="sect3" id="heading_test_1_6.s1.h2-heading">
- <link linkend="heading_test_1_6.s1.h2">H2</link>
+ <phrase id="heading_test_1_6.s1.h2"/><link linkend="heading_test_1_6.s1.h2">H2</link>
</bridgehead>
<section id="heading_test_1_6.s1.s2">
- <title><link linkend="heading_test_1_6.s1.s2">S2</link></title> <anchor id="heading_test_1_6.s1.s2.h3"/>
+ <title><link linkend="heading_test_1_6.s1.s2">S2</link></title>
<bridgehead renderas="sect3" id="heading_test_1_6.s1.s2.h3-heading">
- <link linkend="heading_test_1_6.s1.s2.h3">H3</link>
+ <phrase id="heading_test_1_6.s1.s2.h3"/><link linkend="heading_test_1_6.s1.s2.h3">H3</link>
</bridgehead>
</section>
- <anchor id="heading_test_1_6.s1.h4"/>
<bridgehead renderas="sect2" id="heading_test_1_6.s1.h4-heading">
- <link linkend="heading_test_1_6.s1.h4">H4</link>
+ <phrase id="heading_test_1_6.s1.h4"/><link linkend="heading_test_1_6.s1.h4">H4</link>
</bridgehead>
<section id="heading_test_1_6.s1.s3">
- <title><link linkend="heading_test_1_6.s1.s3">S3</link></title> <anchor id="heading_test_1_6.s1.s3.h5"/>
+ <title><link linkend="heading_test_1_6.s1.s3">S3</link></title>
<bridgehead renderas="sect4" id="heading_test_1_6.s1.s3.h5-heading">
- <link linkend="heading_test_1_6.s1.s3.h5">H5</link>
+ <phrase id="heading_test_1_6.s1.s3.h5"/><link linkend="heading_test_1_6.s1.s3.h5">H5</link>
</bridgehead>
</section>
- <anchor id="heading_test_1_6.s1.h6"/>
<bridgehead renderas="sect2" id="heading_test_1_6.s1.h6-heading">
- <link linkend="heading_test_1_6.s1.h6">H6</link>
+ <phrase id="heading_test_1_6.s1.h6"/><link linkend="heading_test_1_6.s1.h6">H6</link>
</bridgehead>
</section>
- <anchor id="heading_test_1_6.h7"/>
<bridgehead renderas="sect1" id="heading_test_1_6.h7-heading">
- <link linkend="heading_test_1_6.h7">H7</link>
+ <phrase id="heading_test_1_6.h7"/><link linkend="heading_test_1_6.h7">H7</link>
</bridgehead>
- <anchor id="heading_test_1_6.a1"/>
<bridgehead renderas="sect1" id="heading_test_1_6.a1-heading">
- <link linkend="heading_test_1_6.a1">H1</link>
+ <phrase id="heading_test_1_6.a1"/><link linkend="heading_test_1_6.a1">H1</link>
</bridgehead>
<section id="heading_test_1_6.s1">
- <title><link linkend="heading_test_1_6.s1">S1</link></title> <anchor id="heading_test_1_6.s1.a2"/>
+ <title><link linkend="heading_test_1_6.s1">S1</link></title>
<bridgehead renderas="sect2" id="heading_test_1_6.s1.a2-heading">
- <link linkend="heading_test_1_6.s1.a2">H2</link>
+ <phrase id="heading_test_1_6.s1.a2"/><link linkend="heading_test_1_6.s1.a2">H2</link>
</bridgehead>
<section id="heading_test_1_6.s1.s2">
- <title><link linkend="heading_test_1_6.s1.s2">S2</link></title> <anchor id="heading_test_1_6.s1.s2.a3"/>
+ <title><link linkend="heading_test_1_6.s1.s2">S2</link></title>
<bridgehead renderas="sect3" id="heading_test_1_6.s1.s2.a3-heading">
- <link linkend="heading_test_1_6.s1.s2.a3">H3</link>
+ <phrase id="heading_test_1_6.s1.s2.a3"/><link linkend="heading_test_1_6.s1.s2.a3">H3</link>
</bridgehead>
</section>
- <anchor id="heading_test_1_6.s1.a4"/>
<bridgehead renderas="sect2" id="heading_test_1_6.s1.a4-heading">
- <link linkend="heading_test_1_6.s1.a4">H4</link>
+ <phrase id="heading_test_1_6.s1.a4"/><link linkend="heading_test_1_6.s1.a4">H4</link>
</bridgehead>
<section id="heading_test_1_6.s1.s3">
- <title><link linkend="heading_test_1_6.s1.s3">S3</link></title> <anchor id="heading_test_1_6.s1.s3.a5"/>
+ <title><link linkend="heading_test_1_6.s1.s3">S3</link></title>
<bridgehead renderas="sect3" id="heading_test_1_6.s1.s3.a5-heading">
- <link linkend="heading_test_1_6.s1.s3.a5">H5</link>
+ <phrase id="heading_test_1_6.s1.s3.a5"/><link linkend="heading_test_1_6.s1.s3.a5">H5</link>
</bridgehead>
</section>
- <anchor id="heading_test_1_6.s1.a6"/>
<bridgehead renderas="sect3" id="heading_test_1_6.s1.a6-heading">
- <link linkend="heading_test_1_6.s1.a6">H6</link>
+ <phrase id="heading_test_1_6.s1.a6"/><link linkend="heading_test_1_6.s1.a6">H6</link>
</bridgehead>
</section>
- <anchor id="heading_test_1_6.a7"/>
<bridgehead renderas="sect1" id="heading_test_1_6.a7-heading">
- <link linkend="heading_test_1_6.a7">H7</link>
+ <phrase id="heading_test_1_6.a7"/><link linkend="heading_test_1_6.a7">H7</link>
</bridgehead>
</article>
Modified: branches/quickbook-dev/tools/quickbook/test/identifier_1_5.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/identifier_1_5.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/identifier_1_5.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 2011)
@@ -2,9 +2,10 @@
<!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.test_heading_with__code__phrase_role__identifier__code__phrase___code_-heading">
- <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>
</article>
Modified: branches/quickbook-dev/tools/quickbook/test/identifier_1_6.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/identifier_1_6.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/identifier_1_6.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 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="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.test_heading_with__code_-heading">
- <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>
</article>
Modified: branches/quickbook-dev/tools/quickbook/test/include/doc-title1-1.5.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/include/doc-title1-1.5.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/include/doc-title1-1.5.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 2011)
@@ -2,32 +2,26 @@
<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="doc_title_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Doc Title 1</title> <anchor id="doc_title_1.a1"/>
+ <title>Doc Title 1</title>
<bridgehead renderas="sect2" id="doc_title_1.a1-heading">
- <link linkend="doc_title_1.a1">a1</link>
+ <phrase id="doc_title_1.a1"/><link linkend="doc_title_1.a1">a1</link>
</bridgehead>
- <anchor id="doc_title_1.inc1"/>
<bridgehead renderas="sect2" id="doc_title_1.inc1-heading">
- <link linkend="doc_title_1.inc1">inc1</link>
+ <phrase id="doc_title_1.inc1"/><link linkend="doc_title_1.inc1">inc1</link>
</bridgehead>
- <anchor id="doc_title_1.a2"/>
<bridgehead renderas="sect2" id="doc_title_1.a2-heading">
- <link linkend="doc_title_1.a2">a2</link>
+ <phrase id="doc_title_1.a2"/><link linkend="doc_title_1.a2">a2</link>
</bridgehead>
- <anchor id="doc_title_1_inc2.inc2"/>
<bridgehead renderas="sect2" id="doc_title_1_inc2.inc2-heading">
- <link linkend="doc_title_1_inc2.inc2">inc2</link>
+ <phrase id="doc_title_1_inc2.inc2"/><link linkend="doc_title_1_inc2.inc2">inc2</link>
</bridgehead>
- <anchor id="doc_title_1.a3"/>
<bridgehead renderas="sect2" id="doc_title_1.a3-heading">
- <link linkend="doc_title_1.a3">a3</link>
+ <phrase id="doc_title_1.a3"/><link linkend="doc_title_1.a3">a3</link>
</bridgehead>
- <anchor id="doc_title_1_inc2.inc3"/>
<bridgehead renderas="sect2" id="doc_title_1_inc2.inc3-heading">
- <link linkend="doc_title_1_inc2.inc3">inc3</link>
+ <phrase id="doc_title_1_inc2.inc3"/><link linkend="doc_title_1_inc2.inc3">inc3</link>
</bridgehead>
- <anchor id="doc_title_1.a4"/>
<bridgehead renderas="sect2" id="doc_title_1.a4-heading">
- <link linkend="doc_title_1.a4">a4</link>
+ <phrase id="doc_title_1.a4"/><link linkend="doc_title_1.a4">a4</link>
</bridgehead>
</article>
Modified: branches/quickbook-dev/tools/quickbook/test/include/doc-title1a-1.5.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/include/doc-title1a-1.5.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/include/doc-title1a-1.5.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 2011)
@@ -1,32 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="doc-title" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Doc Title 1a</title> <anchor id="doc-title.a1"/>
+ <title>Doc Title 1a</title>
<bridgehead renderas="sect2" id="doc-title.a1-heading">
- <link linkend="doc-title.a1">a1</link>
+ <phrase id="doc-title.a1"/><link linkend="doc-title.a1">a1</link>
</bridgehead>
- <anchor id="doc_title_1a.inc1"/>
<bridgehead renderas="sect2" id="doc_title_1a.inc1-heading">
- <link linkend="doc_title_1a.inc1">inc1</link>
+ <phrase id="doc_title_1a.inc1"/><link linkend="doc_title_1a.inc1">inc1</link>
</bridgehead>
- <anchor id="doc-title.a2"/>
<bridgehead renderas="sect2" id="doc-title.a2-heading">
- <link linkend="doc-title.a2">a2</link>
+ <phrase id="doc-title.a2"/><link linkend="doc-title.a2">a2</link>
</bridgehead>
- <anchor id="doc_title_1_inc2.inc2"/>
<bridgehead renderas="sect2" id="doc_title_1_inc2.inc2-heading">
- <link linkend="doc_title_1_inc2.inc2">inc2</link>
+ <phrase id="doc_title_1_inc2.inc2"/><link linkend="doc_title_1_inc2.inc2">inc2</link>
</bridgehead>
- <anchor id="doc-title.a3"/>
<bridgehead renderas="sect2" id="doc-title.a3-heading">
- <link linkend="doc-title.a3">a3</link>
+ <phrase id="doc-title.a3"/><link linkend="doc-title.a3">a3</link>
</bridgehead>
- <anchor id="doc_title_1_inc2.inc3"/>
<bridgehead renderas="sect2" id="doc_title_1_inc2.inc3-heading">
- <link linkend="doc_title_1_inc2.inc3">inc3</link>
+ <phrase id="doc_title_1_inc2.inc3"/><link linkend="doc_title_1_inc2.inc3">inc3</link>
</bridgehead>
- <anchor id="doc-title.a4"/>
<bridgehead renderas="sect2" id="doc-title.a4-heading">
- <link linkend="doc-title.a4">a4</link>
+ <phrase id="doc-title.a4"/><link linkend="doc-title.a4">a4</link>
</bridgehead>
</article>
Modified: branches/quickbook-dev/tools/quickbook/test/include/include-id-1.5.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/include/include-id-1.5.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/include/include-id-1.5.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 2011)
@@ -2,28 +2,25 @@
<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="include_id_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Include Id Test</title> <anchor id="a.simple_include"/>
+ <title>Include Id Test</title>
<bridgehead renderas="sect2" id="a.simple_include-heading">
- <link linkend="a.simple_include">Simple include</link>
+ <phrase id="a.simple_include"/><link linkend="a.simple_include">Simple include</link>
</bridgehead>
- <anchor id="b.simple_include"/>
<bridgehead renderas="sect2" id="b.simple_include-heading">
- <link linkend="b.simple_include">Simple include</link>
+ <phrase id="b.simple_include"/><link linkend="b.simple_include">Simple include</link>
</bridgehead>
- <anchor id="c.title__no_id"/>
<bridgehead renderas="sect2" id="c.title__no_id-heading">
- <link linkend="c.title__no_id">Title, no id</link>
+ <phrase id="c.title__no_id"/><link linkend="c.title__no_id">Title, no id</link>
</bridgehead>
- <anchor id="d.title__no_id"/>
<bridgehead renderas="sect2" id="d.title__no_id-heading">
- <link linkend="d.title__no_id">Title, no id</link>
+ <phrase id="d.title__no_id"/><link linkend="d.title__no_id">Title, no id</link>
</bridgehead>
- <anchor id="with-id.title_with_id"/>
<bridgehead renderas="sect2" id="with-id.title_with_id-heading">
- <link linkend="with-id.title_with_id">Title with id</link>
+ <phrase id="with-id.title_with_id"/><link linkend="with-id.title_with_id">Title
+ with id</link>
</bridgehead>
- <anchor id="with-id.title_with_id"/>
<bridgehead renderas="sect2" id="with-id.title_with_id-heading">
- <link linkend="with-id.title_with_id">Title with id</link>
+ <phrase id="with-id.title_with_id"/><link linkend="with-id.title_with_id">Title
+ with id</link>
</bridgehead>
</article>
Modified: branches/quickbook-dev/tools/quickbook/test/include/include-id-1.6.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/include/include-id-1.6.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/include/include-id-1.6.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 2011)
@@ -2,36 +2,35 @@
<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="include_id_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Include Id Test</title> <anchor id="a.simple_include"/>
+ <title>Include Id Test</title>
<bridgehead renderas="sect2" id="a.simple_include-heading">
- <link linkend="a.simple_include">Simple include</link>
+ <phrase id="a.simple_include"/><link linkend="a.simple_include">Simple include</link>
</bridgehead>
- <anchor id="b.simple_include"/>
<bridgehead renderas="sect2" id="b.simple_include-heading">
- <link linkend="b.simple_include">Simple include</link>
+ <phrase id="b.simple_include"/><link linkend="b.simple_include">Simple include</link>
</bridgehead>
<article id="c" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Include without id</title> <anchor id="c.title__no_id"/>
+ <title>Include without id</title>
<bridgehead renderas="sect2" id="c.title__no_id-heading">
- <link linkend="c.title__no_id">Title, no id</link>
+ <phrase id="c.title__no_id"/><link linkend="c.title__no_id">Title, no id</link>
</bridgehead>
</article>
<article id="d" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Include without id</title> <anchor id="d.title__no_id"/>
+ <title>Include without id</title>
<bridgehead renderas="sect2" id="d.title__no_id-heading">
- <link linkend="d.title__no_id">Title, no id</link>
+ <phrase id="d.title__no_id"/><link linkend="d.title__no_id">Title, no id</link>
</bridgehead>
</article>
<article id="e" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Include with id</title> <anchor id="e.title_with_id"/>
+ <title>Include with id</title>
<bridgehead renderas="sect2" id="e.title_with_id-heading">
- <link linkend="e.title_with_id">Title with id</link>
+ <phrase id="e.title_with_id"/><link linkend="e.title_with_id">Title with id</link>
</bridgehead>
</article>
<article id="f" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Include with id</title> <anchor id="f.title_with_id"/>
+ <title>Include with id</title>
<bridgehead renderas="sect2" id="f.title_with_id-heading">
- <link linkend="f.title_with_id">Title with id</link>
+ <phrase id="f.title_with_id"/><link linkend="f.title_with_id">Title with id</link>
</bridgehead>
</article>
</article>
Modified: branches/quickbook-dev/tools/quickbook/test/quickbook-manual.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/quickbook-manual.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/quickbook-manual.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 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.version_1_3-heading">
- <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>
@@ -1706,29 +1706,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.heading_1-heading">
- <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.heading_2-heading">
- <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.heading_3-heading">
- <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.heading_4-heading">
- <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.heading_5-heading">
- <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.heading_6-heading">
- <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
@@ -1971,9 +1971,9 @@
]
<!--quickbook-escape-postfix--></programlisting>
- <anchor id="quickbook.syntax.block.templates.template_identifier"/>
<bridgehead renderas="sect5" id="quickbook.syntax.block.templates.template_identifier-heading">
- <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 +1993,9 @@
</simpara>
</listitem>
</itemizedlist>
- <anchor id="quickbook.syntax.block.templates.formal_template_arguments"/>
<bridgehead renderas="sect5" id="quickbook.syntax.block.templates.formal_template_arguments-heading">
- <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 +2013,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.template_body-heading">
- <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>
@@ -2040,9 +2039,9 @@
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.template_expansion-heading">
- <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>
@@ -2083,10 +2082,9 @@
are separated by the double dot <literal>".."</literal> and terminated
by the close parenthesis.
</para>
- <anchor id="quickbook.syntax.block.templates.nullary_templates"/>
<bridgehead renderas="sect5" id="quickbook.syntax.block.templates.nullary_templates-heading">
- <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:
@@ -2176,9 +2174,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.simple_arguments-heading">
- <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>
@@ -2251,9 +2248,9 @@
<para>
what do you think man?
</para>
- <anchor id="quickbook.syntax.block.templates.punctuation_templates"/>
<bridgehead renderas="sect5" id="quickbook.syntax.block.templates.punctuation_templates-heading">
- <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>
@@ -2655,9 +2652,8 @@
<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.example-heading">
- <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.
@@ -2733,9 +2729,8 @@
<para>
Some trailing text here
</para>
- <anchor id="quickbook.syntax.block.import.code_snippet_markup"/>
<bridgehead renderas="sect5" id="quickbook.syntax.block.import.code_snippet_markup-heading">
- <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>
@@ -2755,9 +2750,8 @@
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.special_comments-heading">
- <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>
@@ -2778,9 +2772,8 @@
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.callouts-heading">
- <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:
@@ -3146,9 +3139,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.can_i_use_quickbook_for_non_boost_documentation_-heading">
- <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>
Modified: branches/quickbook-dev/tools/quickbook/test/template-section.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/template-section.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/template-section.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 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.just_to_test_id_generation-heading">
- <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/quickbook-dev/tools/quickbook/test/unicode-escape.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/unicode-escape.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/unicode-escape.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 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.i__xf1_t__xeb_rn__xe2_ti__xf4_n__xe0_liz__xe6_ti__xf8_n-heading">
- <link linkend="utf_8_test.i__xf1_t__xeb_rn__xe2_ti__xf4_n__xe0_liz__xe6_ti__xf8_n">Iñtërnâtiônàlizætiø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ñtërnâtiônàlizætiøn</link>
</bridgehead>
<itemizedlist>
<listitem>
Modified: branches/quickbook-dev/tools/quickbook/test/utf-8-bom.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/utf-8-bom.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/utf-8-bom.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 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.i__t__rn__ti__n__liz__ti__n-heading">
- <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/quickbook-dev/tools/quickbook/test/utf-8.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/utf-8.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/utf-8.gold 2011-06-23 13:46:05 EDT (Thu, 23 Jun 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.i__t__rn__ti__n__liz__ti__n-heading">
- <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>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk