Boost-Commit mailing page: [Boost-commit] svn:boost r51774 - in branches/release: . tools/boostbook tools/boostbook/doc tools/boostbook/dtd tools/boostbook/test tools/boostbook/xsl tools/build/v2/tools tools/quickbook/detail tools/quickbook/doc tools/quickbook/test

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r51774 - in branches/release: . tools/boostbook tools/boostbook/doc tools/boostbook/dtd tools/boostbook/test tools/boostbook/xsl tools/build/v2/tools tools/quickbook/detail tools/quickbook/doc tools/quickbook/test
From: daniel_james_at_[hidden]
Date: 2009-03-14 07:42:42

Author: danieljames
Date: 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
New Revision: 51774
URL: http://svn.boost.org/trac/boost/changeset/51774

Log:
Merge most of the recent changes to quickbook and boostbook.

Left out doxygen changes: [51323],[51324],[51680]
And a quickbook change which might be a breaking change: [51403]

Fixes #1977, #1170, #1213, #2701.
Refs #2153, #2771.

Merged revisions 51268-51269,51319-51321,51370-51372,51388-51389,51401-51402,51405-51406,51508,51647,51696 via svnmerge from
https://svn.boost.org/svn/boost/trunk

........
  r51268 | johnmaddock | 2009-02-16 10:39:18 +0000 (Mon, 16 Feb 2009) | 1 line

  Add default path for callouts.
........
  r51269 | johnmaddock | 2009-02-16 10:40:26 +0000 (Mon, 16 Feb 2009) | 1 line

  Add preliminary HTMLHelp support.
........
  r51319 | danieljames | 2009-02-18 21:22:37 +0000 (Wed, 18 Feb 2009) | 1 line

  Remove long out of date warning.
........
  r51320 | danieljames | 2009-02-18 21:23:13 +0000 (Wed, 18 Feb 2009) | 1 line

  Write out the quickbook options when the file is missing.
........
  r51321 | danieljames | 2009-02-18 21:23:35 +0000 (Wed, 18 Feb 2009) | 1 line

  Add default path for callouts to xhtml.
........
  r51370 | danieljames | 2009-02-21 18:50:00 +0000 (Sat, 21 Feb 2009) | 4 lines

  Regenerate boostbook reference documentation and merge with existing
  documentation.

  Ref #2153
........
  r51371 | danieljames | 2009-02-21 18:50:14 +0000 (Sat, 21 Feb 2009) | 1 line

  Fix links in standalone boostbook documentation.
........
  r51372 | danieljames | 2009-02-21 18:50:25 +0000 (Sat, 21 Feb 2009) | 3 lines

  Change license in boostbook docs to boost license.

  Douglas Gregor is listed in the blanket permissions file.
........
  r51388 | danieljames | 2009-02-22 11:54:01 +0000 (Sun, 22 Feb 2009) | 1 line

  This DTD isn't stable, so I'm calling it a 'development' version. Which is probably wrong, but there you go.
........
  r51389 | danieljames | 2009-02-22 11:54:18 +0000 (Sun, 22 Feb 2009) | 2 lines

  Support the alt tag in headername and macroname. Also make headername
  and macroname valid. Refs #1977
........
  r51401 | danieljames | 2009-02-22 23:47:51 +0000 (Sun, 22 Feb 2009) | 8 lines

  Add a purpose for macroname, headername, enumname, globalname.

  Ref #2153: There's still no documentation for methodname and classname.
  These are actually defined in the docbook DTD for a different purpose so
  I'm not sure how to deal with them.

  http://www.docbook.org/tdg/en/html/methodname.html
  http://www.docbook.org/tdg/en/html/classname.html
........
  r51402 | danieljames | 2009-02-22 23:48:37 +0000 (Sun, 22 Feb 2009) | 7 lines

  Generate slightly more valid boostbook.

  For document types other than library:
  * Don't generate name or dirname for document types.
  * Put title before document info.

  Ref #2771
........
  r51405 | danieljames | 2009-02-22 23:49:21 +0000 (Sun, 22 Feb 2009) | 3 lines

  Print out unexpected characters as errors.

  Ref #1170
........
  r51406 | danieljames | 2009-02-22 23:49:36 +0000 (Sun, 22 Feb 2009) | 1 line

  Better handling of errors without line numbers.
........
  r51508 | danieljames | 2009-03-01 14:16:44 +0000 (Sun, 01 Mar 2009) | 3 lines

  Try to make anchor and link usage a little clearer.

  Refs #1213, #2701
........
  r51647 | danieljames | 2009-03-08 09:45:51 +0000 (Sun, 08 Mar 2009) | 1 line

  Display text purposes in function reference.
........
  r51696 | johnmaddock | 2009-03-11 10:22:42 +0000 (Wed, 11 Mar 2009) | 1 line

  Set margins to 0pt so they line up with surrounding text rather than appearing outside it - prevents margins from overlapping other content.
........

Added:
   branches/release/tools/boostbook/test/
      - copied from r51389, /trunk/tools/boostbook/test/
   branches/release/tools/boostbook/test/Jamfile.v2
      - copied unchanged from r51389, /trunk/tools/boostbook/test/Jamfile.v2
   branches/release/tools/boostbook/test/alt.xml
      - copied unchanged from r51389, /trunk/tools/boostbook/test/alt.xml
   branches/release/tools/boostbook/xsl/html-help.xsl
      - copied unchanged from r51269, /trunk/tools/boostbook/xsl/html-help.xsl
Removed:
   branches/release/tools/quickbook/test/stub.xml
Properties modified:
   branches/release/ (props changed)
Text files modified:
   branches/release/tools/boostbook/doc/Jamfile.v2 | 7
   branches/release/tools/boostbook/doc/boostbook.xml | 14 -
   branches/release/tools/boostbook/doc/reference.dtdxml | 284 +++++++++++++++++++++++++++++++--------
   branches/release/tools/boostbook/doc/reference.xml | 168 +++++++++++++++++++++-
   branches/release/tools/boostbook/dtd/boostbook.dtd | 14 +
   branches/release/tools/boostbook/setup_boostbook.py | 6
   branches/release/tools/boostbook/xsl/annotation.xsl | 26 +++
   branches/release/tools/boostbook/xsl/fo.xsl | 4
   branches/release/tools/boostbook/xsl/function.xsl | 2
   branches/release/tools/boostbook/xsl/html.xsl | 4
   branches/release/tools/boostbook/xsl/xhtml.xsl | 6
   branches/release/tools/build/v2/tools/boostbook.jam | 1
   branches/release/tools/quickbook/detail/actions.cpp | 90 ++++++++----
   branches/release/tools/quickbook/detail/post_process.cpp | 6
   branches/release/tools/quickbook/detail/quickbook.cpp | 15 +
   branches/release/tools/quickbook/detail/utils.cpp | 2
   branches/release/tools/quickbook/detail/utils.hpp | 4
   branches/release/tools/quickbook/doc/quickbook.qbk | 20 +
   branches/release/tools/quickbook/test/code-block-1.gold | 4
   branches/release/tools/quickbook/test/code-block-2.gold | 4
   branches/release/tools/quickbook/test/code-snippet.gold | 4
   branches/release/tools/quickbook/test/escape.gold | 5
   branches/release/tools/quickbook/test/import.gold | 5
   branches/release/tools/quickbook/test/link-side-by-side.gold | 6
   branches/release/tools/quickbook/test/preformatted.gold | 4
   branches/release/tools/quickbook/test/quickbook-manual.gold | 5
   branches/release/tools/quickbook/test/templates.gold | 141 ++++++++++---------
   branches/release/tools/quickbook/test/xinclude.gold | 17 +-
   28 files changed, 621 insertions(+), 247 deletions(-)

Modified: branches/release/tools/boostbook/doc/Jamfile.v2
==============================================================================
--- branches/release/tools/boostbook/doc/Jamfile.v2 (original)
+++ branches/release/tools/boostbook/doc/Jamfile.v2 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -7,5 +7,10 @@
project boost/doc ;
import boostbook : boostbook ;

-boostbook boostbook : boostbook.xml ;
+boostbook boostbook : boostbook.xml :
+ <xsl:param>html.stylesheet=../../../../doc/html/boostbook.css
+ <xsl:param>boost.root=../../../..
+ <xsl:param>boost.libraries=../../../../libs/libraries.htm
+ <xsl:param>navig.graphics=1
+ ;

Modified: branches/release/tools/boostbook/doc/boostbook.xml
==============================================================================
--- branches/release/tools/boostbook/doc/boostbook.xml (original)
+++ branches/release/tools/boostbook/doc/boostbook.xml 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -24,16 +24,10 @@
     </copyright>

     <legalnotice>
- <para>Permission to copy, use, sell and distribute this software
- is granted provided this copyright notice appears in all copies.
- Permission to modify the code and to distribute modified code is
- granted provided this copyright notice appears in all copies,
- and a notice that the code was modified is included with the
- copyright notice. </para>
-
- <para> This software is provided "as is" without express or
- implied warranty, and with no claim as to its suitability for
- any purpose. </para>
+ <para>Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or copy at
+ <ulink url="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt>).
+ </para>
     </legalnotice>
   </partinfo>

Modified: branches/release/tools/boostbook/dtd/boostbook.dtd
==============================================================================
--- branches/release/tools/boostbook/dtd/boostbook.dtd (original)
+++ branches/release/tools/boostbook/dtd/boostbook.dtd 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -1,5 +1,5 @@

-<!ENTITY % local.tech.char.class "|functionname|libraryname|enumname|code">
+<!ENTITY % local.tech.char.class "|functionname|libraryname|enumname|headername|macroname|code">
<!ENTITY % local.para.class
         "|using-namespace|using-class|librarylist|librarycategorylist">
<!ENTITY % local.descobj.class "|libraryinfo">

Modified: branches/release/tools/boostbook/setup_boostbook.py
==============================================================================
--- branches/release/tools/boostbook/setup_boostbook.py (original)
+++ branches/release/tools/boostbook/setup_boostbook.py 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -288,12 +288,6 @@
     print "Done! Execute \"bjam --v2\" in a documentation directory to generate"
     print "documentation with BoostBook. If you have not already, you will need"
     print "to compile Boost.Jam."
- print ""
- print "WARNING FOR WIN32: please obtain a patched version of xsltproc "
- print "from http://engineering.meta-comm.com/xsltproc-win32.zip if you"
- print "are running BoostBook build on Win32 system (this patched version"
- print "solves the long-standing xsltproc problem with "
- print "creating directories for output files)."

def main():
     ( tools_directory ) = accept_args( sys.argv[ 1: ] )

Modified: branches/release/tools/boostbook/xsl/annotation.xsl
==============================================================================
--- branches/release/tools/boostbook/xsl/annotation.xsl (original)
+++ branches/release/tools/boostbook/xsl/annotation.xsl 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -271,7 +271,16 @@
   </xsl:template>

   <xsl:template match="macroname" mode="annotation">
- <xsl:param name="name" select="text()"/>
+ <xsl:param name="name">
+ <xsl:choose>
+ <xsl:when test="@alt">
+ <xsl:value-of select="@alt"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="string(.)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:param>

     <xsl:variable name="node" select="key('macros', $name)"/>
     <xsl:choose>
@@ -291,7 +300,7 @@
               <xsl:with-param name="node" select="$node"/>
             </xsl:call-template>
           </xsl:with-param>
- <xsl:with-param name="text" select="$name"/>
+ <xsl:with-param name="text" select="string(.)"/>
         </xsl:call-template>
       </xsl:when>

@@ -307,7 +316,16 @@
   </xsl:template>

   <xsl:template match="headername" mode="annotation">
- <xsl:param name="name" select="text()"/>
+ <xsl:variable name="name">
+ <xsl:choose>
+ <xsl:when test="@alt">
+ <xsl:value-of select="@alt"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="string(.)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>

     <xsl:variable name="node" select="key('headers', $name)"/>
     <xsl:choose>
@@ -327,7 +345,7 @@
               <xsl:with-param name="node" select="$node"/>
             </xsl:call-template>
           </xsl:with-param>
- <xsl:with-param name="text" select="$name"/>
+ <xsl:with-param name="text" select="string(.)"/>
         </xsl:call-template>
       </xsl:when>

Modified: branches/release/tools/boostbook/xsl/fo.xsl
==============================================================================
--- branches/release/tools/boostbook/xsl/fo.xsl (original)
+++ branches/release/tools/boostbook/xsl/fo.xsl 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -176,6 +176,8 @@
   <xsl:attribute name="padding-top">0.2cm</xsl:attribute>
   <xsl:attribute name="padding-bottom">0.2cm</xsl:attribute>
   <xsl:attribute name="keep-together.within-page">1</xsl:attribute>
+ <xsl:attribute name="margin-left">0pt</xsl:attribute>
+ <xsl:attribute name="margin-right">0pt</xsl:attribute>
</xsl:attribute-set>

<!--
@@ -200,6 +202,8 @@
   <xsl:attribute name="hyphenate">true</xsl:attribute>
   <xsl:attribute name="wrap-option">wrap</xsl:attribute>
   <xsl:attribute name="hyphenation-character">↵</xsl:attribute>
+ <xsl:attribute name="margin-left">0pt</xsl:attribute>
+ <xsl:attribute name="margin-right">0pt</xsl:attribute>
</xsl:attribute-set>

<xsl:param name="hyphenate.verbatim" select="1"></xsl:param>

Modified: branches/release/tools/boostbook/xsl/function.xsl
==============================================================================
--- branches/release/tools/boostbook/xsl/function.xsl (original)
+++ branches/release/tools/boostbook/xsl/function.xsl 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -746,7 +746,7 @@
     <xsl:param name="namespace-reference" select="false()"/>

     <xsl:if test="$namespace-reference=false()">
- <xsl:apply-templates select="purpose/*"/>
+ <xsl:apply-templates select="purpose/*|purpose/text()"/>
     </xsl:if>

     <xsl:apply-templates select="description/*"/>

Modified: branches/release/tools/boostbook/xsl/html.xsl
==============================================================================
--- branches/release/tools/boostbook/xsl/html.xsl (original)
+++ branches/release/tools/boostbook/xsl/html.xsl 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -46,9 +46,11 @@
             select = "concat($boost.root, '/doc/html/images/')"/>
   <xsl:param name = "navig.graphics.path"
             select = "concat($boost.root, '/doc/html/images/')"/>
+ <xsl:param name = "callout.graphics.path"
+ select = "concat($boost.root, '/doc/src/images/callouts/')"/>

- <xsl:param name="admon.style">
+ <xsl:param name="admon.style">
     
</xsl:param>

Modified: branches/release/tools/boostbook/xsl/xhtml.xsl
==============================================================================
--- branches/release/tools/boostbook/xsl/xhtml.xsl (original)
+++ branches/release/tools/boostbook/xsl/xhtml.xsl 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -46,9 +46,11 @@
             select = "concat($boost.root, '/doc/xhtml/images/')"/>
   <xsl:param name = "navig.graphics.path"
             select = "concat($boost.root, '/doc/xhtml/images/')"/>
+ <xsl:param name = "callout.graphics.path"
+ select = "concat($boost.root, '/doc/src/images/callouts/')"/>

- <xsl:param name="admon.style">
+ <xsl:param name="admon.style">
     
</xsl:param>

@@ -75,6 +77,7 @@
set toc,title
   </xsl:param>

+
   <xsl:template name="format.cvs.revision">
     <xsl:param name="text"/>

@@ -307,4 +310,3 @@
</xsl:template>

</xsl:stylesheet>
-

Modified: branches/release/tools/build/v2/tools/boostbook.jam
==============================================================================
--- branches/release/tools/build/v2/tools/boostbook.jam (original)
+++ branches/release/tools/build/v2/tools/boostbook.jam 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -335,6 +335,7 @@
             case htmlhelp :
             {
                 type = HTMLHELP ;
+ manifest = HTML.manifest ;
             }

             case onehtml : type = HTML ;

Modified: branches/release/tools/quickbook/detail/actions.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/actions.cpp (original)
+++ branches/release/tools/quickbook/detail/actions.cpp 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -251,7 +251,11 @@
             << ", unexpected character: " << std::string(first, last)
             << "\n";

- out << '#'; // print out an unexpected character
+ // print out an unexpected character
+ out << "<phrase role=\"error\">";
+ while (first != last)
+ detail::print_char(*first++, out.get());
+ out << "</phrase>";
     }

     void anchor_action::operator()(iterator first, iterator last) const
@@ -1212,6 +1216,9 @@
         out << " <year>" << year << "</year>\n";
     }

+ static void write_document_title(collector& out, quickbook::actions& actions);
+ static void write_document_info(collector& out, quickbook::actions& actions);
+
     void pre(collector& out, quickbook::actions& actions, bool ignore_docinfo)
     {
         // The doc_info in the file has been parsed. Here's what we'll do
@@ -1221,7 +1228,7 @@
             actions.doc_id = detail::make_identifier(
                 actions.doc_title.begin(),actions.doc_title.end());

- if (actions.doc_dirname.empty())
+ if (actions.doc_dirname.empty() && actions.doc_type == "library")
             actions.doc_dirname = actions.doc_id;

         if (actions.doc_last_revision.empty())
@@ -1264,12 +1271,58 @@
             << "<!DOCTYPE library PUBLIC \"-//Boost//DTD BoostBook XML V1.0//EN\"\n"
             << " \"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd\">\n"
             << '<' << actions.doc_type << "\n"
- << " id=\"" << actions.doc_id << "\"\n"
- << " name=\"" << actions.doc_title << "\"\n"
- << " dirname=\"" << actions.doc_dirname << "\"\n"
- << " last-revision=\"" << actions.doc_last_revision << "\" \n"
- << " xmlns:xi=\"http://www.w3.org/2001/XInclude\">\n"
- << " <" << actions.doc_type << "info>\n";
+ << " id=\"" << actions.doc_id << "\"\n";
+
+ if(actions.doc_type == "library")
+ {
+ out << " name=\"" << actions.doc_title << "\"\n";
+ }
+
+ if(!actions.doc_dirname.empty())
+ {
+ out << " dirname=\"" << actions.doc_dirname << "\"\n";
+ }
+
+ out << " last-revision=\"" << actions.doc_last_revision << "\" \n"
+ << " xmlns:xi=\"http://www.w3.org/2001/XInclude\">\n";
+
+ if(actions.doc_type == "library") {
+ write_document_info(out, actions);
+ write_document_title(out, actions);
+ }
+ else {
+ write_document_title(out, actions);
+ write_document_info(out, actions);
+ }
+ }
+
+ void post(collector& out, quickbook::actions& actions, bool ignore_docinfo)
+ {
+ // if we're ignoring the document info, do nothing.
+ if (ignore_docinfo)
+ {
+ return;
+ }
+
+ // We've finished generating our output. Here's what we'll do
+ // *after* everything else.
+ out << "\n</" << actions.doc_type << ">\n\n";
+ }
+
+ void write_document_title(collector& out, quickbook::actions& actions)
+ {
+ if (!actions.doc_title.empty())
+ {
+ out<< " <title>" << actions.doc_title;
+ if (!actions.doc_version.empty())
+ out << ' ' << actions.doc_version;
+ out<< "</title>\n\n\n";
+ }
+ }
+
+ void write_document_info(collector& out, quickbook::actions& actions)
+ {
+ out << " <" << actions.doc_type << "info>\n";

         if(!actions.doc_authors.empty())
         {
@@ -1328,27 +1381,6 @@
         out << " </" << actions.doc_type << "info>\n"
             << "\n"
         ;
-
- if (!actions.doc_title.empty())
- {
- out << " <title>" << actions.doc_title;
- if (!actions.doc_version.empty())
- out << ' ' << actions.doc_version;
- out << "</title>\n\n\n";
- }
- }
-
- void post(collector& out, quickbook::actions& actions, bool ignore_docinfo)
- {
- // if we're ignoring the document info, do nothing.
- if (ignore_docinfo)
- {
- return;
- }
-
- // We've finished generating our output. Here's what we'll do
- // *after* everything else.
- out << "\n</" << actions.doc_type << ">\n\n";
     }

     void phrase_to_string_action::operator()(iterator first, iterator last) const

Modified: branches/release/tools/quickbook/detail/post_process.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/post_process.cpp (original)
+++ branches/release/tools/quickbook/detail/post_process.cpp 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -442,7 +442,7 @@
             else
             {
                 // fallback!
- ::quickbook::detail::outerr("",0)
+ ::quickbook::detail::outerr("")
                     << "Warning: Post Processing Failed."
                     << std::endl;
                 out << in;
@@ -453,8 +453,8 @@
         catch(...)
         {
             // fallback!
- ::quickbook::detail::outerr("",0)
- << "Warning: Post Processing Failed."
+ ::quickbook::detail::outerr("")
+ << "Post Processing Failed."
                 << std::endl;
             out << in;
             return 1;

Modified: branches/release/tools/quickbook/detail/quickbook.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/quickbook.cpp (original)
+++ branches/release/tools/quickbook/detail/quickbook.cpp 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -88,6 +88,12 @@
                 << "Syntax Error near column " << pos.column << ".\n";
             ++actor.error_count;
         }
+
+ if(actor.error_count)
+ {
+ detail::outerr(filein_)
+ << "Error count: " << actor.error_count << ".\n";
+ }

         return actor.error_count ? 1 : 0;
     }
@@ -98,7 +104,7 @@
         actions actor(filein_, outdir, out);
         bool r = parse(filein_, actor);
         if (actor.section_level != 0)
- detail::outwarn(filein_,1)
+ detail::outwarn(filein_)
                 << "Warning missing [endsect] detected at end of file."
                 << std::endl;
         return r;
@@ -264,20 +270,21 @@
         }
         else
         {
- quickbook::detail::outerr("",0) << "Error: No filename given" << std::endl;
+ quickbook::detail::outerr("") << "Error: No filename given\n\n"
+ << desc << std::endl;
             return 1;
         }
     }

     catch(std::exception& e)
     {
- quickbook::detail::outerr("",0) << "Error: " << e.what() << "\n";
+ quickbook::detail::outerr("") << "Error: " << e.what() << "\n";
         return 1;
     }

     catch(...)
     {
- quickbook::detail::outerr("",0) << "Error: Exception of unknown type caught\n";
+ quickbook::detail::outerr("") << "Error: Exception of unknown type caught\n";
         return 1;
     }

Modified: branches/release/tools/quickbook/detail/utils.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/utils.cpp (original)
+++ branches/release/tools/quickbook/detail/utils.cpp 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -212,7 +212,7 @@

         if (!in)
         {
- outerr(filename,-1) << "Could not open input file." << endl;
+ outerr(filename) << "Could not open input file." << endl;
             return 1;
         }

Modified: branches/release/tools/quickbook/detail/utils.hpp
==============================================================================
--- branches/release/tools/quickbook/detail/utils.hpp (original)
+++ branches/release/tools/quickbook/detail/utils.hpp 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -63,8 +63,8 @@
     // common IDEs. Uses the ms_errors global to determine if VS format
     // or GCC format. Returns the stream to continue ouput of the verbose
     // error message.
- std::ostream & outerr(std::string const& file, int line);
- std::ostream & outwarn(std::string const& file, int line);
+ std::ostream & outerr(std::string const& file, int line = -1);
+ std::ostream & outwarn(std::string const& file, int line = -1);

     // load file into memory with extra trailing newlines to eliminate
     // the need to check for end of file in the grammar.

Modified: branches/release/tools/quickbook/doc/quickbook.qbk
==============================================================================
--- branches/release/tools/quickbook/doc/quickbook.qbk (original)
+++ branches/release/tools/quickbook/doc/quickbook.qbk 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -461,6 +461,10 @@
document. You can then reference an anchor with [^'''[link named_anchor
Some link text]''']. See __anchor_links__, __section__ and __heading__.

+These anchors are global and can be accessed from anywhere in the
+quickbook documentation. Be careful to avoid clashes with anchors in
+other sections.
+
[endsect]
[section Links]

@@ -494,7 +498,7 @@
You can link within a document using:

[pre'''
-[link section_id.normalized_header_text The link text]
+[link document_id.section_id.normalized_header_text The link text]
''']

See sections __section__ and __heading__ for more info.
@@ -1053,14 +1057,16 @@
[h5 Heading 5]
[h6 Heading 6]

-Headings 1-3 \[h1 h2 and h3\] will automatically have anchors with normalized
-names with [^name="section_id.normalized_header_text"] (i.e. valid characters are
-=a-z=, =A-Z=, =0-9= and =_=. 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 [^section_2.heading_1]). You can use:
+Headings 1-3 \[h1 h2 and h3\] will automatically have anchors with
+normalized names with
+[^name="document_id.section_id.normalized_header_text"] (i.e. valid
+characters are =a-z=, =A-Z=, =0-9= and =_=. 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
+[^section_2.heading_1]). You can use:

[pre'''
-[link section_id.normalized_header_text The link text]
+[link document_id.section_id.normalized_header_text The link text]
''']

to link to them. See __anchor_links__ and __section__ for more info.

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 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="code_block_1" name="Code Block 1" dirname="code_block_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+<article id="code_block_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>Code Block 1</title>
   <articleinfo>
   </articleinfo>
- <title>Code Block 1</title>
   <section id="code_block_1.a_code_block">
     <title>A code block</title>
     <para>

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 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="code_block_2" name="Code Block 2" dirname="code_block_2" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+<article id="code_block_2" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>Code Block 2</title>
   <articleinfo>
   </articleinfo>
- <title>Code Block 2</title>
   <section id="code_block_2.a_code_block">
     <title>A code block</title>
     <para>

Modified: branches/release/tools/quickbook/test/code-snippet.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-snippet.gold (original)
+++ branches/release/tools/quickbook/test/code-snippet.gold 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="code_snippets" name="Code Snippets" dirname="code_snippets" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+<article id="code_snippets" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>Code Snippets</title>
   <articleinfo>
   </articleinfo>
- <title>Code Snippets</title>
   <section id="code_snippets.a_code_snippet">
     <title>A code snippet</title>
     <para>

Modified: branches/release/tools/quickbook/test/escape.gold
==============================================================================
--- branches/release/tools/quickbook/test/escape.gold (original)
+++ branches/release/tools/quickbook/test/escape.gold 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="escape" name="Escape" dirname="escape" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
- xmlns:xi="http://www.w3.org/2001/XInclude">
+<article id="escape" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>Escape</title>
   <articleinfo>
   </articleinfo>
- <title>Escape</title>
   <section id="escape.escape">
     <title>Escape</title>
     <para>

Modified: branches/release/tools/quickbook/test/import.gold
==============================================================================
--- branches/release/tools/quickbook/test/import.gold (original)
+++ branches/release/tools/quickbook/test/import.gold 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="import" name="Import" dirname="import" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
- xmlns:xi="http://www.w3.org/2001/XInclude">
+<article id="import" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>Import</title>
   <articleinfo>
   </articleinfo>
- <title>Import</title>
   <para>
     <para>
       This is the <emphasis role="bold"><emphasis>foo</emphasis></emphasis> function.

Modified: branches/release/tools/quickbook/test/link-side-by-side.gold
==============================================================================
--- branches/release/tools/quickbook/test/link-side-by-side.gold (original)
+++ branches/release/tools/quickbook/test/link-side-by-side.gold 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="side_by_side_links" name="Side-by-side links" dirname="side_by_side_links"
-last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
+<article id="side_by_side_links" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>Side-by-side links</title>
   <articleinfo>
   </articleinfo>
- <title>Side-by-side links</title>
   <section id="side_by_side_links.side_by_side_links">
     <title>Side-by-side links</title>
     <para>

Modified: branches/release/tools/quickbook/test/preformatted.gold
==============================================================================
--- branches/release/tools/quickbook/test/preformatted.gold (original)
+++ branches/release/tools/quickbook/test/preformatted.gold 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="preformatted" name="Preformatted" dirname="preformatted" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+<article id="preformatted" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>Preformatted</title>
   <articleinfo>
   </articleinfo>
- <title>Preformatted</title>
   <section id="preformatted.preformatted">
     <title>Preformatted</title>
     <para>

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 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="quickbook" name="Quickbook" dirname="quickbook" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
- xmlns:xi="http://www.w3.org/2001/XInclude">
+<article id="quickbook" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>Quickbook 1.4</title>
   <articleinfo>
     <authorgroup>
     <author>
@@ -25,7 +25,6 @@
       <emphasis>WikiWiki</emphasis> style documentation tool
     </articlepurpose>
   </articleinfo>
- <title>Quickbook 1.4</title>
   <section id="quickbook.intro">
     <title><link linkend="quickbook.intro"> Introduction</link></title>
     <blockquote>

Deleted: branches/release/tools/quickbook/test/stub.xml
==============================================================================
--- branches/release/tools/quickbook/test/stub.xml 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
+++ (empty file)
@@ -1 +0,0 @@
-<para>This is a paragraph.</para>

Modified: branches/release/tools/quickbook/test/templates.gold
==============================================================================
--- branches/release/tools/quickbook/test/templates.gold (original)
+++ branches/release/tools/quickbook/test/templates.gold 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -1,69 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="templates" name="Templates" dirname="templates" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
- xmlns:xi="http://www.w3.org/2001/XInclude">
- <articleinfo>
- </articleinfo>
- <title>Templates</title>
- <section id="templates.templates">
- <title><link linkend="templates.templates">Templates</link></title>
- <para>
- nullary_arg
- </para>
- <para>
- foo baz
- </para>
- <para>
- <para>
- foo baz
- </para>
- </para>
- <para>
- <para>
- This is a complete paragraph. kalamazoo kalamazoo kalamazoo kalamazoo kalamazoo
- kalamazoo kalamazoo kalamazoo kalamazoo.... blah blah blah......
- </para>
- </para>
- <para>
- <hey>baz</hey>
- </para>
- <para>
- <para>
- This is a complete paragraph. madagascar madagascar madagascar madagascar
- madagascar madagascar madagascar madagascar madagascar.... blah blah blah......
- </para>
- </para>
- <para>
- zoom peanut zoom
- </para>
- <para>
- exactly xanadu
- </para>
- <para>
- wx
- </para>
- <para>
- wxyz wxyz trail
- </para>
- <para>
-
-<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
-<phrase role="special">{</phrase>
- <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">cout</phrase> <phrase role="special"><<</phrase> "Hello, World" <phrase role="special"><<</phrase> <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">endl</phrase><phrase role="special">;</phrase>
-<phrase role="special">}</phrase>
-</programlisting>
- </para>
- <para>
- x<superscript>2</superscript>
- </para>
- <para>
- α<superscript>2</superscript>
- </para>
- <para>
- x<superscript>2</superscript>
- </para>
- <para>
- got a banana?
- </para>
- </section>
-</article>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<article id="templates" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>Templates</title>
+ <articleinfo>
+ </articleinfo>
+ <section id="templates.templates">
+ <title><link linkend="templates.templates">Templates</link></title>
+ <para>
+ nullary_arg
+ </para>
+ <para>
+ foo baz
+ </para>
+ <para>
+ <para>
+ foo baz
+ </para>
+ </para>
+ <para>
+ <para>
+ This is a complete paragraph. kalamazoo kalamazoo kalamazoo kalamazoo kalamazoo
+ kalamazoo kalamazoo kalamazoo kalamazoo.... blah blah blah......
+ </para>
+ </para>
+ <para>
+ <hey>baz</hey>
+ </para>
+ <para>
+ <para>
+ This is a complete paragraph. madagascar madagascar madagascar madagascar
+ madagascar madagascar madagascar madagascar madagascar.... blah blah blah......
+ </para>
+ </para>
+ <para>
+ zoom peanut zoom
+ </para>
+ <para>
+ exactly xanadu
+ </para>
+ <para>
+ wx
+ </para>
+ <para>
+ wxyz wxyz trail
+ </para>
+ <para>
+
+<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
+<phrase role="special">{</phrase>
+ <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">cout</phrase> <phrase role="special"><<</phrase> "Hello, World" <phrase role="special"><<</phrase> <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">endl</phrase><phrase role="special">;</phrase>
+<phrase role="special">}</phrase>
+</programlisting>
+ </para>
+ <para>
+ x<superscript>2</superscript>
+ </para>
+ <para>
+ α<superscript>2</superscript>
+ </para>
+ <para>
+ x<superscript>2</superscript>
+ </para>
+ <para>
+ got a banana?
+ </para>
+ <para>
+ [join2
+ </para>
+ </section>
+</article>

Modified: branches/release/tools/quickbook/test/xinclude.gold
==============================================================================
--- branches/release/tools/quickbook/test/xinclude.gold (original)
+++ branches/release/tools/quickbook/test/xinclude.gold 2009-03-14 07:42:38 EDT (Sat, 14 Mar 2009)
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="include" name="Include" dirname="include" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
- xmlns:xi="http://www.w3.org/2001/XInclude">
- <articleinfo>
- </articleinfo>
- <title>Include</title>
- <xi:include href="../../../../../../../../../tools/quickbook/test/stub.xml" />
-</article>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<article id="include" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>Include</title>
+ <articleinfo>
+ </articleinfo>
+ <xi:include href="../../../../../../../../../tools/quickbook/test/stub.xml" />
+</article>

Date view	Thread view	Subject view	Author view