Boost logo

Boost-Commit :

From: joel_at_[hidden]
Date: 2008-05-21 02:29:35


Author: djowel
Date: 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
New Revision: 45598
URL: http://svn.boost.org/trac/boost/changeset/45598

Log:
- doc updates
- rudementary template debugging
- template bug! added in test
Text files modified:
   trunk/tools/quickbook/detail/actions.cpp | 12 ++++++---
   trunk/tools/quickbook/doc/html/index.html | 10 +++---
   trunk/tools/quickbook/doc/html/quickbook/change_log.html | 10 +++---
   trunk/tools/quickbook/doc/html/quickbook/editors.html | 6 ++--
   trunk/tools/quickbook/doc/html/quickbook/editors/kde_support.html | 20 +++++++-------
   trunk/tools/quickbook/doc/html/quickbook/editors/scite.html | 6 ++--
   trunk/tools/quickbook/doc/html/quickbook/faq.html | 10 +++---
   trunk/tools/quickbook/doc/html/quickbook/install.html | 6 ++--
   trunk/tools/quickbook/doc/html/quickbook/install/linux.html | 6 ++--
   trunk/tools/quickbook/doc/html/quickbook/install/macosx.html | 6 ++--
   trunk/tools/quickbook/doc/html/quickbook/install/windows.html | 6 ++--
   trunk/tools/quickbook/doc/html/quickbook/intro.html | 6 ++--
   trunk/tools/quickbook/doc/html/quickbook/ref.html | 8 +++---
   trunk/tools/quickbook/doc/html/quickbook/syntax.html | 6 ++--
   trunk/tools/quickbook/doc/html/quickbook/syntax/block.html | 52 ++++++++++++++++++++--------------------
   trunk/tools/quickbook/doc/html/quickbook/syntax/comments.html | 6 ++--
   trunk/tools/quickbook/doc/html/quickbook/syntax/phrase.html | 22 ++++++++--------
   trunk/tools/quickbook/test/templates.quickbook | 7 +++++
   18 files changed, 108 insertions(+), 97 deletions(-)

Modified: trunk/tools/quickbook/detail/actions.cpp
==============================================================================
--- trunk/tools/quickbook/detail/actions.cpp (original)
+++ trunk/tools/quickbook/detail/actions.cpp 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -684,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;
@@ -1061,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())
             {
@@ -1070,7 +1074,7 @@
                 {
                     return current / path;
                 }
-
+
                 // Search in each of the include path locations.
                 BOOST_FOREACH(std::string const & p, include_path)
                 {
@@ -1082,7 +1086,7 @@
                     }
                 }
             }
-
+
             return path;
         }
     }

Modified: trunk/tools/quickbook/doc/html/index.html
==============================================================================
--- trunk/tools/quickbook/doc/html/index.html (original)
+++ trunk/tools/quickbook/doc/html/index.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -10,10 +10,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>
@@ -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="id385586"></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: November 14, 2007 at 10:19:55 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: trunk/tools/quickbook/doc/html/quickbook/change_log.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/change_log.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/change_log.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>
@@ -26,7 +26,7 @@
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="quickbook.change_log"></a> Change Log</h2></div></div></div>
 <a name="quickbook.change_log.version_1_3"></a><h3>
-<a name="id386998"></a>
+<a name="id386592"></a>
       <a href="change_log.html#quickbook.change_log.version_1_3">Version 1.3</a>
     </h3>
 <div class="itemizedlist"><ul type="disc">
@@ -94,7 +94,7 @@
       </li>
 </ul></div>
 <a name="quickbook.change_log.version_1_4"></a><h3>
-<a name="id386285"></a>
+<a name="id387357"></a>
       <a href="change_log.html#quickbook.change_log.version_1_4">Version 1.4</a>
     </h3>
 <div class="itemizedlist"><ul type="disc">

Modified: trunk/tools/quickbook/doc/html/quickbook/editors.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/editors.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/editors.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>

Modified: trunk/tools/quickbook/doc/html/quickbook/editors/kde_support.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/editors/kde_support.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/editors/kde_support.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>
@@ -26,7 +26,7 @@
 <div class="titlepage"><div><div><h3 class="title">
 <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="id466261"></a>
+<a name="id466336"></a>
         <a href="kde_support.html#quickbook.editors.kde_support.boost__hs__quickbook">boost::hs::quickbook</a>
       </h4>
 <p>
@@ -51,7 +51,7 @@
         <span class="bold"><b>html generated from this .qbk file</b></span>
       </p>
 <div class="table">
-<a name="id466362"></a><p class="title"><b>Table 7. Code examples</b></p>
+<a name="id466438"></a><p class="title"><b>Table 7. Code examples</b></p>
 <table class="table" summary="Code examples">
 <colgroup>
 <col>
@@ -140,7 +140,7 @@
 </table>
 </div>
 <a name="quickbook.editors.kde_support.code_folding_"></a><h4>
-<a name="id466769"></a>
+<a name="id466844"></a>
         <a href="kde_support.html#quickbook.editors.kde_support.code_folding_">Code Folding
         </a>
       </h4>
@@ -150,7 +150,7 @@
         region can be folded or unfolded independently.
       </p>
 <a name="quickbook.editors.kde_support.auto_comment___uncomment_"></a><h4>
-<a name="id466801"></a>
+<a name="id466877"></a>
         <a href="kde_support.html#quickbook.editors.kde_support.auto_comment___uncomment_">Auto
         Comment / Uncomment </a>
       </h4>
@@ -161,7 +161,7 @@
         while being in it.
       </p>
 <a name="quickbook.editors.kde_support.styles_reference_"></a><h4>
-<a name="id466843"></a>
+<a name="id466918"></a>
         <a href="kde_support.html#quickbook.editors.kde_support.styles_reference_">Styles reference
         </a>
       </h4>
@@ -398,7 +398,7 @@
 </tbody>
 </table></div>
 <a name="quickbook.editors.kde_support.about_boost__hs"></a><h4>
-<a name="id467291"></a>
+<a name="id467367"></a>
         <a href="kde_support.html#quickbook.editors.kde_support.about_boost__hs">About boost::hs</a>
       </h4>
 <p>
@@ -419,7 +419,7 @@
         </p></td></tr>
 </table></div>
 <a name="quickbook.editors.kde_support.installing_boost__hs"></a><h4>
-<a name="id467359"></a>
+<a name="id467435"></a>
         <a href="kde_support.html#quickbook.editors.kde_support.installing_boost__hs">Installing
         boost::hs</a>
       </h4>

Modified: trunk/tools/quickbook/doc/html/quickbook/editors/scite.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/editors/scite.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/editors/scite.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>

Modified: trunk/tools/quickbook/doc/html/quickbook/faq.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/faq.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/faq.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>
@@ -26,7 +26,7 @@
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <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="id467511"></a>
+<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>
     </h3>
@@ -68,7 +68,7 @@
     ;
 </pre>
 <a name="quickbook.faq.is_there_an_easy_way_to_convert_boostbook_docs_to_quickbook_"></a><h3>
-<a name="id467599"></a>
+<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>
     </h3>

Modified: trunk/tools/quickbook/doc/html/quickbook/install.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/install.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/install.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>

Modified: trunk/tools/quickbook/doc/html/quickbook/install/linux.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/install/linux.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/install/linux.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>

Modified: trunk/tools/quickbook/doc/html/quickbook/install/macosx.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/install/macosx.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/install/macosx.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>

Modified: trunk/tools/quickbook/doc/html/quickbook/install/windows.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/install/windows.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/install/windows.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>

Modified: trunk/tools/quickbook/doc/html/quickbook/intro.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/intro.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/intro.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>

Modified: trunk/tools/quickbook/doc/html/quickbook/ref.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/ref.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/ref.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -11,10 +11,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>
@@ -27,7 +27,7 @@
 <p>
     </p>
 <div class="table">
-<a name="id467661"></a><p class="title"><b>Table 8. Syntax Compendium</b></p>
+<a name="id467737"></a><p class="title"><b>Table 8. Syntax Compendium</b></p>
 <table class="table" summary="Syntax Compendium">
 <colgroup>
 <col>

Modified: trunk/tools/quickbook/doc/html/quickbook/syntax.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/syntax.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/syntax.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>

Modified: trunk/tools/quickbook/doc/html/quickbook/syntax/block.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/syntax/block.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/syntax/block.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>
@@ -644,27 +644,27 @@
 [h6 Heading 6]
 </pre>
 <a name="quickbook.syntax.block.headings.heading_1"></a><h1>
-<a name="id459656"></a>
+<a name="id459731"></a>
           <a href="block.html#quickbook.syntax.block.headings.heading_1">Heading 1</a>
         </h1>
 <a name="quickbook.syntax.block.headings.heading_2"></a><h2>
-<a name="id459680"></a>
+<a name="id459755"></a>
           <a href="block.html#quickbook.syntax.block.headings.heading_2">Heading 2</a>
         </h2>
 <a name="quickbook.syntax.block.headings.heading_3"></a><h3>
-<a name="id459704"></a>
+<a name="id459780"></a>
           <a href="block.html#quickbook.syntax.block.headings.heading_3">Heading 3</a>
         </h3>
 <a name="quickbook.syntax.block.headings.heading_4"></a><h4>
-<a name="id459729"></a>
+<a name="id459804"></a>
           <a href="block.html#quickbook.syntax.block.headings.heading_4">Heading 4</a>
         </h4>
 <a name="quickbook.syntax.block.headings.heading_5"></a><h5>
-<a name="id459754"></a>
+<a name="id459829"></a>
           <a href="block.html#quickbook.syntax.block.headings.heading_5">Heading 5</a>
         </h5>
 <a name="quickbook.syntax.block.headings.heading_6"></a><h5>
-<a name="id459779"></a>
+<a name="id459854"></a>
           <a href="block.html#quickbook.syntax.block.headings.heading_6">Heading 6</a>
         </h5>
 <p>
@@ -802,7 +802,7 @@
           Quickbook has some predefined macros that you can already use.
         </p>
 <div class="table">
-<a name="id460235"></a><p class="title"><b>Table 3. Predefined Macros</b></p>
+<a name="id460310"></a><p class="title"><b>Table 3. Predefined Macros</b></p>
 <table class="table" summary="Predefined Macros">
 <colgroup>
 <col>
@@ -840,7 +840,7 @@
               </td>
 <td>
               <p>
- 2007-Nov-14
+ 2008-May-21
               </p>
               </td>
 </tr>
@@ -857,7 +857,7 @@
               </td>
 <td>
               <p>
- 06:19:55 PM
+ 11:54:31 AM
               </p>
               </td>
 </tr>
@@ -903,7 +903,7 @@
 ]
 </pre>
 <a name="quickbook.syntax.block.templates.template_identifier"></a><h5>
-<a name="id460416"></a>
+<a name="id460490"></a>
           <a href="block.html#quickbook.syntax.block.templates.template_identifier">Template
           Identifier</a>
         </h5>
@@ -921,7 +921,7 @@
           </li>
 </ul></div>
 <a name="quickbook.syntax.block.templates.formal_template_arguments"></a><h5>
-<a name="id460462"></a>
+<a name="id460537"></a>
           <a href="block.html#quickbook.syntax.block.templates.formal_template_arguments">Formal
           Template Arguments</a>
         </h5>
@@ -941,7 +941,7 @@
           of the template call.
         </p>
 <a name="quickbook.syntax.block.templates.template_body"></a><h5>
-<a name="id460581"></a>
+<a name="id460656"></a>
           <a href="block.html#quickbook.syntax.block.templates.template_body">Template
           Body</a>
         </h5>
@@ -966,7 +966,7 @@
           block level elements are not allowed in phrase templates.
         </p>
 <a name="quickbook.syntax.block.templates.template_expansion"></a><h5>
-<a name="id460640"></a>
+<a name="id460715"></a>
           <a href="block.html#quickbook.syntax.block.templates.template_expansion">Template
           Expansion</a>
         </h5>
@@ -1017,7 +1017,7 @@
           by the close parenthesis.
         </p>
 <a name="quickbook.syntax.block.templates.nullary_templates"></a><h5>
-<a name="id460747"></a>
+<a name="id460822"></a>
           <a href="block.html#quickbook.syntax.block.templates.nullary_templates">Nullary
           Templates</a>
         </h5>
@@ -1100,7 +1100,7 @@
           brackets, though.
         </p>
 <a name="quickbook.syntax.block.templates.simple_arguments"></a><h5>
-<a name="id460981"></a>
+<a name="id461056"></a>
           <a href="block.html#quickbook.syntax.block.templates.simple_arguments">Simple
           Arguments</a>
         </h5>
@@ -1168,7 +1168,7 @@
           what do you think man?
         </p>
 <a name="quickbook.syntax.block.templates.punctuation_templates"></a><h5>
-<a name="id461151"></a>
+<a name="id461226"></a>
           <a href="block.html#quickbook.syntax.block.templates.punctuation_templates">Punctuation
           Templates</a>
         </h5>
@@ -1244,7 +1244,7 @@
           will generate:
         </p>
 <div class="table">
-<a name="id461354"></a><p class="title"><b>Table 4. A Simple Table</b></p>
+<a name="id461429"></a><p class="title"><b>Table 4. A Simple Table</b></p>
 <table class="table" summary="A Simple Table">
 <colgroup>
 <col>
@@ -1355,7 +1355,7 @@
           and thus:
         </p>
 <div class="table">
-<a name="id461518"></a><p class="title"><b>Table 5. Table with fat cells</b></p>
+<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>
@@ -1430,7 +1430,7 @@
 ]
 </pre>
 <div class="table">
-<a name="id461636"></a><p class="title"><b>Table 6. Table with code</b></p>
+<a name="id461711"></a><p class="title"><b>Table 6. Table with code</b></p>
 <table class="table" summary="Table with code">
 <colgroup>
 <col>
@@ -1570,7 +1570,7 @@
           QuickBook's import facility provides a nice solution.
         </p>
 <a name="quickbook.syntax.block.import.example"></a><h5>
-<a name="id462059"></a>
+<a name="id462135"></a>
           <a href="block.html#quickbook.syntax.block.import.example">Example</a>
         </h5>
 <p>
@@ -1667,7 +1667,7 @@
 <p>
         </p>
 <a name="quickbook.syntax.block.import.code_snippet_markup"></a><h5>
-<a name="id462364"></a>
+<a name="id462439"></a>
           <a href="block.html#quickbook.syntax.block.import.code_snippet_markup">Code
           Snippet Markup</a>
         </h5>
@@ -1688,7 +1688,7 @@
           This too will not be visible in quickbook.
         </p>
 <a name="quickbook.syntax.block.import.special_comments"></a><h5>
-<a name="id462489"></a>
+<a name="id462565"></a>
           <a href="block.html#quickbook.syntax.block.import.special_comments">Special
           Comments</a>
         </h5>
@@ -1736,7 +1736,7 @@
           between the delimeters will simply be ignored.
         </p>
 <a name="quickbook.syntax.block.import.callouts"></a><h5>
-<a name="id462669"></a>
+<a name="id462744"></a>
           <a href="block.html#quickbook.syntax.block.import.callouts">Callouts</a>
         </h5>
 <p>

Modified: trunk/tools/quickbook/doc/html/quickbook/syntax/comments.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/syntax/comments.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/syntax/comments.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>

Modified: trunk/tools/quickbook/doc/html/quickbook/syntax/phrase.html
==============================================================================
--- trunk/tools/quickbook/doc/html/quickbook/syntax/phrase.html (original)
+++ trunk/tools/quickbook/doc/html/quickbook/syntax/phrase.html 2008-05-21 02:29:33 EDT (Wed, 21 May 2008)
@@ -12,10 +12,10 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center">Home</td>
+<td align="center">Home</td>
 <td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
+<td align="center">People</td>
+<td align="center">FAQ</td>
 <td align="center">More</td>
 </tr></table>
 <hr>
@@ -136,7 +136,7 @@
 <p>
           Unlike QuickBook's standard formatting scheme, the rules for simpler alternatives
           are much stricter
- <sup>[<a name="id455996" href="#ftn.id455996">1</a>]</sup>
+ <sup>[<a name="id456069" href="#ftn.id456069">1</a>]</sup>
           .
         </p>
 <div class="itemizedlist"><ul type="disc">
@@ -172,7 +172,7 @@
           </li>
 </ul></div>
 <div class="table">
-<a name="id456079"></a><p class="title"><b>Table 1. More Formatting Samples</b></p>
+<a name="id456153"></a><p class="title"><b>Table 1. More Formatting Samples</b></p>
 <table class="table" summary="More Formatting Samples">
 <colgroup>
 <col>
@@ -495,7 +495,7 @@
           whereas a Python comment <tt class="computeroutput"><span class="comment">#looks like this</span></tt>.
         </p>
 <div class="table">
-<a name="id457060"></a><p class="title"><b>Table 2. Supported Source Modes</b></p>
+<a name="id457134"></a><p class="title"><b>Table 2. Supported Source Modes</b></p>
 <table class="table" summary="Supported Source Modes">
 <colgroup>
 <col>
@@ -761,7 +761,7 @@
 </pre>
 <p>
           will generate this
- <sup>[<a name="id457901" href="#ftn.id457901">2</a>]</sup>
+ <sup>[<a name="id457975" href="#ftn.id457975">2</a>]</sup>
           .
         </p>
 <div class="section" lang="en">
@@ -814,22 +814,22 @@
         </p>
 <p>
           Yes!
- <sup>[<a name="id458075" href="#ftn.id458075">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.id455996" href="#id455996">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.id457901" href="#id457901">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.id458075" href="#id458075">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: trunk/tools/quickbook/test/templates.quickbook
==============================================================================
--- trunk/tools/quickbook/test/templates.quickbook (original)
+++ trunk/tools/quickbook/test/templates.quickbook 2008-05-21 02:29:33 EDT (Wed, 21 May 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