Boost logo

Boost-Commit :

From: joel_at_[hidden]
Date: 2008-07-15 11:05:10


Author: djowel
Date: 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
New Revision: 47445
URL: http://svn.boost.org/trac/boost/changeset/47445

Log:
merge from trunk
Text files modified:
   branches/release/tools/quickbook/detail/actions.cpp | 85
   branches/release/tools/quickbook/doc/html/index.html | 8
   branches/release/tools/quickbook/doc/html/quickbook/change_log.html | 45
   branches/release/tools/quickbook/doc/html/quickbook/editors.html | 18
   branches/release/tools/quickbook/doc/html/quickbook/editors/kde_support.html | 113
   branches/release/tools/quickbook/doc/html/quickbook/editors/scite.html | 25
   branches/release/tools/quickbook/doc/html/quickbook/faq.html | 29
   branches/release/tools/quickbook/doc/html/quickbook/install.html | 15
   branches/release/tools/quickbook/doc/html/quickbook/install/linux.html | 39
   branches/release/tools/quickbook/doc/html/quickbook/install/macosx.html | 47
   branches/release/tools/quickbook/doc/html/quickbook/install/windows.html | 51
   branches/release/tools/quickbook/doc/html/quickbook/intro.html | 13
   branches/release/tools/quickbook/doc/html/quickbook/ref.html | 220
   branches/release/tools/quickbook/doc/html/quickbook/syntax.html | 9
   branches/release/tools/quickbook/doc/html/quickbook/syntax/block.html | 449 +-
   branches/release/tools/quickbook/doc/html/quickbook/syntax/comments.html | 11
   branches/release/tools/quickbook/doc/html/quickbook/syntax/phrase.html | 271 +-
   branches/release/tools/quickbook/test/code-block-1.gold | 3
   branches/release/tools/quickbook/test/code-block-2.gold | 3
   branches/release/tools/quickbook/test/import.gold | 6
   branches/release/tools/quickbook/test/quickbook-manual.gold | 5076 +++++++++++++++++++--------------------
   branches/release/tools/quickbook/test/templates.gold | 3
   branches/release/tools/quickbook/test/templates.quickbook | 7
   23 files changed, 3252 insertions(+), 3294 deletions(-)

Modified: branches/release/tools/quickbook/detail/actions.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/actions.cpp (original)
+++ branches/release/tools/quickbook/detail/actions.cpp 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -12,6 +12,7 @@
 #include <functional>
 #include <boost/bind.hpp>
 #include <boost/filesystem/convenience.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <boost/lexical_cast.hpp>
 #include "./actions.hpp"
 #include "./utils.hpp"
@@ -324,7 +325,11 @@
         temp.swap(str);
         phrase.swap(save);
 
- out << "<programlisting>\n";
+ //
+ // We must not place a \n after the <programlisting> tag
+ // otherwise PDF output starts code blocks with a blank line:
+ //
+ out << "<programlisting>";
         out << str;
         out << "</programlisting>\n";
     }
@@ -376,9 +381,73 @@
     {
         fs::path const img_path(std::string(first, last));
 
+ std::string attr_text;
+ if(fs::extension(img_path) == ".svg")
+ {
+ //
+ // SVG's need special handling:
+ //
+ // 1) We must set the "format" attribute, otherwise
+ // HTML generation produces code that will not display
+ // the image at all.
+ // 2) We need to set the "contentwidth" and "contentdepth"
+ // attributes, otherwise the image will be displayed inside
+ // a tiny box with scrollbars (Firefox), or else cropped to
+ // fit in a tiny box (IE7).
+ //
+ attr_text = " format=\"SVG\"";
+ //
+ // Image paths are relative to the html subdirectory:
+ //
+ fs::path img;
+ if(img_path.root_path().empty())
+ img = "html" / img_path; // relative path
+ else
+ img = img_path; // absolute path
+ //
+ // Now load the SVG file:
+ //
+ std::string svg_text;
+ fs::ifstream fs(img);
+ char c;
+ while(fs.get(c) && fs.good())
+ svg_text.push_back(c);
+ //
+ // Extract the svg header from the file:
+ //
+ std::string::size_type a, b;
+ a = svg_text.find("<svg");
+ b = svg_text.find('>', a);
+ svg_text = (a == std::string::npos) ? "" : svg_text.substr(a, b - a);
+ //
+ // Now locate the "width" and "height" attributes
+ // and borrow their values:
+ //
+ a = svg_text.find("width");
+ a = svg_text.find('=', a);
+ a = svg_text.find('\"', a);
+ b = svg_text.find('\"', a + 1);
+ if(a != std::string::npos)
+ {
+ attr_text.append(" contentwidth=");
+ attr_text.append(svg_text.begin() + a, svg_text.begin() + b + 1);
+ }
+ a = svg_text.find("height");
+ a = svg_text.find('=', a);
+ a = svg_text.find('\"', a);
+ b = svg_text.find('\"', a + 1);
+ if(a != std::string::npos)
+ {
+ attr_text.append(" contentdepth=");
+ attr_text.append(svg_text.begin() + a, svg_text.begin() + b + 1);
+ }
+ }
+
         phrase << "<inlinemediaobject>";
 
- phrase << "<imageobject><imagedata fileref=\"";
+ phrase << "<imageobject><imagedata ";
+ phrase << attr_text;
+ phrase << " fileref=\"";
         while (first != last)
             detail::print_char(*first++, phrase.get());
         phrase << "\"></imagedata></imageobject>";
@@ -615,7 +684,11 @@
             {
                 boost::spirit::file_position const pos = first.get_position();
                 detail::outerr(pos.file,pos.line)
- << "Expanding template" << std::endl;
+ << "Expanding template:" << template_info[0] << std::endl
+ << "------------------begin------------------" << std::endl
+ << body
+ << "------------------end--------------------" << std::endl
+ << std::endl;
                 actions.pop(); // restore the actions' states
                 --actions.template_depth;
                 return;
@@ -992,7 +1065,7 @@
         fs::path include_search(fs::path const & current, std::string const & name)
         {
             fs::path path(name,fs::native);
-
+
             // If the path is relative, try and resolve it.
             if (!path.is_complete())
             {
@@ -1001,7 +1074,7 @@
                 {
                     return current / path;
                 }
-
+
                 // Search in each of the include path locations.
                 BOOST_FOREACH(std::string const & p, include_path)
                 {
@@ -1013,7 +1086,7 @@
                     }
                 }
             }
-
+
             return path;
         }
     }

Modified: branches/release/tools/quickbook/doc/html/index.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/index.html (original)
+++ branches/release/tools/quickbook/doc/html/index.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -3,9 +3,9 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Quickbook 1.4</title>
 <link rel="stylesheet" href="../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="index.html" title="Quickbook 1.4">
-<link rel="next" href="quickbook/intro.html" title="Introduction">
+<link rel="next" href="quickbook/intro.html" title=" Introduction">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -34,7 +34,7 @@
 <div><p class="copyright">Copyright © 2002, 2004, 2006 Joel de Guzman,
       Eric Niebler</p></div>
 <div><div class="legalnotice">
-<a name="id2625934"></a><p>
+<a name="id385774"></a><p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       </p>
@@ -70,7 +70,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: March 15, 2008 at 14:07:42 GMT</small></p></td>
+<td align="left"><p><small>Last revised: May 21, 2008 at 03:54:31 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>

Modified: branches/release/tools/quickbook/doc/html/quickbook/change_log.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/change_log.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/change_log.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Change Log</title>
+<title> Change Log</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Quickbook 1.4">
 <link rel="up" href="../index.html" title="Quickbook 1.4">
-<link rel="prev" href="intro.html" title="Introduction">
-<link rel="next" href="syntax.html" title="Syntax Summary">
+<link rel="prev" href="intro.html" title=" Introduction">
+<link rel="next" href="syntax.html" title=" Syntax Summary">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -24,12 +24,11 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="quickbook.change_log"></a><a class="link" href="change_log.html" title="Change Log"> Change Log</a>
-</h2></div></div></div>
-<a name="quickbook.change_log.version_1_3"></a><h4>
-<a name="id2586434"></a>
- <a class="link" href="change_log.html#quickbook.change_log.version_1_3">Version 1.3</a>
- </h4>
+<a name="quickbook.change_log"></a> Change Log</h2></div></div></div>
+<a name="quickbook.change_log.version_1_3"></a><h3>
+<a name="id386592"></a>
+ Version 1.3
+ </h3>
 <div class="itemizedlist"><ul type="disc">
 <li>
         Quickbook file inclusion [include].
@@ -66,7 +65,7 @@
 </li>
 <li>
         Fully qualified section and headers. Subsection names are concatenated to
- the ID to avoid clashing. Example: <code class="computeroutput"><span class="identifier">doc_name</span><span class="special">.</span><span class="identifier">sect_name</span><span class="special">.</span><span class="identifier">sub_sect_name</span><span class="special">.</span><span class="identifier">sub_sub_sect_name</span></code>
+ the ID to avoid clashing. Example: <tt class="computeroutput"><span class="identifier">doc_name</span><span class="special">.</span><span class="identifier">sect_name</span><span class="special">.</span><span class="identifier">sub_sect_name</span><span class="special">.</span><span class="identifier">sub_sub_sect_name</span></tt>
 </li>
 <li>
         Better &amp;nbsp; and whitespace handling in code snippets.
@@ -94,10 +93,10 @@
         Replaceable, with the [~replacement] syntax.
       </li>
 </ul></div>
-<a name="quickbook.change_log.version_1_4"></a><h4>
-<a name="id2585329"></a>
- <a class="link" href="change_log.html#quickbook.change_log.version_1_4">Version 1.4</a>
- </h4>
+<a name="quickbook.change_log.version_1_4"></a><h3>
+<a name="id387357"></a>
+ Version 1.4
+ </h3>
 <div class="itemizedlist"><ul type="disc">
 <li>
         Generic Headers
@@ -116,7 +115,7 @@
       </li>
 <li>
         Allow escape of spaces. The escaped space is removed from the output. Syntax:
- <code class="computeroutput"><span class="special">\</span> </code>.
+ <tt class="computeroutput"><span class="special">\</span> </tt>.
       </li>
 <li>
         Nested comments are now allowed.
@@ -125,7 +124,7 @@
         Quickbook blocks can nest inside comments.
       </li>
 <li>
-<a class="link" href="syntax/block.html#quickbook.syntax.block.import" title="Import">Import</a> facility.
+Import facility.
       </li>
 <li>
         Callouts on imported code
@@ -134,21 +133,21 @@
         Simple markups can now span a whole block.
       </li>
 <li>
-<a class="link" href="syntax/block.html#quickbook.syntax.block.blurbs" title="Blurbs">Blurbs</a>, <a class="link" href="syntax/block.html#quickbook.syntax.block.admonitions" title="Admonitions">Admonitions</a>
- and table cells (see <a class="link" href="syntax/block.html#quickbook.syntax.block.tables" title="Tables">Tables</a>)
+Blurbs, Admonitions
+ and table cells (see Tables)
         may now contain paragraphs.
       </li>
 <li>
-<code class="computeroutput"><span class="special">\</span><span class="identifier">n</span></code>
- and <code class="computeroutput"><span class="special">[</span><span class="identifier">br</span><span class="special">]</span></code> are now deprecated.
+<tt class="computeroutput"><span class="special">\</span><span class="identifier">n</span></tt>
+ and <tt class="computeroutput"><span class="special">[</span><span class="identifier">br</span><span class="special">]</span></tt> are now deprecated.
       </li>
 <li>
-<a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.cond" title="Conditional Generation">Conditional Generation</a>.
+Conditional Generation.
         Ala C++ #ifdef.
       </li>
 <li>
         Searching of included and imported files in an extensible search path with
- <code class="computeroutput"><span class="special">--</span><span class="identifier">include</span><span class="special">-</span><span class="identifier">path</span></code> (<code class="computeroutput"><span class="special">-</span><span class="identifier">I</span></code>) option.
+ <tt class="computeroutput"><span class="special">--</span><span class="identifier">include</span><span class="special">-</span><span class="identifier">path</span></tt> (<tt class="computeroutput"><span class="special">-</span><span class="identifier">I</span></tt>) option.
       </li>
 </ul></div>
 </div>

Modified: branches/release/tools/quickbook/doc/html/quickbook/editors.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/editors.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/editors.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Editor Support</title>
+<title> Editor Support</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Quickbook 1.4">
 <link rel="up" href="../index.html" title="Quickbook 1.4">
-<link rel="prev" href="install/linux.html" title="Debian, Ubuntu">
-<link rel="next" href="editors/scite.html" title="Scintilla Text Editor">
+<link rel="prev" href="install/linux.html" title=" Debian, Ubuntu">
+<link rel="next" href="editors/scite.html" title=" Scintilla Text Editor">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -24,8 +24,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="quickbook.editors"></a><a class="link" href="editors.html" title="Editor Support"> Editor Support</a>
-</h2></div></div></div>
+<a name="quickbook.editors"></a> Editor Support</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"> Scintilla Text Editor</span></dt>
 <dt><span class="section">KDE Support</span></dt>
@@ -35,14 +34,11 @@
       The following sections list the settings for some editors which can help make
       editing quickbook files a bit easier.
     </p>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
+<div class="sidebar"><p>
       <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span> You may submit your settings, tips, and suggestions to
       the authors, or through the <a href="https://lists.sourceforge.net/lists/listinfo/boost-" target="_top">docs
       Boost Docs mailing list</a>.
- </p>
-</div>
+ </p></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>

Modified: branches/release/tools/quickbook/doc/html/quickbook/editors/kde_support.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/editors/kde_support.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/editors/kde_support.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -3,11 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>KDE Support</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../editors.html" title="Editor Support">
-<link rel="prev" href="scite.html" title="Scintilla Text Editor">
-<link rel="next" href="../faq.html" title="Frequently Asked Questions">
+<link rel="up" href="../editors.html" title=" Editor Support">
+<link rel="prev" href="scite.html" title=" Scintilla Text Editor">
+<link rel="next" href="../faq.html" title=" Frequently Asked Questions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -24,12 +24,11 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.editors.kde_support"></a><a class="link" href="kde_support.html" title="KDE Support">KDE Support</a>
-</h3></div></div></div>
-<a name="quickbook.editors.kde_support.boost__hs__quickbook"></a><h5>
-<a name="id2644180"></a>
- <a class="link" href="kde_support.html#quickbook.editors.kde_support.boost__hs__quickbook">boost::hs::quickbook</a>
- </h5>
+<a name="quickbook.editors.kde_support"></a>KDE Support</h3></div></div></div>
+<a name="quickbook.editors.kde_support.boost__hs__quickbook"></a><h4>
+<a name="id466336"></a>
+ boost::hs::quickbook
+ </h4>
 <p>
         boost::hs::quickbook is a syntax highlighting designed to work with Katepart.
         It can be used in KWrite, Kate, Konqueror and KDevelop, and supports all
@@ -49,11 +48,11 @@
 </dl>
 </div>
 <p>
- <span class="bold"><strong>html generated from this .qbk file</strong></span>
+ <span class="bold"><b>html generated from this .qbk file</b></span>
       </p>
 <div class="table">
-<a name="id2644266"></a><p class="title"><b>Table 7. Code examples</b></p>
-<div class="table-contents"><table class="table" summary="Code examples">
+<a name="id466438"></a><p class="title"><b>Table 7. Code examples</b></p>
+<table class="table" summary="Code examples">
 <colgroup>
 <col>
 <col>
@@ -85,8 +84,8 @@
             </td>
 <td>
             <p>
- <code class="computeroutput"> <span class="keyword">for</span><span class="special">(</span><span class="identifier">int</span> <span class="identifier">k</span><span class="special">=</span><span class="number">0</span><span class="special">;</span>
- <span class="identifier">k</span><span class="special">&lt;</span><span class="number">10</span><span class="special">;</span> <span class="identifier">k</span><span class="special">++)</span> <span class="identifier">v</span><span class="special">+=</span><span class="identifier">k</span><span class="special">;</span> </code>
+ <tt class="computeroutput"> <span class="keyword">for</span><span class="special">(</span><span class="identifier">int</span> <span class="identifier">k</span><span class="special">=</span><span class="number">0</span><span class="special">;</span>
+ <span class="identifier">k</span><span class="special">&lt;</span><span class="number">10</span><span class="special">;</span> <span class="identifier">k</span><span class="special">++)</span> <span class="identifier">v</span><span class="special">+=</span><span class="identifier">k</span><span class="special">;</span> </tt>
             </p>
             </td>
 <td>
@@ -103,12 +102,12 @@
             </td>
 <td>
             <p>
- <code class="computeroutput"> <span class="special">{</span> <span class="identifier">int</span>
+ <tt class="computeroutput"> <span class="special">{</span> <span class="identifier">int</span>
               <span class="identifier">k</span><span class="special">;</span>
               <span class="keyword">while</span><span class="special">(</span>
               <span class="identifier">k</span> <span class="special">&lt;</span>
               <span class="number">10</span> <span class="special">)</span>
- <span class="special">{</span> <span class="identifier">v</span><span class="special">+=</span><span class="identifier">k</span><span class="special">;</span> <span class="identifier">k</span><span class="special">++</span> <span class="special">}</span> <span class="special">}</span> </code>
+ <span class="special">{</span> <span class="identifier">v</span><span class="special">+=</span><span class="identifier">k</span><span class="special">;</span> <span class="identifier">k</span><span class="special">++</span> <span class="special">}</span> <span class="special">}</span> </tt>
             </p>
             </td>
 <td>
@@ -125,10 +124,10 @@
             </td>
 <td>
             <p>
- <code class="computeroutput"> <span class="keyword">while</span><span class="special">(</span>
+ <tt class="computeroutput"> <span class="keyword">while</span><span class="special">(</span>
               <span class="identifier">true</span> <span class="special">)</span>
               <span class="special">{</span> <span class="identifier">v</span><span class="special">+=</span><span class="number">1</span><span class="special">;</span>
- <span class="special">}</span> </code>
+ <span class="special">}</span> </tt>
             </p>
             </td>
 <td>
@@ -138,34 +137,34 @@
             </td>
 </tr>
 </tbody>
-</table></div>
+</table>
 </div>
-<br class="table-break"><a name="quickbook.editors.kde_support.code_folding_"></a><h5>
-<a name="id2644614"></a>
- <a class="link" href="kde_support.html#quickbook.editors.kde_support.code_folding_">Code Folding
+<a name="quickbook.editors.kde_support.code_folding_"></a><h4>
+<a name="id466844"></a>
+ <a href="kde_support.html#quickbook.editors.kde_support.code_folding_">Code Folding
         </a>
- </h5>
+ </h4>
 <p>
         boost::hs goes far beyond simple coloring. One useful thing you can get the
         editor to do is to mark regions. They appear in a small grey line and each
         region can be folded or unfolded independently.
       </p>
-<a name="quickbook.editors.kde_support.auto_comment___uncomment_"></a><h5>
-<a name="id2644639"></a>
- <a class="link" href="kde_support.html#quickbook.editors.kde_support.auto_comment___uncomment_">Auto
+<a name="quickbook.editors.kde_support.auto_comment___uncomment_"></a><h4>
+<a name="id466877"></a>
+ <a href="kde_support.html#quickbook.editors.kde_support.auto_comment___uncomment_">Auto
         Comment / Uncomment </a>
- </h5>
+ </h4>
 <p>
         Another important feature is the possibility to auto-comment or uncomment
         some piece of code (<span class="emphasis"><em>Tools - Comment</em></span>). Commented regions
         can be uncommented simple calling the <span class="emphasis"><em>uncomment</em></span> command
         while being in it.
       </p>
-<a name="quickbook.editors.kde_support.styles_reference_"></a><h5>
-<a name="id2644672"></a>
- <a class="link" href="kde_support.html#quickbook.editors.kde_support.styles_reference_">Styles reference
+<a name="quickbook.editors.kde_support.styles_reference_"></a><h4>
+<a name="id466918"></a>
+ <a href="kde_support.html#quickbook.editors.kde_support.styles_reference_">Styles reference
         </a>
- </h5>
+ </h4>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -193,7 +192,7 @@
 <tr>
 <td>
               <p>
- <span class="bold"><strong>plain text</strong></span>
+ <span class="bold"><b>plain text</b></span>
               </p>
               </td>
 <td>
@@ -210,7 +209,7 @@
 <tr>
 <td>
               <p>
- <span class="bold"><strong>formatted text</strong></span>
+ <span class="bold"><b>formatted text</b></span>
               </p>
               </td>
 <td>
@@ -227,7 +226,7 @@
 <tr>
 <td>
               <p>
- <span class="bold"><strong>structure</strong></span>
+ <span class="bold"><b>structure</b></span>
               </p>
               </td>
 <td>
@@ -245,7 +244,7 @@
 <tr>
 <td>
               <p>
- <span class="bold"><strong>macros</strong></span>
+ <span class="bold"><b>macros</b></span>
               </p>
               </td>
 <td>
@@ -263,7 +262,7 @@
 <tr>
 <td>
               <p>
- <span class="bold"><strong>templates</strong></span>
+ <span class="bold"><b>templates</b></span>
               </p>
               </td>
 <td>
@@ -280,7 +279,7 @@
 <tr>
 <td>
               <p>
- <span class="bold"><strong>anchors</strong></span>
+ <span class="bold"><b>anchors</b></span>
               </p>
               </td>
 <td>
@@ -297,7 +296,7 @@
 <tr>
 <td>
               <p>
- <span class="bold"><strong>comments</strong></span>
+ <span class="bold"><b>comments</b></span>
               </p>
               </td>
 <td>
@@ -314,7 +313,7 @@
 <tr>
 <td>
               <p>
- <span class="bold"><strong>tables</strong></span>
+ <span class="bold"><b>tables</b></span>
               </p>
               </td>
 <td>
@@ -331,7 +330,7 @@
 <tr>
 <td>
               <p>
- <span class="bold"><strong>variable lists</strong></span>
+ <span class="bold"><b>variable lists</b></span>
               </p>
               </td>
 <td>
@@ -348,7 +347,7 @@
 <tr>
 <td>
               <p>
- <span class="bold"><strong>c++ code</strong></span>
+ <span class="bold"><b>c++ code</b></span>
               </p>
               </td>
 <td>
@@ -365,7 +364,7 @@
 <tr>
 <td>
               <p>
- <span class="bold"><strong>paths</strong></span>
+ <span class="bold"><b>paths</b></span>
               </p>
               </td>
 <td>
@@ -382,7 +381,7 @@
 <tr>
 <td>
               <p>
- <span class="bold"><strong>IDE specific</strong></span>
+ <span class="bold"><b>IDE specific</b></span>
               </p>
               </td>
 <td>
@@ -398,10 +397,10 @@
 </tr>
 </tbody>
 </table></div>
-<a name="quickbook.editors.kde_support.about_boost__hs"></a><h5>
-<a name="id2645064"></a>
- <a class="link" href="kde_support.html#quickbook.editors.kde_support.about_boost__hs">About boost::hs</a>
- </h5>
+<a name="quickbook.editors.kde_support.about_boost__hs"></a><h4>
+<a name="id467367"></a>
+ About boost::hs
+ </h4>
 <p>
         <span class="inlinemediaobject"><img src="../../images/extra/katepart/boost.hs.logo.png" alt="boost.hs.logo"></span>
       </p>
@@ -415,15 +414,15 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
 <th align="left">Note</th>
 </tr>
-<tr><td align="left" valign="top"><p>
+<tr><td colspan="2" align="left" valign="top"><p>
           boost::hs::cpp support QuickBook code import comments style!
         </p></td></tr>
 </table></div>
-<a name="quickbook.editors.kde_support.installing_boost__hs"></a><h5>
-<a name="id2645119"></a>
- <a class="link" href="kde_support.html#quickbook.editors.kde_support.installing_boost__hs">Installing
+<a name="quickbook.editors.kde_support.installing_boost__hs"></a><h4>
+<a name="id467435"></a>
+ <a href="kde_support.html#quickbook.editors.kde_support.installing_boost__hs">Installing
         boost::hs</a>
- </h5>
+ </h4>
 <p>
         There exist an ongoing effort to push boost::hs upstream to the KatePart
         project. In a few months KDE may have native Quickbook support! For the moment
@@ -437,13 +436,13 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
 <th align="left">Note</th>
 </tr>
-<tr><td align="left" valign="top"><p>
- A copy of boost::hs::quickbook and boost::hs::cpp is available in <code class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">tools</span><span class="special">/</span><span class="identifier">quickbook</span><span class="special">/</span><span class="identifier">extra</span><span class="special">/</span><span class="identifier">katepart</span></code>.
+<tr><td colspan="2" align="left" valign="top"><p>
+ A copy of boost::hs::quickbook and boost::hs::cpp is available in <tt class="computeroutput"><span class="identifier">boost</span><span class="special">/</span><span class="identifier">tools</span><span class="special">/</span><span class="identifier">quickbook</span><span class="special">/</span><span class="identifier">extra</span><span class="special">/</span><span class="identifier">katepart</span></tt>.
         </p></td></tr>
 </table></div>
 <p>
- In order to install it you must copy the content in the folder <span class="bold"><strong>katepart/syntax/</strong></span> to the appropriate katepart syntax
- folder in your machine. In general this folder will be in <span class="bold"><strong>/usr/share/apps/katepart/syntax</strong></span>.
+ In order to install it you must copy the content in the folder <span class="bold"><b>katepart/syntax/</b></span> to the appropriate katepart syntax
+ folder in your machine. In general this folder will be in <span class="bold"><b>/usr/share/apps/katepart/syntax</b></span>.
         A bash script named <span class="emphasis"><em>install.sh</em></span> is included that copy
         the files to this folder.
       </p>

Modified: branches/release/tools/quickbook/doc/html/quickbook/editors/scite.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/editors/scite.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/editors/scite.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Scintilla Text Editor</title>
+<title> Scintilla Text Editor</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../editors.html" title="Editor Support">
-<link rel="prev" href="../editors.html" title="Editor Support">
+<link rel="up" href="../editors.html" title=" Editor Support">
+<link rel="prev" href="../editors.html" title=" Editor Support">
 <link rel="next" href="kde_support.html" title="KDE Support">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -24,8 +24,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.editors.scite"></a><a class="link" href="scite.html" title="Scintilla Text Editor"> Scintilla Text Editor</a>
-</h3></div></div></div>
+<a name="quickbook.editors.scite"></a> Scintilla Text Editor</h3></div></div></div>
 <div class="blockquote"><blockquote class="blockquote">
 <p>
           </p>
@@ -39,12 +38,9 @@
         The Scintilla Text Editor (SciTE) is a free source code editor for Win32
         and X. It uses the SCIntilla source code editing component.
       </p>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
+<div class="sidebar"><p>
         <span class="inlinemediaobject"><img src="../../images/tip.png" alt="tip"></span> SciTE can be downloaded from http://www.scintilla.org/SciTE.html
- </p>
-</div>
+ </p></div>
 <p>
         You can use the following settings to highlight quickbook tags when editing
         quickbook files.
@@ -61,12 +57,9 @@
 comment.box.middle.props=
 comment.box.end.props=]
 </pre>
-<div class="sidebar">
-<p class="title"><b></b></p>
-<p>
+<div class="sidebar"><p>
         <span class="inlinemediaobject"><img src="../../images/note.png" alt="note"></span> Thanks to Rene Rivera for the above SciTE settings.
- </p>
-</div>
+ </p></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>

Modified: branches/release/tools/quickbook/doc/html/quickbook/faq.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/faq.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/faq.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Frequently Asked Questions</title>
+<title> Frequently Asked Questions</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Quickbook 1.4">
 <link rel="up" href="../index.html" title="Quickbook 1.4">
 <link rel="prev" href="editors/kde_support.html" title="KDE Support">
-<link rel="next" href="ref.html" title="Quick Reference">
+<link rel="next" href="ref.html" title=" Quick Reference">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -24,13 +24,12 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="quickbook.faq"></a><a class="link" href="faq.html" title="Frequently Asked Questions"> Frequently Asked Questions</a>
-</h2></div></div></div>
-<a name="quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_"></a><h4>
-<a name="id2645242"></a>
- <a class="link" href="faq.html#quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_">Can
+<a name="quickbook.faq"></a> Frequently Asked Questions</h2></div></div></div>
+<a name="quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_"></a><h3>
+<a name="id467587"></a>
+ <a href="faq.html#quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_">Can
       I use QuickBook for non-Boost documentation?</a>
- </h4>
+ </h3>
 <p>
       QuickBook can be used for non-Boost documentation with a little extra work.
     </p>
@@ -61,18 +60,18 @@
     :
         my_doc
     :
- &lt;xsl:param&gt;boost.image.src<code class="literal">images/my_project_logo.png
- &lt;xsl:param&gt;boost.image.alt</code>"\"My Project\""
+ &lt;xsl:param&gt;boost.image.src<tt class="literal">images/my_project_logo.png
+ &lt;xsl:param&gt;boost.image.alt</tt>"\"My Project\""
         &lt;xsl:param&gt;boost.image.w=100
         &lt;xsl:param&gt;boost.image.h=50
         &lt;xsl:param&gt;nav.layout=none
     ;
 </pre>
-<a name="quickbook.faq.is_there_an_easy_way_to_convert_boostbook_docs_to_quickbook_"></a><h4>
-<a name="id2645314"></a>
- <a class="link" href="faq.html#quickbook.faq.is_there_an_easy_way_to_convert_boostbook_docs_to_quickbook_">Is
+<a name="quickbook.faq.is_there_an_easy_way_to_convert_boostbook_docs_to_quickbook_"></a><h3>
+<a name="id467675"></a>
+ <a href="faq.html#quickbook.faq.is_there_an_easy_way_to_convert_boostbook_docs_to_quickbook_">Is
       there an easy way to convert BoostBook docs to QuickBook?</a>
- </h4>
+ </h3>
 <p>
       There's a stylesheet that allows Boostbook generated HTML to be viewed as quickbook
       source, see http://svn.boost.org/trac/boost/wiki/QuickbookSourceStylesheetProject,

Modified: branches/release/tools/quickbook/doc/html/quickbook/install.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/install.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/install.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Installation and configuration</title>
+<title> Installation and configuration</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Quickbook 1.4">
 <link rel="up" href="../index.html" title="Quickbook 1.4">
-<link rel="prev" href="syntax/block.html" title="Block Level Elements">
-<link rel="next" href="install/macosx.html" title="Mac OS X">
+<link rel="prev" href="syntax/block.html" title=" Block Level Elements">
+<link rel="next" href="install/macosx.html" title=" Mac OS X">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -24,8 +24,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="quickbook.install"></a><a class="link" href="install.html" title="Installation and configuration"> Installation and configuration</a>
-</h2></div></div></div>
+<a name="quickbook.install"></a> Installation and configuration</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"> Mac OS X</span></dt>
 <dt><span class="section"> Windows 2000, XP, 2003, Vista</span></dt>
@@ -38,8 +37,8 @@
 <p>
       Before continuing, it is very important that you keep this in mind: if you
       try to build some documents and the process breaks due to misconfiguration,
- be absolutely sure to delete any <code class="computeroutput"><span class="identifier">bin</span></code>
- and <code class="computeroutput"><span class="identifier">bin</span><span class="special">.</span><span class="identifier">v2</span></code> directories generated by the build before
+ be absolutely sure to delete any <tt class="computeroutput"><span class="identifier">bin</span></tt>
+ and <tt class="computeroutput"><span class="identifier">bin</span><span class="special">.</span><span class="identifier">v2</span></tt> directories generated by the build before
       trying again. Otherwise your configuration fixes will not take any effect.
     </p>
 </div>

Modified: branches/release/tools/quickbook/doc/html/quickbook/install/linux.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/install/linux.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/install/linux.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Debian, Ubuntu</title>
+<title> Debian, Ubuntu</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../install.html" title="Installation and configuration">
-<link rel="prev" href="windows.html" title="Windows 2000, XP, 2003, Vista">
-<link rel="next" href="../editors.html" title="Editor Support">
+<link rel="up" href="../install.html" title=" Installation and configuration">
+<link rel="prev" href="windows.html" title=" Windows 2000, XP, 2003, Vista">
+<link rel="next" href="../editors.html" title=" Editor Support">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -24,30 +24,29 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.install.linux"></a><a class="link" href="linux.html" title="Debian, Ubuntu"> Debian, Ubuntu</a>
-</h3></div></div></div>
+<a name="quickbook.install.linux"></a> Debian, Ubuntu</h3></div></div></div>
 <p>
         The following instructions apply to Debian and its derivatives. They are
         based on a Ubuntu Edgy install but should work on other Debian based systems.
       </p>
 <p>
- First install the <code class="computeroutput"><span class="identifier">bjam</span></code>,
- <code class="computeroutput"><span class="identifier">xsltproc</span></code>, <code class="computeroutput"><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xsl</span></code> and
- <code class="computeroutput"><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xml</span></code> packages. For example, using <code class="computeroutput"><span class="identifier">apt</span><span class="special">-</span><span class="identifier">get</span></code>:
+ First install the <tt class="computeroutput"><span class="identifier">bjam</span></tt>,
+ <tt class="computeroutput"><span class="identifier">xsltproc</span></tt>, <tt class="computeroutput"><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xsl</span></tt> and
+ <tt class="computeroutput"><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xml</span></tt> packages. For example, using <tt class="computeroutput"><span class="identifier">apt</span><span class="special">-</span><span class="identifier">get</span></tt>:
       </p>
 <pre class="programlisting">
 <span class="identifier">sudo</span> <span class="identifier">apt</span><span class="special">-</span><span class="identifier">get</span> <span class="identifier">install</span> <span class="identifier">xsltproc</span> <span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xsl</span> <span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xml</span>
 </pre>
 <p>
         If you're planning on building boost's documentation, you'll also need to
- install the <code class="computeroutput"><span class="identifier">doxygen</span></code> package
+ install the <tt class="computeroutput"><span class="identifier">doxygen</span></tt> package
         as well.
       </p>
 <p>
         Next, we need to configure Boost Build to compile BoostBook files. Add the
- following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code> file, which should be in your home
+ following to your <tt class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></tt> file, which should be in your home
         directory. If you don't have one, create a file containing this text. For
- more information on setting up <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>, see
+ more information on setting up <tt class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></tt>, see
         the <a href="http://boost.org/boost-build2/doc/html/bbv2/advanced/configuration.html" target="_top">Boost
         Build documentation</a>.
       </p>
@@ -68,19 +67,19 @@
       </p>
 <div class="orderedlist"><ol type="1">
 <li>
- Go to Quickbook's source directory (<code class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">/</span><span class="identifier">tools</span><span class="special">/</span><span class="identifier">quickbook</span></code>).
+ Go to Quickbook's source directory (<tt class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">/</span><span class="identifier">tools</span><span class="special">/</span><span class="identifier">quickbook</span></tt>).
         </li>
 <li>
- Build the utility by issuing <code class="computeroutput"><span class="identifier">bjam</span>
- <span class="special">--</span><span class="identifier">v2</span></code>.
+ Build the utility by issuing <tt class="computeroutput"><span class="identifier">bjam</span>
+ <span class="special">--</span><span class="identifier">v2</span></tt>.
         </li>
 <li>
- Copy the resulting <code class="computeroutput"><span class="identifier">quickbook</span></code>
- binary (located under the <code class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">/</span><span class="identifier">bin</span><span class="special">.</span><span class="identifier">v2</span></code> hierarchy)
- to a safe place. The traditional location is <code class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">bin</span></code>.
+ Copy the resulting <tt class="computeroutput"><span class="identifier">quickbook</span></tt>
+ binary (located under the <tt class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">/</span><span class="identifier">bin</span><span class="special">.</span><span class="identifier">v2</span></tt> hierarchy)
+ to a safe place. The traditional location is <tt class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">bin</span></tt>.
         </li>
 <li>
- Add the following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>
+ Add the following to your <tt class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></tt>
           file, using the full path of the quickbook executable:
         </li>
 </ol></div>

Modified: branches/release/tools/quickbook/doc/html/quickbook/install/macosx.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/install/macosx.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/install/macosx.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Mac OS X</title>
+<title> Mac OS X</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../install.html" title="Installation and configuration">
-<link rel="prev" href="../install.html" title="Installation and configuration">
-<link rel="next" href="windows.html" title="Windows 2000, XP, 2003, Vista">
+<link rel="up" href="../install.html" title=" Installation and configuration">
+<link rel="prev" href="../install.html" title=" Installation and configuration">
+<link rel="next" href="windows.html" title=" Windows 2000, XP, 2003, Vista">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -24,8 +24,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.install.macosx"></a><a class="link" href="macosx.html" title="Mac OS X"> Mac OS X</a>
-</h3></div></div></div>
+<a name="quickbook.install.macosx"></a> Mac OS X</h3></div></div></div>
 <div class="blockquote"><blockquote class="blockquote">
 <p>
           </p>
@@ -45,13 +44,13 @@
 <p>
         The text below assumes you want to install all the necessary utilities in
         a system-wide location, allowing any user in the machine to have access to
- them. Therefore, all files will be put in the <code class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span></code>
+ them. Therefore, all files will be put in the <tt class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span></tt>
         hierarchy. If you do not want this, you can choose any other prefix such
- as <code class="computeroutput"><span class="special">~/</span><span class="identifier">Applications</span></code>
+ as <tt class="computeroutput"><span class="special">~/</span><span class="identifier">Applications</span></tt>
         for a single-user installation.
       </p>
 <p>
- Mac OS X comes with <code class="computeroutput"><span class="identifier">xsltproc</span></code>
+ Mac OS X comes with <tt class="computeroutput"><span class="identifier">xsltproc</span></tt>
         and all related libraries preinstalled, so you do not need to take any extra
         steps to set them up. It is probable that future versions will include them
         too, but these instructions may not apply to older versions.
@@ -62,16 +61,16 @@
 <div class="orderedlist"><ol type="1">
 <li>
           Download <a href="http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip" target="_top">Docbook
- XML 4.2</a> and unpack it inside <code class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">share</span><span class="special">/</span><span class="identifier">xml</span><span class="special">/</span><span class="identifier">docbook</span><span class="special">/</span><span class="number">4.2</span></code>.
+ XML 4.2</a> and unpack it inside <tt class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">share</span><span class="special">/</span><span class="identifier">xml</span><span class="special">/</span><span class="identifier">docbook</span><span class="special">/</span><span class="number">4.2</span></tt>.
         </li>
 <li>
           Download the latest <a href="http://sourceforge.net/project/showfiles.php?group_id=21935&amp;package_id=16608" target="_top">Docbook
- XSL</a> version and unpack it. Put the results in <code class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">share</span><span class="special">/</span><span class="identifier">xsl</span><span class="special">/</span><span class="identifier">docbook</span></code>, thus effectively removing the
+ XSL</a> version and unpack it. Put the results in <tt class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">share</span><span class="special">/</span><span class="identifier">xsl</span><span class="special">/</span><span class="identifier">docbook</span></tt>, thus effectively removing the
           version number from the directory name (for simplicity).
         </li>
 <li>
- Add the following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>
- file, which should live in your home directory (<code class="computeroutput"><span class="special">/</span><span class="identifier">Users</span><span class="special">/&lt;</span><span class="identifier">your_username</span><span class="special">&gt;</span></code>).
+ Add the following to your <tt class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></tt>
+ file, which should live in your home directory (<tt class="computeroutput"><span class="special">/</span><span class="identifier">Users</span><span class="special">/&lt;</span><span class="identifier">your_username</span><span class="special">&gt;</span></tt>).
           You must already have it somewhere or otherwise you could not be building
           Boost (i.e. missing tools configuration).
         </li>
@@ -91,20 +90,20 @@
       </p>
 <div class="orderedlist"><ol type="1">
 <li>
- Go to Quickbook's source directory (<code class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">/</span><span class="identifier">tools</span><span class="special">/</span><span class="identifier">quickbook</span></code>).
+ Go to Quickbook's source directory (<tt class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">/</span><span class="identifier">tools</span><span class="special">/</span><span class="identifier">quickbook</span></tt>).
         </li>
 <li>
- Build the utility by issuing <code class="computeroutput"><span class="identifier">bjam</span>
- <span class="special">--</span><span class="identifier">v2</span></code>.
+ Build the utility by issuing <tt class="computeroutput"><span class="identifier">bjam</span>
+ <span class="special">--</span><span class="identifier">v2</span></tt>.
         </li>
 <li>
- Copy the resulting <code class="computeroutput"><span class="identifier">quickbook</span></code>
- binary (located under the <code class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">/</span><span class="identifier">bin</span><span class="special">.</span><span class="identifier">v2</span></code> hierarchy)
+ Copy the resulting <tt class="computeroutput"><span class="identifier">quickbook</span></tt>
+ binary (located under the <tt class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">/</span><span class="identifier">bin</span><span class="special">.</span><span class="identifier">v2</span></tt> hierarchy)
           to a safe place. Following our previous example, you can install it into:
- <code class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">bin</span></code>.
+ <tt class="computeroutput"><span class="special">/</span><span class="identifier">usr</span><span class="special">/</span><span class="identifier">local</span><span class="special">/</span><span class="identifier">bin</span></tt>.
         </li>
 <li>
- Add the following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>
+ Add the following to your <tt class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></tt>
           file:
         </li>
 </ol></div>
@@ -120,14 +119,14 @@
 <div class="orderedlist"><ol type="1">
 <li>
           Go to the <a href="http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc" target="_top">downloads
- section</a> and get the disk image (<code class="computeroutput"><span class="identifier">dmg</span></code>
+ section</a> and get the disk image (<tt class="computeroutput"><span class="identifier">dmg</span></tt>
           file) for Mac OS X.
         </li>
 <li>
- Open the disk image and drag the Doxygen application to your <code class="computeroutput"><span class="identifier">Applications</span></code> folder to install it.
+ Open the disk image and drag the Doxygen application to your <tt class="computeroutput"><span class="identifier">Applications</span></tt> folder to install it.
         </li>
 <li>
- Add the following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>
+ Add the following to your <tt class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></tt>
           file:
         </li>
 </ol></div>

Modified: branches/release/tools/quickbook/doc/html/quickbook/install/windows.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/install/windows.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/install/windows.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Windows 2000, XP, 2003, Vista</title>
+<title> Windows 2000, XP, 2003, Vista</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../install.html" title="Installation and configuration">
-<link rel="prev" href="macosx.html" title="Mac OS X">
-<link rel="next" href="linux.html" title="Debian, Ubuntu">
+<link rel="up" href="../install.html" title=" Installation and configuration">
+<link rel="prev" href="macosx.html" title=" Mac OS X">
+<link rel="next" href="linux.html" title=" Debian, Ubuntu">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -24,8 +24,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.install.windows"></a><a class="link" href="windows.html" title="Windows 2000, XP, 2003, Vista"> Windows 2000, XP, 2003, Vista</a>
-</h3></div></div></div>
+<a name="quickbook.install.windows"></a> Windows 2000, XP, 2003, Vista</h3></div></div></div>
 <p>
       </p>
 <div class="blockquote"><blockquote class="blockquote">
@@ -45,39 +44,39 @@
       </p>
 <div class="orderedlist"><ol type="1">
 <li>
- First of all you need to have a copy of <code class="computeroutput"><span class="identifier">xsltproc</span></code>
+ First of all you need to have a copy of <tt class="computeroutput"><span class="identifier">xsltproc</span></tt>
           for Windows. There are many ways to get this tool, but to keep things simple,
           use the binary packages
           made by Igor Zlatkovic. At the very least, you need to download the following
- packages: <code class="computeroutput"><span class="identifier">iconv</span></code>, <code class="computeroutput"><span class="identifier">zlib</span></code>, <code class="computeroutput"><span class="identifier">libxml2</span></code>
- and <code class="computeroutput"><span class="identifier">libxslt</span></code>.
+ packages: <tt class="computeroutput"><span class="identifier">iconv</span></tt>, <tt class="computeroutput"><span class="identifier">zlib</span></tt>, <tt class="computeroutput"><span class="identifier">libxml2</span></tt>
+ and <tt class="computeroutput"><span class="identifier">libxslt</span></tt>.
         </li>
 <li>
           Unpack all these packages in the same directory so that you get unique
- <code class="computeroutput"><span class="identifier">bin</span></code>, <code class="computeroutput"><span class="identifier">include</span></code>
- and <code class="computeroutput"><span class="identifier">lib</span></code> directories within
- the hierarchy. These instructions use <code class="computeroutput"><span class="identifier">C</span><span class="special">:\</span><span class="identifier">Users</span><span class="special">\</span><span class="identifier">example</span><span class="special">\</span><span class="identifier">Documents</span><span class="special">\</span><span class="identifier">boost</span><span class="special">\</span><span class="identifier">xml</span></code>
+ <tt class="computeroutput"><span class="identifier">bin</span></tt>, <tt class="computeroutput"><span class="identifier">include</span></tt>
+ and <tt class="computeroutput"><span class="identifier">lib</span></tt> directories within
+ the hierarchy. These instructions use <tt class="computeroutput"><span class="identifier">C</span><span class="special">:\</span><span class="identifier">Users</span><span class="special">\</span><span class="identifier">example</span><span class="special">\</span><span class="identifier">Documents</span><span class="special">\</span><span class="identifier">boost</span><span class="special">\</span><span class="identifier">xml</span></tt>
           as the root for all files.
         </li>
 <li>
- From the command line, go to the <code class="computeroutput"><span class="identifier">bin</span></code>
- directory and launch <code class="computeroutput"><span class="identifier">xsltproc</span><span class="special">.</span><span class="identifier">exe</span></code>
+ From the command line, go to the <tt class="computeroutput"><span class="identifier">bin</span></tt>
+ directory and launch <tt class="computeroutput"><span class="identifier">xsltproc</span><span class="special">.</span><span class="identifier">exe</span></tt>
           to ensure it works. You should get usage information on screen.
         </li>
 <li>
           Download <a href="http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip" target="_top">Docbook
           XML 4.2</a> and unpack it in the same directory used above. That is:
- <code class="computeroutput"><span class="identifier">C</span><span class="special">:\</span><span class="identifier">Users</span><span class="special">\</span><span class="identifier">example</span><span class="special">\</span><span class="identifier">Documents</span><span class="special">\</span><span class="identifier">boost</span><span class="special">\</span><span class="identifier">xml</span><span class="special">\</span><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xml</span></code>.
+ <tt class="computeroutput"><span class="identifier">C</span><span class="special">:\</span><span class="identifier">Users</span><span class="special">\</span><span class="identifier">example</span><span class="special">\</span><span class="identifier">Documents</span><span class="special">\</span><span class="identifier">boost</span><span class="special">\</span><span class="identifier">xml</span><span class="special">\</span><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xml</span></tt>.
         </li>
 <li>
           Download the latest <a href="http://sourceforge.net/project/showfiles.php?group_id=21935&amp;package_id=16608" target="_top">Docbook
           XSL</a> version and unpack it, again in the same directory used before.
           To make things easier, rename the directory created during the extraction
- to <code class="computeroutput"><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xsl</span></code> (bypassing the version name): <code class="computeroutput"><span class="identifier">C</span><span class="special">:\</span><span class="identifier">Users</span><span class="special">\</span><span class="identifier">example</span><span class="special">\</span><span class="identifier">Documents</span><span class="special">\</span><span class="identifier">boost</span><span class="special">\</span><span class="identifier">xml</span><span class="special">\</span><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xsl</span></code>.
+ to <tt class="computeroutput"><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xsl</span></tt> (bypassing the version name): <tt class="computeroutput"><span class="identifier">C</span><span class="special">:\</span><span class="identifier">Users</span><span class="special">\</span><span class="identifier">example</span><span class="special">\</span><span class="identifier">Documents</span><span class="special">\</span><span class="identifier">boost</span><span class="special">\</span><span class="identifier">xml</span><span class="special">\</span><span class="identifier">docbook</span><span class="special">-</span><span class="identifier">xsl</span></tt>.
         </li>
 <li>
- Add the following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>
- file, which should live in your home directory (<code class="computeroutput"><span class="special">%</span><span class="identifier">HOMEDRIVE</span><span class="special">%%</span><span class="identifier">HOMEPATH</span><span class="special">%</span></code>).
+ Add the following to your <tt class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></tt>
+ file, which should live in your home directory (<tt class="computeroutput"><span class="special">%</span><span class="identifier">HOMEDRIVE</span><span class="special">%%</span><span class="identifier">HOMEPATH</span><span class="special">%</span></tt>).
           You must already have it somewhere or otherwise you could not be building
           Boost (i.e. missing tools configuration).
         </li>
@@ -98,20 +97,20 @@
       </p>
 <div class="orderedlist"><ol type="1">
 <li>
- Go to Quickbook's source directory (<code class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">\</span><span class="identifier">tools</span><span class="special">\</span><span class="identifier">quickbook</span></code>).
+ Go to Quickbook's source directory (<tt class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">\</span><span class="identifier">tools</span><span class="special">\</span><span class="identifier">quickbook</span></tt>).
         </li>
 <li>
- Build the utility by issuing <code class="computeroutput"><span class="identifier">bjam</span>
- <span class="special">--</span><span class="identifier">v2</span></code>.
+ Build the utility by issuing <tt class="computeroutput"><span class="identifier">bjam</span>
+ <span class="special">--</span><span class="identifier">v2</span></tt>.
         </li>
 <li>
- Copy the resulting <code class="computeroutput"><span class="identifier">quickbook</span><span class="special">.</span><span class="identifier">exe</span></code>
- binary (located under the <code class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">\</span><span class="identifier">bin</span><span class="special">.</span><span class="identifier">v2</span></code> hierarchy)
+ Copy the resulting <tt class="computeroutput"><span class="identifier">quickbook</span><span class="special">.</span><span class="identifier">exe</span></tt>
+ binary (located under the <tt class="computeroutput"><span class="identifier">BOOST_ROOT</span><span class="special">\</span><span class="identifier">bin</span><span class="special">.</span><span class="identifier">v2</span></tt> hierarchy)
           to a safe place. Following our previous example, you can install it into:
- <code class="computeroutput"><span class="identifier">C</span><span class="special">:\</span><span class="identifier">Users</span><span class="special">\</span><span class="identifier">example</span><span class="special">\</span><span class="identifier">Documents</span><span class="special">\</span><span class="identifier">boost</span><span class="special">\</span><span class="identifier">xml</span><span class="special">\</span><span class="identifier">bin</span></code>.
+ <tt class="computeroutput"><span class="identifier">C</span><span class="special">:\</span><span class="identifier">Users</span><span class="special">\</span><span class="identifier">example</span><span class="special">\</span><span class="identifier">Documents</span><span class="special">\</span><span class="identifier">boost</span><span class="special">\</span><span class="identifier">xml</span><span class="special">\</span><span class="identifier">bin</span></tt>.
         </li>
 <li>
- Add the following to your <code class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></code>
+ Add the following to your <tt class="computeroutput"><span class="identifier">user</span><span class="special">-</span><span class="identifier">config</span><span class="special">.</span><span class="identifier">jam</span></tt>
           file:
         </li>
 </ol></div>

Modified: branches/release/tools/quickbook/doc/html/quickbook/intro.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/intro.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/intro.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Introduction</title>
+<title> Introduction</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Quickbook 1.4">
 <link rel="up" href="../index.html" title="Quickbook 1.4">
 <link rel="prev" href="../index.html" title="Quickbook 1.4">
-<link rel="next" href="change_log.html" title="Change Log">
+<link rel="next" href="change_log.html" title=" Change Log">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -24,14 +24,13 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="quickbook.intro"></a><a class="link" href="intro.html" title="Introduction"> Introduction</a>
-</h2></div></div></div>
+<a name="quickbook.intro"></a> Introduction</h2></div></div></div>
 <div class="blockquote"><blockquote class="blockquote">
 <p>
         </p>
 <p>
- <span class="bold"><strong><span class="emphasis"><em>&#8220;<span class="quote">Why program by hand in five days
- what you can spend five years of your life automating?</span>&#8221;</em></span></strong></span>
+ <span class="bold"><b><span class="emphasis"><em>&#8220;<span class="quote">Why program by hand in five days
+ what you can spend five years of your life automating?</span>&#8221;</em></span></b></span>
         </p>
 <p>
         </p>

Modified: branches/release/tools/quickbook/doc/html/quickbook/ref.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/ref.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/ref.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Quick Reference</title>
+<title> Quick Reference</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Quickbook 1.4">
 <link rel="up" href="../index.html" title="Quickbook 1.4">
-<link rel="prev" href="faq.html" title="Frequently Asked Questions">
+<link rel="prev" href="faq.html" title=" Frequently Asked Questions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -23,13 +23,12 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="quickbook.ref"></a><a class="link" href="ref.html" title="Quick Reference"> Quick Reference</a>
-</h2></div></div></div>
+<a name="quickbook.ref"></a> Quick Reference</h2></div></div></div>
 <p>
     </p>
 <div class="table">
-<a name="id2645360"></a><p class="title"><b>Table 8. Syntax Compendium</b></p>
-<div class="table-contents"><table class="table" summary="Syntax Compendium">
+<a name="id467737"></a><p class="title"><b>Table 8. Syntax Compendium</b></p>
+<table class="table" summary="Syntax Compendium">
 <colgroup>
 <col>
 <col>
@@ -61,12 +60,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[/ some comment]</code>
+ <tt class="literal">[/ some comment]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/comments.html" title="Comments">Comments</a>
+ Comments
           </p>
           </td>
 </tr>
@@ -78,13 +77,13 @@
           </td>
 <td>
           <p>
- <code class="literal">['italics] or /italics/</code>
+ <tt class="literal">['italics] or /italics/</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.font_styles" title="Font Styles">Font Styles</a>
- and <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
+ Font Styles
+ and <a href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
             formatting</a>
           </p>
           </td>
@@ -92,18 +91,18 @@
 <tr>
 <td>
           <p>
- <span class="bold"><strong>bold</strong></span>
+ <span class="bold"><b>bold</b></span>
           </p>
           </td>
 <td>
           <p>
- <code class="literal">[*bold] or *bold*</code>
+ <tt class="literal">[*bold] or *bold*</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.font_styles" title="Font Styles">Font Styles</a>
- and <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
+ Font Styles
+ and <a href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
             formatting</a>
           </p>
           </td>
@@ -116,13 +115,13 @@
           </td>
 <td>
           <p>
- <code class="literal">[_underline] or _underline_</code>
+ <tt class="literal">[_underline] or _underline_</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.font_styles" title="Font Styles">Font Styles</a>
- and <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
+ Font Styles
+ and <a href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
             formatting</a>
           </p>
           </td>
@@ -130,18 +129,18 @@
 <tr>
 <td>
           <p>
- <code class="literal">teletype</code>
+ <tt class="literal">teletype</tt>
           </p>
           </td>
 <td>
           <p>
- <code class="literal">[^teletype] or =teletype=</code>
+ <tt class="literal">[^teletype] or =teletype=</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.font_styles" title="Font Styles">Font Styles</a>
- and <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
+ Font Styles
+ and <a href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
             formatting</a>
           </p>
           </td>
@@ -154,13 +153,13 @@
           </td>
 <td>
           <p>
- <code class="literal">[-strikethrough]</code>
+ <tt class="literal">[-strikethrough]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.font_styles" title="Font Styles">Font Styles</a>
- and <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
+ Font Styles
+ and <a href="syntax/phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple
             formatting</a>
           </p>
           </td>
@@ -168,19 +167,19 @@
 <tr>
 <td>
           <p>
- <em class="replaceable"><code>
+ <i class="replaceable"><tt>
               replaceable
- </code></em>
+ </tt></i>
           </p>
           </td>
 <td>
           <p>
- <code class="literal">[~replaceable]</code>
+ <tt class="literal">[~replaceable]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.replaceable" title="Replaceable">Replaceble</a>
+ Replaceble
           </p>
           </td>
 </tr>
@@ -192,12 +191,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[c++]</code> or <code class="literal">[python]</code>
+ <tt class="literal">[c++]</tt> or <tt class="literal">[python]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.source_mode" title="Source Mode">Source Mode</a>
+ Source Mode
           </p>
           </td>
 </tr>
@@ -209,12 +208,12 @@
           </td>
 <td>
           <p>
- <code class="literal">`int main();`</code>
+ <tt class="literal">`int main();`</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.inline_code" title="Inline code">Inline code</a>
+ Inline code
           </p>
           </td>
 </tr>
@@ -226,12 +225,12 @@
           </td>
 <td>
           <p>
- <code class="literal">``int main();``</code>
+ <tt class="literal">``int main();``</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.code" title="Code">Code</a>
+ Code
           </p>
           </td>
 </tr>
@@ -243,12 +242,13 @@
           </td>
 <td>
           <p>
- <code class="literal">``from c++ to QuickBook``</code>
+ <tt class="literal">``from c++ to QuickBook``</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.escape_back" title="Escaping Back To QuickBook">Escaping Back To QuickBook</a>
+ <a href="syntax/block.html#quickbook.syntax.block.escape_back" title=" Escaping Back
+ To QuickBook">Escaping Back To QuickBook</a>
           </p>
           </td>
 </tr>
@@ -260,13 +260,13 @@
           </td>
 <td>
           <p>
- <code class="literal">[br] or \n</code>
+ <tt class="literal">[br] or \n</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.line_break" title="line-break">line-break</a>
- <span class="bold"><strong>DEPRECATED</strong></span>
+ line-break
+ <span class="bold"><b>DEPRECATED</b></span>
           </p>
           </td>
 </tr>
@@ -278,12 +278,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[#anchor]</code>
+ <tt class="literal">[#anchor]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.anchors" title="Anchors">Anchors</a>
+ Anchors
           </p>
           </td>
 </tr>
@@ -295,12 +295,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[@http://www.boost.org Boost]</code>
+ <tt class="literal">[@http://www.boost.org Boost]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.links" title="Links">Links</a>
+ Links
           </p>
           </td>
 </tr>
@@ -312,12 +312,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[link section.anchor Link text]</code>
+ <tt class="literal">[link section.anchor Link text]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.anchor_links" title="Anchor links">Anchor links</a>
+ Anchor links
           </p>
           </td>
 </tr>
@@ -329,12 +329,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[link xml.refentry Link text]</code>
+ <tt class="literal">[link xml.refentry Link text]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.refentry_links" title="refentry links">refentry links</a>
+ refentry links
           </p>
           </td>
 </tr>
@@ -346,12 +346,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[funcref fully::qualified::function_name Link text]</code>
+ <tt class="literal">[funcref fully::qualified::function_name Link text]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
+ <a href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title=" Code Links">function, class, member,
             enum, macro, concept or header links</a>
           </p>
           </td>
@@ -364,12 +364,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[classref fully::qualified::class_name Link text]</code>
+ <tt class="literal">[classref fully::qualified::class_name Link text]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
+ <a href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title=" Code Links">function, class, member,
             enum, macro, concept or header links</a>
           </p>
           </td>
@@ -382,12 +382,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[memberref fully::qualified::member_name Link text]</code>
+ <tt class="literal">[memberref fully::qualified::member_name Link text]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
+ <a href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title=" Code Links">function, class, member,
             enum, macro, concept or header links</a>
           </p>
           </td>
@@ -400,12 +400,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[enumref fully::qualified::enum_name Link text]</code>
+ <tt class="literal">[enumref fully::qualified::enum_name Link text]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
+ <a href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title=" Code Links">function, class, member,
             enum, macro, concept or header links</a>
           </p>
           </td>
@@ -418,12 +418,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[macroref MACRO_NAME Link text]</code>
+ <tt class="literal">[macroref MACRO_NAME Link text]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
+ <a href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title=" Code Links">function, class, member,
             enum, macro, concept or header links</a>
           </p>
           </td>
@@ -436,12 +436,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[conceptref ConceptName Link text]</code>
+ <tt class="literal">[conceptref ConceptName Link text]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
+ <a href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title=" Code Links">function, class, member,
             enum, macro, concept or header links</a>
           </p>
           </td>
@@ -454,12 +454,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[headerref path/to/header.hpp Link text]</code>
+ <tt class="literal">[headerref path/to/header.hpp Link text]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title="Code Links">function, class, member,
+ <a href="syntax/phrase.html#quickbook.syntax.phrase.code_links" title=" Code Links">function, class, member,
             enum, macro, concept or header links</a>
           </p>
           </td>
@@ -472,12 +472,12 @@
           </td>
 <td>
           <p>
- <code class="literal">'''escaped text (no processing/formatting)'''</code>
+ <tt class="literal">'''escaped text (no processing/formatting)'''</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.escape" title="Escape">Escape</a>
+ Escape
           </p>
           </td>
 </tr>
@@ -489,12 +489,13 @@
           </td>
 <td>
           <p>
- <code class="literal">\c</code>
+ <tt class="literal">\c</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.single_char_escape" title="Single char escape">Single char
+ <a href="syntax/phrase.html#quickbook.syntax.phrase.single_char_escape" title="Single
+ char escape">Single char
             escape</a>
           </p>
           </td>
@@ -507,12 +508,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[$image.jpg]</code>
+ <tt class="literal">[$image.jpg]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.images" title="Images">Images</a>
+ Images
           </p>
           </td>
 </tr>
@@ -524,12 +525,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[section The Section Title]</code>
+ <tt class="literal">[section The Section Title]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.section" title="Section">Section</a>
+ Section
           </p>
           </td>
 </tr>
@@ -541,12 +542,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[endsect]</code>
+ <tt class="literal">[endsect]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.section" title="Section">Section</a>
+ Section
           </p>
           </td>
 </tr>
@@ -564,7 +565,7 @@
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.paragraphs" title="Paragraphs">Paragraphs</a>
+ Paragraphs
           </p>
           </td>
 </tr>
@@ -587,7 +588,8 @@
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.lists.ordered_lists" title="Ordered lists">Ordered lists</a>
+ <a href="syntax/block.html#quickbook.syntax.block.lists.ordered_lists" title="Ordered
+ lists">Ordered lists</a>
           </p>
           </td>
 </tr>
@@ -610,7 +612,8 @@
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.lists.unordered_lists" title="Unordered lists">Unordered
+ <a href="syntax/block.html#quickbook.syntax.block.lists.unordered_lists" title="Unordered
+ lists">Unordered
             lists</a>
           </p>
           </td>
@@ -628,7 +631,7 @@
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.code" title="Code">Code</a>
+ Code
           </p>
           </td>
 </tr>
@@ -640,12 +643,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[pre preformatted]</code>
+ <tt class="literal">[pre preformatted]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.preformatted" title="Preformatted">Preformatted</a>
+ Preformatted
           </p>
           </td>
 </tr>
@@ -657,12 +660,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[:sometext...]</code>
+ <tt class="literal">[:sometext...]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.blockquote" title="Blockquote">Blockquote</a>
+ Blockquote
           </p>
           </td>
 </tr>
@@ -674,12 +677,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[h1 Heading 1]</code>
+ <tt class="literal">[h1 Heading 1]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>
+ Heading
           </p>
           </td>
 </tr>
@@ -691,12 +694,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[h2 Heading 2]</code>
+ <tt class="literal">[h2 Heading 2]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>
+ Heading
           </p>
           </td>
 </tr>
@@ -708,12 +711,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[h3 Heading 3]</code>
+ <tt class="literal">[h3 Heading 3]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>
+ Heading
           </p>
           </td>
 </tr>
@@ -725,12 +728,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[h4 Heading 4]</code>
+ <tt class="literal">[h4 Heading 4]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>
+ Heading
           </p>
           </td>
 </tr>
@@ -742,12 +745,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[h5 Heading 5]</code>
+ <tt class="literal">[h5 Heading 5]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>
+ Heading
           </p>
           </td>
 </tr>
@@ -759,12 +762,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[h6 Heading 6]</code>
+ <tt class="literal">[h6 Heading 6]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>
+ Heading
           </p>
           </td>
 </tr>
@@ -776,12 +779,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[def macro_identifier some text]</code>
+ <tt class="literal">[def macro_identifier some text]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.macros" title="Macros">Macros</a>
+ Macros
           </p>
           </td>
 </tr>
@@ -793,12 +796,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[template[a b] [a] body [b]]</code>
+ <tt class="literal">[template[a b] [a] body [b]]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.templates" title="Templates">Templates</a>
+ Templates
           </p>
           </td>
 </tr>
@@ -810,12 +813,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[blurb advertisement or note...]</code>
+ <tt class="literal">[blurb advertisement or note...]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.blurbs" title="Blurbs">Blurbs</a>
+ Blurbs
           </p>
           </td>
 </tr>
@@ -827,12 +830,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[warning Warning text...]</code>
+ <tt class="literal">[warning Warning text...]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.admonitions" title="Admonitions">Admonitions</a>
+ Admonitions
           </p>
           </td>
 </tr>
@@ -856,7 +859,7 @@
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.tables" title="Tables">Tables</a>
+ Tables
           </p>
           </td>
 </tr>
@@ -880,7 +883,7 @@
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.variable_lists" title="Variable Lists">Variable Lists</a>
+ Variable Lists
           </p>
           </td>
 </tr>
@@ -892,12 +895,12 @@
           </td>
 <td>
           <p>
- <code class="literal">[include someother.qbk]</code>
+ <tt class="literal">[include someother.qbk]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/block.html#quickbook.syntax.block.include" title="Include">Include</a>
+ Include
           </p>
           </td>
 </tr>
@@ -909,19 +912,18 @@
           </td>
 <td>
           <p>
- <code class="literal">[? symbol phrase]</code>
+ <tt class="literal">[? symbol phrase]</tt>
           </p>
           </td>
 <td>
           <p>
- <a class="link" href="syntax/phrase.html#quickbook.syntax.phrase.cond" title="Conditional Generation">Conditional Generation</a>
+ Conditional Generation
           </p>
           </td>
 </tr>
 </tbody>
-</table></div>
+</table>
 </div>
-<br class="table-break">
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>

Modified: branches/release/tools/quickbook/doc/html/quickbook/syntax.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/syntax.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/syntax.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,12 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Syntax Summary</title>
+<title> Syntax Summary</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../index.html" title="Quickbook 1.4">
 <link rel="up" href="../index.html" title="Quickbook 1.4">
-<link rel="prev" href="change_log.html" title="Change Log">
+<link rel="prev" href="change_log.html" title=" Change Log">
 <link rel="next" href="syntax/comments.html" title="Comments">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -24,8 +24,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="quickbook.syntax"></a><a class="link" href="syntax.html" title="Syntax Summary"> Syntax Summary</a>
-</h2></div></div></div>
+<a name="quickbook.syntax"></a> Syntax Summary</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Comments</span></dt>
 <dt><span class="section"> Phrase Level Elements</span></dt>

Modified: branches/release/tools/quickbook/doc/html/quickbook/syntax/block.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/syntax/block.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/syntax/block.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Block Level Elements</title>
+<title> Block Level Elements</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../syntax.html" title="Syntax Summary">
-<link rel="prev" href="phrase.html" title="Phrase Level Elements">
-<link rel="next" href="../install.html" title="Installation and configuration">
+<link rel="up" href="../syntax.html" title=" Syntax Summary">
+<link rel="prev" href="phrase.html" title=" Phrase Level Elements">
+<link rel="next" href="../install.html" title=" Installation and configuration">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -24,8 +24,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.syntax.block"></a><a class="link" href="block.html" title="Block Level Elements"> Block Level Elements</a>
-</h3></div></div></div>
+<a name="quickbook.syntax.block"></a> Block Level Elements</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Document</span></dt>
 <dt><span class="section">Section</span></dt>
@@ -52,8 +51,7 @@
 </dl></div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.document"></a><a class="link" href="block.html#quickbook.syntax.block.document" title="Document">Document</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.document"></a>Document</h4></div></div></div>
 <p>
           Every document must begin with a Document Info section, which should look
           like this:
@@ -114,22 +112,21 @@
           for. In its absence, version 1.1 is assumed.
         </p>
 <p>
- <code class="literal">version</code>, <code class="literal">id</code>, <code class="literal">dirname</code>,
- <code class="literal">copyright</code>, <code class="literal">purpose</code>, <code class="literal">category</code>,
- <code class="literal">authors</code>, <code class="literal">license</code>, <code class="literal">last-revision</code>
- and <code class="literal">source-mode</code> are optional information.
+ <tt class="literal">version</tt>, <tt class="literal">id</tt>, <tt class="literal">dirname</tt>,
+ <tt class="literal">copyright</tt>, <tt class="literal">purpose</tt>, <tt class="literal">category</tt>,
+ <tt class="literal">authors</tt>, <tt class="literal">license</tt>, <tt class="literal">last-revision</tt>
+ and <tt class="literal">source-mode</tt> are optional information.
         </p>
 <p>
- <code class="literal">source-type</code> is a lowercase string setting the initial
- <a class="link" href="phrase.html#quickbook.syntax.phrase.source_mode" title="Source Mode">Source Mode</a>.
- If the <code class="literal">source-mode</code> field is omitted, a default value
- of <code class="literal">c++</code> will be used.
+ <tt class="literal">source-type</tt> is a lowercase string setting the initial
+ Source Mode.
+ If the <tt class="literal">source-mode</tt> field is omitted, a default value
+ of <tt class="literal">c++</tt> will be used.
         </p>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.section"></a><a class="link" href="block.html#quickbook.syntax.block.section" title="Section">Section</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.section"></a>Section</h4></div></div></div>
 <p>
           Starting a new section is accomplished with:
         </p>
@@ -138,8 +135,8 @@
 <p>
           where <span class="emphasis"><em>id</em></span> is optional. id will be the filename of the
           generated section. If it is not present, "The Section Title"
- will be normalized and become the id. Valid characters are <code class="literal">a-Z</code>,
- <code class="literal">A-Z</code>, <code class="literal">0-9</code> and <code class="literal">_</code>.
+ will be normalized and become the id. Valid characters are <tt class="literal">a-Z</tt>,
+ <tt class="literal">A-Z</tt>, <tt class="literal">0-9</tt> and <tt class="literal">_</tt>.
           All non-valid characters are converted to underscore and all upper-case
           are converted to lower case. Thus: "The Section Title" will be
           normalized to "the_section_title".
@@ -155,8 +152,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.xinclude"></a><a class="link" href="block.html#quickbook.syntax.block.xinclude" title="xinclude">xinclude</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.xinclude"></a>xinclude</h4></div></div></div>
 <p>
           You can include another XML file with:
         </p>
@@ -169,8 +165,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.paragraphs"></a><a class="link" href="block.html#quickbook.syntax.block.paragraphs" title="Paragraphs">Paragraphs</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.paragraphs"></a>Paragraphs</h4></div></div></div>
 <p>
           Paragraphs start left-flushed and are terminated by two or more newlines.
           No markup is needed for paragraphs. QuickBook automatically detects paragraphs
@@ -184,8 +179,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.lists"></a><a class="link" href="block.html#quickbook.syntax.block.lists" title="Lists">Lists</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.lists"></a>Lists</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="block.html#quickbook.syntax.block.lists.ordered_lists">Ordered
           lists</a></span></dt>
@@ -199,9 +193,9 @@
 </dl></div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.block.lists.ordered_lists"></a><a class="link" href="block.html#quickbook.syntax.block.lists.ordered_lists" title="Ordered lists">Ordered
- lists</a>
-</h5></div></div></div>
+<a name="quickbook.syntax.block.lists.ordered_lists"></a><a href="block.html#quickbook.syntax.block.lists.ordered_lists" title="Ordered
+ lists">Ordered
+ lists</a></h5></div></div></div>
 <pre class="programlisting"># One
 # Two
 # Three
@@ -223,9 +217,9 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.block.lists.list_hierarchies"></a><a class="link" href="block.html#quickbook.syntax.block.lists.list_hierarchies" title="List Hierarchies">List
- Hierarchies</a>
-</h5></div></div></div>
+<a name="quickbook.syntax.block.lists.list_hierarchies"></a><a href="block.html#quickbook.syntax.block.lists.list_hierarchies" title="List
+ Hierarchies">List
+ Hierarchies</a></h5></div></div></div>
 <p>
             List hierarchies are supported. Example:
           </p>
@@ -286,9 +280,9 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.block.lists.long_list_lines"></a><a class="link" href="block.html#quickbook.syntax.block.lists.long_list_lines" title="Long List Lines">Long
- List Lines</a>
-</h5></div></div></div>
+<a name="quickbook.syntax.block.lists.long_list_lines"></a><a href="block.html#quickbook.syntax.block.lists.long_list_lines" title="Long
+ List Lines">Long
+ List Lines</a></h5></div></div></div>
 <p>
             Long lines will be wrapped appropriately. Example:
           </p>
@@ -317,9 +311,9 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.block.lists.unordered_lists"></a><a class="link" href="block.html#quickbook.syntax.block.lists.unordered_lists" title="Unordered lists">Unordered
- lists</a>
-</h5></div></div></div>
+<a name="quickbook.syntax.block.lists.unordered_lists"></a><a href="block.html#quickbook.syntax.block.lists.unordered_lists" title="Unordered
+ lists">Unordered
+ lists</a></h5></div></div></div>
 <pre class="programlisting">* First
 * Second
 * Third
@@ -341,8 +335,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.block.lists.mixed_lists"></a><a class="link" href="block.html#quickbook.syntax.block.lists.mixed_lists" title="Mixed lists">Mixed lists</a>
-</h5></div></div></div>
+<a name="quickbook.syntax.block.lists.mixed_lists"></a>Mixed lists</h5></div></div></div>
 <p>
             Mixed lists (ordered and unordered) are supported. Example:
           </p>
@@ -453,11 +446,10 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.code"></a><a class="link" href="block.html#quickbook.syntax.block.code" title="Code">Code</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.code"></a>Code</h4></div></div></div>
 <p>
           Preformatted code starts with a space or a tab. The code will be syntax
- highlighted according to the current <a class="link" href="phrase.html#quickbook.syntax.phrase.source_mode" title="Source Mode">Source
+ highlighted according to the current <a href="phrase.html#quickbook.syntax.phrase.source_mode" title="Source Mode">Source
           Mode</a>:
         </p>
 <p>
@@ -501,9 +493,9 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.escape_back"></a><a class="link" href="block.html#quickbook.syntax.block.escape_back" title="Escaping Back To QuickBook"> Escaping Back
- To QuickBook</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.escape_back"></a><a href="block.html#quickbook.syntax.block.escape_back" title=" Escaping Back
+ To QuickBook"> Escaping Back
+ To QuickBook</a></h4></div></div></div>
 <p>
           Inside code, code blocks and inline code, QuickBook does not allow any
           markup to avoid conflicts with the target syntax (e.g. c++). In case you
@@ -531,11 +523,10 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.preformatted"></a><a class="link" href="block.html#quickbook.syntax.block.preformatted" title="Preformatted">Preformatted</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.preformatted"></a>Preformatted</h4></div></div></div>
 <p>
           Sometimes, you don't want some preformatted text to be parsed as C++. In
- such cases, use the <code class="literal">[pre ... ]</code> markup block.
+ such cases, use the <tt class="literal">[pre ... ]</tt> markup block.
         </p>
 <pre class="programlisting">[pre
 
@@ -552,22 +543,21 @@
           level markup, pre (and Code) are the only ones that allow multiple newlines.
           The markup above will generate:
         </p>
-<pre class="programlisting">Some <span class="bold"><strong>preformatted</strong></span> text Some <span class="bold"><strong>preformatted</strong></span> text
+<pre class="programlisting">Some <span class="bold"><b>preformatted</b></span> text Some <span class="bold"><b>preformatted</b></span> text
 
- Some <span class="bold"><strong>preformatted</strong></span> text Some <span class="bold"><strong>preformatted</strong></span> text
+ Some <span class="bold"><b>preformatted</b></span> text Some <span class="bold"><b>preformatted</b></span> text
 
- Some <span class="bold"><strong>preformatted</strong></span> text Some <span class="bold"><strong>preformatted</strong></span> text
+ Some <span class="bold"><b>preformatted</b></span> text Some <span class="bold"><b>preformatted</b></span> text
 
 </pre>
 <p>
           Notice that unlike Code, phrase markup such as font style is still permitted
- inside <code class="literal">pre</code> blocks.
+ inside <tt class="literal">pre</tt> blocks.
         </p>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.blockquote"></a><a class="link" href="block.html#quickbook.syntax.block.blockquote" title="Blockquote">Blockquote</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.blockquote"></a>Blockquote</h4></div></div></div>
 <pre class="programlisting">[:sometext...]
 </pre>
 <div class="blockquote"><blockquote class="blockquote">
@@ -582,8 +572,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.admonitions"></a><a class="link" href="block.html#quickbook.syntax.block.admonitions" title="Admonitions">Admonitions</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.admonitions"></a>Admonitions</h4></div></div></div>
 <pre class="programlisting">[note This is a note]
 [tip This is a tip]
 [important This is important]
@@ -598,7 +587,7 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
 <th align="left">Note</th>
 </tr>
-<tr><td align="left" valign="top"><p>
+<tr><td colspan="2" align="left" valign="top"><p>
             This is a note
           </p></td></tr>
 </table></div>
@@ -607,7 +596,7 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../doc/html/images/tip.png"></td>
 <th align="left">Tip</th>
 </tr>
-<tr><td align="left" valign="top"><p>
+<tr><td colspan="2" align="left" valign="top"><p>
             This is a tip
           </p></td></tr>
 </table></div>
@@ -616,7 +605,7 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../../../../../doc/html/images/important.png"></td>
 <th align="left">Important</th>
 </tr>
-<tr><td align="left" valign="top"><p>
+<tr><td colspan="2" align="left" valign="top"><p>
             This is important
           </p></td></tr>
 </table></div>
@@ -625,7 +614,7 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Caution]" src="../../../../../../doc/html/images/caution.png"></td>
 <th align="left">Caution</th>
 </tr>
-<tr><td align="left" valign="top"><p>
+<tr><td colspan="2" align="left" valign="top"><p>
             This is a caution
           </p></td></tr>
 </table></div>
@@ -634,20 +623,19 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../doc/html/images/warning.png"></td>
 <th align="left">Warning</th>
 </tr>
-<tr><td align="left" valign="top"><p>
+<tr><td colspan="2" align="left" valign="top"><p>
             This is a warning
           </p></td></tr>
 </table></div>
 <p>
           These are the only admonitions supported by DocBook.
- So, for example <code class="literal">[information This is some information]</code>
+ So, for example <tt class="literal">[information This is some information]</tt>
           is unlikely to produce the desired effect.
         </p>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.headings"></a><a class="link" href="block.html#quickbook.syntax.block.headings" title="Headings">Headings</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.headings"></a>Headings</h4></div></div></div>
 <pre class="programlisting">[h1 Heading 1]
 [h2 Heading 2]
 [h3 Heading 3]
@@ -655,51 +643,50 @@
 [h5 Heading 5]
 [h6 Heading 6]
 </pre>
-<a name="quickbook.syntax.block.headings.heading_1"></a><h2>
-<a name="id2638745"></a>
- <a class="link" href="block.html#quickbook.syntax.block.headings.heading_1">Heading 1</a>
+<a name="quickbook.syntax.block.headings.heading_1"></a><h1>
+<a name="id459731"></a>
+ Heading 1
+ </h1>
+<a name="quickbook.syntax.block.headings.heading_2"></a><h2>
+<a name="id459755"></a>
+ Heading 2
         </h2>
-<a name="quickbook.syntax.block.headings.heading_2"></a><h3>
-<a name="id2638762"></a>
- <a class="link" href="block.html#quickbook.syntax.block.headings.heading_2">Heading 2</a>
+<a name="quickbook.syntax.block.headings.heading_3"></a><h3>
+<a name="id459780"></a>
+ Heading 3
         </h3>
-<a name="quickbook.syntax.block.headings.heading_3"></a><h4>
-<a name="id2638780"></a>
- <a class="link" href="block.html#quickbook.syntax.block.headings.heading_3">Heading 3</a>
+<a name="quickbook.syntax.block.headings.heading_4"></a><h4>
+<a name="id459804"></a>
+ Heading 4
         </h4>
-<a name="quickbook.syntax.block.headings.heading_4"></a><h5>
-<a name="id2638798"></a>
- <a class="link" href="block.html#quickbook.syntax.block.headings.heading_4">Heading 4</a>
+<a name="quickbook.syntax.block.headings.heading_5"></a><h5>
+<a name="id459829"></a>
+ Heading 5
         </h5>
-<a name="quickbook.syntax.block.headings.heading_5"></a><h6>
-<a name="id2638816"></a>
- <a class="link" href="block.html#quickbook.syntax.block.headings.heading_5">Heading 5</a>
- </h6>
 <a name="quickbook.syntax.block.headings.heading_6"></a><h5>
-<a name="id2638833"></a>
- <a class="link" href="block.html#quickbook.syntax.block.headings.heading_6">Heading 6</a>
+<a name="id459854"></a>
+ Heading 6
         </h5>
 <p>
           Headings 1-3 [h1 h2 and h3] will automatically have anchors with normalized
- names with <code class="literal">name="section_id.normalized_header_text"</code>
- (i.e. valid characters are <code class="literal">a-z</code>, <code class="literal">A-Z</code>,
- <code class="literal">0-9</code> and <code class="literal">_</code>. All non-valid characters
+ names with <tt class="literal">name="section_id.normalized_header_text"</tt>
+ (i.e. valid characters are <tt class="literal">a-z</tt>, <tt class="literal">A-Z</tt>,
+ <tt class="literal">0-9</tt> and <tt class="literal">_</tt>. All non-valid characters
           are converted to underscore and all upper-case are converted to lower-case.
- For example: Heading 1 in section Section 2 will be normalized to <code class="literal">section_2.heading_1</code>).
+ For example: Heading 1 in section Section 2 will be normalized to <tt class="literal">section_2.heading_1</tt>).
           You can use:
         </p>
 <pre class="programlisting">[link section_id.normalized_header_text The link text]
 </pre>
 <p>
- to link to them. See <a class="link" href="phrase.html#quickbook.syntax.phrase.anchor_links" title="Anchor links">Anchor
- links</a> and <a class="link" href="block.html#quickbook.syntax.block.section" title="Section">Section</a>
+ to link to them. See <a href="phrase.html#quickbook.syntax.phrase.anchor_links" title="Anchor links">Anchor
+ links</a> and Section
           for more info.
         </p>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.generic_heading"></a><a class="link" href="block.html#quickbook.syntax.block.generic_heading" title="Generic Heading">Generic Heading</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.generic_heading"></a>Generic Heading</h4></div></div></div>
 <p>
           In cases when you don't want to care about the heading level (1 to 6),
           you can use the <span class="emphasis"><em>Generic Heading</em></span>:
@@ -746,8 +733,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.macros"></a><a class="link" href="block.html#quickbook.syntax.block.macros" title="Macros">Macros</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.macros"></a>Macros</h4></div></div></div>
 <pre class="programlisting">[def macro_identifier some text]
 </pre>
 <p>
@@ -771,19 +757,19 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../../../../../../doc/html/images/tip.png"></td>
 <th align="left">Tip</th>
 </tr>
-<tr><td align="left" valign="top"><p>
+<tr><td colspan="2" align="left" valign="top"><p>
             It's a good idea to use macro identifiers that are distinguishable. For
             instance, in this document, macro identifiers have two leading and trailing
- underscores (e.g. <code class="literal">__spirit__</code>). The reason is to avoid unwanted
+ underscores (e.g. <tt class="literal">__spirit__</tt>). The reason is to avoid unwanted
             macro replacement.
           </p></td></tr>
 </table></div>
 <p>
- Links (URLS) and images are good candidates for macros. <span class="bold"><strong>1</strong></span>)
+ Links (URLS) and images are good candidates for macros. <span class="bold"><b>1</b></span>)
           They tend to change a lot. It is a good idea to place all links and images
- in one place near the top to make it easy to make changes. <span class="bold"><strong>2</strong></span>)
- The syntax is not pretty. It's easier to read and write, e.g. <code class="literal">__spirit__</code>
- than <code class="literal">[@http://spirit.sourceforge.net Spirit]</code>.
+ in one place near the top to make it easy to make changes. <span class="bold"><b>2</b></span>)
+ The syntax is not pretty. It's easier to read and write, e.g. <tt class="literal">__spirit__</tt>
+ than <tt class="literal">[@http://spirit.sourceforge.net Spirit]</tt>.
         </p>
 <p>
           Some more examples:
@@ -792,8 +778,8 @@
 [def __spirit__ [@http://spirit.sourceforge.net Spirit]]
 </pre>
 <p>
- (See <a class="link" href="phrase.html#quickbook.syntax.phrase.images" title="Images">Images</a> and
- <a class="link" href="phrase.html#quickbook.syntax.phrase.links" title="Links">Links</a>)
+ (See Images and
+ Links)
         </p>
 <p>
           Invoking these macros:
@@ -809,15 +795,15 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.predefined_macros"></a><a class="link" href="block.html#quickbook.syntax.block.predefined_macros" title="Predefined Macros">Predefined
- Macros</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.predefined_macros"></a><a href="block.html#quickbook.syntax.block.predefined_macros" title="Predefined
+ Macros">Predefined
+ Macros</a></h4></div></div></div>
 <p>
           Quickbook has some predefined macros that you can already use.
         </p>
 <div class="table">
-<a name="id2639211"></a><p class="title"><b>Table 3. Predefined Macros</b></p>
-<div class="table-contents"><table class="table" summary="Predefined Macros">
+<a name="id460310"></a><p class="title"><b>Table 3. Predefined Macros</b></p>
+<table class="table" summary="Predefined Macros">
 <colgroup>
 <col>
 <col>
@@ -854,7 +840,7 @@
               </td>
 <td>
               <p>
- 2008-Mar-15
+ 2008-May-21
               </p>
               </td>
 </tr>
@@ -871,7 +857,7 @@
               </td>
 <td>
               <p>
- 02:07:42 PM
+ 11:54:31 AM
               </p>
               </td>
 </tr>
@@ -888,19 +874,17 @@
               </td>
 <td>
               <p>
- /home/daniel/boost/branches/release/tools/quickbook/doc/quickbook.qbk
+ C:\dev\boost\tools\quickbook\doc\quickbook.qbk
               </p>
               </td>
 </tr>
 </tbody>
-</table></div>
+</table>
 </div>
-<br class="table-break">
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.templates"></a><a class="link" href="block.html#quickbook.syntax.block.templates" title="Templates">Templates</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.templates"></a>Templates</h4></div></div></div>
 <p>
           Templates provide a more versatile text substitution mechanism. Templates
           come in handy when you need to create parameterizable, multi-line, boilerplate
@@ -918,11 +902,11 @@
 
 ]
 </pre>
-<a name="quickbook.syntax.block.templates.template_identifier"></a><h6>
-<a name="id2639367"></a>
- <a class="link" href="block.html#quickbook.syntax.block.templates.template_identifier">Template
+<a name="quickbook.syntax.block.templates.template_identifier"></a><h5>
+<a name="id460490"></a>
+ <a href="block.html#quickbook.syntax.block.templates.template_identifier">Template
           Identifier</a>
- </h6>
+ </h5>
 <p>
           Template identifiers can either consist of:
         </p>
@@ -936,11 +920,11 @@
             A single character punctuation (a non-alphanumeric printable character)
           </li>
 </ul></div>
-<a name="quickbook.syntax.block.templates.formal_template_arguments"></a><h6>
-<a name="id2639406"></a>
- <a class="link" href="block.html#quickbook.syntax.block.templates.formal_template_arguments">Formal
+<a name="quickbook.syntax.block.templates.formal_template_arguments"></a><h5>
+<a name="id460537"></a>
+ <a href="block.html#quickbook.syntax.block.templates.formal_template_arguments">Formal
           Template Arguments</a>
- </h6>
+ </h5>
 <p>
           Template formal arguments are identifiers consisting of an initial alphabetic
           character or the underscore, followed by zero or more alphanumeric characters
@@ -948,19 +932,19 @@
         </p>
 <p>
           A template formal argument temporarily hides a template of the same name
- at the point where the <a class="link" href="block.html#quickbook.syntax.block.templates.template_expansion">template
- is expanded</a>. Note that the body of the <code class="literal">person</code>
- template above refers to <code class="literal">name</code> <code class="literal">age</code>
- and <code class="literal">what</code> as <code class="literal">[name]</code> <code class="literal">[age]</code>
- and <code class="literal">[what]</code>. <code class="literal">name</code> <code class="literal">age</code>
- and <code class="literal">what</code> are actually templates that exist in the duration
+ at the point where the <a href="block.html#quickbook.syntax.block.templates.template_expansion">template
+ is expanded</a>. Note that the body of the <tt class="literal">person</tt>
+ template above refers to <tt class="literal">name</tt> <tt class="literal">age</tt>
+ and <tt class="literal">what</tt> as <tt class="literal">[name]</tt> <tt class="literal">[age]</tt>
+ and <tt class="literal">[what]</tt>. <tt class="literal">name</tt> <tt class="literal">age</tt>
+ and <tt class="literal">what</tt> are actually templates that exist in the duration
           of the template call.
         </p>
-<a name="quickbook.syntax.block.templates.template_body"></a><h6>
-<a name="id2639501"></a>
- <a class="link" href="block.html#quickbook.syntax.block.templates.template_body">Template
+<a name="quickbook.syntax.block.templates.template_body"></a><h5>
+<a name="id460656"></a>
+ <a href="block.html#quickbook.syntax.block.templates.template_body">Template
           Body</a>
- </h6>
+ </h5>
 <p>
           The template body can be just about any QuickBook block or phrase. There
           are actually two forms. Templates may be phrase or block level. Phrase
@@ -981,11 +965,11 @@
           Phrase templates are typically expanded as part of phrases. Like macros,
           block level elements are not allowed in phrase templates.
         </p>
-<a name="quickbook.syntax.block.templates.template_expansion"></a><h6>
-<a name="id2639554"></a>
- <a class="link" href="block.html#quickbook.syntax.block.templates.template_expansion">Template
+<a name="quickbook.syntax.block.templates.template_expansion"></a><h5>
+<a name="id460715"></a>
+ <a href="block.html#quickbook.syntax.block.templates.template_expansion">Template
           Expansion</a>
- </h6>
+ </h5>
 <p>
           You expand a template this way:
         </p>
@@ -1018,7 +1002,7 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Caution]" src="../../../../../../doc/html/images/caution.png"></td>
 <th align="left">Caution</th>
 </tr>
-<tr><td align="left" valign="top"><p>
+<tr><td colspan="2" align="left" valign="top"><p>
             A word of caution: Templates are recursive. A template can call another
             template or even itself, directly or indirectly. There are no control
             structures in QuickBook (yet) so this will always mean infinite recursion.
@@ -1028,15 +1012,15 @@
 </table></div>
 <p>
           Each actual argument can be a word, a text fragment or just about any
- <a class="link" href="phrase.html" title="Phrase Level Elements">QuickBook phrase</a>. Arguments
- are separated by the double dot <code class="literal">".."</code> and terminated
+ QuickBook phrase. Arguments
+ are separated by the double dot <tt class="literal">".."</tt> and terminated
           by the close parenthesis.
         </p>
-<a name="quickbook.syntax.block.templates.nullary_templates"></a><h6>
-<a name="id2639643"></a>
- <a class="link" href="block.html#quickbook.syntax.block.templates.nullary_templates">Nullary
+<a name="quickbook.syntax.block.templates.nullary_templates"></a><h5>
+<a name="id460822"></a>
+ <a href="block.html#quickbook.syntax.block.templates.nullary_templates">Nullary
           Templates</a>
- </h6>
+ </h5>
 <p>
           Nullary templates look and act like simple macros. Example:
         </p>
@@ -1051,14 +1035,14 @@
           We have:
         </p>
 <p>
- Some squiggles...<span class="bold"><strong>&#945;&#946;</strong></span>
+ Some squiggles...<span class="bold"><b>&#945;&#946;</b></span>
         </p>
 <p>
           The difference with macros are
         </p>
 <div class="itemizedlist"><ul type="disc">
 <li>
- The explicit <a class="link" href="block.html#quickbook.syntax.block.templates.template_expansion">template
+ The explicit <a href="block.html#quickbook.syntax.block.templates.template_expansion">template
             expansion syntax</a>. This is an advantage because, now, we don't
             have to use obscure naming conventions like double underscores (e.g.
             __alpha__) to avoid unwanted macro replacement.
@@ -1071,7 +1055,7 @@
           </li>
 </ul></div>
 <p>
- The empty brackets after the template identifier (<code class="literal">alpha[]</code>)
+ The empty brackets after the template identifier (<tt class="literal">alpha[]</tt>)
           indicates no arguments. If the template body does not look like a template
           argument list, we can elide the empty brackets. Example:
         </p>
@@ -1087,15 +1071,15 @@
           We have:
         </p>
 <p>
- Here's a quote from Aristotle: <span class="bold"><strong><span class="emphasis"><em>Education
- is the best provision for the journey to old age.</em></span></strong></span>.
+ Here's a quote from Aristotle: <span class="bold"><b><span class="emphasis"><em>Education
+ is the best provision for the journey to old age.</em></span></b></span>.
         </p>
 <p>
           The disadvantage is that you can't avoid the space between the template
- identifier, <code class="computeroutput"><span class="identifier">aristotle_quote</span></code>,
+ identifier, <tt class="computeroutput"><span class="identifier">aristotle_quote</span></tt>,
           and the template body "Aristotle...". This space will be part
           of the template body. If that space is unwanted, use empty brackets or
- use the space escape: "<code class="computeroutput"><span class="special">\</span> </code>".
+ use the space escape: "<tt class="computeroutput"><span class="special">\</span> </tt>".
           Example:
         </p>
 <pre class="programlisting">[template tag\ _tag]
@@ -1109,26 +1093,26 @@
           We have:
         </p>
 <p>
- <code class="computeroutput"><span class="keyword">struct</span></code> x_tag;
+ <tt class="computeroutput"><span class="keyword">struct</span></tt> x_tag;
         </p>
 <p>
           You have a couple of ways to do it. I personally prefer the explicit empty
           brackets, though.
         </p>
-<a name="quickbook.syntax.block.templates.simple_arguments"></a><h6>
-<a name="id2639840"></a>
- <a class="link" href="block.html#quickbook.syntax.block.templates.simple_arguments">Simple
+<a name="quickbook.syntax.block.templates.simple_arguments"></a><h5>
+<a name="id461056"></a>
+ <a href="block.html#quickbook.syntax.block.templates.simple_arguments">Simple
           Arguments</a>
- </h6>
+ </h5>
 <p>
- As mentioned, arguments are separated by the double dot <code class="literal">".."</code>.
+ As mentioned, arguments are separated by the double dot <tt class="literal">".."</tt>.
           If there are less arguments passed than expected, QuickBook attempts to
           break the last argument into two or more arguments following this logic:
         </p>
 <div class="itemizedlist"><ul type="disc">
 <li>
- Break the last argument into two, at the first space found (<code class="literal">'',
- '\n', \t' or '\r'</code>).
+ Break the last argument into two, at the first space found (<tt class="literal">'',
+ '\n', \t' or '\r'</tt>).
           </li>
 <li>
             Repeat until there are enough arguments or if there are no more spaces
@@ -1149,8 +1133,8 @@
         </p>
 <p>
           "w x y z" is initially treated as a single argument because we
- didn't supply any <code class="literal">".."</code> separators. However,
- since <code class="literal">simple</code> expects 4 arguments, "w x y z"
+ didn't supply any <tt class="literal">".."</tt> separators. However,
+ since <tt class="literal">simple</tt> expects 4 arguments, "w x y z"
           is broken down iteratively (applying the logic above) until we have "w",
           "x", "y" and "z".
         </p>
@@ -1171,8 +1155,8 @@
         </p>
 <p>
           It should be obvious now that for simple arguments with no spaces, we can
- get by without separating the arguments with <code class="literal">".."</code>
- separators. It is possible to combine <code class="literal">".."</code>
+ get by without separating the arguments with <tt class="literal">".."</tt>
+ separators. It is possible to combine <tt class="literal">".."</tt>
           separators with the argument passing simplification presented above. Example:
         </p>
 <pre class="programlisting">[simple what do you think ..m a n?]
@@ -1183,17 +1167,17 @@
 <p>
           what do you think man?
         </p>
-<a name="quickbook.syntax.block.templates.punctuation_templates"></a><h6>
-<a name="id2639982"></a>
- <a class="link" href="block.html#quickbook.syntax.block.templates.punctuation_templates">Punctuation
+<a name="quickbook.syntax.block.templates.punctuation_templates"></a><h5>
+<a name="id461226"></a>
+ <a href="block.html#quickbook.syntax.block.templates.punctuation_templates">Punctuation
           Templates</a>
- </h6>
+ </h5>
 <p>
           With templates, one of our objectives is to allow us to rewrite QuickBook
           in QuickBook (as a qbk library). For that to happen, we need to accommodate
           single character punctuation templates which are fairly common in QuickBook.
           You might have noticed that single character punctuations are allowed as
- <a class="link" href="block.html#quickbook.syntax.block.templates.template_identifier">template
+ <a href="block.html#quickbook.syntax.block.templates.template_identifier">template
           identifiers</a>. Example:
         </p>
 <pre class="programlisting">[template ![bar] &lt;hey&gt;[bar]&lt;/hey&gt;]
@@ -1211,8 +1195,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.blurbs"></a><a class="link" href="block.html#quickbook.syntax.block.blurbs" title="Blurbs">Blurbs</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.blurbs"></a>Blurbs</h4></div></div></div>
 <pre class="programlisting">[blurb :-) [*An eye catching advertisement or note...]
 
     __spirit__ is an object-oriented recursive-descent parser generator framework
@@ -1225,10 +1208,9 @@
           will generate this:
         </p>
 <div class="sidebar">
-<p class="title"><b></b></p>
 <p>
- <span class="inlinemediaobject"><img src="../../images/smiley.png" alt="smiley"></span> <span class="bold"><strong>An eye catching advertisement
- or note...</strong></span>
+ <span class="inlinemediaobject"><img src="../../images/smiley.png" alt="smiley"></span> <span class="bold"><b>An eye catching advertisement
+ or note...</b></span>
         </p>
 <p>
           <a href="http://spirit.sourceforge.net" target="_top">Spirit</a> is an object-oriented
@@ -1242,16 +1224,15 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
 <th align="left">Note</th>
 </tr>
-<tr><td align="left" valign="top"><p>
- Prefer <a class="link" href="block.html#quickbook.syntax.block.admonitions" title="Admonitions">admonitions</a>
+<tr><td colspan="2" align="left" valign="top"><p>
+ Prefer admonitions
             wherever appropriate.
           </p></td></tr>
 </table></div>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.tables"></a><a class="link" href="block.html#quickbook.syntax.block.tables" title="Tables">Tables</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.tables"></a>Tables</h4></div></div></div>
 <pre class="programlisting">[table A Simple Table
     [[Heading 1] [Heading 2] [Heading 3]]
     [[R0-C0] [R0-C1] [R0-C2]]
@@ -1263,8 +1244,8 @@
           will generate:
         </p>
 <div class="table">
-<a name="id2640152"></a><p class="title"><b>Table 4. A Simple Table</b></p>
-<div class="table-contents"><table class="table" summary="A Simple Table">
+<a name="id461429"></a><p class="title"><b>Table 4. A Simple Table</b></p>
+<table class="table" summary="A Simple Table">
 <colgroup>
 <col>
 <col>
@@ -1340,11 +1321,11 @@
               </td>
 </tr>
 </tbody>
-</table></div>
+</table>
 </div>
-<br class="table-break"><p>
+<p>
           The table title is optional. The first row of the table is automatically
- treated as the table header; that is, it is wrapped in <code class="literal">&lt;thead&gt;...&lt;/thead&gt;</code>
+ treated as the table header; that is, it is wrapped in <tt class="literal">&lt;thead&gt;...&lt;/thead&gt;</tt>
           XML tags. Note that unlike the original QuickDoc, the columns are nested
           in [ cells... ]. The syntax is free-format and allows big cells to be formatted
           nicely. Example:
@@ -1374,8 +1355,8 @@
           and thus:
         </p>
 <div class="table">
-<a name="id2640298"></a><p class="title"><b>Table 5. Table with fat cells</b></p>
-<div class="table-contents"><table class="table" summary="Table with fat cells">
+<a name="id461593"></a><p class="title"><b>Table 5. Table with fat cells</b></p>
+<table class="table" summary="Table with fat cells">
 <colgroup>
 <col>
 <col>
@@ -1427,9 +1408,9 @@
               </td>
 </tr>
 </tbody>
-</table></div>
+</table>
 </div>
-<br class="table-break"><p>
+<p>
           Here's how to have preformatted blocks of code in a table cell:
         </p>
 <pre class="programlisting">[table Table with code
@@ -1449,8 +1430,8 @@
 ]
 </pre>
 <div class="table">
-<a name="id2640404"></a><p class="title"><b>Table 6. Table with code</b></p>
-<div class="table-contents"><table class="table" summary="Table with code">
+<a name="id461711"></a><p class="title"><b>Table 6. Table with code</b></p>
+<table class="table" summary="Table with code">
 <colgroup>
 <col>
 <col>
@@ -1490,14 +1471,12 @@
               </p>
               </td>
 </tr></tbody>
-</table></div>
+</table>
 </div>
-<br class="table-break">
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.variable_lists"></a><a class="link" href="block.html#quickbook.syntax.block.variable_lists" title="Variable Lists">Variable Lists</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.variable_lists"></a>Variable Lists</h4></div></div></div>
 <pre class="programlisting">[variablelist A Variable List
     [[term 1] [The definition of term 1]]
     [[term 2] [The definition of term 2]]
@@ -1542,8 +1521,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.include"></a><a class="link" href="block.html#quickbook.syntax.block.include" title="Include">Include</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.include"></a>Include</h4></div></div></div>
 <p>
           You can include one QuickBook file from another. The syntax is simply:
         </p>
@@ -1563,7 +1541,7 @@
           </li>
 </ul></div>
 <p>
- The <code class="literal">[include]</code> directive lets you specify a document
+ The <tt class="literal">[include]</tt> directive lets you specify a document
           id to use for the included file. When this id is not explicitly specified,
           the id defaults to the filename ("someother", in the example
           above). You can specify the id like this:
@@ -1574,13 +1552,12 @@
           All auto-generated anchors will use the document id as a unique prefix.
           So for instance, if there is a top section in someother.qbk named "Intro",
           the named anchor for that section will be "someid.intro", and
- you can link to it with <code class="literal">[link someid.intro The Intro]</code>.
+ you can link to it with <tt class="literal">[link someid.intro The Intro]</tt>.
         </p>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.block.import"></a><a class="link" href="block.html#quickbook.syntax.block.import" title="Import">Import</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.block.import"></a>Import</h4></div></div></div>
 <p>
           When documenting code, you'd surely need to present code from actual source
           files. While it is possible to copy some code and paste them in your QuickBook
@@ -1592,10 +1569,10 @@
 <p>
           QuickBook's import facility provides a nice solution.
         </p>
-<a name="quickbook.syntax.block.import.example"></a><h6>
-<a name="id2640767"></a>
- <a class="link" href="block.html#quickbook.syntax.block.import.example">Example</a>
- </h6>
+<a name="quickbook.syntax.block.import.example"></a><h5>
+<a name="id462135"></a>
+ Example
+ </h5>
 <p>
           You can effortlessly import code snippets from source code into your QuickBook.
           The following illustrates how this is done:
@@ -1612,8 +1589,8 @@
 <p>
           collects specially marked-up code snippets from stub.cpp
           and places them in your QuickBook file as virtual templates. Each of the
- specially marked-up code snippets has a name (e.g. <code class="computeroutput"><span class="identifier">foo</span></code>
- and <code class="computeroutput"><span class="identifier">bar</span></code> in the example
+ specially marked-up code snippets has a name (e.g. <tt class="computeroutput"><span class="identifier">foo</span></tt>
+ and <tt class="computeroutput"><span class="identifier">bar</span></tt> in the example
           above). This shall be the template identifier for that particular code
           snippet. The second and third line above does the actual template expansion:
         </p>
@@ -1626,7 +1603,7 @@
 <p>
           </p>
 <p>
- This is the <span class="bold"><strong><span class="emphasis"><em>foo</em></span></strong></span>
+ This is the <span class="bold"><b><span class="emphasis"><em>foo</em></span></b></span>
             function.
           </p>
 <p>
@@ -1666,7 +1643,7 @@
 <p>
           </p>
 <p>
- This is the <span class="bold"><strong><span class="emphasis"><em>bar</em></span></strong></span>
+ This is the <span class="bold"><b><span class="emphasis"><em>bar</em></span></b></span>
             function
           </p>
 <p>
@@ -1689,11 +1666,11 @@
           </p>
 <p>
         </p>
-<a name="quickbook.syntax.block.import.code_snippet_markup"></a><h6>
-<a name="id2641021"></a>
- <a class="link" href="block.html#quickbook.syntax.block.import.code_snippet_markup">Code
+<a name="quickbook.syntax.block.import.code_snippet_markup"></a><h5>
+<a name="id462439"></a>
+ <a href="block.html#quickbook.syntax.block.import.code_snippet_markup">Code
           Snippet Markup</a>
- </h6>
+ </h5>
 <p>
           Note how the code snippets in stub.cpp
           get marked up. We use distinguishable comments following the form:
@@ -1705,16 +1682,16 @@
 </span></pre>
 <p>
           The first comment line above initiates a named code-snippet. This prefix
- will not be visible in quickbook. The entire code-snippet in between <code class="computeroutput"><span class="comment">//[id</span></code> and <code class="computeroutput"><span class="comment">//]</span></code>
+ will not be visible in quickbook. The entire code-snippet in between <tt class="computeroutput"><span class="comment">//[id</span></tt> and <tt class="computeroutput"><span class="comment">//]</span></tt>
           will be inserted as a template in quickbook with name <span class="emphasis"><em><span class="emphasis"><em>id</em></span></em></span>.
- The comment <code class="computeroutput"><span class="comment">//]</span></code> ends a code-snippet
+ The comment <tt class="computeroutput"><span class="comment">//]</span></tt> ends a code-snippet
           This too will not be visible in quickbook.
         </p>
-<a name="quickbook.syntax.block.import.special_comments"></a><h6>
-<a name="id2641120"></a>
- <a class="link" href="block.html#quickbook.syntax.block.import.special_comments">Special
+<a name="quickbook.syntax.block.import.special_comments"></a><h5>
+<a name="id462565"></a>
+ <a href="block.html#quickbook.syntax.block.import.special_comments">Special
           Comments</a>
- </h6>
+ </h5>
 <p>
           Special comments of the form:
         </p>
@@ -1758,10 +1735,10 @@
           can be used to inhibit code from passing through to quickbook. All text
           between the delimeters will simply be ignored.
         </p>
-<a name="quickbook.syntax.block.import.callouts"></a><h6>
-<a name="id2641268"></a>
- <a class="link" href="block.html#quickbook.syntax.block.import.callouts">Callouts</a>
- </h6>
+<a name="quickbook.syntax.block.import.callouts"></a><h5>
+<a name="id462744"></a>
+ Callouts
+ </h5>
 <p>
           Special comments of the form:
         </p>
@@ -1780,9 +1757,9 @@
             
 </p>
 <pre class="programlisting">
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">foo_bar</span><span class="special">()</span> <span class="callout_bug"><a class="co" name="quickbook0co" href="block.html#quickbook0"><img src="../../images/callouts/1.png" alt="1" border="0"></a></span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">foo_bar</span><span class="special">()</span> <span class="callout_bug"><a name="quickbook0co" href="block.html#quickbook0"><img src="../../images/callouts/1.png" alt="1" border="0"></a></span>
 <span class="special">{</span>
- <span class="keyword">return</span> <span class="string">"foo-bar"</span><span class="special">;</span> <span class="callout_bug"><a class="co" name="quickbook1co" href="block.html#quickbook1"><img src="../../images/callouts/2.png" alt="2" border="0"></a></span>
+ <span class="keyword">return</span> <span class="string">"foo-bar"</span><span class="special">;</span> <span class="callout_bug"><a name="quickbook1co" href="block.html#quickbook1"><img src="../../images/callouts/2.png" alt="2" border="0"></a></span>
 <span class="special">}</span>
 </pre>
 <p>
@@ -1793,12 +1770,14 @@
             </p>
 <div class="calloutlist"><table border="0" summary="Callout list">
 <tr>
-<td width="5%" valign="top" align="left"><p><a name="quickbook0"></a>1 </p></td>
+<td width="5%" valign="top" align="left">
+<a name="quickbook0"></a>1 </td>
 <td valign="top" align="left"><p> The <span class="emphasis"><em>Mythical</em></span> FooBar. See <a href="http://en.wikipedia.org/wiki/Foobar" target="_top">Foobar
             for details</a> </p></td>
 </tr>
 <tr>
-<td width="5%" valign="top" align="left"><p><a name="quickbook1"></a>2 </p></td>
+<td width="5%" valign="top" align="left">
+<a name="quickbook1"></a>2 </td>
 <td valign="top" align="left"><p> return 'em, foo-bar man! </p></td>
 </tr>
 </table></div>
@@ -1842,20 +1821,20 @@
 <span class="special">{</span>
 <span class="keyword">public</span><span class="special">:</span>
 
- <span class="line_callout_bug"><a class="co" name="quickbook2co" href="block.html#quickbook2"><img src="../../images/callouts/1.png" alt="1" border="0"></a></span><span class="identifier">x</span><span class="special">()</span> <span class="special">:</span> <span class="identifier">n</span><span class="special">(</span><span class="number">0</span><span class="special">)</span>
+ <span class="line_callout_bug"><a name="quickbook2co" href="block.html#quickbook2"><img src="../../images/callouts/1.png" alt="1" border="0"></a></span><span class="identifier">x</span><span class="special">()</span> <span class="special">:</span> <span class="identifier">n</span><span class="special">(</span><span class="number">0</span><span class="special">)</span>
     <span class="special">{</span>
     <span class="special">}</span>
 
- <span class="line_callout_bug"><a class="co" name="quickbook3co" href="block.html#quickbook3"><img src="../../images/callouts/2.png" alt="2" border="0"></a></span><span class="special">~</span><span class="identifier">x</span><span class="special">()</span>
+ <span class="line_callout_bug"><a name="quickbook3co" href="block.html#quickbook3"><img src="../../images/callouts/2.png" alt="2" border="0"></a></span><span class="special">~</span><span class="identifier">x</span><span class="special">()</span>
     <span class="special">{</span>
     <span class="special">}</span>
 
- <span class="line_callout_bug"><a class="co" name="quickbook4co" href="block.html#quickbook4"><img src="../../images/callouts/3.png" alt="3" border="0"></a></span><span class="keyword">int</span> <span class="identifier">get</span><span class="special">()</span> <span class="keyword">const</span>
+ <span class="line_callout_bug"><a name="quickbook4co" href="block.html#quickbook4"><img src="../../images/callouts/3.png" alt="3" border="0"></a></span><span class="keyword">int</span> <span class="identifier">get</span><span class="special">()</span> <span class="keyword">const</span>
     <span class="special">{</span>
         <span class="keyword">return</span> <span class="identifier">n</span><span class="special">;</span>
     <span class="special">}</span>
 
- <span class="line_callout_bug"><a class="co" name="quickbook5co" href="block.html#quickbook5"><img src="../../images/callouts/4.png" alt="4" border="0"></a></span><span class="keyword">void</span> <span class="identifier">set</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">n_</span><span class="special">)</span>
+ <span class="line_callout_bug"><a name="quickbook5co" href="block.html#quickbook5"><img src="../../images/callouts/4.png" alt="4" border="0"></a></span><span class="keyword">void</span> <span class="identifier">set</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">n_</span><span class="special">)</span>
     <span class="special">{</span>
         <span class="identifier">n</span> <span class="special">=</span> <span class="identifier">n_</span><span class="special">;</span>
     <span class="special">}</span>
@@ -1869,21 +1848,25 @@
             </p>
 <div class="calloutlist"><table border="0" summary="Callout list">
 <tr>
-<td width="5%" valign="top" align="left"><p><a name="quickbook2"></a>1 </p></td>
+<td width="5%" valign="top" align="left">
+<a name="quickbook2"></a>1 </td>
 <td valign="top" align="left"><p> Constructor </p></td>
 </tr>
 <tr>
-<td width="5%" valign="top" align="left"><p><a name="quickbook3"></a>2 </p></td>
+<td width="5%" valign="top" align="left">
+<a name="quickbook3"></a>2 </td>
 <td valign="top" align="left"><p> Destructor </p></td>
 </tr>
 <tr>
-<td width="5%" valign="top" align="left"><p><a name="quickbook4"></a>3 </p></td>
-<td valign="top" align="left"><p> Get the <code class="computeroutput"><span class="identifier">n</span></code>
+<td width="5%" valign="top" align="left">
+<a name="quickbook4"></a>3 </td>
+<td valign="top" align="left"><p> Get the <tt class="computeroutput"><span class="identifier">n</span></tt>
             member variable </p></td>
 </tr>
 <tr>
-<td width="5%" valign="top" align="left"><p><a name="quickbook5"></a>4 </p></td>
-<td valign="top" align="left"><p> Set the <code class="computeroutput"><span class="identifier">n</span></code>
+<td width="5%" valign="top" align="left">
+<a name="quickbook5"></a>4 </td>
+<td valign="top" align="left"><p> Set the <tt class="computeroutput"><span class="identifier">n</span></tt>
             member variable </p></td>
 </tr>
 </table></div>

Modified: branches/release/tools/quickbook/doc/html/quickbook/syntax/comments.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/syntax/comments.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/syntax/comments.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -3,11 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Comments</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../syntax.html" title="Syntax Summary">
-<link rel="prev" href="../syntax.html" title="Syntax Summary">
-<link rel="next" href="phrase.html" title="Phrase Level Elements">
+<link rel="up" href="../syntax.html" title=" Syntax Summary">
+<link rel="prev" href="../syntax.html" title=" Syntax Summary">
+<link rel="next" href="phrase.html" title=" Phrase Level Elements">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -24,8 +24,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.syntax.comments"></a><a class="link" href="comments.html" title="Comments">Comments</a>
-</h3></div></div></div>
+<a name="quickbook.syntax.comments"></a>Comments</h3></div></div></div>
 <p>
         Can be placed anywhere.
       </p>

Modified: branches/release/tools/quickbook/doc/html/quickbook/syntax/phrase.html
==============================================================================
--- branches/release/tools/quickbook/doc/html/quickbook/syntax/phrase.html (original)
+++ branches/release/tools/quickbook/doc/html/quickbook/syntax/phrase.html 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -1,13 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Phrase Level Elements</title>
+<title> Phrase Level Elements</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
 <link rel="start" href="../../index.html" title="Quickbook 1.4">
-<link rel="up" href="../syntax.html" title="Syntax Summary">
+<link rel="up" href="../syntax.html" title=" Syntax Summary">
 <link rel="prev" href="comments.html" title="Comments">
-<link rel="next" href="block.html" title="Block Level Elements">
+<link rel="next" href="block.html" title=" Block Level Elements">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -24,8 +24,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="quickbook.syntax.phrase"></a><a class="link" href="phrase.html" title="Phrase Level Elements"> Phrase Level Elements</a>
-</h3></div></div></div>
+<a name="quickbook.syntax.phrase"></a> Phrase Level Elements</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Font Styles</span></dt>
 <dt><span class="section">Replaceable</span></dt>
@@ -49,15 +48,14 @@
 </dl></div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.font_styles"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.font_styles" title="Font Styles">Font Styles</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.font_styles"></a>Font Styles</h4></div></div></div>
 <pre class="programlisting">['italic], [*bold], [_underline], [^teletype], [-strikethrough]
 </pre>
 <p>
           will generate:
         </p>
 <p>
- <span class="emphasis"><em>italic</em></span>, <span class="bold"><strong>bold</strong></span>, <span class="underline">underline</span>, <code class="literal">teletype</code>, <span class="strikethrough">strikethrough</span>
+ <span class="emphasis"><em>italic</em></span>, <span class="bold"><b>bold</b></span>, <span class="underline">underline</span>, <tt class="literal">teletype</tt>, <span class="strikethrough">strikethrough</span>
         </p>
 <p>
           Like all non-terminal phrase level elements, this can of course be nested:
@@ -68,13 +66,12 @@
           will generate:
         </p>
 <p>
- <span class="bold"><strong><span class="emphasis"><em>bold-italic</em></span></strong></span>
+ <span class="bold"><b><span class="emphasis"><em>bold-italic</em></span></b></span>
         </p>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.replaceable"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.replaceable" title="Replaceable">Replaceable</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.replaceable"></a>Replaceable</h4></div></div></div>
 <p>
           When you want content that may or must be replaced by the user, use the
           syntax:
@@ -85,15 +82,14 @@
           This will generate:
         </p>
 <p>
- <em class="replaceable"><code>
+ <i class="replaceable"><tt>
             replacement
- </code></em>
+ </tt></i>
         </p>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.quotations"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.quotations" title="Quotations">Quotations</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.quotations"></a>Quotations</h4></div></div></div>
 <pre class="programlisting">["A question that sometimes drives me hazy: am I or are the others crazy?]--Einstein
 </pre>
 <p>
@@ -124,8 +120,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.simple_formatting"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.simple_formatting" title="Simple formatting">Simple formatting</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.simple_formatting"></a>Simple formatting</h4></div></div></div>
 <p>
           Simple markup for formatting text, common in many applications, is now
           supported:
@@ -136,12 +131,12 @@
           will generate:
         </p>
 <p>
- <span class="emphasis"><em>italic</em></span>, <span class="bold"><strong>bold</strong></span>, <span class="underline">underline</span>, <code class="literal">teletype</code>
+ <span class="emphasis"><em>italic</em></span>, <span class="bold"><b>bold</b></span>, <span class="underline">underline</span>, <tt class="literal">teletype</tt>
         </p>
 <p>
           Unlike QuickBook's standard formatting scheme, the rules for simpler alternatives
           are much stricter
- <sup>[<a name="id2635685" href="#ftn.id2635685" class="footnote">1</a>]</sup>
+ <sup>[<a name="id456069" href="#ftn.id456069">1</a>]</sup>
           .
         </p>
 <div class="itemizedlist"><ul type="disc">
@@ -171,13 +166,14 @@
           </li>
 <li>
             A line starting with the star will be interpreted as an unordered list.
- See <a class="link" href="block.html#quickbook.syntax.block.lists.unordered_lists" title="Unordered lists">Unordered
+ See <a href="block.html#quickbook.syntax.block.lists.unordered_lists" title="Unordered
+ lists">Unordered
             lists</a>.
           </li>
 </ul></div>
 <div class="table">
-<a name="id2635762"></a><p class="title"><b>Table 1. More Formatting Samples</b></p>
-<div class="table-contents"><table class="table" summary="More Formatting Samples">
+<a name="id456153"></a><p class="title"><b>Table 1. More Formatting Samples</b></p>
+<table class="table" summary="More Formatting Samples">
 <colgroup>
 <col>
 <col>
@@ -198,31 +194,31 @@
 <tr>
 <td>
               <p>
- <code class="literal">*Bold*</code>
+ <tt class="literal">*Bold*</tt>
               </p>
               </td>
 <td>
               <p>
- <span class="bold"><strong>Bold</strong></span>
+ <span class="bold"><b>Bold</b></span>
               </p>
               </td>
 </tr>
 <tr>
 <td>
               <p>
- <code class="literal">*Is bold*</code>
+ <tt class="literal">*Is bold*</tt>
               </p>
               </td>
 <td>
               <p>
- <span class="bold"><strong>Is bold</strong></span>
+ <span class="bold"><b>Is bold</b></span>
               </p>
               </td>
 </tr>
 <tr>
 <td>
               <p>
- <code class="literal">* Not bold* *Not bold * * Not bold *</code>
+ <tt class="literal">* Not bold* *Not bold * * Not bold *</tt>
               </p>
               </td>
 <td>
@@ -234,7 +230,7 @@
 <tr>
 <td>
               <p>
- <code class="literal">This*Isn't*Bold (no bold)</code>
+ <tt class="literal">This*Isn't*Bold (no bold)</tt>
               </p>
               </td>
 <td>
@@ -246,31 +242,31 @@
 <tr>
 <td>
               <p>
- <code class="literal">(*Bold Inside*) (parenthesis not bold)</code>
+ <tt class="literal">(*Bold Inside*) (parenthesis not bold)</tt>
               </p>
               </td>
 <td>
               <p>
- (<span class="bold"><strong>Bold Inside</strong></span>) (parenthesis not bold)
+ (<span class="bold"><b>Bold Inside</b></span>) (parenthesis not bold)
               </p>
               </td>
 </tr>
 <tr>
 <td>
               <p>
- <code class="literal">*(Bold Outside)* (parenthesis bold)</code>
+ <tt class="literal">*(Bold Outside)* (parenthesis bold)</tt>
               </p>
               </td>
 <td>
               <p>
- <span class="bold"><strong>(Bold Outside)</strong></span> (parenthesis bold)
+ <span class="bold"><b>(Bold Outside)</b></span> (parenthesis bold)
               </p>
               </td>
 </tr>
 <tr>
 <td>
               <p>
- <code class="literal">3*4*5 = 60 (no bold)</code>
+ <tt class="literal">3*4*5 = 60 (no bold)</tt>
               </p>
               </td>
 <td>
@@ -282,7 +278,7 @@
 <tr>
 <td>
               <p>
- <code class="literal">3 * 4 * 5 = 60 (no bold)</code>
+ <tt class="literal">3 * 4 * 5 = 60 (no bold)</tt>
               </p>
               </td>
 <td>
@@ -294,79 +290,79 @@
 <tr>
 <td>
               <p>
- <code class="literal">3 *4* 5 = 60 (4 is bold)</code>
+ <tt class="literal">3 *4* 5 = 60 (4 is bold)</tt>
               </p>
               </td>
 <td>
               <p>
- 3 <span class="bold"><strong>4</strong></span> 5 = 60 (4 is bold)
+ 3 <span class="bold"><b>4</b></span> 5 = 60 (4 is bold)
               </p>
               </td>
 </tr>
 <tr>
 <td>
               <p>
- <code class="literal">*This is bold* this is not *but this is*</code>
+ <tt class="literal">*This is bold* this is not *but this is*</tt>
               </p>
               </td>
 <td>
               <p>
- <span class="bold"><strong>This is bold</strong></span> this is not <span class="bold"><strong>but this is</strong></span>
+ <span class="bold"><b>This is bold</b></span> this is not <span class="bold"><b>but this is</b></span>
               </p>
               </td>
 </tr>
 <tr>
 <td>
               <p>
- <code class="literal">*This is bold*.</code>
+ <tt class="literal">*This is bold*.</tt>
               </p>
               </td>
 <td>
               <p>
- <span class="bold"><strong>This is bold</strong></span>.
+ <span class="bold"><b>This is bold</b></span>.
               </p>
               </td>
 </tr>
 <tr>
 <td>
               <p>
- <code class="literal">*B*. (bold B)</code>
+ <tt class="literal">*B*. (bold B)</tt>
               </p>
               </td>
 <td>
               <p>
- <span class="bold"><strong>B</strong></span>. (bold B)
+ <span class="bold"><b>B</b></span>. (bold B)
               </p>
               </td>
 </tr>
 <tr>
 <td>
               <p>
- <code class="literal">['*Bold-Italic*]</code>
+ <tt class="literal">['*Bold-Italic*]</tt>
               </p>
               </td>
 <td>
               <p>
- <span class="emphasis"><em><span class="bold"><strong>Bold-Italic</strong></span></em></span>
+ <span class="emphasis"><em><span class="bold"><b>Bold-Italic</b></span></em></span>
               </p>
               </td>
 </tr>
 <tr>
 <td>
               <p>
- <code class="literal">*side-by*/-side/</code>
+ <tt class="literal">*side-by*/-side/</tt>
               </p>
               </td>
 <td>
               <p>
- <span class="bold"><strong>side-by</strong></span><span class="emphasis"><em>-side</em></span>
+ <span class="bold"><b>side-by</b></span><span class="emphasis"><em>-side</em></span>
               </p>
               </td>
 </tr>
 </tbody>
-</table></div>
+</table>
 </div>
-<br class="table-break"><p>
+<p>
           As mentioned, simple markups cannot go past a single block. The text from
           "have" to "full" in the following paragraph will be
           rendered as bold:
@@ -377,8 +373,8 @@
 And one for the little boy who lives down the lane.
 </pre>
 <p>
- Baa baa black sheep, <span class="bold"><strong>have you any wool? Yes sir,
- yes sir, three bags full!</strong></span> One for the master, one for the dame,
+ Baa baa black sheep, <span class="bold"><b>have you any wool? Yes sir,
+ yes sir, three bags full!</b></span> One for the master, one for the dame,
           And one for the little boy who lives down the lane.
         </p>
 <p>
@@ -397,8 +393,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.inline_code"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.inline_code" title="Inline code">Inline code</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.inline_code"></a>Inline code</h4></div></div></div>
 <p>
           Inlining code in paragraphs is quite common when writing C++ documentation.
           We provide a very simple markup for this. For example, this:
@@ -409,7 +404,7 @@
           will generate:
         </p>
 <p>
- This text has inlined code <code class="computeroutput"><span class="keyword">int</span> <span class="identifier">main</span><span class="special">()</span> <span class="special">{</span> <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span> <span class="special">}</span></code>
+ This text has inlined code <tt class="computeroutput"><span class="keyword">int</span> <span class="identifier">main</span><span class="special">()</span> <span class="special">{</span> <span class="keyword">return</span> <span class="number">0</span><span class="special">;</span> <span class="special">}</span></tt>
           in it. The code will be syntax highlighted.
         </p>
 <div class="note"><table border="0" summary="Note">
@@ -417,23 +412,24 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
 <th align="left">Note</th>
 </tr>
-<tr><td align="left" valign="top"><p>
- We simply enclose the code with the tick: <code class="literal">"`"</code>, not the
- single quote: <code class="computeroutput"><span class="string">"'"</span></code>.
- Note too that <code class="literal">`some code`</code> is preferred over <code class="literal">[^some code]</code>.
+<tr><td colspan="2" align="left" valign="top"><p>
+ We simply enclose the code with the tick: <tt class="literal">"`"</tt>, not the
+ single quote: <tt class="computeroutput"><span class="string">"'"</span></tt>.
+ Note too that <tt class="literal">`some code`</tt> is preferred over <tt class="literal">[^some code]</tt>.
           </p></td></tr>
 </table></div>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.code_blocks"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.code_blocks" title="Code blocks">Code blocks</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.code_blocks"></a>Code blocks</h4></div></div></div>
 <p>
- Preformatted code simply starts with a space or a tab (See <a class="link" href="block.html#quickbook.syntax.block.code" title="Code">Code</a>).
+ Preformatted code simply starts with a space or a tab (See Code).
           However, such a simple syntax cannot be used as phrase elements in lists
- (See <a class="link" href="block.html#quickbook.syntax.block.lists.ordered_lists" title="Ordered lists">Ordered
- lists</a> and <a class="link" href="block.html#quickbook.syntax.block.lists.unordered_lists" title="Unordered lists">Unordered
- lists</a>), tables (See <a class="link" href="block.html#quickbook.syntax.block.tables" title="Tables">Tables</a>),
+ (See <a href="block.html#quickbook.syntax.block.lists.ordered_lists" title="Ordered
+ lists">Ordered
+ lists</a> and <a href="block.html#quickbook.syntax.block.lists.unordered_lists" title="Unordered
+ lists">Unordered
+ lists</a>), tables (See Tables),
           etc. Inline code (see above) can. The problem is, inline code does not
           allow formatting with newlines, spaces, and tabs. These are lost.
         </p>
@@ -472,18 +468,17 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.source_mode"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.source_mode" title="Source Mode">Source Mode</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.source_mode"></a>Source Mode</h4></div></div></div>
 <p>
           If a document contains more than one type of source code then the source
           mode may be changed dynamically as the document is processed. All QuickBook
           documents are initially in C++ mode by default, though an alternative initial
- value may be set in the <a class="link" href="block.html#quickbook.syntax.block.document" title="Document">Document</a>
+ value may be set in the Document
           section.
         </p>
 <p>
- To change the source mode, use the <code class="literal">[source-mode]</code> markup,
- where <code class="literal">source-mode</code> is one of the supported modes. For
+ To change the source mode, use the <tt class="literal">[source-mode]</tt> markup,
+ where <tt class="literal">source-mode</tt> is one of the supported modes. For
           example, this:
         </p>
 <pre class="programlisting">Python's [python] `import` is rather like C++'s [c++] `#include`. A
@@ -494,14 +489,14 @@
           will generate:
         </p>
 <p>
- Python's <code class="computeroutput"><span class="keyword">import</span></code> is rather
- like C++'s <code class="computeroutput"><span class="preprocessor">#include</span></code>.
- A C++ comment <code class="computeroutput"><span class="comment">// looks like this</span></code>
- whereas a Python comment <code class="computeroutput"><span class="comment">#looks like this</span></code>.
+ Python's <tt class="computeroutput"><span class="keyword">import</span></tt> is rather
+ like C++'s <tt class="computeroutput"><span class="preprocessor">#include</span></tt>.
+ A C++ comment <tt class="computeroutput"><span class="comment">// looks like this</span></tt>
+ whereas a Python comment <tt class="computeroutput"><span class="comment">#looks like this</span></tt>.
         </p>
 <div class="table">
-<a name="id2636594"></a><p class="title"><b>Table 2. Supported Source Modes</b></p>
-<div class="table-contents"><table class="table" summary="Supported Source Modes">
+<a name="id457134"></a><p class="title"><b>Table 2. Supported Source Modes</b></p>
+<table class="table" summary="Supported Source Modes">
 <colgroup>
 <col>
 <col>
@@ -527,7 +522,7 @@
               </td>
 <td>
               <p>
- <code class="literal">[c++]</code>
+ <tt class="literal">[c++]</tt>
               </p>
               </td>
 </tr>
@@ -539,27 +534,26 @@
               </td>
 <td>
               <p>
- <code class="literal">[python]</code>
+ <tt class="literal">[python]</tt>
               </p>
               </td>
 </tr>
 </tbody>
-</table></div>
+</table>
 </div>
-<br class="table-break"><div class="note"><table border="0" summary="Note">
+<div class="note"><table border="0" summary="Note">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
 <th align="left">Note</th>
 </tr>
-<tr><td align="left" valign="top"><p>
+<tr><td colspan="2" align="left" valign="top"><p>
             The source mode strings are lowercase.
           </p></td></tr>
 </table></div>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.line_break"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.line_break" title="line-break">line-break</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.line_break"></a>line-break</h4></div></div></div>
 <pre class="programlisting">[br]
 </pre>
 <div class="warning"><table border="0" summary="Warning">
@@ -567,39 +561,37 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../doc/html/images/warning.png"></td>
 <th align="left">Warning</th>
 </tr>
-<tr><td align="left" valign="top"><p>
- <code class="computeroutput"><span class="special">[</span><span class="identifier">br</span><span class="special">]</span></code> is now deprecated. <a class="link" href="block.html#quickbook.syntax.block.blurbs" title="Blurbs">Blurbs</a>,
- <a class="link" href="block.html#quickbook.syntax.block.admonitions" title="Admonitions">Admonitions</a>
- and table cells (see <a class="link" href="block.html#quickbook.syntax.block.tables" title="Tables">Tables</a>)
+<tr><td colspan="2" align="left" valign="top"><p>
+ <tt class="computeroutput"><span class="special">[</span><span class="identifier">br</span><span class="special">]</span></tt> is now deprecated. Blurbs,
+ Admonitions
+ and table cells (see Tables)
             may now contain paragraphs.
           </p></td></tr>
 </table></div>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.anchors"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.anchors" title="Anchors">Anchors</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.anchors"></a>Anchors</h4></div></div></div>
 <pre class="programlisting">[#named_anchor]
 </pre>
 <p>
           A named anchor is a hook that can be referenced by a link elsewhere in
- the document. You can then reference an anchor with <code class="literal">[link named_anchor
-Some link text]</code>.
- See <a class="link" href="phrase.html#quickbook.syntax.phrase.anchor_links" title="Anchor links">Anchor links</a>,
- <a class="link" href="block.html#quickbook.syntax.block.section" title="Section">Section</a> and <a class="link" href="block.html#quickbook.syntax.block.headings" title="Headings">Heading</a>.
+ the document. You can then reference an anchor with <tt class="literal">[link named_anchor
+Some link text]</tt>.
+ See Anchor links,
+ Section and Heading.
         </p>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.links"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.links" title="Links">Links</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.links"></a>Links</h4></div></div></div>
 <pre class="programlisting">[@http://www.boost.org this is [*boost's] website....]
 </pre>
 <p>
           will generate:
         </p>
 <p>
- <a href="http://www.boost.org" target="_top">this is <span class="bold"><strong>boost's</strong></span>
+ <a href="http://www.boost.org" target="_top">this is <span class="bold"><b>boost's</b></span>
           website....</a>
         </p>
 <p>
@@ -621,31 +613,29 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.anchor_links"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.anchor_links" title="Anchor links">Anchor links</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.anchor_links"></a>Anchor links</h4></div></div></div>
 <p>
           You can link within a document using:
         </p>
 <pre class="programlisting">[link section_id.normalized_header_text The link text]
 </pre>
 <p>
- See sections <a class="link" href="block.html#quickbook.syntax.block.section" title="Section">Section</a>
- and <a class="link" href="block.html#quickbook.syntax.block.headings" title="Headings">Heading</a> for
+ See sections Section
+ and Heading for
           more info.
         </p>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.refentry_links"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.refentry_links" title="refentry links">refentry links</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.refentry_links"></a>refentry links</h4></div></div></div>
 <p>
           In addition, you can link internally to an XML refentry like:
         </p>
 <pre class="programlisting">[link xml.refentry The link text]
 </pre>
 <p>
- This gets converted into <code class="literal">&lt;link linkend="xml.refentry"&gt;The
- link text&lt;/link&gt;</code>.
+ This gets converted into <tt class="literal">&lt;link linkend="xml.refentry"&gt;The
+ link text&lt;/link&gt;</tt>.
         </p>
 <p>
           Like URLs, the link text is optional. If this is not present, the link
@@ -654,13 +644,12 @@
 <pre class="programlisting">[link xml.refentry]
 </pre>
 <p>
- This gets converted into <code class="literal">&lt;link linkend="xml.refentry"&gt;xml.refentry&lt;/link&gt;</code>.
+ This gets converted into <tt class="literal">&lt;link linkend="xml.refentry"&gt;xml.refentry&lt;/link&gt;</tt>.
         </p>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.code_links"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.code_links" title="Code Links"> Code Links</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.code_links"></a> Code Links</h4></div></div></div>
 <p>
           If you want to link to a function, class, member, enum, concept or header
           in the reference section, you can use:
@@ -686,8 +675,7 @@
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.escape"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.escape" title="Escape">Escape</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.escape"></a>Escape</h4></div></div></div>
 <p>
           The escape mark-up is used when we don't want to do any processing.
         </p>
@@ -704,31 +692,31 @@
 '''
 </pre>
 <p>
- <span class="bold"><strong>This is direct XML markup</strong></span>
+ <span class="bold"><b>This is direct XML markup</b></span>
         </p>
 <div class="important"><table border="0" summary="Important">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../../../../../doc/html/images/important.png"></td>
 <th align="left">Important</th>
 </tr>
-<tr><td align="left" valign="top"><p>
+<tr><td colspan="2" align="left" valign="top"><p>
             Be careful when using the escape. The text must conform to BoostBook/DocBook syntax.
           </p></td></tr>
 </table></div>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.single_char_escape"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.single_char_escape" title="Single char escape">Single
- char escape</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.single_char_escape"></a><a href="phrase.html#quickbook.syntax.phrase.single_char_escape" title="Single
+ char escape">Single
+ char escape</a></h4></div></div></div>
 <p>
           The backslash may be used to escape a single punctuation character. The
           punctuation immediately after the backslash is passed without any processing.
- This is useful when we need to escape QuickBook punctuations such as <code class="computeroutput"><span class="special">[</span></code> and <code class="computeroutput"><span class="special">]</span></code>.
- For example, how do you escape the triple quote? Simple: <code class="literal">\'\'\'</code>
+ This is useful when we need to escape QuickBook punctuations such as <tt class="computeroutput"><span class="special">[</span></tt> and <tt class="computeroutput"><span class="special">]</span></tt>.
+ For example, how do you escape the triple quote? Simple: <tt class="literal">\'\'\'</tt>
         </p>
 <p>
- <code class="computeroutput"><span class="special">\</span><span class="identifier">n</span></code>
+ <tt class="computeroutput"><span class="special">\</span><span class="identifier">n</span></tt>
           has a special meaning. It is used to generate line breaks.
         </p>
 <div class="warning"><table border="0" summary="Warning">
@@ -736,30 +724,28 @@
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Warning]" src="../../../../../../doc/html/images/warning.png"></td>
 <th align="left">Warning</th>
 </tr>
-<tr><td align="left" valign="top"><p>
- <code class="computeroutput"><span class="special">\</span><span class="identifier">n</span></code>
- and <code class="computeroutput"><span class="special">[</span><span class="identifier">br</span><span class="special">]</span></code> are now deprecated. <a class="link" href="block.html#quickbook.syntax.block.blurbs" title="Blurbs">Blurbs</a>,
- <a class="link" href="block.html#quickbook.syntax.block.admonitions" title="Admonitions">Admonitions</a>
- and table cells (see <a class="link" href="block.html#quickbook.syntax.block.tables" title="Tables">Tables</a>)
+<tr><td colspan="2" align="left" valign="top"><p>
+ <tt class="computeroutput"><span class="special">\</span><span class="identifier">n</span></tt>
+ and <tt class="computeroutput"><span class="special">[</span><span class="identifier">br</span><span class="special">]</span></tt> are now deprecated. Blurbs,
+ Admonitions
+ and table cells (see Tables)
             may now contain paragraphs.
           </p></td></tr>
 </table></div>
 <p>
- The escaped space: <code class="computeroutput"><span class="special">\</span> </code> also
+ The escaped space: <tt class="computeroutput"><span class="special">\</span> </tt> also
           has a special meaning. The escaped space is removed from the output.
         </p>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.images"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.images" title="Images">Images</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.images"></a>Images</h4></div></div></div>
 <pre class="programlisting">[$image.jpg]
 </pre>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.footnotes"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.footnotes" title="Footnotes">Footnotes</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.footnotes"></a>Footnotes</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="phrase.html#quickbook.syntax.phrase.footnotes.macro_expansion">Macro
           Expansion</a></span></dt>
@@ -768,46 +754,45 @@
 </dl></div>
 <p>
           As of version 1.3, QuickBook supports footnotes. Just put the text of the
- footnote in a <code class="computeroutput"><span class="special">[</span><span class="identifier">footnote</span><span class="special">]</span></code> block, and the text will be put at the
+ footnote in a <tt class="computeroutput"><span class="special">[</span><span class="identifier">footnote</span><span class="special">]</span></tt> block, and the text will be put at the
           bottom of the current page. For example, this:
         </p>
 <pre class="programlisting">[footnote A sample footnote]
 </pre>
 <p>
           will generate this
- <sup>[<a name="id2637304" href="#ftn.id2637304" class="footnote">2</a>]</sup>
+ <sup>[<a name="id457975" href="#ftn.id457975">2</a>]</sup>
           .
         </p>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.phrase.footnotes.macro_expansion"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.footnotes.macro_expansion" title="Macro Expansion">Macro
- Expansion</a>
-</h5></div></div></div>
+<a name="quickbook.syntax.phrase.footnotes.macro_expansion"></a><a href="phrase.html#quickbook.syntax.phrase.footnotes.macro_expansion" title="Macro
+ Expansion">Macro
+ Expansion</a></h5></div></div></div>
 <pre class="programlisting">__a_macro_identifier__
 </pre>
 <p>
- See <a class="link" href="block.html#quickbook.syntax.block.macros" title="Macros">Macros</a> for details.
+ See Macros for details.
           </p>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h5 class="title">
-<a name="quickbook.syntax.phrase.footnotes.template_expansion"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.footnotes.template_expansion" title="Template Expansion">Template
- Expansion</a>
-</h5></div></div></div>
+<a name="quickbook.syntax.phrase.footnotes.template_expansion"></a><a href="phrase.html#quickbook.syntax.phrase.footnotes.template_expansion" title="Template
+ Expansion">Template
+ Expansion</a></h5></div></div></div>
 <pre class="programlisting">[a_template_identifier]
 </pre>
 <p>
- See <a class="link" href="block.html#quickbook.syntax.block.templates" title="Templates">Templates</a>
+ See Templates
             for details.
           </p>
 </div>
 </div>
 <div class="section" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="quickbook.syntax.phrase.cond"></a><a class="link" href="phrase.html#quickbook.syntax.phrase.cond" title="Conditional Generation"> Conditional Generation</a>
-</h4></div></div></div>
+<a name="quickbook.syntax.phrase.cond"></a> Conditional Generation</h4></div></div></div>
 <p>
- Like C++ <code class="computeroutput"><span class="comment">#ifdef</span></code>, you can generate
+ Like C++ <tt class="computeroutput"><span class="comment">#ifdef</span></tt>, you can generate
           phrases depending on the presence of a macro. Example:
         </p>
 <pre class="programlisting">[? __to_be__ To be or not to be]
@@ -829,22 +814,22 @@
         </p>
 <p>
           Yes!
- <sup>[<a name="id2637437" href="#ftn.id2637437" class="footnote">3</a>]</sup>
+ <sup>[<a name="id458150" href="#ftn.id458150">3</a>]</sup>
         </p>
 </div>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a name="ftn.id2635685" href="#id2635685" class="para">1</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id456069" href="#id456069">1</a>] </sup>
               Thanks to David Barrett, author of Qwiki,
               for sharing these samples and teaching me these obscure formatting
               rules. I wasn't sure at all if Spirit,
               being more or less a formal EBNF parser, can handle the context sensitivity
               and ambiguity.
             </p></div>
-<div class="footnote"><p><sup>[<a name="ftn.id2637304" href="#id2637304" class="para">2</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id457975" href="#id457975">2</a>] </sup>
               A sample footnote
             </p></div>
-<div class="footnote"><p><sup>[<a name="ftn.id2637437" href="#id2637437" class="para">3</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id458150" href="#id458150">3</a>] </sup>
               Conditional Generation makes quickbook turing complete.
             </p></div>
 </div>

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 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -11,8 +11,7 @@
       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>
+<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special">&lt;</phrase><phrase role="identifier">iostream</phrase><phrase role="special">&gt;</phrase>
 
 <phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
 <phrase role="special">{</phrase>

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 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -12,8 +12,7 @@
     </para>
     <para>
       
-<programlisting>
-<phrase role="preprocessor">#include</phrase> <phrase role="special">&lt;</phrase><phrase role="identifier">iostream</phrase><phrase role="special">&gt;</phrase>
+<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special">&lt;</phrase><phrase role="identifier">iostream</phrase><phrase role="special">&gt;</phrase>
 
 <phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
 <phrase role="special">{</phrase>

Modified: branches/release/tools/quickbook/test/import.gold
==============================================================================
--- branches/release/tools/quickbook/test/import.gold (original)
+++ branches/release/tools/quickbook/test/import.gold 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -25,16 +25,12 @@
     </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>
+<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> <phrase role="keyword">return</phrase> <phrase role="string">&quot;foo&quot;</phrase><phrase role="special">;</phrase>
 <phrase role="special">}</phrase>
 </programlisting>
     </para>
- <para>
- <calloutlist></calloutlist>
- </para>
   </para>
 </article>

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 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -129,8 +129,7 @@
       <listitem>
         Better (intuitive) paragraph termination. Some markups may terminate a paragraph.
         Example:
-<programlisting>
-<phrase role="special">[</phrase><phrase role="identifier">section</phrase> <phrase role="identifier">x</phrase><phrase role="special">]</phrase>
+<programlisting><phrase role="special">[</phrase><phrase role="identifier">section</phrase> <phrase role="identifier">x</phrase><phrase role="special">]</phrase>
 <phrase role="identifier">blah</phrase><phrase role="special">...</phrase>
 <phrase role="special">[</phrase><phrase role="identifier">endsect</phrase><phrase role="special">]</phrase></programlisting>
       </listitem>
@@ -647,8 +646,7 @@
         </para>
         <para>
           
-<programlisting>
-<phrase role="preprocessor">#include</phrase> <phrase role="special">&lt;</phrase><phrase role="identifier">iostream</phrase><phrase role="special">&gt;</phrase>
+<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special">&lt;</phrase><phrase role="identifier">iostream</phrase><phrase role="special">&gt;</phrase>
 
 <phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
 <phrase role="special">{</phrase>
@@ -740,105 +738,103 @@
 <!--quickbook-escape-postfix--></programlisting>
         <warning>
           <para>
- <para>
- <code><phrase role="special">[</phrase><phrase role="identifier">br</phrase><phrase
- role="special">]</phrase></code> is now deprecated. <link linkend="quickbook.syntax.block.blurbs">Blurbs</link>,
- <link linkend="quickbook.syntax.block.admonitions">Admonitions</link>
- and table cells (see <link linkend="quickbook.syntax.block.tables">Tables</link>)
- may now contain paragraphs.
- </para>
- </warning>
- </section>
- <section id="quickbook.syntax.phrase.anchors">
- <title><link linkend="quickbook.syntax.phrase.anchors">Anchors</link></title>
-
+ <code><phrase role="special">[</phrase><phrase role="identifier">br</phrase><phrase
+ role="special">]</phrase></code> is now deprecated. <link linkend="quickbook.syntax.block.blurbs">Blurbs</link>,
+ <link linkend="quickbook.syntax.block.admonitions">Admonitions</link>
+ and table cells (see <link linkend="quickbook.syntax.block.tables">Tables</link>)
+ may now contain paragraphs.
+ </para>
+ </warning>
+ </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>
- A named anchor is a hook that can be referenced by a link elsewhere in
- the document. You can then reference an anchor with <literal>[link named_anchor
+ <para>
+ A named anchor is a hook that can be referenced by a link elsewhere in
+ the document. You can then reference an anchor with <literal>[link named_anchor
 Some link text]</literal>.
- See <link linkend="quickbook.syntax.phrase.anchor_links">Anchor links</link>,
- <link linkend="quickbook.syntax.block.section">Section</link> and <link
- linkend="quickbook.syntax.block.headings">Heading</link>.
- </para>
- </section>
- <section id="quickbook.syntax.phrase.links">
- <title><link linkend="quickbook.syntax.phrase.links">Links</link></title>
-
+ See <link linkend="quickbook.syntax.phrase.anchor_links">Anchor links</link>,
+ <link linkend="quickbook.syntax.block.section">Section</link> and <link
+ linkend="quickbook.syntax.block.headings">Heading</link>.
+ </para>
+ </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>
- will generate:
- </para>
- <para>
- <ulink url="http://www.boost.org">this is <emphasis role="bold">boost's</emphasis>
- website....</ulink>
- </para>
- <para>
- URL links where the link text is the link itself is common. Example:
- </para>
-
+ <para>
+ will generate:
+ </para>
+ <para>
+ <ulink url="http://www.boost.org">this is <emphasis role="bold">boost's</emphasis>
+ website....</ulink>
+ </para>
+ <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>
-
+ <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>
- will generate:
- </para>
- <para>
- see <ulink url="http://spirit.sourceforge.net/">http://spirit.sourceforge.net/>
- </para>
- </section>
- <section id="quickbook.syntax.phrase.anchor_links">
- <title><link linkend="quickbook.syntax.phrase.anchor_links">Anchor links</link></title>
- <para>
- You can link within a document using:
- </para>
-
+ <para>
+ will generate:
+ </para>
+ <para>
+ see <ulink url="
http://spirit.sourceforge.net/">http://spirit.sourceforge.net/>
+ </para>
+ </section>
+ <section id="quickbook.syntax.phrase.anchor_links">
+ <title><link linkend="quickbook.syntax.phrase.anchor_links">Anchor links</link></title>
+ <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>
- See sections <link linkend="quickbook.syntax.block.section">Section</link>
- and <link linkend="quickbook.syntax.block.headings">Heading</link> for
- more info.
- </para>
- </section>
- <section id="quickbook.syntax.phrase.refentry_links">
- <title><link linkend="quickbook.syntax.phrase.refentry_links">refentry
- links</link></title>
- <para>
- In addition, you can link internally to an XML refentry like:
- </para>
-
+ <para>
+ See sections <link linkend="quickbook.syntax.block.section">Section</link>
+ and <link linkend="quickbook.syntax.block.headings">Heading</link> for
+ more info.
+ </para>
+ </section>
+ <section id="quickbook.syntax.phrase.refentry_links">
+ <title><link linkend="quickbook.syntax.phrase.refentry_links">refentry links</link></title>
+ <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>
- This gets converted into <literal>&lt;link linkend=&quot;xml.refentry&quot;&gt;The
- link text&lt;/link&gt;</literal>.
- </para>
- <para>
- Like URLs, the link text is optional. If this is not present, the link
- text will automatically be the refentry. Example:
- </para>
-
+ <para>
+ This gets converted into <literal>&lt;link linkend=&quot;xml.refentry&quot;&gt;The
+ link text&lt;/link&gt;</literal>.
+ </para>
+ <para>
+ 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>
- This gets converted into <literal>&lt;link linkend=&quot;xml.refentry&quot;&gt;xml.refentry&lt;/link&gt;</literal>.
- </para>
- </section>
- <section id="quickbook.syntax.phrase.code_links">
- <title><link linkend="quickbook.syntax.phrase.code_links"> Code Links</link></title>
- <para>
- If you want to link to a function, class, member, enum, concept or header
- in the reference section, you can use:
- </para>
-
+ <para>
+ This gets converted into <literal>&lt;link linkend=&quot;xml.refentry&quot;&gt;xml.refentry&lt;/link&gt;</literal>.
+ </para>
+ </section>
+ <section id="quickbook.syntax.phrase.code_links">
+ <title><link linkend="quickbook.syntax.phrase.code_links"> Code Links</link></title>
+ <para>
+ 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]
@@ -847,135 +843,132 @@
 [conceptref ConceptName The link text]
 [headerref path/to/header.hpp The link text]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- Again, the link text is optional. If this is not present, the link text
- will automatically be the function, class, member, enum, macro, concept
- or header. Example:
- </para>
-
+ <para>
+ Again, the link text is optional. If this is not present, the link text
+ 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>
- would have &quot;boost::bar::baz&quot; as the link text.
- </para>
- </section>
- <section id="quickbook.syntax.phrase.escape">
- <title><link linkend="quickbook.syntax.phrase.escape">Escape</link></title>
- <para>
- The escape mark-up is used when we don't want to do any processing.
- </para>
-
+ <para>
+ would have &quot;boost::bar::baz&quot; as the link text.
+ </para>
+ </section>
+ <section id="quickbook.syntax.phrase.escape">
+ <title><link linkend="quickbook.syntax.phrase.escape">Escape</link></title>
+ <para>
+ The escape mark-up is used when we don't want to do any processing.
+ </para>
+
 <programlisting>'''
 escape (no processing/formatting)
 '''
 </programlisting>
- <para>
- 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>
-
+ <para>
+ 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;
 '''
 </programlisting>
+ <para>
+ <emphasis role="bold">This is direct XML markup</emphasis>
+ </para>
+ <important>
           <para>
- <emphasis role="bold">This is direct XML markup</emphasis>
- </para>
- <important>
- <para>
- Be careful when using the escape. The text must conform to <ulink url="http://www.boost.org/doc/html/boostbook.html">BoostBook</ulink>/<ulink
- url="http://www.docbook.org/">DocBook</ulink> syntax.
- </para>
- </important>
- </section>
- <section id="quickbook.syntax.phrase.single_char_escape">
- <title><link linkend="quickbook.syntax.phrase.single_char_escape">Single
- char escape</link></title>
- <para>
- The backslash may be used to escape a single punctuation character. The
- punctuation immediately after the backslash is passed without any processing.
- This is useful when we need to escape QuickBook punctuations such as
- <code><phrase role="special">[</phrase></code> and <code><phrase role="special">]</phrase></code>.
- For example, how do you escape the triple quote? Simple: <literal>\'\'\'</literal>
+ Be careful when using the escape. The text must conform to <ulink url="http://www.boost.org/doc/html/boostbook.html">BoostBook</ulink>/<ulink
+ url="http://www.docbook.org/">DocBook</ulink> syntax.
           </para>
+ </important>
+ </section>
+ <section id="quickbook.syntax.phrase.single_char_escape">
+ <title><link linkend="quickbook.syntax.phrase.single_char_escape">Single
+ char escape</link></title>
+ <para>
+ The backslash may be used to escape a single punctuation character. The
+ punctuation immediately after the backslash is passed without any processing.
+ This is useful when we need to escape QuickBook punctuations such as <code><phrase
+ role="special">[</phrase></code> and <code><phrase role="special">]</phrase></code>.
+ For example, how do you escape the triple quote? Simple: <literal>\'\'\'</literal>
+ </para>
+ <para>
+ <code><phrase role="special">\</phrase><phrase role="identifier">n</phrase></code>
+ has a special meaning. It is used to generate line breaks.
+ </para>
+ <warning>
           <para>
             <code><phrase role="special">\</phrase><phrase role="identifier">n</phrase></code>
- has a special meaning. It is used to generate line breaks.
+ and <code><phrase role="special">[</phrase><phrase role="identifier">br</phrase><phrase
+ role="special">]</phrase></code> are now deprecated. <link linkend="quickbook.syntax.block.blurbs">Blurbs</link>,
+ <link linkend="quickbook.syntax.block.admonitions">Admonitions</link>
+ and table cells (see <link linkend="quickbook.syntax.block.tables">Tables</link>)
+ may now contain paragraphs.
           </para>
- <warning>
- <para>
- <para>
- <code><phrase role="special">\</phrase><phrase role="identifier">n</phrase></code>
- and <code><phrase role="special">[</phrase><phrase role="identifier">br</phrase><phrase
- role="special">]</phrase></code> are now deprecated. <link linkend="quickbook.syntax.block.blurbs">Blurbs</link>,
- <link linkend="quickbook.syntax.block.admonitions">Admonitions</link>
- and table cells (see <link linkend="quickbook.syntax.block.tables">Tables</link>)
- may now contain paragraphs.
- </para>
- </warning>
- <para>
- The escaped space: <code><phrase role="special">\</phrase> </code>
- also has a special meaning. The escaped space is removed from the output.
- </para>
- </section>
- <section id="quickbook.syntax.phrase.images">
- <title><link linkend="quickbook.syntax.phrase.images">Images</link></title>
-
+ </warning>
+ <para>
+ The escaped space: <code><phrase role="special">\</phrase> </code> also
+ has a special meaning. The escaped space is removed from the output.
+ </para>
+ </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>
- <section id="quickbook.syntax.phrase.footnotes">
- <title><link linkend="quickbook.syntax.phrase.footnotes">Footnotes</link></title>
- <para>
- As of version 1.3, QuickBook supports footnotes. Just put the text
- of the footnote in a <code><phrase role="special">[</phrase><phrase
- role="identifier">footnote</phrase><phrase role="special">]</phrase></code>
- block, and the text will be put at the bottom of the current page.
- For example, this:
- </para>
-
+ </section>
+ <section id="quickbook.syntax.phrase.footnotes">
+ <title><link linkend="quickbook.syntax.phrase.footnotes">Footnotes</link></title>
+ <para>
+ As of version 1.3, QuickBook supports footnotes. Just put the text of the
+ footnote in a <code><phrase role="special">[</phrase><phrase role="identifier">footnote</phrase><phrase
+ 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>
             <para>
- will generate this
- <footnote>
- <para>
- A sample footnote
- </para>
- </footnote>
- .
+ A sample footnote
             </para>
- <section id="quickbook.syntax.phrase.footnotes.macro_expansion">
- <title><link linkend="quickbook.syntax.phrase.footnotes.macro_expansion">Macro
- Expansion</link></title>
+ </footnote>
+ .
+ </para>
+ <section id="quickbook.syntax.phrase.footnotes.macro_expansion">
+ <title><link linkend="quickbook.syntax.phrase.footnotes.macro_expansion">Macro
+ Expansion</link></title>
 <programlisting><!--quickbook-escape-prefix-->__a_macro_identifier__
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- See <link linkend="quickbook.syntax.block.macros">Macros</link> for
- details.
- </para>
- </section>
- <section id="quickbook.syntax.phrase.footnotes.template_expansion">
- <title><link linkend="quickbook.syntax.phrase.footnotes.template_expansion">Template
- Expansion</link></title>
+ <para>
+ See <link linkend="quickbook.syntax.block.macros">Macros</link> for details.
+ </para>
+ </section>
+ <section id="quickbook.syntax.phrase.footnotes.template_expansion">
+ <title><link linkend="quickbook.syntax.phrase.footnotes.template_expansion">Template
+ Expansion</link></title>
 <programlisting><!--quickbook-escape-prefix-->[a_template_identifier]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- See <link linkend="quickbook.syntax.block.templates">Templates</link>
- for details.
- </para>
- </section>
- </section>
+ <para>
+ See <link linkend="quickbook.syntax.block.templates">Templates</link>
+ for details.
+ </para>
         </section>
- <section id="quickbook.syntax.block">
- <title><link linkend="quickbook.syntax.block"> Block Level Elements</link></title>
- <section id="quickbook.syntax.block.document">
- <title><link linkend="quickbook.syntax.block.document">Document</link></title>
- <para>
- Every document must begin with a Document Info section, which should
- look like this:
- </para>
-
+ </section>
+ </section>
+ <section id="quickbook.syntax.block">
+ <title><link linkend="quickbook.syntax.block"> Block Level Elements</link></title>
+ <section id="quickbook.syntax.block.document">
+ <title><link linkend="quickbook.syntax.block.document">Document</link></title>
+ <para>
+ 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]
@@ -989,146 +982,145 @@
     [source-mode source-type]
 ]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- Where document-type is one of:
- </para>
- <itemizedlist>
- <listitem>
- book
- </listitem>
- <listitem>
- article
- </listitem>
- <listitem>
- library
- </listitem>
- <listitem>
- chapter
- </listitem>
- <listitem>
- part
- </listitem>
- <listitem>
- appendix
- </listitem>
- <listitem>
- preface
- </listitem>
- <listitem>
- qandadiv
- </listitem>
- <listitem>
- qandaset
- </listitem>
- <listitem>
- reference
- </listitem>
- <listitem>
- set
- </listitem>
- </itemizedlist>
- <para>
- quickbook 1.3 declares the version of quickbook the document is written
- for. In its absence, version 1.1 is assumed.
- </para>
- <para>
- <literal>version</literal>, <literal>id</literal>, <literal>dirname</literal>,
- <literal>copyright</literal>, <literal>purpose</literal>, <literal>category</literal>,
- <literal>authors</literal>, <literal>license</literal>, <literal>last-revision</literal>
- and <literal>source-mode</literal> are optional information.
- </para>
- <para>
- <literal>source-type</literal> is a lowercase string setting the initial
- <link linkend="quickbook.syntax.phrase.source_mode">Source Mode</link>.
- If the <literal>source-mode</literal> field is omitted, a default value
- of <literal>c++</literal> will be used.
- </para>
- </section>
- <section id="quickbook.syntax.block.section">
- <title><link linkend="quickbook.syntax.block.section">Section</link></title>
- <para>
- Starting a new section is accomplished with:
- </para>
-
+ <para>
+ Where document-type is one of:
+ </para>
+ <itemizedlist>
+ <listitem>
+ book
+ </listitem>
+ <listitem>
+ article
+ </listitem>
+ <listitem>
+ library
+ </listitem>
+ <listitem>
+ chapter
+ </listitem>
+ <listitem>
+ part
+ </listitem>
+ <listitem>
+ appendix
+ </listitem>
+ <listitem>
+ preface
+ </listitem>
+ <listitem>
+ qandadiv
+ </listitem>
+ <listitem>
+ qandaset
+ </listitem>
+ <listitem>
+ reference
+ </listitem>
+ <listitem>
+ set
+ </listitem>
+ </itemizedlist>
+ <para>
+ quickbook 1.3 declares the version of quickbook the document is written
+ for. In its absence, version 1.1 is assumed.
+ </para>
+ <para>
+ <literal>version</literal>, <literal>id</literal>, <literal>dirname</literal>,
+ <literal>copyright</literal>, <literal>purpose</literal>, <literal>category</literal>,
+ <literal>authors</literal>, <literal>license</literal>, <literal>last-revision</literal>
+ and <literal>source-mode</literal> are optional information.
+ </para>
+ <para>
+ <literal>source-type</literal> is a lowercase string setting the initial
+ <link linkend="quickbook.syntax.phrase.source_mode">Source Mode</link>.
+ If the <literal>source-mode</literal> field is omitted, a default value
+ of <literal>c++</literal> will be used.
+ </para>
+ </section>
+ <section id="quickbook.syntax.block.section">
+ <title><link linkend="quickbook.syntax.block.section">Section</link></title>
+ <para>
+ Starting a new section is accomplished with:
+ </para>
+
 <programlisting><!--quickbook-escape-prefix-->[section:id The Section Title]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- where <emphasis>id</emphasis> is optional. id will be the filename
- of the generated section. If it is not present, &quot;The Section Title&quot;
- will be normalized and become the id. Valid characters are <literal>a-Z</literal>,
- <literal>A-Z</literal>, <literal>0-9</literal> and <literal>_</literal>.
- All non-valid characters are converted to underscore and all upper-case
- are converted to lower case. Thus: &quot;The Section Title&quot; will
- be normalized to &quot;the_section_title&quot;.
- </para>
- <para>
- End a section with:
- </para>
-
+ <para>
+ where <emphasis>id</emphasis> is optional. id will be the filename of the
+ generated section. If it is not present, &quot;The Section Title&quot;
+ will be normalized and become the id. Valid characters are <literal>a-Z</literal>,
+ <literal>A-Z</literal>, <literal>0-9</literal> and <literal>_</literal>.
+ All non-valid characters are converted to underscore and all upper-case
+ are converted to lower case. Thus: &quot;The Section Title&quot; will be
+ normalized to &quot;the_section_title&quot;.
+ </para>
+ <para>
+ End a section with:
+ </para>
+
 <programlisting><!--quickbook-escape-prefix-->[endsect]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- Sections can nest, and that results in a hierarchy in the table of
- contents.
- </para>
- </section>
- <section id="quickbook.syntax.block.xinclude">
- <title><link linkend="quickbook.syntax.block.xinclude">xinclude</link></title>
- <para>
- You can include another XML file with:
- </para>
-
+ <para>
+ Sections can nest, and that results in a hierarchy in the table of contents.
+ </para>
+ </section>
+ <section id="quickbook.syntax.block.xinclude">
+ <title><link linkend="quickbook.syntax.block.xinclude">xinclude</link></title>
+ <para>
+ You can include another XML file with:
+ </para>
+
 <programlisting><!--quickbook-escape-prefix-->[xinclude file.xml]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- This is useful when file.xml has been generated by Doxygen and contains
- your reference section.
- </para>
- </section>
- <section id="quickbook.syntax.block.paragraphs">
- <title><link linkend="quickbook.syntax.block.paragraphs">Paragraphs</link></title>
- <para>
- Paragraphs start left-flushed and are terminated by two or more newlines.
- No markup is needed for paragraphs. QuickBook automatically detects
- paragraphs from the context. Block markups [section, endsect, h1, h2,
- h3, h4, h5, h6, blurb, (block-quote) ':', pre, def, table and include
- ] may also terminate a paragraph.
- </para>
- </section>
- <section id="quickbook.syntax.block.lists">
- <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>
+ <para>
+ This is useful when file.xml has been generated by Doxygen and contains
+ your reference section.
+ </para>
+ </section>
+ <section id="quickbook.syntax.block.paragraphs">
+ <title><link linkend="quickbook.syntax.block.paragraphs">Paragraphs</link></title>
+ <para>
+ Paragraphs start left-flushed and are terminated by two or more newlines.
+ No markup is needed for paragraphs. QuickBook automatically detects paragraphs
+ from the context. Block markups [section, endsect, h1, h2, h3, h4, h5,
+ h6, blurb, (block-quote) ':', pre, def, table and include ] may also terminate
+ a paragraph.
+ </para>
+ </section>
+ <section id="quickbook.syntax.block.lists">
+ <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>
 <programlisting># One
 # Two
 # Three
 </programlisting>
- <para>
- will generate:
- </para>
- <orderedlist>
- <listitem>
- One
- </listitem>
- <listitem>
- Two
- </listitem>
- <listitem>
- Three
- </listitem>
- </orderedlist>
- </section>
- <section id="quickbook.syntax.block.lists.list_hierarchies">
- <title><link linkend="quickbook.syntax.block.lists.list_hierarchies">List
- Hierarchies</link></title>
- <para>
- List hierarchies are supported. Example:
- </para>
-
-<programlisting># One
-# Two
-# Three
+ <para>
+ will generate:
+ </para>
+ <orderedlist>
+ <listitem>
+ One
+ </listitem>
+ <listitem>
+ Two
+ </listitem>
+ <listitem>
+ Three
+ </listitem>
+ </orderedlist>
+ </section>
+ <section id="quickbook.syntax.block.lists.list_hierarchies">
+ <title><link linkend="quickbook.syntax.block.lists.list_hierarchies">List
+ Hierarchies</link></title>
+ <para>
+ List hierarchies are supported. Example:
+ </para>
+
+<programlisting># One
+# Two
+# Three
     # Three.a
     # Three.b
     # Three.c
@@ -1138,58 +1130,58 @@
         # Four.a.ii
 # Five
 </programlisting>
- <para>
- will generate:
- </para>
+ <para>
+ will generate:
+ </para>
+ <orderedlist>
+ <listitem>
+ One
+ </listitem>
+ <listitem>
+ Two
+ </listitem>
+ <listitem>
+ Three
               <orderedlist>
                 <listitem>
- One
+ Three.a
                 </listitem>
                 <listitem>
- Two
+ Three.b
                 </listitem>
                 <listitem>
- Three
- <orderedlist>
- <listitem>
- Three.a
- </listitem>
- <listitem>
- Three.b
- </listitem>
- <listitem>
- Three.c
- </listitem>
- </orderedlist>
+ Three.c
                 </listitem>
+ </orderedlist>
+ </listitem>
+ <listitem>
+ Fourth
+ <orderedlist>
                 <listitem>
- Fourth
+ Four.a
                   <orderedlist>
                     <listitem>
- Four.a
- <orderedlist>
- <listitem>
- Four.a.i
- </listitem>
- <listitem>
- Four.a.ii
- </listitem>
- </orderedlist>
+ Four.a.i
+ </listitem>
+ <listitem>
+ Four.a.ii
                     </listitem>
                   </orderedlist>
                 </listitem>
- <listitem>
- Five
- </listitem>
               </orderedlist>
- </section>
- <section id="quickbook.syntax.block.lists.long_list_lines">
- <title><link linkend="quickbook.syntax.block.lists.long_list_lines">Long
- List Lines</link></title>
- <para>
- Long lines will be wrapped appropriately. Example:
- </para>
-
+ </listitem>
+ <listitem>
+ Five
+ </listitem>
+ </orderedlist>
+ </section>
+ <section id="quickbook.syntax.block.lists.long_list_lines">
+ <title><link linkend="quickbook.syntax.block.lists.long_list_lines">Long
+ List Lines</link></title>
+ <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.
@@ -1198,51 +1190,49 @@
   A very long item. A very long item. A very long item.
 # A short item.
 </programlisting>
- <orderedlist>
- <listitem>
- A short item.
- </listitem>
- <listitem>
- A very long 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. A very
- long 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. A very long
- item.
- </listitem>
- <listitem>
- A short item.
- </listitem>
- </orderedlist>
- </section>
- <section id="quickbook.syntax.block.lists.unordered_lists">
- <title><link linkend="quickbook.syntax.block.lists.unordered_lists">Unordered
- lists</link></title>
+ <orderedlist>
+ <listitem>
+ A short item.
+ </listitem>
+ <listitem>
+ A very long 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. A very long 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. A very long item.
+ </listitem>
+ <listitem>
+ A short item.
+ </listitem>
+ </orderedlist>
+ </section>
+ <section id="quickbook.syntax.block.lists.unordered_lists">
+ <title><link linkend="quickbook.syntax.block.lists.unordered_lists">Unordered
+ lists</link></title>
 <programlisting><!--quickbook-escape-prefix-->* First
 * Second
 * Third
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- will generate:
- </para>
- <itemizedlist>
- <listitem>
- First
- </listitem>
- <listitem>
- Second
- </listitem>
- <listitem>
- Third
- </listitem>
- </itemizedlist>
- </section>
- <section id="quickbook.syntax.block.lists.mixed_lists">
- <title><link linkend="quickbook.syntax.block.lists.mixed_lists">Mixed
- lists</link></title>
- <para>
- Mixed lists (ordered and unordered) are supported. Example:
- </para>
-
+ <para>
+ will generate:
+ </para>
+ <itemizedlist>
+ <listitem>
+ First
+ </listitem>
+ <listitem>
+ Second
+ </listitem>
+ <listitem>
+ Third
+ </listitem>
+ </itemizedlist>
+ </section>
+ <section id="quickbook.syntax.block.lists.mixed_lists">
+ <title><link linkend="quickbook.syntax.block.lists.mixed_lists">Mixed lists</link></title>
+ <para>
+ Mixed lists (ordered and unordered) are supported. Example:
+ </para>
+
 <programlisting><!--quickbook-escape-prefix--># One
 # Two
 # Three
@@ -1251,38 +1241,38 @@
     * Three.c
 # Four
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- will generate:
- </para>
- <orderedlist>
- <listitem>
- One
- </listitem>
+ <para>
+ will generate:
+ </para>
+ <orderedlist>
+ <listitem>
+ One
+ </listitem>
+ <listitem>
+ Two
+ </listitem>
+ <listitem>
+ Three
+ <itemizedlist>
                 <listitem>
- Two
+ Three.a
                 </listitem>
                 <listitem>
- Three
- <itemizedlist>
- <listitem>
- Three.a
- </listitem>
- <listitem>
- Three.b
- </listitem>
- <listitem>
- Three.c
- </listitem>
- </itemizedlist>
+ Three.b
                 </listitem>
                 <listitem>
- Four
+ Three.c
                 </listitem>
- </orderedlist>
- <para>
- And...
- </para>
-
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ Four
+ </listitem>
+ </orderedlist>
+ <para>
+ And...
+ </para>
+
 <programlisting><!--quickbook-escape-prefix--># 1
     * 1.a
         # 1.a.1
@@ -1296,71 +1286,70 @@
             * 2.b.2.a
             * 2.b.2.b
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- will generate:
- </para>
- <orderedlist>
+ <para>
+ will generate:
+ </para>
+ <orderedlist>
+ <listitem>
+ 1
+ <itemizedlist>
                 <listitem>
- 1
- <itemizedlist>
+ 1.a
+ <orderedlist>
                     <listitem>
- 1.a
- <orderedlist>
- <listitem>
- 1.a.1
- </listitem>
- <listitem>
- 1.a.2
- </listitem>
- </orderedlist>
+ 1.a.1
                     </listitem>
                     <listitem>
- 1.b
+ 1.a.2
                     </listitem>
- </itemizedlist>
+ </orderedlist>
+ </listitem>
+ <listitem>
+ 1.b
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ 2
+ <itemizedlist>
+ <listitem>
+ 2.a
                 </listitem>
                 <listitem>
- 2
- <itemizedlist>
+ 2.b
+ <orderedlist>
                     <listitem>
- 2.a
+ 2.b.1
                     </listitem>
                     <listitem>
- 2.b
- <orderedlist>
+ 2.b.2
+ <itemizedlist>
                         <listitem>
- 2.b.1
+ 2.b.2.a
                         </listitem>
                         <listitem>
- 2.b.2
- <itemizedlist>
- <listitem>
- 2.b.2.a
- </listitem>
- <listitem>
- 2.b.2.b
- </listitem>
- </itemizedlist>
+ 2.b.2.b
                         </listitem>
- </orderedlist>
+ </itemizedlist>
                     </listitem>
- </itemizedlist>
+ </orderedlist>
                 </listitem>
- </orderedlist>
- </section>
- </section>
- <section id="quickbook.syntax.block.code">
- <title><link linkend="quickbook.syntax.block.code">Code</link></title>
- <para>
- Preformatted code starts with a space or a tab. The code will be syntax
- highlighted according to the current <link linkend="quickbook.syntax.phrase.source_mode">Source
- Mode</link>:
- </para>
- <para>
- </para>
-
-<programlisting>
-<phrase role="preprocessor">#include</phrase> <phrase role="special">&lt;</phrase><phrase role="identifier">iostream</phrase><phrase role="special">&gt;</phrase>
+ </itemizedlist>
+ </listitem>
+ </orderedlist>
+ </section>
+ </section>
+ <section id="quickbook.syntax.block.code">
+ <title><link linkend="quickbook.syntax.block.code">Code</link></title>
+ <para>
+ Preformatted code starts with a space or a tab. The code will be syntax
+ highlighted according to the current <link linkend="quickbook.syntax.phrase.source_mode">Source
+ Mode</link>:
+ </para>
+ <para>
+ </para>
+
+<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special">&lt;</phrase><phrase role="identifier">iostream</phrase><phrase role="special">&gt;</phrase>
 
 <phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
 <phrase role="special">{</phrase>
@@ -1369,73 +1358,70 @@
     <phrase role="keyword">return</phrase> <phrase role="number">0</phrase><phrase role="special">;</phrase>
 <phrase role="special">}</phrase>
 </programlisting>
- <para>
- </para>
-
-<programlisting>
-<phrase role="keyword">import</phrase> <phrase role="identifier">cgi</phrase>
+ <para>
+ </para>
+
+<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>
     <phrase role="string">'''&quot;Cooks&quot; the input text for HTML.'''</phrase>
 
     <phrase role="keyword">return</phrase> <phrase role="identifier">cgi</phrase><phrase role="special">.</phrase><phrase role="identifier">escape</phrase><phrase role="special">(</phrase><phrase role="identifier">text</phrase><phrase role="special">)</phrase>
 </programlisting>
- <para>
- </para>
- <para>
- Macros that are already defined are expanded in source code. Example:
- </para>
-
+ <para>
+ </para>
+ <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]]
 
     using __boost__::__array__;
 <!--quickbook-escape-postfix--></programlisting>
- <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>
+ <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>
- <section id="quickbook.syntax.block.escape_back">
- <title><link linkend="quickbook.syntax.block.escape_back"> Escaping Back
- To QuickBook</link></title>
- <para>
- Inside code, code blocks and inline code, QuickBook does not allow
- any markup to avoid conflicts with the target syntax (e.g. c++). In
- case you need to switch back to QuickBook markup inside code, you can
- do so using a language specific <emphasis>escape-back</emphasis> delimiter.
- In C++ and Python, the delimiter is the double tick (back-quote): &quot;``&quot;
- and &quot;``&quot;. Example:
- </para>
-
+ </section>
+ <section id="quickbook.syntax.block.escape_back">
+ <title><link linkend="quickbook.syntax.block.escape_back"> Escaping Back
+ To QuickBook</link></title>
+ <para>
+ Inside code, code blocks and inline code, QuickBook does not allow any
+ markup to avoid conflicts with the target syntax (e.g. c++). In case you
+ need to switch back to QuickBook markup inside code, you can do so using
+ a language specific <emphasis>escape-back</emphasis> delimiter. In C++
+ 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]``()
 {
 }
 <!--quickbook-escape-postfix--></programlisting>
- <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>
+ <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>
 </programlisting>
- <para>
- When escaping from code to QuickBook, only phrase level markups are
- allowed. Block level markups like lists, tables etc. are not allowed.
- </para>
- </section>
- <section id="quickbook.syntax.block.preformatted">
- <title><link linkend="quickbook.syntax.block.preformatted">Preformatted</link></title>
- <para>
- Sometimes, you don't want some preformatted text to be parsed as C++.
- In such cases, use the <literal>[pre ... ]</literal> markup block.
- </para>
-
+ <para>
+ When escaping from code to QuickBook, only phrase level markups are allowed.
+ Block level markups like lists, tables etc. are not allowed.
+ </para>
+ </section>
+ <section id="quickbook.syntax.block.preformatted">
+ <title><link linkend="quickbook.syntax.block.preformatted">Preformatted</link></title>
+ <para>
+ 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
@@ -1446,12 +1432,12 @@
 
 ]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- Spaces, tabs and newlines are rendered as-is. Unlike all quickbook
- block level markup, pre (and Code) are the only ones that allow multiple
- newlines. The markup above will generate:
- </para>
-
+ <para>
+ Spaces, tabs and newlines are rendered as-is. Unlike all quickbook block
+ 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
@@ -1459,71 +1445,70 @@
         Some <emphasis role="bold">preformatted</emphasis> text Some <emphasis role="bold">preformatted</emphasis> text
 
 </programlisting>
- <para>
- Notice that unlike Code, phrase markup such as font style is still
- permitted inside <literal>pre</literal> blocks.
- </para>
- </section>
- <section id="quickbook.syntax.block.blockquote">
- <title><link linkend="quickbook.syntax.block.blockquote">Blockquote</link></title>
-
+ <para>
+ Notice that unlike Code, phrase markup such as font style is still permitted
+ inside <literal>pre</literal> blocks.
+ </para>
+ </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>
- <para>
- <para>
- Indents the paragraph. This applies to one paragraph only.
- </para>
- </para>
- </blockquote>
- </section>
- <section id="quickbook.syntax.block.admonitions">
- <title><link linkend="quickbook.syntax.block.admonitions">Admonitions</link></title>
-
+ <blockquote>
+ <para>
+ <para>
+ Indents the paragraph. This applies to one paragraph only.
+ </para>
+ </para>
+ </blockquote>
+ </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]
 [caution This is a caution]
 [warning This is a warning]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- generates <ulink url="http://www.docbook.org/">DocBook</ulink> admonitions:
- </para>
- <note>
- <para>
- This is a note
- </para>
- </note>
- <tip>
- <para>
- This is a tip
- </para>
- </tip>
- <important>
- <para>
- This is important
- </para>
- </important>
- <caution>
- <para>
- This is a caution
- </para>
- </caution>
- <warning>
- <para>
- <para>
- This is a warning
- </para>
- </warning>
- <para>
- These are the only admonitions supported by <ulink url="http://www.docbook.org/">DocBook</ulink>.
- So, for example <literal>[information This is some information]</literal>
- is unlikely to produce the desired effect.
- </para>
- </section>
- <section id="quickbook.syntax.block.headings">
- <title><link linkend="quickbook.syntax.block.headings">Headings</link></title>
-
+ <para>
+ generates <ulink url="http://www.docbook.org/">DocBook</ulink> admonitions:
+ </para>
+ <note>
+ <para>
+ This is a note
+ </para>
+ </note>
+ <tip>
+ <para>
+ This is a tip
+ </para>
+ </tip>
+ <important>
+ <para>
+ This is important
+ </para>
+ </important>
+ <caution>
+ <para>
+ This is a caution
+ </para>
+ </caution>
+ <warning>
+ <para>
+ This is a warning
+ </para>
+ </warning>
+ <para>
+ These are the only admonitions supported by <ulink url="http://www.docbook.org/">DocBook</ulink>.
+ So, for example <literal>[information This is some information]</literal>
+ is unlikely to produce the desired effect.
+ </para>
+ </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]
@@ -1531,577 +1516,564 @@
 [h5 Heading 5]
 [h6 Heading 6]
 <!--quickbook-escape-postfix--></programlisting>
- <anchor id="quickbook.syntax.block.headings.heading_1"/>
- <bridgehead renderas="sect1">
- <link linkend="quickbook.syntax.block.headings.heading_1">Heading
- 1</link>
- </bridgehead>
- <anchor id="quickbook.syntax.block.headings.heading_2"/>
- <bridgehead renderas="sect2">
- <link linkend="quickbook.syntax.block.headings.heading_2">Heading
- 2</link>
- </bridgehead>
- <anchor id="quickbook.syntax.block.headings.heading_3"/>
- <bridgehead renderas="sect3">
- <link linkend="quickbook.syntax.block.headings.heading_3">Heading
- 3</link>
- </bridgehead>
- <anchor id="quickbook.syntax.block.headings.heading_4"/>
- <bridgehead renderas="sect4">
- <link linkend="quickbook.syntax.block.headings.heading_4">Heading
- 4</link>
- </bridgehead>
- <anchor id="quickbook.syntax.block.headings.heading_5"/>
- <bridgehead renderas="sect5">
- <link linkend="quickbook.syntax.block.headings.heading_5">Heading
- 5</link>
- </bridgehead>
- <anchor id="quickbook.syntax.block.headings.heading_6"/>
- <bridgehead renderas="sect6">
- <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 names with <literal>name=&quot;section_id.normalized_header_text&quot;</literal>
- (i.e. valid characters are <literal>a-z</literal>, <literal>A-Z</literal>,
- <literal>0-9</literal> and <literal>_</literal>. All non-valid characters
- are converted to underscore and all upper-case are converted to lower-case.
- For example: Heading 1 in section Section 2 will be normalized to
- <literal>section_2.heading_1</literal>). You can use:
- </para>
-
+ <anchor id="quickbook.syntax.block.headings.heading_1"/>
+ <bridgehead renderas="sect1">
+ <link linkend="quickbook.syntax.block.headings.heading_1">Heading 1</link>
+ </bridgehead>
+ <anchor id="quickbook.syntax.block.headings.heading_2"/>
+ <bridgehead renderas="sect2">
+ <link linkend="quickbook.syntax.block.headings.heading_2">Heading 2</link>
+ </bridgehead>
+ <anchor id="quickbook.syntax.block.headings.heading_3"/>
+ <bridgehead renderas="sect3">
+ <link linkend="quickbook.syntax.block.headings.heading_3">Heading 3</link>
+ </bridgehead>
+ <anchor id="quickbook.syntax.block.headings.heading_4"/>
+ <bridgehead renderas="sect4">
+ <link linkend="quickbook.syntax.block.headings.heading_4">Heading 4</link>
+ </bridgehead>
+ <anchor id="quickbook.syntax.block.headings.heading_5"/>
+ <bridgehead renderas="sect5">
+ <link linkend="quickbook.syntax.block.headings.heading_5">Heading 5</link>
+ </bridgehead>
+ <anchor id="quickbook.syntax.block.headings.heading_6"/>
+ <bridgehead renderas="sect6">
+ <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
+ names with <literal>name=&quot;section_id.normalized_header_text&quot;</literal>
+ (i.e. valid characters are <literal>a-z</literal>, <literal>A-Z</literal>,
+ <literal>0-9</literal> and <literal>_</literal>. All non-valid characters
+ are converted to underscore and all upper-case are converted to lower-case.
+ 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>
- to link to them. See <link linkend="quickbook.syntax.phrase.anchor_links">Anchor
- links</link> and <link linkend="quickbook.syntax.block.section">Section</link>
- for more info.
- </para>
- </section>
- <section id="quickbook.syntax.block.generic_heading">
- <title><link linkend="quickbook.syntax.block.generic_heading">Generic
- Heading</link></title>
- <para>
- 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>
-
+ <para>
+ to link to them. See <link linkend="quickbook.syntax.phrase.anchor_links">Anchor
+ links</link> and <link linkend="quickbook.syntax.block.section">Section</link>
+ for more info.
+ </para>
+ </section>
+ <section id="quickbook.syntax.block.generic_heading">
+ <title><link linkend="quickbook.syntax.block.generic_heading">Generic Heading</link></title>
+ <para>
+ 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>
- The <emphasis>Generic Heading</emphasis> assumes the level, plus
- one, of the innermost section where it is placed. For example, if
- it is placed in the outermost section, then, it assumes <emphasis>h2</emphasis>.
- </para>
- <para>
- Headings are often used as an alternative to sections. It is used
- particularly if you do not want to start a new section. In many cases,
- however, headings in a particular section is just flat. Example:
- </para>
-
+ <para>
+ The <emphasis>Generic Heading</emphasis> assumes the level, plus one, of
+ the innermost section where it is placed. For example, if it is placed
+ in the outermost section, then, it assumes <emphasis>h2</emphasis>.
+ </para>
+ <para>
+ Headings are often used as an alternative to sections. It is used particularly
+ 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]
 [h2 Z]
 [endsect]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- Here we use h2 assuming that section A is the outermost level. If
- it is placed in an inner level, you'll have to use h3, h4, etc. depending
- on where the section is. In general, it is the section level plus
- one. It is rather tedious, however, to scan the section level everytime.
- If you rewrite the example above as shown below, this will be automatic:
- </para>
-
+ <para>
+ Here we use h2 assuming that section A is the outermost level. If it is
+ placed in an inner level, you'll have to use h3, h4, etc. depending on
+ where the section is. In general, it is the section level plus one. It
+ 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]
 [heading Z]
 [endsect]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- They work well regardless where you place them. You can rearrange
- sections at will without any extra work to ensure correct heading
- levels. In fact, with <emphasis>section</emphasis> and <emphasis>heading</emphasis>,
- you have all you need. <emphasis>h1</emphasis>..<emphasis>h6</emphasis>
- becomes redundant. <emphasis>h1</emphasis>..<emphasis>h6</emphasis>
- might be deprecated in the future.
- </para>
- </section>
- <section id="quickbook.syntax.block.macros">
- <title><link linkend="quickbook.syntax.block.macros">Macros</link></title>
-
+ <para>
+ They work well regardless where you place them. You can rearrange sections
+ at will without any extra work to ensure correct heading levels. In fact,
+ with <emphasis>section</emphasis> and <emphasis>heading</emphasis>, you
+ have all you need. <emphasis>h1</emphasis>..<emphasis>h6</emphasis> becomes
+ redundant. <emphasis>h1</emphasis>..<emphasis>h6</emphasis> might be deprecated
+ in the future.
+ </para>
+ </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>
- When a macro is defined, the identifier replaces the text anywhere
- in the file, in paragraphs, in markups, etc. macro_identifier is
- a string of non- white space characters except ']'. A macro may not
- follow an alphabetic 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]]
+ <para>
+ When a macro is defined, the identifier replaces the text anywhere in the
+ file, in paragraphs, in markups, etc. macro_identifier is a string of non-
+ white space characters except ']'. A macro may not follow an alphabetic
+ 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>
+ <para>
+ Now everywhere the sf_logo is placed, the picture will be inlined.
+ </para>
+ <para>
+ <inlinemediaobject><imageobject><imagedata fileref="http://sourceforge.net/sflogo.php?group_id=28447&amp;type=1"></imagedata></imageobject>
+ <textobject>
+ <phrase>sflogo</phrase>
+ </textobject>
+ </inlinemediaobject>
+ </para>
+ <tip>
+ <para>
+ It's a good idea to use macro identifiers that are distinguishable. For
+ instance, in this document, macro identifiers have two leading and trailing
+ underscores (e.g. <literal>__spirit__</literal>). The reason is to avoid unwanted
+ macro replacement.
+ </para>
+ </tip>
+ <para>
+ Links (URLS) and images are good candidates for macros. <emphasis role="bold">1</emphasis>)
+ They tend to change a lot. It is a good idea to place all links and images
+ in one place near the top to make it easy to make changes. <emphasis role="bold">2</emphasis>)
+ The syntax is not pretty. It's easier to read and write, e.g. <literal>__spirit__</literal>
+ than <literal>[@http://spirit.sourceforge.net Spirit]</literal>.
+ </para>
+ <para>
+ Some more examples:
+ </para>
+
+<programlisting><!--quickbook-escape-prefix-->[def :-) [$theme/smiley.png]]
+[def __spirit__ [@http://spirit.sourceforge.net Spirit]]
+<!--quickbook-escape-postfix--></programlisting>
+ <para>
+ (See <link linkend="quickbook.syntax.phrase.images">Images</link> and
+ <link linkend="quickbook.syntax.phrase.links">Links</link>)
+ </para>
+ <para>
+ Invoking these macros:
+ </para>
+
+<programlisting><!--quickbook-escape-prefix-->Hi __spirit__ :-)
+<!--quickbook-escape-postfix--></programlisting>
+ <para>
+ will generate this:
+ </para>
+ <para>
+ Hi <ulink url="http://spirit.sourceforge.net">Spirit</ulink> <inlinemediaobject><imageobject><imagedata
+ fileref="images/smiley.png"></imagedata></imageobject>
+ <textobject>
+ <phrase>smiley</phrase>
+ </textobject>
+ </inlinemediaobject>
+ </para>
+ </section>
+ <section id="quickbook.syntax.block.predefined_macros">
+ <title><link linkend="quickbook.syntax.block.predefined_macros">Predefined
+ Macros</link></title>
+ <para>
+ Quickbook has some predefined macros that you can already use.
+ </para>
+ <table frame="all"> <title>Predefined Macros</title>
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>
               <para>
- Now everywhere the sf_logo is placed, the picture will be inlined.
+ Macro
               </para>
+ </entry><entry>
               <para>
- <inlinemediaobject><imageobject><imagedata fileref="http://sourceforge.net/sflogo.php?group_id=28447&amp;type=1"></imagedata></imageobject>
- <textobject>
- <phrase>sflogo</phrase>
- </textobject>
- </inlinemediaobject>
- </para>
- <tip>
- <para>
- It's a good idea to use macro identifiers that are distinguishable.
- For instance, in this document, macro identifiers have two leading
- and trailing underscores (e.g. <literal>__spirit__</literal>). The reason
- is to avoid unwanted macro replacement.
- </para>
- </tip>
- <para>
- Links (URLS) and images are good candidates for macros. <emphasis
- role="bold">1</emphasis>) They tend to change a lot. It is a good
- idea to place all links and images in one place near the top to make
- it easy to make changes. <emphasis role="bold">2</emphasis>) The
- syntax is not pretty. It's easier to read and write, e.g. <literal>__spirit__</literal>
- than <literal>[@http://spirit.sourceforge.net Spirit]</literal>.
+ Meaning
               </para>
+ </entry><entry>
               <para>
- Some more examples:
+ Example
               </para>
-
-<programlisting><!--quickbook-escape-prefix-->[def :-) [$theme/smiley.png]]
-[def __spirit__ [@http://spirit.sourceforge.net Spirit]]
-<!--quickbook-escape-postfix--></programlisting>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
               <para>
- (See <link linkend="quickbook.syntax.phrase.images">Images</link>
- and <link linkend="quickbook.syntax.phrase.links">Links</link>)
+ __DATE__
               </para>
+ </entry><entry>
               <para>
- Invoking these macros:
+ Today's date
               </para>
-
-<programlisting><!--quickbook-escape-prefix-->Hi __spirit__ :-)
-<!--quickbook-escape-postfix--></programlisting>
+ </entry><entry>
+ <para>
+ 2000-Dec-20
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ __TIME__
+ </para>
+ </entry><entry>
+ <para>
+ The current time
+ </para>
+ </entry><entry>
+ <para>
+ 12:00:00 PM
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
               <para>
- will generate this:
+ __FILENAME__
               </para>
+ </entry><entry>
               <para>
- Hi <ulink url="http://spirit.sourceforge.net">Spirit</ulink> <inlinemediaobject><imageobject><imagedata
- fileref="images/smiley.png"></imagedata></imageobject>
- <textobject>
- <phrase>smiley</phrase>
- </textobject>
- </inlinemediaobject>
- </para>
- </section>
- <section id="quickbook.syntax.block.predefined_macros">
- <title><link linkend="quickbook.syntax.block.predefined_macros">Predefined
- Macros</link></title>
- <para>
- Quickbook has some predefined macros that you can already use.
- </para>
- <table frame="all"> <title>Predefined Macros</title>
- <tgroup cols="3">
- <thead>
- <row>
- <entry>
- <para>
- Macro
- </para>
- </entry><entry>
- <para>
- Meaning
- </para>
- </entry><entry>
- <para>
- Example
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- __DATE__
- </para>
- </entry><entry>
- <para>
- Today's date
- </para>
- </entry><entry>
- <para>
- 2000-Dec-20
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- __TIME__
- </para>
- </entry><entry>
- <para>
- The current time
- </para>
- </entry><entry>
- <para>
- 12:00:00 PM
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- __FILENAME__
- </para>
- </entry><entry>
- <para>
- Quickbook source filename
- </para>
- </entry><entry>
- <para>
- NO_FILENAME_MACRO_GENERATED_IN_DEBUG_MODE
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
- <section id="quickbook.syntax.block.templates">
- <title><link linkend="quickbook.syntax.block.templates">Templates</link></title>
- <para>
- Templates provide a more versatile text substitution mechanism. Templates
- come in handy when you need to create parameterizable, multi-line,
- boilerplate text that you specify once and expand many times. Templates
- accept one or more arguments. These arguments act like place-holders
- for text replacement. Unlike simple macros, which are limited to
- phrase level markup, templates can contain block level markup (e.g.
- paragraphs, code blocks and tables).
+ Quickbook source filename
               </para>
+ </entry><entry>
               <para>
- Example template:
+ NO_FILENAME_MACRO_GENERATED_IN_DEBUG_MODE
               </para>
-
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+ <section id="quickbook.syntax.block.templates">
+ <title><link linkend="quickbook.syntax.block.templates">Templates</link></title>
+ <para>
+ Templates provide a more versatile text substitution mechanism. Templates
+ come in handy when you need to create parameterizable, multi-line, boilerplate
+ text that you specify once and expand many times. Templates accept one
+ or more arguments. These arguments act like place-holders for text replacement.
+ Unlike simple macros, which are limited to phrase level markup, templates
+ can contain block level markup (e.g. paragraphs, code blocks and tables).
+ </para>
+ <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">
- <link linkend="quickbook.syntax.block.templates.template_identifier">Template
- Identifier</link>
- </bridgehead>
- <para>
- Template identifiers can either consist of:
- </para>
- <itemizedlist>
- <listitem>
- An initial alphabetic character or the underscore, followed by
- zero or more alphanumeric characters or the underscore. This is
- similar to your typical C/C++ identifier.
- </listitem>
- <listitem>
- A single character punctuation (a non-alphanumeric printable character)
- </listitem>
- </itemizedlist>
- <anchor id="quickbook.syntax.block.templates.formal_template_arguments"/>
- <bridgehead renderas="sect5">
- <link linkend="quickbook.syntax.block.templates.formal_template_arguments">Formal
- Template Arguments</link>
- </bridgehead>
- <para>
- Template formal arguments are identifiers consisting of an initial
- alphabetic character or the underscore, followed by zero or more
- alphanumeric characters or the underscore. This is similar to your
- typical C/C++ identifier.
- </para>
- <para>
- A template formal argument temporarily hides a template of the same
- name at the point where the <link linkend="quickbook.syntax.block.templates.template_expansion">template
- is expanded</link>. Note that the body of the <literal>person</literal>
- template above refers to <literal>name</literal> <literal>age</literal>
- and <literal>what</literal> as <literal>[name]</literal> <literal>[age]</literal>
- and <literal>[what]</literal>. <literal>name</literal> <literal>age</literal>
- 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">
- <link linkend="quickbook.syntax.block.templates.template_body">Template
- Body</link>
- </bridgehead>
- <para>
- The template body can be just about any QuickBook block or phrase.
- There are actually two forms. Templates may be phrase or block level.
- Phrase templates are of the form:
- </para>
-
+ <anchor id="quickbook.syntax.block.templates.template_identifier"/>
+ <bridgehead renderas="sect5">
+ <link linkend="quickbook.syntax.block.templates.template_identifier">Template
+ Identifier</link>
+ </bridgehead>
+ <para>
+ Template identifiers can either consist of:
+ </para>
+ <itemizedlist>
+ <listitem>
+ An initial alphabetic character or the underscore, followed by zero or
+ more alphanumeric characters or the underscore. This is similar to your
+ typical C/C++ identifier.
+ </listitem>
+ <listitem>
+ A single character punctuation (a non-alphanumeric printable character)
+ </listitem>
+ </itemizedlist>
+ <anchor id="quickbook.syntax.block.templates.formal_template_arguments"/>
+ <bridgehead renderas="sect5">
+ <link linkend="quickbook.syntax.block.templates.formal_template_arguments">Formal
+ Template Arguments</link>
+ </bridgehead>
+ <para>
+ Template formal arguments are identifiers consisting of an initial alphabetic
+ character or the underscore, followed by zero or more alphanumeric characters
+ or the underscore. This is similar to your typical C/C++ identifier.
+ </para>
+ <para>
+ A template formal argument temporarily hides a template of the same name
+ at the point where the <link linkend="quickbook.syntax.block.templates.template_expansion">template
+ is expanded</link>. Note that the body of the <literal>person</literal>
+ template above refers to <literal>name</literal> <literal>age</literal>
+ and <literal>what</literal> as <literal>[name]</literal> <literal>[age]</literal>
+ and <literal>[what]</literal>. <literal>name</literal> <literal>age</literal>
+ 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">
+ <link linkend="quickbook.syntax.block.templates.template_body">Template
+ Body</link>
+ </bridgehead>
+ <para>
+ The template body can be just about any QuickBook block or phrase. There
+ 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>
-
+ <para>
+ Block templates are of the form:
+ </para>
+
 <programlisting><!--quickbook-escape-prefix-->[template sample[arg1 arg2...argN]
 replacement text...
 ]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- The basic rule is as follows: if a newline immediately follows the
- argument list, then it is a block template, otherwise, it is a phrase
- template. 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">
- <link linkend="quickbook.syntax.block.templates.template_expansion">Template
- Expansion</link>
- </bridgehead>
- <para>
- You expand a template this way:
- </para>
-
+ <para>
+ The basic rule is as follows: if a newline immediately follows the argument
+ list, then it is a block template, otherwise, it is a phrase template.
+ 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">
+ <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>
-
+ <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>
- <para>
- Which will expand to:
- </para>
- <para>
- <para>
- Hi, my name is James Bond. I am 39 years old. I am a Spy.
- </para>
- <para>
- Hi, my name is Santa Clause. I am 87 years old. I am a Big Red
- Fatso.
- </para>
- </para>
- <caution>
- <para>
- A word of caution: Templates are recursive. A template can call
- another template or even itself, directly or indirectly. There
- are no control structures in QuickBook (yet) so this will always
- mean infinite recursion. QuickBook can detect this situation and
- report an error if recursion exceeds a certain limit.
- </para>
- </caution>
- <para>
- Each actual argument can be a word, a text fragment or just about
- any <link linkend="quickbook.syntax.phrase">QuickBook phrase</link>.
- Arguments 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">
- <link linkend="quickbook.syntax.block.templates.nullary_templates">Nullary
- Templates</link>
- </bridgehead>
- <para>
- Nullary templates look and act like simple macros. Example:
- </para>
-
+ <para>
+ Which will expand to:
+ </para>
+ <para>
+ <para>
+ Hi, my name is James Bond. I am 39 years old. I am a Spy.
+ </para>
+ <para>
+ Hi, my name is Santa Clause. I am 87 years old. I am a Big Red Fatso.
+ </para>
+ </para>
+ <caution>
+ <para>
+ A word of caution: Templates are recursive. A template can call another
+ template or even itself, directly or indirectly. There are no control
+ structures in QuickBook (yet) so this will always mean infinite recursion.
+ QuickBook can detect this situation and report an error if recursion
+ exceeds a certain limit.
+ </para>
+ </caution>
+ <para>
+ Each actual argument can be a word, a text fragment or just about any
+ <link linkend="quickbook.syntax.phrase">QuickBook phrase</link>. Arguments
+ 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">
+ <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>
-
+ <para>
+ Expanding:
+ </para>
+
 <programlisting><!--quickbook-escape-prefix-->Some squigles...[*[alpha][beta]]<!--quickbook-escape-postfix--></programlisting>
- <para>
- We have:
- </para>
- <para>
- Some squiggles...<emphasis role="bold">&#945;&#946;</emphasis>
- </para>
- <para>
- The difference with macros are
- </para>
- <itemizedlist>
- <listitem>
- The explicit <link linkend="quickbook.syntax.block.templates.template_expansion">template
- expansion syntax</link>. This is an advantage because, now, we
- don't have to use obscure naming conventions like double underscores
- (e.g. __alpha__) to avoid unwanted macro replacement.
- </listitem>
- <listitem>
- The template is expanded at the point where it is invoked. A macro
- is expanded immediately at its point of declaration. This is subtle
- and can cause a slight difference in behavior especially if you
- refer to other macros and templates in the body.
- </listitem>
- </itemizedlist>
- <para>
- The empty brackets after the template identifier (<literal>alpha[]</literal>)
- indicates no arguments. If the template body does not look like a
- template argument list, we can elide the empty brackets. Example:
- </para>
-
+ <para>
+ We have:
+ </para>
+ <para>
+ Some squiggles...<emphasis role="bold">&#945;&#946;</emphasis>
+ </para>
+ <para>
+ The difference with macros are
+ </para>
+ <itemizedlist>
+ <listitem>
+ The explicit <link linkend="quickbook.syntax.block.templates.template_expansion">template
+ expansion syntax</link>. This is an advantage because, now, we don't
+ have to use obscure naming conventions like double underscores (e.g.
+ __alpha__) to avoid unwanted macro replacement.
+ </listitem>
+ <listitem>
+ The template is expanded at the point where it is invoked. A macro is
+ expanded immediately at its point of declaration. This is subtle and
+ can cause a slight difference in behavior especially if you refer to
+ other macros and templates in the body.
+ </listitem>
+ </itemizedlist>
+ <para>
+ The empty brackets after the template identifier (<literal>alpha[]</literal>)
+ 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>
-
+ <para>
+ Expanding:
+ </para>
+
 <programlisting><!--quickbook-escape-prefix-->Here's a quote from [aristotle_quote].
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- We have:
- </para>
- <para>
- Here's a quote from Aristotle: <emphasis role="bold"><emphasis>Education
- is the best provision for the journey to old age.</emphasis></emphasis>.
- </para>
- <para>
- The disadvantage is that you can't avoid the space between the template
- identifier, <code><phrase role="identifier">aristotle_quote</phrase></code>,
- and the template body &quot;Aristotle...&quot;. This space will be
- part of the template body. If that space is unwanted, use empty brackets
- or use the space escape: &quot;<code><phrase role="special">\</phrase>
- </code>&quot;. Example:
- </para>
-
+ <para>
+ We have:
+ </para>
+ <para>
+ Here's a quote from Aristotle: <emphasis role="bold"><emphasis>Education
+ is the best provision for the journey to old age.</emphasis></emphasis>.
+ </para>
+ <para>
+ The disadvantage is that you can't avoid the space between the template
+ identifier, <code><phrase role="identifier">aristotle_quote</phrase></code>,
+ and the template body &quot;Aristotle...&quot;. This space will be part
+ of the template body. If that space is unwanted, use empty brackets or
+ 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>
-
+ <para>
+ Then expanding:
+ </para>
+
 <programlisting><!--quickbook-escape-prefix-->`struct` x[tag];
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- We have:
- </para>
- <para>
- <code><phrase role="keyword">struct</phrase></code> x_tag;
- </para>
- <para>
- 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">
- <link linkend="quickbook.syntax.block.templates.simple_arguments">Simple
- Arguments</link>
- </bridgehead>
- <para>
- As mentioned, arguments are separated by the double dot <literal>&quot;..&quot;</literal>.
- If there are less arguments passed than expected, QuickBook attempts
- to break the last argument into two or more arguments following this
- logic:
- </para>
- <itemizedlist>
- <listitem>
- Break the last argument into two, at the first space found (<literal>'',
- '\n', \t' or '\r'</literal>).
- </listitem>
- <listitem>
- Repeat until there are enough arguments or if there are no more
- spaces found (in which case, an error is reported).
- </listitem>
- </itemizedlist>
- <para>
- For example:
- </para>
-
+ <para>
+ We have:
+ </para>
+ <para>
+ <code><phrase role="keyword">struct</phrase></code> x_tag;
+ </para>
+ <para>
+ 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">
+ <link linkend="quickbook.syntax.block.templates.simple_arguments">Simple
+ Arguments</link>
+ </bridgehead>
+ <para>
+ As mentioned, arguments are separated by the double dot <literal>&quot;..&quot;</literal>.
+ If there are less arguments passed than expected, QuickBook attempts to
+ break the last argument into two or more arguments following this logic:
+ </para>
+ <itemizedlist>
+ <listitem>
+ Break the last argument into two, at the first space found (<literal>'',
+ '\n', \t' or '\r'</literal>).
+ </listitem>
+ <listitem>
+ Repeat until there are enough arguments or if there are no more spaces
+ found (in which case, an error is reported).
+ </listitem>
+ </itemizedlist>
+ <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>
- <para>
- will produce:
- </para>
- <para>
- wxyz
- </para>
- <para>
- &quot;w x y z&quot; is initially treated as a single argument because
- we didn't supply any <literal>&quot;..&quot;</literal> separators.
- However, since <literal>simple</literal> expects 4 arguments, &quot;w
- x y z&quot; is broken down iteratively (applying the logic above)
- until we have &quot;w&quot;, &quot;x&quot;, &quot;y&quot; and &quot;z&quot;.
- </para>
- <para>
- QuickBook only tries to get the arguments it needs. For example:
- </para>
-
+ <para>
+ will produce:
+ </para>
+ <para>
+ wxyz
+ </para>
+ <para>
+ &quot;w x y z&quot; is initially treated as a single argument because we
+ didn't supply any <literal>&quot;..&quot;</literal> separators. However,
+ since <literal>simple</literal> expects 4 arguments, &quot;w x y z&quot;
+ is broken down iteratively (applying the logic above) until we have &quot;w&quot;,
+ &quot;x&quot;, &quot;y&quot; and &quot;z&quot;.
+ </para>
+ <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>
- will produce:
- </para>
- <para>
- wxyz trail
- </para>
- <para>
- The arguments being: &quot;w&quot;, &quot;x&quot;, &quot;y&quot;
- and &quot;z trail&quot;.
- </para>
- <para>
- It should be obvious now that for simple arguments with no spaces,
- we can get by without separating the arguments with <literal>&quot;..&quot;</literal>
- 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>
- will produce:
- </para>
- <para>
- what do you think man?
- </para>
- <anchor id="quickbook.syntax.block.templates.punctuation_templates"/>
- <bridgehead renderas="sect5">
- <link linkend="quickbook.syntax.block.templates.punctuation_templates">Punctuation
- Templates</link>
- </bridgehead>
- <para>
- With templates, one of our objectives is to allow us to rewrite QuickBook
- in QuickBook (as a qbk library). For that to happen, we need to accommodate
- single character punctuation templates which are fairly common in
- QuickBook. You might have noticed that single character punctuations
- are allowed as <link linkend="quickbook.syntax.block.templates.template_identifier">template
- identifiers</link>. Example:
- </para>
-
+ <para>
+ will produce:
+ </para>
+ <para>
+ wxyz trail
+ </para>
+ <para>
+ The arguments being: &quot;w&quot;, &quot;x&quot;, &quot;y&quot; and &quot;z
+ trail&quot;.
+ </para>
+ <para>
+ It should be obvious now that for simple arguments with no spaces, we can
+ get by without separating the arguments with <literal>&quot;..&quot;</literal>
+ 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>
+ will produce:
+ </para>
+ <para>
+ what do you think man?
+ </para>
+ <anchor id="quickbook.syntax.block.templates.punctuation_templates"/>
+ <bridgehead renderas="sect5">
+ <link linkend="quickbook.syntax.block.templates.punctuation_templates">Punctuation
+ Templates</link>
+ </bridgehead>
+ <para>
+ With templates, one of our objectives is to allow us to rewrite QuickBook
+ in QuickBook (as a qbk library). For that to happen, we need to accommodate
+ single character punctuation templates which are fairly common in QuickBook.
+ You might have noticed that single character punctuations are allowed as
+ <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>
-
+ <para>
+ Now, expanding this:
+ </para>
+
 <programlisting><!--quickbook-escape-prefix-->[!baz]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- We will have:
- </para>
-
+ <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>
-
+ </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
@@ -2110,35 +2082,35 @@
     completely in C++.
 ]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- will generate this:
- </para>
- <sidebar role="blurb">
- <para>
- <inlinemediaobject><imageobject><imagedata fileref="images/smiley.png"></imagedata></imageobject>
- <textobject>
- <phrase>smiley</phrase>
- </textobject>
- </inlinemediaobject> <emphasis role="bold">An eye catching advertisement
- or note...</emphasis>
- </para>
- <para>
- <ulink url="http://spirit.sourceforge.net">Spirit</ulink> is an object-oriented
- recursive-descent parser generator framework implemented using template
- meta-programming techniques. Expression templates allow us to approximate
- the syntax of Extended Backus-Normal Form (EBNF) completely in C++.
- </para>
- </sidebar>
- <note>
- <para>
- Prefer <link linkend="quickbook.syntax.block.admonitions">admonitions</link>
- wherever appropriate.
- </para>
- </note>
- </section>
- <section id="quickbook.syntax.block.tables">
- <title><link linkend="quickbook.syntax.block.tables">Tables</link></title>
-
+ <para>
+ will generate this:
+ </para>
+ <sidebar role="blurb">
+ <para>
+ <inlinemediaobject><imageobject><imagedata fileref="images/smiley.png"></imagedata></imageobject>
+ <textobject>
+ <phrase>smiley</phrase>
+ </textobject>
+ </inlinemediaobject> <emphasis role="bold">An eye catching advertisement
+ or note...</emphasis>
+ </para>
+ <para>
+ <ulink url="http://spirit.sourceforge.net">Spirit</ulink> is an object-oriented
+ recursive-descent parser generator framework implemented using template
+ meta-programming techniques. Expression templates allow us to approximate
+ the syntax of Extended Backus-Normal Form (EBNF) completely in C++.
+ </para>
+ </sidebar>
+ <note>
+ <para>
+ Prefer <link linkend="quickbook.syntax.block.admonitions">admonitions</link>
+ wherever appropriate.
+ </para>
+ </note>
+ </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]]
@@ -2146,85 +2118,85 @@
     [[R2-C0] [R2-C1] [R2-C2]]
 ]
 <!--quickbook-escape-postfix--></programlisting>
+ <para>
+ will generate:
+ </para>
+ <table frame="all"> <title>A Simple Table</title>
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>
+ <para>
+ Heading 1
+ </para>
+ </entry><entry>
+ <para>
+ Heading 2
+ </para>
+ </entry><entry>
+ <para>
+ Heading 3
+ </para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>
+ R0-C0
+ </para>
+ </entry><entry>
+ <para>
+ R0-C1
+ </para>
+ </entry><entry>
+ <para>
+ R0-C2
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
               <para>
- will generate:
+ R2-C0
               </para>
- <table frame="all"> <title>A Simple Table</title>
- <tgroup cols="3">
- <thead>
- <row>
- <entry>
- <para>
- Heading 1
- </para>
- </entry><entry>
- <para>
- Heading 2
- </para>
- </entry><entry>
- <para>
- Heading 3
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- R0-C0
- </para>
- </entry><entry>
- <para>
- R0-C1
- </para>
- </entry><entry>
- <para>
- R0-C2
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- R2-C0
- </para>
- </entry><entry>
- <para>
- R2-C1
- </para>
- </entry><entry>
- <para>
- R2-C2
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- R3-C0
- </para>
- </entry><entry>
- <para>
- R3-C1
- </para>
- </entry><entry>
- <para>
- R3-C2
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <para>
- The table title is optional. The first row of the table is automatically
- treated as the table header; that is, it is wrapped in <literal>&lt;thead&gt;...&lt;/thead&gt;</literal>
- XML tags. Note that unlike the original QuickDoc, the columns are
- nested in [ cells... ]. The syntax is free-format and allows big
- cells to be formatted nicely. Example:
+ </entry><entry>
+ <para>
+ R2-C1
+ </para>
+ </entry><entry>
+ <para>
+ R2-C2
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ R3-C0
+ </para>
+ </entry><entry>
+ <para>
+ R3-C1
+ </para>
+ </entry><entry>
+ <para>
+ R3-C2
               </para>
-
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <para>
+ The table title is optional. The first row of the table is automatically
+ treated as the table header; that is, it is wrapped in <literal>&lt;thead&gt;...&lt;/thead&gt;</literal>
+ XML tags. Note that unlike the original QuickDoc, the columns are nested
+ 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]]
     [
@@ -2246,63 +2218,63 @@
     ]
 ]
 <!--quickbook-escape-postfix--></programlisting>
+ <para>
+ and thus:
+ </para>
+ <table frame="all"> <title>Table with fat cells</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>
+ <para>
+ Heading 1
+ </para>
+ </entry><entry>
+ <para>
+ Heading 2
+ </para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>
+ Row 0, Col 0: a small cell
+ </para>
+ </entry><entry>
+ <para>
+ Row 0, Col 1: a big fat cell with paragraphs
+ </para>
+ <para>
+ Boost provides free peer-reviewed portable C++ source libraries.
+ </para>
+ <para>
+ We emphasize libraries that work well with the C++ Standard Library.
+ Boost libraries are intended to be widely useful, and usable across
+ a broad spectrum of applications. The Boost license encourages both
+ commercial and non-commercial use.
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
               <para>
- and thus:
+ Row 1, Col 0: a small cell
               </para>
- <table frame="all"> <title>Table with fat cells</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>
- <para>
- Heading 1
- </para>
- </entry><entry>
- <para>
- Heading 2
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- Row 0, Col 0: a small cell
- </para>
- </entry><entry>
- <para>
- Row 0, Col 1: a big fat cell with paragraphs
- </para>
- <para>
- Boost provides free peer-reviewed portable C++ source libraries.
- </para>
- <para>
- We emphasize libraries that work well with the C++ Standard
- Library. Boost libraries are intended to be widely useful,
- and usable across a broad spectrum of applications. The Boost
- license encourages both commercial and non-commercial use.
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- Row 1, Col 0: a small cell
- </para>
- </entry><entry>
- <para>
- Row 1, Col 1: a small cell
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
+ </entry><entry>
               <para>
- Here's how to have preformatted blocks of code in a table cell:
+ Row 1, Col 1: a small cell
               </para>
-
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <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]]
     [
@@ -2319,32 +2291,31 @@
     ]
 ]
 <!--quickbook-escape-postfix--></programlisting>
- <table frame="all"> <title>Table with code</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>
- <para>
- Comment
- </para>
- </entry><entry>
- <para>
- Code
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- My first program
- </para>
- </entry><entry>
- <para>
-
-<programlisting>
-<phrase role="preprocessor">#include</phrase> <phrase role="special">&lt;</phrase><phrase role="identifier">iostream</phrase><phrase role="special">&gt;</phrase>
+ <table frame="all"> <title>Table with code</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>
+ <para>
+ Comment
+ </para>
+ </entry><entry>
+ <para>
+ Code
+ </para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>
+ My first program
+ </para>
+ </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>
 <phrase role="special">{</phrase>
@@ -2352,381 +2323,361 @@
     <phrase role="keyword">return</phrase> <phrase role="number">0</phrase><phrase role="special">;</phrase>
 <phrase role="special">}</phrase>
 </programlisting>
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
- <section id="quickbook.syntax.block.variable_lists">
- <title><link linkend="quickbook.syntax.block.variable_lists">Variable
- Lists</link></title>
+ </para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </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]]
     [[term 3] [The definition of term 3]]
 ]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- will generate:
- </para>
- <variablelist>
- <title>A Variable List</title> <varlistentry><term>term 1</term>
- <listitem>
- <para>
- The definition of term 1
- </para>
- </listitem>
- </varlistentry> <varlistentry><term>term 2</term>
- <listitem>
- <para>
- The definition of term 2
- </para>
- </listitem>
- </varlistentry> <varlistentry><term>term 3</term>
- <listitem>
- <para>
- The definition of term 3
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <para>
- The rules for variable lists are the same as for tables, except that
- only 2 &quot;columns&quot; are allowed. The first column contains
- the terms, and the second column contains the definitions. Those
- familiar with HTML will recognize this as a &quot;definition list&quot;.
- </para>
- </section>
- <section id="quickbook.syntax.block.include">
- <title><link linkend="quickbook.syntax.block.include">Include</link></title>
- <para>
- You can include one QuickBook file from another. The syntax is simply:
- </para>
-
+ <para>
+ will generate:
+ </para>
+ <variablelist>
+ <title>A Variable List</title> <varlistentry><term>term 1</term>
+ <listitem>
+ <para>
+ The definition of term 1
+ </para>
+ </listitem>
+ </varlistentry> <varlistentry><term>term 2</term>
+ <listitem>
+ <para>
+ The definition of term 2
+ </para>
+ </listitem>
+ </varlistentry> <varlistentry><term>term 3</term>
+ <listitem>
+ <para>
+ The definition of term 3
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>
+ The rules for variable lists are the same as for tables, except that only
+ 2 &quot;columns&quot; are allowed. The first column contains the terms,
+ and the second column contains the definitions. Those familiar with HTML
+ will recognize this as a &quot;definition list&quot;.
+ </para>
+ </section>
+ <section id="quickbook.syntax.block.include">
+ <title><link linkend="quickbook.syntax.block.include">Include</link></title>
+ <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>
- The included file will be processed as if it had been cut and pasted
- into the current document, with the following exceptions:
- </para>
- <itemizedlist>
- <listitem>
- The __FILENAME__ predefined macro will reflect the name of the file currently
- being processed.
- </listitem>
- <listitem>
- Any macros defined in the included file are scoped to that file.
- </listitem>
- </itemizedlist>
- <para>
- The <literal>[include]</literal> directive lets you specify a document
- id to use for the included file. When this id is not explicitly specified,
- the id defaults to the filename (&quot;someother&quot;, in the example
- above). You can specify the id like this:
- </para>
-
+ <para>
+ The included file will be processed as if it had been cut and pasted into
+ the current document, with the following exceptions:
+ </para>
+ <itemizedlist>
+ <listitem>
+ The __FILENAME__ predefined macro will reflect the name of the file currently being
+ processed.
+ </listitem>
+ <listitem>
+ Any macros defined in the included file are scoped to that file.
+ </listitem>
+ </itemizedlist>
+ <para>
+ The <literal>[include]</literal> directive lets you specify a document
+ id to use for the included file. When this id is not explicitly specified,
+ 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>
- All auto-generated anchors will use the document id as a unique prefix.
- So for instance, if there is a top section in someother.qbk named
- &quot;Intro&quot;, the named anchor for that section will be &quot;someid.intro&quot;,
- and you can link to it with <literal>[link someid.intro The Intro]</literal>.
- </para>
- </section>
- <section id="quickbook.syntax.block.import">
- <title><link linkend="quickbook.syntax.block.import">Import</link></title>
- <para>
- When documenting code, you'd surely need to present code from actual
- source files. While it is possible to copy some code and paste them
- in your QuickBook file, doing so is error prone and the extracted
- code in the documentation tends to get out of sync with the actual
- code as the code evolves. The problem, as always, is that once documentation
- is written, the tendency is for the docs to languish in the archives
- without maintenance.
- </para>
- <para>
- QuickBook's import facility provides a nice solution.
- </para>
- <anchor id="quickbook.syntax.block.import.example"/>
- <bridgehead renderas="sect5">
- <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>
-
+ <para>
+ All auto-generated anchors will use the document id as a unique prefix.
+ So for instance, if there is a top section in someother.qbk named &quot;Intro&quot;,
+ the named anchor for that section will be &quot;someid.intro&quot;, and
+ you can link to it with <literal>[link someid.intro The Intro]</literal>.
+ </para>
+ </section>
+ <section id="quickbook.syntax.block.import">
+ <title><link linkend="quickbook.syntax.block.import">Import</link></title>
+ <para>
+ When documenting code, you'd surely need to present code from actual source
+ files. While it is possible to copy some code and paste them in your QuickBook
+ file, doing so is error prone and the extracted code in the documentation
+ tends to get out of sync with the actual code as the code evolves. The
+ problem, as always, is that once documentation is written, the tendency
+ is for the docs to languish in the archives without maintenance.
+ </para>
+ <para>
+ QuickBook's import facility provides a nice solution.
+ </para>
+ <anchor id="quickbook.syntax.block.import.example"/>
+ <bridgehead renderas="sect5">
+ <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]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- The first line:
- </para>
-
+ <para>
+ The first line:
+ </para>
+
 <programlisting><!--quickbook-escape-prefix-->[import ../test/stub.cpp]
 <!--quickbook-escape-postfix--></programlisting>
- <para>
- collects specially marked-up code snippets from <ulink url="../../test/stub.cpp">stub.cpp</ulink>
- and places them in your QuickBook file as virtual templates. Each
- of the specially marked-up code snippets has a name (e.g. <code><phrase
- role="identifier">foo</phrase></code> and <code><phrase role="identifier">bar</phrase></code>
- in the example above). This shall be the template identifier for
- that particular code snippet. The second and third line above does
- the actual template expansion:
- </para>
-
+ <para>
+ collects specially marked-up code snippets from <ulink url="../../test/stub.cpp">stub.cpp</ulink>
+ and places them in your QuickBook file as virtual templates. Each of the
+ specially marked-up code snippets has a name (e.g. <code><phrase role="identifier">foo</phrase></code>
+ and <code><phrase role="identifier">bar</phrase></code> in the example
+ 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>
- <para>
- And the result is:
- </para>
- <para>
- <para>
- This is the <emphasis role="bold"><emphasis>foo</emphasis></emphasis>
- function.
- </para>
- <para>
- This description can have paragraphs...
- </para>
- <itemizedlist>
- <listitem>
- lists
- </listitem>
- <listitem>
- etc.
- </listitem>
- </itemizedlist>
- <para>
- 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> <phrase role="keyword">return</phrase> <phrase role="string">&quot;foo&quot;</phrase><phrase role="special">;</phrase>
-<phrase role="special">}</phrase>
-</programlisting>
- </para>
- <para>
- <calloutlist></calloutlist>
- </para>
- <para>
- 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> <phrase role="keyword">return</phrase> <phrase role="string">&quot;bar&quot;</phrase><phrase role="special">;</phrase>
+ <para>
+ And the result is:
+ </para>
+ <para>
+ <para>
+ This is the <emphasis role="bold"><emphasis>foo</emphasis></emphasis>
+ function.
+ </para>
+ <para>
+ This description can have paragraphs...
+ </para>
+ <itemizedlist>
+ <listitem>
+ lists
+ </listitem>
+ <listitem>
+ etc.
+ </listitem>
+ </itemizedlist>
+ <para>
+ 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> <phrase role="keyword">return</phrase> <phrase role="string">&quot;foo&quot;</phrase><phrase role="special">;</phrase>
+<phrase role="special">}</phrase>
+</programlisting>
+ </para>
+ <para>
+ 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> <phrase role="keyword">return</phrase> <phrase role="string">&quot;bar&quot;</phrase><phrase role="special">;</phrase>
 <phrase role="special">}</phrase></programlisting>
- </para>
- <para>
- Some trailing text here <calloutlist></calloutlist>
- </para>
- </para>
- <anchor id="quickbook.syntax.block.import.code_snippet_markup"/>
- <bridgehead renderas="sect5">
- <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
+ </para>
+ <para>
+ Some trailing text here
+ </para>
+ </para>
+ <anchor id="quickbook.syntax.block.import.code_snippet_markup"/>
+ <bridgehead renderas="sect5">
+ <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></programlisting>
- <para>
- The first comment line above initiates a named code-snippet. This
- prefix will not be visible in quickbook. The entire code-snippet
- in between <code><phrase role="comment">//[id</phrase></code> and
- <code><phrase role="comment">//]</phrase></code> will be inserted
- as a template in quickbook with name <emphasis><emphasis>id</emphasis></emphasis>.
- 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">
- <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
+ <para>
+ The first comment line above initiates a named code-snippet. This prefix
+ will not be visible in quickbook. The entire code-snippet in between <code><phrase
+ role="comment">//[id</phrase></code> and <code><phrase role="comment">//]</phrase></code>
+ will be inserted as a template in quickbook with name <emphasis><emphasis>id</emphasis></emphasis>.
+ 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">
+ <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>
+ <para>
+ and:
+ </para>
+
+<programlisting><phrase role="comment">/*` some [*quickbook] markup here */</phrase>
 </programlisting>
- <para>
- will be parsed by QuickBook. This can contain quickbook <emphasis>blocks</emphasis>
- (e.g. sections, paragraphs, tables, etc). In the first case, the
- initial 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">
- <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>
+ <para>
+ will be parsed by QuickBook. This can contain quickbook <emphasis>blocks</emphasis>
+ (e.g. sections, paragraphs, tables, etc). In the first case, the initial
+ 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">
+ <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>
- will be regarded as callouts. These will be collected, numbered and
- rendered as a &quot;callout bug&quot; (a small icon with a number).
- After the whole snippet is parsed, the callout list is generated.
- See <ulink url="http://www.docbook.org/tdg/en/html/callout.html">Callouts</ulink>
- for details. Example:
- </para>
- <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> <!--quickbook-escape-prefix--><phrase role="callout_bug"><co id="quickbook0co" linkends="quickbook0" /></phrase><!--quickbook-escape-postfix-->
+ <para>
+ will be regarded as callouts. These will be collected, numbered and rendered
+ as a &quot;callout bug&quot; (a small icon with a number). After the whole
+ snippet is parsed, the callout list is generated. See <ulink url="http://www.docbook.org/tdg/en/html/callout.html">Callouts</ulink>
+ for details. Example:
+ </para>
+ <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> <!--quickbook-escape-prefix--><phrase role="callout_bug"><co id="quickbook0co" linkends="quickbook0" /></phrase><!--quickbook-escape-postfix-->
 <phrase role="special">{</phrase>
     <phrase role="keyword">return</phrase> <phrase role="string">&quot;foo-bar&quot;</phrase><phrase role="special">;</phrase> <!--quickbook-escape-prefix--><phrase role="callout_bug"><co id="quickbook1co" linkends="quickbook1" /></phrase><!--quickbook-escape-postfix-->
 <phrase role="special">}</phrase>
 </programlisting>
- </para>
- <para>
- <calloutlist><callout arearefs="quickbook0co" id="quickbook0"><para> The <emphasis>Mythical</emphasis> FooBar. See <ulink url="http://en.wikipedia.org/wiki/Foobar">Foobar
- for details</ulink> </para></callout><callout arearefs="quickbook1co" id="quickbook1"><para> return 'em, foo-bar man! </para></callout></calloutlist>
- </para>
- </para>
- <para>
- Checkout <ulink url="../../test/stub.cpp">stub.cpp</ulink> to see
- the actual code.
- </para>
- </section>
- </section>
- </section>
- <section id="quickbook.install">
- <title><link linkend="quickbook.install"> Installation and configuration</link></title>
+ </para>
           <para>
- This section provides some guidelines on how to install and configure
- BoostBook and Quickbook under several operating systems.
+ <calloutlist><callout arearefs="quickbook0co" id="quickbook0"><para> The <emphasis>Mythical</emphasis> FooBar. See <ulink url="http://en.wikipedia.org/wiki/Foobar">Foobar
+ for details</ulink> </para></callout><callout arearefs="quickbook1co" id="quickbook1"><para> return 'em, foo-bar man! </para></callout></calloutlist>
           </para>
+ </para>
+ <para>
+ Checkout <ulink url="../../test/stub.cpp">stub.cpp</ulink> to see the actual
+ code.
+ </para>
+ </section>
+ </section>
+ </section>
+ <section id="quickbook.install">
+ <title><link linkend="quickbook.install"> Installation and configuration</link></title>
+ <para>
+ This section provides some guidelines on how to install and configure BoostBook
+ and Quickbook under several operating systems.
+ </para>
+ <para>
+ Before continuing, it is very important that you keep this in mind: if you
+ try to build some documents and the process breaks due to misconfiguration,
+ be absolutely sure to delete any <code><phrase role="identifier">bin</phrase></code>
+ and <code><phrase role="identifier">bin</phrase><phrase role="special">.</phrase><phrase
+ role="identifier">v2</phrase></code> directories generated by the build before
+ trying again. Otherwise your configuration fixes will not take any effect.
+ </para>
+ <section id="quickbook.install.windows">
+ <title><link linkend="quickbook.install.windows"> Windows 2000, XP, 2003, Vista</link></title>
+ <para>
+ </para>
+ <blockquote>
+ <para>
           <para>
- Before continuing, it is very important that you keep this in mind: if
- you try to build some documents and the process breaks due to misconfiguration,
- be absolutely sure to delete any <code><phrase role="identifier">bin</phrase></code>
- and <code><phrase role="identifier">bin</phrase><phrase role="special">.</phrase><phrase
- role="identifier">v2</phrase></code> directories generated by the build
- before trying again. Otherwise your configuration fixes will not take
- any effect.
- </para>
- <section id="quickbook.install.windows">
- <title><link linkend="quickbook.install.windows"> Windows 2000, XP, 2003,
- Vista</link></title>
- <para>
- </para>
- <blockquote>
- <para>
- <para>
- <emphasis>Section contributed by Julio M. Merino Vidal</emphasis>
- </para>
- </para>
- </blockquote>
- <para>
- The following instructions apply to any Windows system based on Windows
- 2000, including Windows XP, Windows 2003 Server and Windows Vista.
- 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.
- </para>
- <orderedlist>
- <listitem>
- First of all you need to have a copy of <code><phrase role="identifier">xsltproc</phrase></code>
- for Windows. There are many ways to get this tool, but to keep things
- simple, use the <ulink url="http://www.zlatkovic.com/pub/libxml/">binary
- packages</ulink> made by Igor Zlatkovic. At the very least, you need
- to download the following packages: <code><phrase role="identifier">iconv</phrase></code>,
- <code><phrase role="identifier">zlib</phrase></code>, <code><phrase
- role="identifier">libxml2</phrase></code> and <code><phrase role="identifier">libxslt</phrase></code>.
- </listitem>
- <listitem>
- Unpack all these packages in the same directory so that you get unique
- <code><phrase role="identifier">bin</phrase></code>, <code><phrase
- role="identifier">include</phrase></code> and <code><phrase role="identifier">lib</phrase></code>
- directories within the hierarchy. These instructions use <code><phrase
- role="identifier">C</phrase><phrase role="special">:\</phrase><phrase
- role="identifier">Users</phrase><phrase role="special">\</phrase><phrase
- role="identifier">example</phrase><phrase role="special">\</phrase><phrase
- role="identifier">Documents</phrase><phrase role="special">\</phrase><phrase
- role="identifier">boost</phrase><phrase role="special">\</phrase><phrase
- role="identifier">xml</phrase></code> as the root for all files.
- </listitem>
- <listitem>
- From the command line, go to the <code><phrase role="identifier">bin</phrase></code>
- directory and launch <code><phrase role="identifier">xsltproc</phrase><phrase
- role="special">.</phrase><phrase role="identifier">exe</phrase></code>
- to ensure it works. You should get usage information on screen.
- </listitem>
- <listitem>
- Download <ulink url="http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip">Docbook
- XML 4.2</ulink> and unpack it in the same directory used above. That
- is: <code><phrase role="identifier">C</phrase><phrase role="special">:\</phrase><phrase
- role="identifier">Users</phrase><phrase role="special">\</phrase><phrase
- role="identifier">example</phrase><phrase role="special">\</phrase><phrase
- role="identifier">Documents</phrase><phrase role="special">\</phrase><phrase
- role="identifier">boost</phrase><phrase role="special">\</phrase><phrase
- role="identifier">xml</phrase><phrase role="special">\</phrase><phrase
- role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase
- role="identifier">xml</phrase></code>.
- </listitem>
- <listitem>
- Download the latest <ulink url="http://sourceforge.net/project/showfiles.php?group_id=21935&amp;package_id=16608">Docbook
- XSL</ulink> version and unpack it, again in the same directory used
- before. To make things easier, rename the directory created during
- the extraction to <code><phrase role="identifier">docbook</phrase><phrase
- role="special">-</phrase><phrase role="identifier">xsl</phrase></code>
- (bypassing the version name): <code><phrase role="identifier">C</phrase><phrase
- role="special">:\</phrase><phrase role="identifier">Users</phrase><phrase
- role="special">\</phrase><phrase role="identifier">example</phrase><phrase
- role="special">\</phrase><phrase role="identifier">Documents</phrase><phrase
- role="special">\</phrase><phrase role="identifier">boost</phrase><phrase
- role="special">\</phrase><phrase role="identifier">xml</phrase><phrase
- role="special">\</phrase><phrase role="identifier">docbook</phrase><phrase
- role="special">-</phrase><phrase role="identifier">xsl</phrase></code>.
- </listitem>
- <listitem>
- Add the following to your <code><phrase role="identifier">user</phrase><phrase
- role="special">-</phrase><phrase role="identifier">config</phrase><phrase
- role="special">.</phrase><phrase role="identifier">jam</phrase></code>
- file, which should live in your home directory (<code><phrase role="special">%</phrase><phrase
- role="identifier">HOMEDRIVE</phrase><phrase role="special">%%</phrase><phrase
- role="identifier">HOMEPATH</phrase><phrase role="special">%</phrase></code>).
- You must already have it somewhere or otherwise you could not be
- building Boost (i.e. missing tools configuration).
- </listitem>
- </orderedlist>
-
-<programlisting>
-<phrase role="identifier">using</phrase> <phrase role="identifier">xsltproc</phrase>
+ <emphasis>Section contributed by Julio M. Merino Vidal</emphasis>
+ </para>
+ </para>
+ </blockquote>
+ <para>
+ The following instructions apply to any Windows system based on Windows 2000,
+ including Windows XP, Windows 2003 Server and Windows Vista. 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.
+ </para>
+ <orderedlist>
+ <listitem>
+ First of all you need to have a copy of <code><phrase role="identifier">xsltproc</phrase></code>
+ for Windows. There are many ways to get this tool, but to keep things simple,
+ use the <ulink url="http://www.zlatkovic.com/pub/libxml/">binary packages</ulink>
+ made by Igor Zlatkovic. At the very least, you need to download the following
+ packages: <code><phrase role="identifier">iconv</phrase></code>, <code><phrase
+ role="identifier">zlib</phrase></code>, <code><phrase role="identifier">libxml2</phrase></code>
+ and <code><phrase role="identifier">libxslt</phrase></code>.
+ </listitem>
+ <listitem>
+ Unpack all these packages in the same directory so that you get unique
+ <code><phrase role="identifier">bin</phrase></code>, <code><phrase role="identifier">include</phrase></code>
+ and <code><phrase role="identifier">lib</phrase></code> directories within
+ the hierarchy. These instructions use <code><phrase role="identifier">C</phrase><phrase
+ role="special">:\</phrase><phrase role="identifier">Users</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">example</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">Documents</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">boost</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">xml</phrase></code>
+ as the root for all files.
+ </listitem>
+ <listitem>
+ From the command line, go to the <code><phrase role="identifier">bin</phrase></code>
+ directory and launch <code><phrase role="identifier">xsltproc</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">exe</phrase></code>
+ to ensure it works. You should get usage information on screen.
+ </listitem>
+ <listitem>
+ Download <ulink url="http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip">Docbook
+ XML 4.2</ulink> and unpack it in the same directory used above. That is:
+ <code><phrase role="identifier">C</phrase><phrase role="special">:\</phrase><phrase
+ role="identifier">Users</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">example</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">Documents</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">boost</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">xml</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase
+ role="identifier">xml</phrase></code>.
+ </listitem>
+ <listitem>
+ Download the latest <ulink url="http://sourceforge.net/project/showfiles.php?group_id=21935&amp;package_id=16608">Docbook
+ XSL</ulink> version and unpack it, again in the same directory used before.
+ To make things easier, rename the directory created during the extraction
+ to <code><phrase role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase
+ role="identifier">xsl</phrase></code> (bypassing the version name): <code><phrase
+ role="identifier">C</phrase><phrase role="special">:\</phrase><phrase role="identifier">Users</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">example</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">Documents</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">boost</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">xml</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">docbook</phrase><phrase
+ role="special">-</phrase><phrase role="identifier">xsl</phrase></code>.
+ </listitem>
+ <listitem>
+ Add the following to your <code><phrase role="identifier">user</phrase><phrase
+ role="special">-</phrase><phrase role="identifier">config</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">jam</phrase></code>
+ file, which should live in your home directory (<code><phrase role="special">%</phrase><phrase
+ role="identifier">HOMEDRIVE</phrase><phrase role="special">%%</phrase><phrase
+ role="identifier">HOMEPATH</phrase><phrase role="special">%</phrase></code>).
+ You must already have it somewhere or otherwise you could not be building
+ Boost (i.e. missing tools configuration).
+ </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>
 
@@ -2735,90 +2686,84 @@
     <phrase role="special">:</phrase> <phrase role="string">&quot;C:/Users/example/Documents/boost/xml/docbook-xml&quot;</phrase>
     <phrase role="special">;</phrase>
 </programlisting>
- <para>
- The above steps are enough to get a functional BoostBook setup. Quickbook
- will be automatically built when needed. If you want to avoid these
- rebuilds:
- </para>
- <orderedlist>
- <listitem>
- Go to Quickbook's source directory (<code><phrase role="identifier">BOOST_ROOT</phrase><phrase
- role="special">\</phrase><phrase role="identifier">tools</phrase><phrase
- role="special">\</phrase><phrase role="identifier">quickbook</phrase></code>).
- </listitem>
- <listitem>
- Build the utility by issuing <code><phrase role="identifier">bjam</phrase>
- <phrase role="special">--</phrase><phrase role="identifier">v2</phrase></code>.
- </listitem>
- <listitem>
- Copy the resulting <code><phrase role="identifier">quickbook</phrase><phrase
- role="special">.</phrase><phrase role="identifier">exe</phrase></code>
- binary (located under the <code><phrase role="identifier">BOOST_ROOT</phrase><phrase
- role="special">\</phrase><phrase role="identifier">bin</phrase><phrase
- role="special">.</phrase><phrase role="identifier">v2</phrase></code>
- hierarchy) to a safe place. Following our previous example, you can
- install it into: <code><phrase role="identifier">C</phrase><phrase
- role="special">:\</phrase><phrase role="identifier">Users</phrase><phrase
- role="special">\</phrase><phrase role="identifier">example</phrase><phrase
- role="special">\</phrase><phrase role="identifier">Documents</phrase><phrase
- role="special">\</phrase><phrase role="identifier">boost</phrase><phrase
- role="special">\</phrase><phrase role="identifier">xml</phrase><phrase
- role="special">\</phrase><phrase role="identifier">bin</phrase></code>.
- </listitem>
- <listitem>
- Add the following to your <code><phrase role="identifier">user</phrase><phrase
- role="special">-</phrase><phrase role="identifier">config</phrase><phrase
- role="special">.</phrase><phrase role="identifier">jam</phrase></code>
- file:
- </listitem>
- </orderedlist>
-
-<programlisting>
-<phrase role="identifier">using</phrase> <phrase role="identifier">quickbook</phrase>
+ <para>
+ The above steps are enough to get a functional BoostBook setup. Quickbook
+ will be automatically built when needed. If you want to avoid these rebuilds:
+ </para>
+ <orderedlist>
+ <listitem>
+ Go to Quickbook's source directory (<code><phrase role="identifier">BOOST_ROOT</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">tools</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">quickbook</phrase></code>).
+ </listitem>
+ <listitem>
+ Build the utility by issuing <code><phrase role="identifier">bjam</phrase>
+ <phrase role="special">--</phrase><phrase role="identifier">v2</phrase></code>.
+ </listitem>
+ <listitem>
+ Copy the resulting <code><phrase role="identifier">quickbook</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">exe</phrase></code>
+ binary (located under the <code><phrase role="identifier">BOOST_ROOT</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">bin</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">v2</phrase></code> hierarchy)
+ to a safe place. Following our previous example, you can install it into:
+ <code><phrase role="identifier">C</phrase><phrase role="special">:\</phrase><phrase
+ role="identifier">Users</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">example</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">Documents</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">boost</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">xml</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">bin</phrase></code>.
+ </listitem>
+ <listitem>
+ Add the following to your <code><phrase role="identifier">user</phrase><phrase
+ role="special">-</phrase><phrase role="identifier">config</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">jam</phrase></code>
+ file:
+ </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>
 </programlisting>
- </section>
- <section id="quickbook.install.linux">
- <title><link linkend="quickbook.install.linux"> Debian, Ubuntu</link></title>
- <para>
- The following instructions apply to Debian and its derivatives. They
- are based on a Ubuntu Edgy install but should work on other Debian
- based systems.
- </para>
- <para>
- First install the <code><phrase role="identifier">bjam</phrase></code>,
- <code><phrase role="identifier">xsltproc</phrase></code>, <code><phrase
- role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase
- role="identifier">xsl</phrase></code> and <code><phrase role="identifier">docbook</phrase><phrase
- role="special">-</phrase><phrase 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>
+ </section>
+ <section id="quickbook.install.linux">
+ <title><link linkend="quickbook.install.linux"> Debian, Ubuntu</link></title>
+ <para>
+ The following instructions apply to Debian and its derivatives. They are
+ based on a Ubuntu Edgy install but should work on other Debian based systems.
+ </para>
+ <para>
+ First install the <code><phrase role="identifier">bjam</phrase></code>,
+ <code><phrase role="identifier">xsltproc</phrase></code>, <code><phrase role="identifier">docbook</phrase><phrase
+ role="special">-</phrase><phrase role="identifier">xsl</phrase></code> and
+ <code><phrase role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase
+ 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>
- If you're planning on building boost's documentation, you'll also need
- to install the <code><phrase role="identifier">doxygen</phrase></code>
- package as well.
- </para>
- <para>
- Next, we need to configure Boost Build to compile BoostBook files.
- Add the following to your <code><phrase role="identifier">user</phrase><phrase
- role="special">-</phrase><phrase role="identifier">config</phrase><phrase
- role="special">.</phrase><phrase role="identifier">jam</phrase></code>
- file, which should be in your home directory. If you don't have one,
- create a file containing this text. For more information on setting
- up <code><phrase role="identifier">user</phrase><phrase role="special">-</phrase><phrase
- role="identifier">config</phrase><phrase role="special">.</phrase><phrase
- role="identifier">jam</phrase></code>, see 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>
+ <para>
+ If you're planning on building boost's documentation, you'll also need to
+ install the <code><phrase role="identifier">doxygen</phrase></code> package
+ as well.
+ </para>
+ <para>
+ Next, we need to configure Boost Build to compile BoostBook files. Add the
+ following to your <code><phrase role="identifier">user</phrase><phrase role="special">-</phrase><phrase
+ role="identifier">config</phrase><phrase role="special">.</phrase><phrase
+ role="identifier">jam</phrase></code> file, which should be in your home
+ directory. If you don't have one, create a file containing this text. For
+ more information on setting up <code><phrase role="identifier">user</phrase><phrase
+ role="special">-</phrase><phrase role="identifier">config</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">jam</phrase></code>, see
+ 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>
     <phrase role="special">:</phrase> <phrase role="special">/</phrase><phrase role="identifier">usr</phrase><phrase role="special">/</phrase><phrase role="identifier">share</phrase><phrase role="special">/</phrase><phrase role="identifier">xml</phrase><phrase role="special">/</phrase><phrase role="identifier">docbook</phrase><phrase role="special">/</phrase><phrase role="identifier">stylesheet</phrase><phrase role="special">/</phrase><phrase role="identifier">nwalsh</phrase>
@@ -2828,91 +2773,89 @@
 <phrase role="comment"># Remove this line if you're not using doxygen
 </phrase><phrase role="identifier">using</phrase> <phrase role="identifier">doxygen</phrase> <phrase role="special">;</phrase>
 </programlisting>
- <para>
- The above steps are enough to get a functional BoostBook setup. Quickbook
- will be automatically built when needed. If you want to avoid these
- rebuilds:
- </para>
- <orderedlist>
- <listitem>
- Go to Quickbook's source directory (<code><phrase role="identifier">BOOST_ROOT</phrase><phrase
- role="special">/</phrase><phrase role="identifier">tools</phrase><phrase
- role="special">/</phrase><phrase role="identifier">quickbook</phrase></code>).
- </listitem>
- <listitem>
- Build the utility by issuing <code><phrase role="identifier">bjam</phrase>
- <phrase role="special">--</phrase><phrase role="identifier">v2</phrase></code>.
- </listitem>
- <listitem>
- Copy the resulting <code><phrase role="identifier">quickbook</phrase></code>
- binary (located under the <code><phrase role="identifier">BOOST_ROOT</phrase><phrase
- role="special">/</phrase><phrase role="identifier">bin</phrase><phrase
- role="special">.</phrase><phrase role="identifier">v2</phrase></code>
- hierarchy) to a safe place. The traditional location is <code><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></code>.
- </listitem>
- <listitem>
- Add the following to your <code><phrase role="identifier">user</phrase><phrase
- role="special">-</phrase><phrase role="identifier">config</phrase><phrase
- role="special">.</phrase><phrase role="identifier">jam</phrase></code>
- file, using the full path of the quickbook executable:
- </listitem>
- </orderedlist>
-
-<programlisting>
-<phrase role="identifier">using</phrase> <phrase role="identifier">quickbook</phrase>
+ <para>
+ The above steps are enough to get a functional BoostBook setup. Quickbook
+ will be automatically built when needed. If you want to avoid these rebuilds:
+ </para>
+ <orderedlist>
+ <listitem>
+ Go to Quickbook's source directory (<code><phrase role="identifier">BOOST_ROOT</phrase><phrase
+ role="special">/</phrase><phrase role="identifier">tools</phrase><phrase
+ role="special">/</phrase><phrase role="identifier">quickbook</phrase></code>).
+ </listitem>
+ <listitem>
+ Build the utility by issuing <code><phrase role="identifier">bjam</phrase>
+ <phrase role="special">--</phrase><phrase role="identifier">v2</phrase></code>.
+ </listitem>
+ <listitem>
+ Copy the resulting <code><phrase role="identifier">quickbook</phrase></code>
+ binary (located under the <code><phrase role="identifier">BOOST_ROOT</phrase><phrase
+ role="special">/</phrase><phrase role="identifier">bin</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">v2</phrase></code> hierarchy)
+ to a safe place. The traditional location is <code><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></code>.
+ </listitem>
+ <listitem>
+ Add the following to your <code><phrase role="identifier">user</phrase><phrase
+ role="special">-</phrase><phrase role="identifier">config</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">jam</phrase></code>
+ file, using the full path of the quickbook executable:
+ </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>
 </programlisting>
- </section>
- </section>
- <section id="quickbook.editors">
- <title><link linkend="quickbook.editors"> Editor Support</link></title>
+ </section>
+ </section>
+ <section id="quickbook.editors">
+ <title><link linkend="quickbook.editors"> Editor Support</link></title>
+ <para>
+ Editing quickbook files is usually done with text editors both simple and powerful.
+ The following sections list the settings for some editors which can help make
+ editing quickbook files a bit easier.
+ </para>
+ <sidebar role="blurb">
+ <para>
+ <inlinemediaobject><imageobject><imagedata fileref="images/note.png"></imagedata></imageobject>
+ <textobject>
+ <phrase>note</phrase>
+ </textobject>
+ </inlinemediaobject> You may submit your settings, tips, and suggestions to
+ the authors, or through the <ulink url="https://lists.sourceforge.net/lists/listinfo/boost-">docs
+ Boost Docs mailing list</ulink>.
+ </para>
+ </sidebar>
+ <section id="quickbook.editors.scite">
+ <title><link linkend="quickbook.editors.scite"> Scintilla Text Editor</link></title>
+ <blockquote>
+ <para>
           <para>
- Editing quickbook files is usually done with text editors both simple
- and powerful. The following sections list the settings for some editors
- which can help make editing quickbook files a bit easier.
- </para>
- <sidebar role="blurb">
- <para>
- <inlinemediaobject><imageobject><imagedata fileref="images/note.png"></imagedata></imageobject>
- <textobject>
- <phrase>note</phrase>
- </textobject>
- </inlinemediaobject> You may submit your settings, tips, and suggestions
- to the authors, or through the <ulink url="https://lists.sourceforge.net/lists/listinfo/boost-">docs
- Boost Docs mailing list</ulink>.
- </para>
- </sidebar>
- <section id="quickbook.editors.scite">
- <title><link linkend="quickbook.editors.scite"> Scintilla Text Editor</link></title>
- <blockquote>
- <para>
- <para>
- <emphasis>Section contributed by Dean Michael Berris</emphasis>
- </para>
- </para>
- </blockquote>
- <para>
- The Scintilla Text Editor (SciTE) is a free source code editor for
- Win32 and X. It uses the SCIntilla source code editing component.
- </para>
- <sidebar role="blurb">
- <para>
- <inlinemediaobject><imageobject><imagedata fileref="images/tip.png"></imagedata></imageobject>
- <textobject>
- <phrase>tip</phrase>
- </textobject>
- </inlinemediaobject> SciTE can be downloaded from <ulink url="http://www.scintilla.org/SciTE.html">http://www.scintilla.org/SciTE.html>
- </para>
- </sidebar>
- <para>
- You can use the following settings to highlight quickbook tags when
- editing quickbook files.
- </para>
-
+ <emphasis>Section contributed by Dean Michael Berris</emphasis>
+ </para>
+ </para>
+ </blockquote>
+ <para>
+ The Scintilla Text Editor (SciTE) is a free source code editor for Win32
+ and X. It uses the SCIntilla source code editing component.
+ </para>
+ <sidebar role="blurb">
+ <para>
+ <inlinemediaobject><imageobject><imagedata fileref="images/tip.png"></imagedata></imageobject>
+ <textobject>
+ <phrase>tip</phrase>
+ </textobject>
+ </inlinemediaobject> SciTE can be downloaded from <ulink url="
http://www.scintilla.org/SciTE.html">http://www.scintilla.org/SciTE.html>
+ </para>
+ </sidebar>
+ <para>
+ 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
@@ -2925,47 +2868,45 @@
 comment.box.middle.props=
 comment.box.end.props=]
 <!--quickbook-escape-postfix--></programlisting>
- <sidebar role="blurb">
- <para>
- <inlinemediaobject><imageobject><imagedata fileref="images/note.png"></imagedata></imageobject>
- <textobject>
- <phrase>note</phrase>
- </textobject>
- </inlinemediaobject> Thanks to Rene Rivera for the above SciTE settings.
- </para>
- </sidebar>
- </section>
- </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">
- <link linkend="quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_">Can
- I use QuickBook for non-Boost documentation?</link>
- </bridgehead>
- <para>
- QuickBook can be used for non-Boost documentation with a little extra
- work.
- </para>
- <blockquote>
- <para>
- <para>
- <emphasis>Faq contributed by Michael Marcin</emphasis>
- </para>
- </para>
- </blockquote>
- <para>
- When building HTML documentation with BoostBook a Boost C++ Libraries
- header is added to the files. When using QuickBook to document projects
- outside of Boost this is not desirable. This behavior can be overridden
- at the BoostBook level by specifying some XSLT options. When using Boost
- Build version 2 (BBv2) this can be achieved by adding parameters to the
- BoostBook target declaration.
- </para>
- <para>
- For example:
- </para>
-
+ <sidebar role="blurb">
+ <para>
+ <inlinemediaobject><imageobject><imagedata fileref="images/note.png"></imagedata></imageobject>
+ <textobject>
+ <phrase>note</phrase>
+ </textobject>
+ </inlinemediaobject> Thanks to Rene Rivera for the above SciTE settings.
+ </para>
+ </sidebar>
+ </section>
+ </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">
+ <link linkend="quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_">Can
+ I use QuickBook for non-Boost documentation?</link>
+ </bridgehead>
+ <para>
+ QuickBook can be used for non-Boost documentation with a little extra work.
+ </para>
+ <blockquote>
+ <para>
+ <para>
+ <emphasis>Faq contributed by Michael Marcin</emphasis>
+ </para>
+ </para>
+ </blockquote>
+ <para>
+ When building HTML documentation with BoostBook a Boost C++ Libraries header
+ is added to the files. When using QuickBook to document projects outside of
+ Boost this is not desirable. This behavior can be overridden at the BoostBook
+ level by specifying some XSLT options. When using Boost Build version 2 (BBv2)
+ this can be achieved by adding parameters to the BoostBook target declaration.
+ </para>
+ <para>
+ For example:
+ </para>
+
 <programlisting>using quickbook ;
 
 xml my_doc : my_doc.qbk ;
@@ -2981,785 +2922,780 @@
         &lt;xsl:param&gt;nav.layout=none
     ;
 </programlisting>
- </section>
- <section id="quickbook.ref">
- <title><link linkend="quickbook.ref"> Quick Reference</link></title>
+ </section>
+ <section id="quickbook.ref">
+ <title><link linkend="quickbook.ref"> Quick Reference</link></title>
+ <para>
+ [cpp]
+ </para>
+ <table frame="all"> <title>Syntax Compendium</title>
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>
+ <para>
+ To do this...
+ </para>
+ </entry><entry>
+ <para>
+ Use this...
+ </para>
+ </entry><entry>
+ <para>
+ See this...
+ </para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>
+ comment
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[/ some comment]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.comments">Comments</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ <emphasis>italics</emphasis>
+ </para>
+ </entry><entry>
+ <para>
+ <literal>['italics] or /italics/</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.font_styles">Font Styles</link>
+ and <link linkend="quickbook.syntax.phrase.simple_formatting">Simple
+ formatting</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ <emphasis role="bold">bold</emphasis>
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[*bold] or *bold*</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.font_styles">Font Styles</link>
+ and <link linkend="quickbook.syntax.phrase.simple_formatting">Simple
+ formatting</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ <emphasis role="underline">underline</emphasis>
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[_underline] or _underline_</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.font_styles">Font Styles</link>
+ and <link linkend="quickbook.syntax.phrase.simple_formatting">Simple
+ formatting</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ <literal>teletype</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[^teletype] or =teletype=</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.font_styles">Font Styles</link>
+ and <link linkend="quickbook.syntax.phrase.simple_formatting">Simple
+ formatting</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ <emphasis role="strikethrough">strikethrough</emphasis>
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[-strikethrough]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.font_styles">Font Styles</link>
+ and <link linkend="quickbook.syntax.phrase.simple_formatting">Simple
+ formatting</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ <replaceable>
+ replaceable
+ </replaceable>
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[~replaceable]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.replaceable">Replaceble</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ source mode
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[c++]</literal> or <literal>[python]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.source_mode">Source Mode</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ inline code
+ </para>
+ </entry><entry>
+ <para>
+ <literal>`int main();`</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.inline_code">Inline code</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ code block
+ </para>
+ </entry><entry>
+ <para>
+ <literal>``int main();``</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.code">Code</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ code escape
+ </para>
+ </entry><entry>
+ <para>
+ <literal>``from c++ to QuickBook``</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.escape_back">Escaping Back To QuickBook</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ line break
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[br] or \n</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.line_break">line-break</link>
+ <emphasis role="bold">DEPRECATED</emphasis>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ anchor
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[#anchor]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.anchors">Anchors</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ link
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[@
http://www.boost.org Boost]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.links">Links</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ anchor link
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[link section.anchor Link text]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.anchor_links">Anchor links</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ refentry link
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[link xml.refentry Link text]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.refentry_links">refentry links</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ function link
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[funcref fully::qualified::function_name Link text]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.code_links">function, class, member,
+ enum, macro, concept or header links</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ class link
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[classref fully::qualified::class_name Link text]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.code_links">function, class, member,
+ enum, macro, concept or header links</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ member link
+ </para>
+ </entry><entry>
           <para>
- [cpp]
+ <literal>[memberref fully::qualified::member_name Link text]</literal>
           </para>
- <table frame="all"> <title>Syntax Compendium</title>
- <tgroup cols="3">
- <thead>
- <row>
- <entry>
- <para>
- To do this...
- </para>
- </entry><entry>
- <para>
- Use this...
- </para>
- </entry><entry>
- <para>
- See this...
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- comment
- </para>
- </entry><entry>
- <para>
- <literal>[/ some comment]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.comments">Comments</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- <emphasis>italics</emphasis>
- </para>
- </entry><entry>
- <para>
- <literal>['italics] or /italics/</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.font_styles">Font Styles</link>
- and <link linkend="quickbook.syntax.phrase.simple_formatting">Simple
- formatting</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- <emphasis role="bold">bold</emphasis>
- </para>
- </entry><entry>
- <para>
- <literal>[*bold] or *bold*</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.font_styles">Font Styles</link>
- and <link linkend="quickbook.syntax.phrase.simple_formatting">Simple
- formatting</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- <emphasis role="underline">underline</emphasis>
- </para>
- </entry><entry>
- <para>
- <literal>[_underline] or _underline_</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.font_styles">Font Styles</link>
- and <link linkend="quickbook.syntax.phrase.simple_formatting">Simple
- formatting</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- <literal>teletype</literal>
- </para>
- </entry><entry>
- <para>
- <literal>[^teletype] or =teletype=</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.font_styles">Font Styles</link>
- and <link linkend="quickbook.syntax.phrase.simple_formatting">Simple
- formatting</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- <emphasis role="strikethrough">strikethrough</emphasis>
- </para>
- </entry><entry>
- <para>
- <literal>[-strikethrough]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.font_styles">Font Styles</link>
- and <link linkend="quickbook.syntax.phrase.simple_formatting">Simple
- formatting</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- <replaceable>
- replaceable
- </replaceable>
- </para>
- </entry><entry>
- <para>
- <literal>[~replaceable]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.replaceable">Replaceble</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- source mode
- </para>
- </entry><entry>
- <para>
- <literal>[c++]</literal> or <literal>[python]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.source_mode">Source Mode</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- inline code
- </para>
- </entry><entry>
- <para>
- <literal>`int main();`</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.inline_code">Inline code</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- code block
- </para>
- </entry><entry>
- <para>
- <literal>``int main();``</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.code">Code</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- code escape
- </para>
- </entry><entry>
- <para>
- <literal>``from c++ to QuickBook``</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.escape_back">Escaping Back
- To QuickBook</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- line break
- </para>
- </entry><entry>
- <para>
- <literal>[br] or \n</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.line_break">line-break</link>
- <emphasis role="bold">DEPRECATED</emphasis>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- anchor
- </para>
- </entry><entry>
- <para>
- <literal>[#anchor]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.anchors">Anchors</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- link
- </para>
- </entry><entry>
- <para>
- <literal>[@http://www.boost.org Boost]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.links">Links</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- anchor link
- </para>
- </entry><entry>
- <para>
- <literal>[link section.anchor Link text]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.anchor_links">Anchor links</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- refentry link
- </para>
- </entry><entry>
- <para>
- <literal>[link xml.refentry Link text]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.refentry_links">refentry
- links</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- function link
- </para>
- </entry><entry>
- <para>
- <literal>[funcref fully::qualified::function_name Link text]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.code_links">function, class,
- member, enum, macro, concept or header links</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- class link
- </para>
- </entry><entry>
- <para>
- <literal>[classref fully::qualified::class_name Link text]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.code_links">function, class,
- member, enum, macro, concept or header links</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- member link
- </para>
- </entry><entry>
- <para>
- <literal>[memberref fully::qualified::member_name Link text]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.code_links">function, class,
- member, enum, macro, concept or header links</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- enum link
- </para>
- </entry><entry>
- <para>
- <literal>[enumref fully::qualified::enum_name Link text]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.code_links">function, class,
- member, enum, macro, concept or header links</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- macro link
- </para>
- </entry><entry>
- <para>
- <literal>[macroref MACRO_NAME Link text]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.code_links">function, class,
- member, enum, macro, concept or header links</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- concept link
- </para>
- </entry><entry>
- <para>
- <literal>[conceptref ConceptName Link text]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.code_links">function, class,
- member, enum, macro, concept or header links</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- header link
- </para>
- </entry><entry>
- <para>
- <literal>[headerref path/to/header.hpp Link text]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.code_links">function, class,
- member, enum, macro, concept or header links</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- escape
- </para>
- </entry><entry>
- <para>
- <literal>'''escaped text (no processing/formatting)'''</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.escape">Escape</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- single char escape
- </para>
- </entry><entry>
- <para>
- <literal>\c</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.single_char_escape">Single
- char escape</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- images
- </para>
- </entry><entry>
- <para>
- <literal>[$image.jpg]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.phrase.images">Images</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- begin section
- </para>
- </entry><entry>
- <para>
- <literal>[section The Section Title]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.section">Section</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- end section
- </para>
- </entry><entry>
- <para>
- <literal>[endsect]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.section">Section</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- paragraph
- </para>
- </entry><entry>
- <para>
- No markup. Paragraphs start left-flushed and are terminated by
- two or more newlines.
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.paragraphs">Paragraphs</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- ordered list
- </para>
- </entry><entry>
- <para>
-
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.code_links">function, class, member,
+ enum, macro, concept or header links</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ enum link
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[enumref fully::qualified::enum_name Link text]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.code_links">function, class, member,
+ enum, macro, concept or header links</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ macro link
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[macroref MACRO_NAME Link text]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.code_links">function, class, member,
+ enum, macro, concept or header links</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ concept link
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[conceptref ConceptName Link text]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.code_links">function, class, member,
+ enum, macro, concept or header links</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ header link
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[headerref path/to/header.hpp Link text]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.code_links">function, class, member,
+ enum, macro, concept or header links</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ escape
+ </para>
+ </entry><entry>
+ <para>
+ <literal>'''escaped text (no processing/formatting)'''</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.escape">Escape</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ single char escape
+ </para>
+ </entry><entry>
+ <para>
+ <literal>\c</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.single_char_escape">Single char
+ escape</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ images
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[$image.jpg]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.phrase.images">Images</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ begin section
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[section The Section Title]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.section">Section</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ end section
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[endsect]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.section">Section</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ paragraph
+ </para>
+ </entry><entry>
+ <para>
+ No markup. Paragraphs start left-flushed and are terminated by two or
+ more newlines.
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.paragraphs">Paragraphs</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ ordered list
+ </para>
+ </entry><entry>
+ <para>
+
 <programlisting><!--quickbook-escape-prefix--># one
 # two
 # three
 <!--quickbook-escape-postfix--></programlisting>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.lists.ordered_lists">Ordered
- lists</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- unordered list
- </para>
- </entry><entry>
- <para>
-
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.lists.ordered_lists">Ordered lists</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ unordered list
+ </para>
+ </entry><entry>
+ <para>
+
 <programlisting><!--quickbook-escape-prefix-->* one
 * two
 * three
 <!--quickbook-escape-postfix--></programlisting>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.lists.unordered_lists">Unordered
- lists</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- code
- </para>
- </entry><entry>
- <para>
- No markup. Preformatted code starts with a space or a tab.
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.code">Code</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- preformatted
- </para>
- </entry><entry>
- <para>
- <literal>[pre preformatted]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.preformatted">Preformatted</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- block quote
- </para>
- </entry><entry>
- <para>
- <literal>[:sometext...]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.blockquote">Blockquote</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- heading 1
- </para>
- </entry><entry>
- <para>
- <literal>[h1 Heading 1]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.headings">Heading</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- heading 2
- </para>
- </entry><entry>
- <para>
- <literal>[h2 Heading 2]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.headings">Heading</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- heading 3
- </para>
- </entry><entry>
- <para>
- <literal>[h3 Heading 3]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.headings">Heading</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- heading 4
- </para>
- </entry><entry>
- <para>
- <literal>[h4 Heading 4]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.headings">Heading</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- heading 5
- </para>
- </entry><entry>
- <para>
- <literal>[h5 Heading 5]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.headings">Heading</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- heading 6
- </para>
- </entry><entry>
- <para>
- <literal>[h6 Heading 6]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.headings">Heading</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- macro
- </para>
- </entry><entry>
- <para>
- <literal>[def macro_identifier some text]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.macros">Macros</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- template
- </para>
- </entry><entry>
- <para>
- <literal>[template[a b] [a] body [b]]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.templates">Templates</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- blurb
- </para>
- </entry><entry>
- <para>
- <literal>[blurb advertisement or note...]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.blurbs">Blurbs</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- admonition
- </para>
- </entry><entry>
- <para>
- <literal>[warning Warning text...]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.admonitions">Admonitions</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- table
- </para>
- </entry><entry>
- <para>
-
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.lists.unordered_lists">Unordered
+ lists</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ code
+ </para>
+ </entry><entry>
+ <para>
+ No markup. Preformatted code starts with a space or a tab.
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.code">Code</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ preformatted
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[pre preformatted]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.preformatted">Preformatted</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ block quote
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[:sometext...]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.blockquote">Blockquote</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ heading 1
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[h1 Heading 1]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.headings">Heading</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ heading 2
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[h2 Heading 2]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.headings">Heading</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ heading 3
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[h3 Heading 3]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.headings">Heading</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ heading 4
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[h4 Heading 4]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.headings">Heading</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ heading 5
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[h5 Heading 5]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.headings">Heading</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ heading 6
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[h6 Heading 6]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.headings">Heading</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ macro
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[def macro_identifier some text]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.macros">Macros</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ template
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[template[a b] [a] body [b]]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.templates">Templates</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ blurb
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[blurb advertisement or note...]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.blurbs">Blurbs</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ admonition
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[warning Warning text...]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.admonitions">Admonitions</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ table
+ </para>
+ </entry><entry>
+ <para>
+
 <programlisting><!--quickbook-escape-prefix-->[table Title
 [[a][b][c]]
 [[a][b][c]]
 ]
 <!--quickbook-escape-postfix--></programlisting>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.tables">Tables</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- variablelist
- </para>
- </entry><entry>
- <para>
-
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.tables">Tables</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ variablelist
+ </para>
+ </entry><entry>
+ <para>
+
 <programlisting><!--quickbook-escape-prefix-->[variablelist Title
 [[a][b]]
 [[a][b]]
 ]
 <!--quickbook-escape-postfix--></programlisting>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.variable_lists">Variable
- Lists</link>
- </para>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- include
- </para>
- </entry><entry>
- <para>
- <literal>[include someother.qbk]</literal>
- </para>
- </entry><entry>
- <para>
- <link linkend="quickbook.syntax.block.include">Include</link>
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
- </article>
-
\ No newline at end of file
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.variable_lists">Variable Lists</link>
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para>
+ include
+ </para>
+ </entry><entry>
+ <para>
+ <literal>[include someother.qbk]</literal>
+ </para>
+ </entry><entry>
+ <para>
+ <link linkend="quickbook.syntax.block.include">Include</link>
+ </para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+</article>

Modified: branches/release/tools/quickbook/test/templates.gold
==============================================================================
--- branches/release/tools/quickbook/test/templates.gold (original)
+++ branches/release/tools/quickbook/test/templates.gold 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -47,8 +47,7 @@
     </para>
     <para>
       
-<programlisting>
-<phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
+<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>
 <phrase role="special">}</phrase>

Modified: branches/release/tools/quickbook/test/templates.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/templates.quickbook (original)
+++ branches/release/tools/quickbook/test/templates.quickbook 2008-07-15 11:05:07 EDT (Tue, 15 Jul 2008)
@@ -93,4 +93,11 @@
 
 [plantation [banana]]
 
+[/-------------------------------- Bugs! ]
+
+[template join1[a b] [b][a]]
+[template join2[a b] [a][b]]
+[template test[x] [join1 [join2 0 [x]] 0]]
+[test 0]
+
 [endsect]


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