Merge the 1.5.2 changes from trunk.

[SVN r62830]
2026-01-26 06:42:27 +00:00 · 2010-06-12 08:29:53 +00:00
parent f50dee9a1c
commit e529faf7ba
62 changed files with 1569 additions and 612 deletions
--- a/Jamfile.v2
+++ b/Jamfile.v2
@@ -49,6 +49,8 @@ exe quickbook
    /boost//program_options
    /boost//filesystem
    : #<define>QUICKBOOK_NO_DATES
+      # Still using 'normalize' which has been deprecated.
+      #<define>BOOST_FILESYSTEM_NO_DEPRECATED
      <toolset>msvc:<cxxflags>/wd4355
      <toolset>msvc:<cxxflags>/wd4511
      <toolset>msvc:<cxxflags>/wd4512
--- a/block_actions.cpp
+++ b/block_actions.cpp
@@ -243,7 +243,7 @@ namespace quickbook

        fs::path include_search(fs::path const & current, std::string const & name)
        {
-            fs::path path(name,fs::native);
+            fs::path path(name);

            // If the path is relative, try and resolve it.
            if (!path.is_complete())
@@ -257,7 +257,7 @@ namespace quickbook
                // Search in each of the include path locations.
                BOOST_FOREACH(std::string const & p, include_path)
                {
-                    fs::path full(p,fs::native);
+                    fs::path full(p);
                    full /= path;
                    if (fs::exists(full))
                    {
@@ -295,7 +295,7 @@ namespace quickbook
            if (!path.is_complete())
            {
                fs::path infile = fs::complete(state.filename).normalize();
-                path = (infile.branch_path() / path).normalize();
+                path = (infile.parent_path() / path).normalize();
                fs::path outdir = fs::complete(state.outdir).normalize();
                path = path_difference(outdir, path);
            }
@@ -312,7 +312,7 @@ namespace quickbook

    nothing process(quickbook::state& state, include const& x)
    {
-        fs::path filein = include_search(state.filename.branch_path(), x.path);
+        fs::path filein = include_search(state.filename.parent_path(), x.path);
        raw_string doc_id;

        // swap the filenames
@@ -342,10 +342,10 @@ namespace quickbook

        // update the __FILENAME__ macro
        *state.macro.find("__FILENAME__") =
-            quickbook::macro(state.filename.native_file_string());
+            quickbook::macro(state.filename.file_string());

        // parse the file
-        quickbook::parse(state.filename.native_file_string().c_str(), state, true);
+        quickbook::parse(state.filename.file_string().c_str(), state, true);

        // restore the values
        std::swap(state.filename, filein);
@@ -369,8 +369,8 @@ namespace quickbook

    nothing process(quickbook::state& state, import const& x)
    {
-        fs::path path = include_search(state.filename.branch_path(), x.path);
-        std::string ext = fs::extension(path);
+        fs::path path = include_search(state.filename.parent_path(), x.path);
+        std::string ext = path.extension();
        std::vector<define_template> storage;
        state.error_count +=
            load_snippets(path.string(), storage, ext, state.doc_id);
--- a/block_grammar.cpp
+++ b/block_grammar.cpp
@@ -55,7 +55,7 @@ namespace quickbook
            |   code                            [actions.process]
            |   list                            [actions.process]
            |   hr                              [actions.process]
-            |   comment >> *eol
+            |   comment >> +eol
            |   paragraph                       [actions.process]
            |   eol
            )
@@ -102,7 +102,7 @@ namespace quickbook
           *(   common
            |   (qi::char_ -
                    (   qi::eol >> *qi::blank >> &(qi::char_('*') | '#')
-                    |   (eol >> eol)
+                    |   (eol >> *qi::blank >> qi::eol)
                    )
                )                               [actions.process]
            )
@@ -136,7 +136,7 @@ namespace quickbook
            ;

        paragraph_end =
-            '[' >> space >> paragraph_end_markups >> hard_space | eol >> eol
+            '[' >> space >> paragraph_end_markups >> hard_space | eol >> *qi::blank >> qi::eol
            ;

        paragraph_end_markups =
--- a/block_markup_grammar.cpp
+++ b/block_markup_grammar.cpp
@@ -374,8 +374,7 @@ namespace quickbook
        inside_paragraph =
                qi::eps                             [actions.phrase_push]
            >>  inside_paragraph2                   [actions.process]
-            >>  *(  eol
-                >>  eol
+            >>  *(  +eol
                >>  inside_paragraph2               [actions.process]
                )
            >>  qi::eps                             [actions.phrase_pop]
@@ -397,7 +396,7 @@ namespace quickbook
        // Make sure that we don't go past a single block, except when
        // preformatted.
        phrase_end =
-            ']' | qi::eps(ph::ref(no_eols)) >> eol >> eol
+            ']' | qi::eps(ph::ref(no_eols)) >> eol >> *qi::blank >> qi::eol
            ;

        // Identifiers
--- a/boostbook.cpp
+++ b/boostbook.cpp
@@ -63,14 +63,14 @@ namespace quickbook
            { "h5", "<bridgehead renderas=\"sect5\">", "</bridgehead>" },
            { "h6", "<bridgehead renderas=\"sect6\">", "</bridgehead>" },
            { "blurb", "<sidebar role=\"blurb\">\n", "</sidebar>\n" },
-            { "blockquote", "<blockquote><para>", "</para></blockquote>" },
+            { "blockquote", "<blockquote>", "</blockquote>" },
            { "preformatted", "<programlisting>", "</programlisting>" },
            { "warning", "<warning>", "</warning>" },
            { "caution", "<caution>", "</caution>" },
            { "important", "<important>", "</important>" },
            { "note", "<note>", "</note>" },
            { "tip", "<tip>", "</tip>" },
-            { "list_item", "<listitem>\n", "\n</listitem>" },
+            { "list_item", "<listitem><simpara>\n", "\n</simpara></listitem>" },
            { "bold", "<emphasis role=\"bold\">", "</emphasis>" },
            { "italic", "<emphasis>", "</emphasis>" },
            { "underline", "<emphasis role=\"underline\">", "</emphasis>" },
@@ -354,9 +354,9 @@ namespace quickbook
        for(std::vector<list_item2>::const_iterator
            it = x.items.begin(), end = x.items.end(); it != end; ++it)
        {
-            state.phrase << "<listitem>\n" << it->content;
+            state.phrase << "<listitem><simpara>\n" << it->content;
            if(!it->sublist.items.empty()) (*this)(state, it->sublist);
-            state.phrase << std::string("\n</listitem>");
+            state.phrase << std::string("\n</simpara></listitem>");
        }

        state.phrase << std::string(x.mark == '#' ? "\n</orderedlist>" : "\n</itemizedlist>");
@@ -365,11 +365,10 @@ namespace quickbook
    void boostbook_encoder::operator()(quickbook::state& state, callout_link const& x)
    {
        state.phrase
-            << "<phrase role=\"" << x.role << "\">"
            << "<co id=\"" << x.identifier << "co\""
            << " linkends=\"" << x.identifier << "\""
            << " />"
-            << "</phrase>";
+            ;
    }

    void boostbook_encoder::operator()(quickbook::state& state, callout_list const& x)
@@ -412,7 +411,9 @@ namespace quickbook

        state.phrase
            << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-            << "<!DOCTYPE library PUBLIC \"-//Boost//DTD BoostBook XML V1.0//EN\""
+            << "<!DOCTYPE "
+            << info.doc_type
+            << " PUBLIC \"-//Boost//DTD BoostBook XML V1.0//EN\""
            << " \"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd\">";

        // Document tag
@@ -505,11 +506,11 @@ namespace quickbook
            ;
        }

-        if (!info.doc_category.empty())
+        BOOST_FOREACH(raw_string const& category, info.doc_categories)
        {
            state.phrase
                << "<" << info.doc_type << "category name=\"category:"
-                << encode(info.doc_category)
+                << encode(category)
                << "\"></" << info.doc_type << "category>\n"
                << "\n"
            ;
--- a/code_snippet_grammar.cpp
+++ b/code_snippet_grammar.cpp
@@ -36,8 +36,6 @@ namespace quickbook
            code_elements;
        qi::rule<iterator, std::string()>
            identifier;
-        qi::rule<iterator, quickbook::callout()>
-            inline_callout, line_callout;
        qi::rule<iterator, quickbook::escaped_comment()>
            escaped_comment;
    };  
--- a/doc/quickbook.qbk
+++ b/doc/quickbook.qbk
@@ -192,6 +192,19 @@ Features include:
 * Add command line flag to define macros at the command line,
  e.g. `quickbook "-D__italic_foo__=/foo/"`.

+[h3 Version 1.5.2 - Boost 1.44.0]
+
+* Generate more valid boostbook (still invalid in a few places).
+* Warn about invalid doc_info members.
+* Support multiple categories in library doc_info.
+* Use the cygwin 1.7 API for better path handling.
+* Fix some corner cases for paragraph detection:
+  * A line containing only a comment is no longer interpreted as a
+    paragraph break.
+  * If a line starts with a comment, interpret it as a paragraph even if it's
+    followed by whitespace or a list character.
+  * Don't treat 4+ consecutive blank lines as multiple paragraph breaks.
+
 [endsect]

 [section:syntax Syntax Summary]
--- a/doc_info.hpp
+++ b/doc_info.hpp
@@ -24,6 +24,7 @@ namespace quickbook
        typedef std::vector<unsigned int> copyright_years;
        typedef std::pair<copyright_years, std::string> copyright_entry;
        typedef std::vector<copyright_entry> copyright_list;
+        typedef std::vector<raw_string> category_list;
        typedef std::pair<std::string, std::string> author;
        typedef std::vector<author> author_list;
        typedef boost::variant<raw_string, std::string> variant_string;
@@ -36,7 +37,7 @@ namespace quickbook
        raw_string              doc_dirname;
        copyright_list          doc_copyrights;
        variant_string          doc_purpose;
-        raw_string              doc_category;
+        category_list           doc_categories;
        author_list             doc_authors;
        variant_string          doc_license;
        raw_string              doc_last_revision;
--- a/doc_info_actions.cpp
+++ b/doc_info_actions.cpp
@@ -12,6 +12,7 @@
 #include <string>
 #include <vector>
 #include <utility>
+#include <boost/algorithm/string/join.hpp>
 #include "fwd.hpp"
 #include "collector.hpp"
 #include "quickbook.hpp"
@@ -21,6 +22,27 @@

 namespace quickbook
 {
+    namespace 
+    {
+        struct empty_visitor {
+            typedef bool result_type;
+        
+            template <typename T>
+            bool operator()(T const& x) const {
+                return x.empty();
+            }
+        };
+
+        struct clear_visitor {
+            typedef void result_type;
+        
+            template <typename T>
+            void operator()(T& x) const {
+                return x.clear();
+            }
+        };
+    }
+
    doc_info process(quickbook::state& state, doc_info const& x)
    {
        doc_info info = x;
@@ -56,6 +78,34 @@ namespace quickbook
            info.doc_last_revision = strdate;
        }

+        std::vector<std::string> invalid_attributes;
+
+        if (info.doc_type != "library")
+        {
+            if (!boost::apply_visitor(empty_visitor(), info.doc_purpose))
+            {
+                boost::apply_visitor(clear_visitor(), info.doc_purpose);
+                invalid_attributes.push_back("purpose");
+            }
+
+            if (!info.doc_categories.empty())
+            {
+                info.doc_categories.clear();
+                invalid_attributes.push_back("category");
+            }
+        }
+
+        if(!invalid_attributes.empty())
+        {
+            detail::outwarn(state.filename.file_string(),1)
+                << (invalid_attributes.size() > 1 ?
+                    "Invalid attributes" : "Invalid attribute")
+                << " for '" << info.doc_type << "': "
+                << boost::algorithm::join(invalid_attributes, ", ")
+                << "\n"
+                ;
+        }
+
        return info;
    }
 }
--- a/doc_info_grammar.cpp
+++ b/doc_info_grammar.cpp
@@ -44,7 +44,7 @@ namespace quickbook
            qbk_minor_version = 1;

            // TODO:
-            //detail::outwarn(actions.filename.native_file_string(),1)
+            //detail::outwarn(actions.filename.file_string(),1)
            //    << "Warning: Quickbook version undefined. "
            //       "Version 1.1 is assumed" << std::endl;
        }
@@ -95,9 +95,9 @@ namespace quickbook
                      doc_version           [member_assign(&doc_info::doc_version)]
                    | doc_id                [member_assign(&doc_info::doc_id)]
                    | doc_dirname           [member_assign(&doc_info::doc_dirname)]
-                    | doc_copyright         [ph::push_back(ph::bind(&doc_info::doc_copyrights, qi::_val), qi::_1)]
+                    | doc_copyright         [member_push(&doc_info::doc_copyrights)]
                    | doc_purpose           [member_assign(&doc_info::doc_purpose)]
-                    | doc_category          [member_assign(&doc_info::doc_category)]
+                    | doc_category          [member_push(&doc_info::doc_categories)]
                    | doc_authors           [member_assign(&doc_info::doc_authors)]
                    | doc_license           [member_assign(&doc_info::doc_license)]
                    | doc_last_revision     [member_assign(&doc_info::doc_last_revision)]
--- a/input_path.cpp
+++ b/input_path.cpp
@@ -7,14 +7,11 @@
 =============================================================================*/

 #include <boost/program_options.hpp>
-#include "input_path.hpp"
+#include "./input_path.hpp"

-#if defined(__cygwin__) || defined(__CYGWIN__)
-#include <boost/filesystem/config.hpp>
-#include <windows.h>
-#include <sys/cygwin.h>
-#endif
+#if !(defined(__cygwin__) || defined(__CYGWIN__))

+// Everything but cygwin

 namespace quickbook { namespace detail
 {
@@ -25,18 +22,84 @@ namespace quickbook { namespace detail
        std::string path
            = boost::program_options::validators::get_single_string(values);

-#if !(defined(__cygwin__) || defined(__CYGWIN__))
        v = input_path(path);
-#elif defined(BOOST_WINDOWS_PATH)
+    }
+}}
+
+#elif defined(QUICKBOOK_CYGWIN_1_5)
+
+// Cygwin 1.5.x
+
+#include <boost/filesystem/config.hpp>
+#include <windows.h>
+#include <sys/cygwin.h>
+
+namespace quickbook { namespace detail
+{
+    void validate(boost::any& v,
+            const std::vector<std::string>& values,
+            input_path*, int)
+    {
+        std::string path
+            = boost::program_options::validators::get_single_string(values);
+
        char result[MAX_PATH + 1];
+
+#if defined(BOOST_WINDOWS_PATH)
        cygwin_conv_to_win32_path(path.c_str(), result);
-        v = input_path(result);
 #elif defined(BOOST_POSIX_PATH)
-        char result[MAX_PATH + 1];
        cygwin_conv_to_posix_path(path.c_str(), result);
-        v = input_path(result);
 #else
 #    error "Bosot filesystem path type doesn't seem to be set."
 #endif
+
+        v = input_path(result);
    }
 }}
+
+#else
+
+// Cygwin 1.7.x
+    
+#include <boost/filesystem/config.hpp>
+#include <boost/scoped_array.hpp>
+#include <boost/program_options/errors.hpp>
+#include <windows.h>
+#include <sys/cygwin.h>
+
+namespace quickbook { namespace detail
+{
+    void validate(boost::any& v,
+            const std::vector<std::string>& values,
+            input_path*, int)
+    {
+        std::string path
+            = boost::program_options::validators::get_single_string(values);
+
+#if defined(BOOST_WINDOWS_PATH)
+        cygwin_conv_path_t flags = CCP_POSIX_TO_WIN_A | CCP_RELATIVE;
+#elif defined(BOOST_POSIX_PATH)
+        cygwin_conv_path_t flags = CCP_WIN_A_TO_POSIX | CCP_RELATIVE;
+#else
+#    error "Bosot filesystem path type doesn't seem to be set."
+#endif
+
+        ssize_t size = cygwin_conv_path(flags, path.c_str(), NULL, 0);
+        
+        if (size < 0) {
+            throw boost::program_options::validation_error(
+                boost::program_options::validation_error::invalid_option_value);
+        }
+
+        boost::scoped_array<char> result(new char[size]);
+
+        if(cygwin_conv_path(flags, path.c_str(), result.get(), size)) {
+            throw boost::program_options::validation_error(
+                boost::program_options::validation_error::invalid_option_value);
+        }
+
+        v = input_path(result.get());
+    }
+}}
+
+#endif
--- a/parse_utils.hpp
+++ b/parse_utils.hpp
@@ -63,6 +63,54 @@ namespace quickbook
    member_assign_type<Struct, Member> member_assign(Member Struct::*mem_ptr) {
        return member_assign_type<Struct, Member>(mem_ptr);
    }
+
+    // member_push - action to push the attribute to a member of the
+    //               rule's attributte.
+
+    template <typename Struct, typename Member>
+    struct member_push_type {
+        member_push_type(Member Struct::*mem_ptr) : mem_ptr_(mem_ptr) {}
+    
+        template <typename Context>
+        void operator()(Member& attrib, Context& context, bool& pass) const {
+            ph::bind(mem_ptr_, spirit::_val)(attrib, context, pass)
+                .push_back(attrib);
+        }
+        
+        template <typename Attrib, typename Context>
+        void operator()(Attrib& attrib, Context& context, bool& pass) const {
+            ph::bind(mem_ptr_, spirit::_val)(attrib, context, pass)
+                .push_back(typename Member::value_type(attrib));
+        }
+
+        Member Struct::*mem_ptr_;
+    };
+    
+    template <typename Struct>
+    struct member_push_type<Struct, std::vector<std::string> > {
+        member_push_type(std::vector<std::string> Struct::*mem_ptr) : mem_ptr_(mem_ptr) {}
+    
+        template <typename Context>
+        void operator()(std::string& attrib, Context& context, bool& pass) const {
+            ph::bind(mem_ptr_, spirit::_val)(attrib, context, pass)
+                .push_back(attrib);
+        }
+
+        template <typename Attrib, typename Context>
+        void operator()(Attrib& attrib, Context& context, bool& pass) const {
+            ph::bind(mem_ptr_, spirit::_val)(attrib, context, pass)
+                .push_back(std::string(attrib.begin(), attrib.end()));
+        }
+        
+        std::vector<std::string> Struct::*mem_ptr_;
+    };
+    
+    template <typename Struct, typename Member>
+    member_push_type<Struct, Member> member_push(Member Struct::*mem_ptr) {
+        return member_push_type<Struct, Member>(mem_ptr);
+    }
+
+
 }

 #endif
--- a/phrase_image.cpp
+++ b/phrase_image.cpp
@@ -48,9 +48,9 @@ namespace quickbook
        fs::path const img_path(x.image_filename);
        attributes.insert(attribute("fileref", x.image_filename));
        // Note: If there is already an alt attribute this is a no-op.
-        attributes.insert(attribute("alt", fs::basename(img_path)));
+        attributes.insert(attribute("alt", img_path.stem()));

-        if(fs::extension(img_path) == ".svg")
+        if(img_path.extension() == ".svg")
        {
           //
           // SVG's need special handling:
--- a/post_process.cpp
+++ b/post_process.cpp
@@ -193,7 +193,6 @@ namespace quickbook
        , "caution"
        , "copyright"
        , "entry"
-        , "footnote"
        , "important"
        , "informaltable"
        , "itemizedlist"
@@ -204,6 +203,7 @@ namespace quickbook
        , "para"
        , "row"
        , "section"
+        , "simpara"
        , "table"
        , "tbody"
        , "textobject"
--- a/quickbook.cpp
+++ b/quickbook.cpp
@@ -30,7 +30,7 @@
 #pragma warning(disable:4355)
 #endif

-#define QUICKBOOK_VERSION "Quickbook Version 1.5.2"
+#define QUICKBOOK_VERSION "Quickbook Spirit 2 port"

 namespace quickbook
 {
@@ -153,7 +153,7 @@ namespace quickbook
    {
        int result = 0;
        std::ofstream fileout(fileout_);
-        fs::path outdir = fs::path(fileout_, fs::native).branch_path();
+        fs::path outdir = fs::path(fileout_).parent_path();
        if (outdir.empty())
            outdir = ".";
        if (pretty_print)
@@ -203,7 +203,7 @@ main(int argc, char* argv[])
        using boost::program_options::positional_options_description;

        // First thing, the filesystem should record the current working directory.
-        boost::filesystem::initial_path();
+        boost::filesystem::initial_path<boost::filesystem::path>();

        options_description desc("Allowed options");
        desc.add_options()
--- a/state.cpp
+++ b/state.cpp
@@ -33,7 +33,7 @@ namespace quickbook
        , encoder(encoder)

    // state
-        , filename(fs::complete(fs::path(filein_, fs::native)))
+        , filename(fs::complete(fs::path(filein_)))
        , outdir(outdir_)
        , macro()
        , section_level(0)
@@ -50,7 +50,7 @@ namespace quickbook
        // turn off __FILENAME__ macro on debug mode = true
        std::string filename_str = debug_mode ?
            std::string("NO_FILENAME_MACRO_GENERATED_IN_DEBUG_MODE") :
-            filename.native_file_string();
+            filename.file_string();

        // add the predefined macros
        macro.add
--- a/strings.hpp
+++ b/strings.hpp
@@ -31,6 +31,7 @@ namespace quickbook
        std::string::const_iterator begin() const { return value.begin(); }
        std::string::const_iterator end() const { return value.end(); }
        bool empty() const { return value.empty(); }
+        void clear() { value.clear(); }
    
        std::string value;
    };
--- a/template.cpp
+++ b/template.cpp
@@ -328,7 +328,7 @@ namespace quickbook
                quickbook_grammar g(actions);

                //  do a phrase level parse
-                iterator first(body.begin(), body.end(), state.filename.native_file_string().c_str());
+                iterator first(body.begin(), body.end(), state.filename.file_string().c_str());
                first.set_position(template_pos);
                iterator last(body.end(), body.end());
                r = boost::spirit::qi::parse(first, last, g.simple_phrase) && first == last;
@@ -344,7 +344,7 @@ namespace quickbook
                //  the need to check for end of file in the grammar.
                body += "\n\n";

-                iterator first(body.begin(), body.end(), state.filename.native_file_string().c_str());
+                iterator first(body.begin(), body.end(), state.filename.file_string().c_str());
                first.set_position(template_pos);
                iterator last(body.end(), body.end());

--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -32,15 +32,18 @@ test-suite quickbook.test :
    [ quickbook-test section_1_4 ]
    [ quickbook-test section_1_5 ]
    [ quickbook-test heading ]
+    [ quickbook-test para-test ]
    [ quickbook-test table_1_5 ]
    [ quickbook-test image_1_5 ]
    [ quickbook-test list_test ]
    [ quickbook-test cond_phrase ]
    [ quickbook-test doc-info-1 ]
+    [ quickbook-test doc-info-2 ]
    [ quickbook-test callouts ]
    [ quickbook-test simple_markup ]
    [ quickbook-test xml-escape_1_2 ]
    [ quickbook-test xml-escape_1_5 ]
+    [ quickbook-test blocks ]
    [ quickbook-fail-test fail-include ]
    [ quickbook-fail-test fail-import ]
    [ quickbook-fail-test fail-template-arguments1 ]
--- a/test/blocks.gold
+++ b/test/blocks.gold
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<article id="various_blocks" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Various blocks</title>
+  <articleinfo>
+  </articleinfo>
+  <anchor id="various_blocks.blockquotes"/>
+  <bridgehead renderas="sect2">
+    <link linkend="various_blocks.blockquotes">Blockquotes</link>
+  </bridgehead>
+  <para>
+    Here's a blockquote:
+  </para>
+  <blockquote>
+    <para>
+      Blockquote.
+    </para>
+  </blockquote>
+  <para>
+    And another:
+  </para>
+  <blockquote>
+    <para>
+      Blockquote first paragraph.
+    </para>
+    <para>
+      Blockquote second paragraph.
+    </para>
+  </blockquote>
+  <anchor id="various_blocks.admonitions"/>
+  <bridgehead renderas="sect2">
+    <link linkend="various_blocks.admonitions">Admonitions</link>
+  </bridgehead>
+  <warning>
+    <para>
+      Warning
+    </para>
+  </warning>
+  <caution>
+    <para>
+      Caution
+    </para>
+  </caution>
+  <important>
+    <para>
+      Important
+    </para>
+  </important>
+  <note>
+    <para>
+      Note
+    </para>
+  </note>
+  <tip>
+    <para>
+      Tip
+    </para>
+  </tip>
+  <warning>
+    <para>
+      Warning first paragraph.
+    </para>
+    <para>
+      Warning second paragraph.
+    </para>
+  </warning>
+  <anchor id="various_blocks.blurb"/>
+  <bridgehead renderas="sect2">
+    <link linkend="various_blocks.blurb">Blurb</link>
+  </bridgehead>
+  <sidebar role="blurb">
+  <para>
+    Blurb
+  </para>
+  </sidebar> <anchor id="various_blocks.inline_blocks"/>
+  <bridgehead renderas="sect2">
+    <link linkend="various_blocks.inline_blocks">Inline blocks</link>
+  </bridgehead>
+  <blockquote>
+    <para>
+      Blockquote containing a footnote<footnote>
+      <para>
+        Here it is!
+      </para>
+      </footnote>.
+    </para>
+  </blockquote>
+</article>
--- a/test/blocks.quickbook
+++ b/test/blocks.quickbook
@@ -0,0 +1,39 @@
+[article Various blocks
+[quickbook 1.5]
+]
+
+[heading Blockquotes]
+
+Here's a blockquote:
+
+[:Blockquote.]
+
+And another:
+
+[:
+Blockquote first paragraph.
+
+Blockquote second paragraph.
+]
+
+[heading Admonitions]
+
+[warning Warning]
+[caution Caution]
+[important Important]
+[note Note]
+[tip Tip]
+
+[warning Warning first paragraph.
+
+Warning second paragraph.]
+
+[heading Blurb]
+
+[blurb Blurb]
+
+[heading Inline blocks]
+
+[: Blockquote containing a footnote[footnote Here it is!].]
+
+[/ Unfortunately footnotes currently can't contain blocks.]
--- a/test/callouts.gold
+++ b/test/callouts.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="callout_tests" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Callout Tests</title>
@@ -15,7 +15,7 @@
    <para>
      
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
-  <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <phrase role="callout_bug"><co id="callout_tests0co" linkends="callout_tests0" /></phrase>
+  <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <co id="callout_tests0co" linkends="callout_tests0" />
 <phrase role="special">}</phrase>

 </programlisting>
@@ -35,7 +35,7 @@
    <para>
      
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
-  <phrase role="line_callout_bug"><co id="callout_tests1co" linkends="callout_tests1" /></phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special">&lt;</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&amp;,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="special">&gt;</phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
+  <co id="callout_tests1co" linkends="callout_tests1" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special">&lt;</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&amp;,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="special">&gt;</phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
 <phrase role="special">}</phrase>

 </programlisting>
@@ -57,7 +57,7 @@
    <para>
      
 <programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
-  <phrase role="line_callout_bug"><co id="callout_tests2co" linkends="callout_tests2" /></phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special">&lt;</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&amp;,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="special">&gt;</phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
+  <co id="callout_tests2co" linkends="callout_tests2" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special">&lt;</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&amp;,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special">&lt;&gt;</phrase> <phrase role="special">&gt;</phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
 <phrase role="special">}</phrase>

 </programlisting>
--- a/test/code-block-1.gold
+++ b/test/code-block-1.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <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>
--- a/test/code-block-2.gold
+++ b/test/code-block-2.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <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>
--- a/test/code-block-3.gold
+++ b/test/code-block-3.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="code_block_3" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Code Block 3</title>
--- a/test/code-block-teletype.gold
+++ b/test/code-block-teletype.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="code_block_teletype_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Code Block Teletype 1</title>
--- a/test/code-snippet.gold
+++ b/test/code-snippet.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <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>
@@ -16,5 +16,9 @@
      <phrase role="special">}</phrase></code>, should be properly formatted and
      not glued to the surrounding text.
    </para>
+    <para>
+      There shoud be no spacees around (<code><phrase role="keyword">this</phrase></code>),
+      and spaces around <code><phrase role="keyword">this</phrase></code> code.
+    </para>
  </section>
 </article>
--- a/test/code-snippet.quickbook
+++ b/test/code-snippet.quickbook
@@ -7,4 +7,6 @@ Code snippets inlined in text, as in `namespace quickbook { static const int
 value = 0; }`, should be properly formatted and not glued to the surrounding
 text.

+There shoud be no spacees around (`this`), and spaces around `this` code.
+
 [endsect]
--- a/test/cond_phrase.gold
+++ b/test/cond_phrase.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="coniditional_phrase_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Coniditional Phrase Test</title>
--- a/test/doc-info-1.gold
+++ b/test/doc-info-1.gold
@@ -1,12 +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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="document_information_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Document Information 1</title>
  <articleinfo>
-    <articlepurpose>
-      Inline code test: <code>1 + 2</code>
-    </articlepurpose>
  </articleinfo>
  <para>
    The body is largely irrelevant.
--- a/test/doc-info-1.quickbook
+++ b/test/doc-info-1.quickbook
@@ -2,6 +2,8 @@
 [quickbook 1.5]
 [source-mode teletype]
 [purpose Inline code test: `1 + 2`]
+[category tests]
+[category irrelevance]
 ]

 The body is largely irrelevant.
--- a/test/doc-info-2.gold
+++ b/test/doc-info-2.gold
@@ -0,0 +1,15 @@
+<?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">
+<library id="document_information_1" name="Document Information 1" dirname="document_information_1"
+last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <libraryinfo>
+    <librarypurpose>
+      Inline code test: <code>1 + 2</code>
+    </librarypurpose>
+    <librarycategory name="category:tests"></librarycategory> <librarycategory name="category:irrelevance"></librarycategory>
+  </libraryinfo>
+  <title>Document Information 1</title>
+  <para>
+    The body is largely irrelevant.
+  </para>
+</library>
--- a/test/doc-info-2.quickbook
+++ b/test/doc-info-2.quickbook
@@ -0,0 +1,9 @@
+[library Document Information 1
+[quickbook 1.5]
+[source-mode teletype]
+[purpose Inline code test: `1 + 2`]
+[category tests]
+[category irrelevance]
+]
+
+The body is largely irrelevant.
--- a/test/escape.gold
+++ b/test/escape.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <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>
--- a/test/heading.gold
+++ b/test/heading.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="header" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Header</title>
  <articleinfo>
--- a/test/image_1_5.gold
+++ b/test/image_1_5.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="images_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Images 1.5</title>
  <articleinfo>
--- a/test/import.gold
+++ b/test/import.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <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>
@@ -13,10 +13,14 @@
    </para>
    <itemizedlist>
      <listitem>
-        lists
+        <simpara>
+          lists
+        </simpara>
      </listitem>
      <listitem>
-        etc.
+        <simpara>
+          etc.
+        </simpara>
      </listitem>
    </itemizedlist>
    <para>
@@ -42,10 +46,14 @@
    </para>
    <itemizedlist>
      <listitem>
-        lists
+        <simpara>
+          lists
+        </simpara>
      </listitem>
      <listitem>
-        etc.
+        <simpara>
+          etc.
+        </simpara>
      </listitem>
    </itemizedlist>
    <para>
@@ -69,10 +77,14 @@
    </para>
    <itemizedlist>
      <listitem>
-        lists
+        <simpara>
+          lists
+        </simpara>
      </listitem>
      <listitem>
-        etc.
+        <simpara>
+          etc.
+        </simpara>
      </listitem>
    </itemizedlist>
    <para>
--- a/test/include_1_5.gold
+++ b/test/include_1_5.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="include-test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Include Test</title>
--- a/test/include_1_6-2.gold
+++ b/test/include_1_6-2.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="include-test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Include Test</title>
--- a/test/include_1_6.gold
+++ b/test/include_1_6.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="include-test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Include Test</title>
--- a/test/link-side-by-side.gold
+++ b/test/link-side-by-side.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <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>
--- a/test/list_test.gold
+++ b/test/list_test.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="list_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>List Test</title>
  <articleinfo>
@@ -9,10 +9,14 @@
  </para>
  <itemizedlist>
    <listitem>
-      A
+      <simpara>
+        A
+      </simpara>
    </listitem>
    <listitem>
-      B
+      <simpara>
+        B
+      </simpara>
    </listitem>
  </itemizedlist>
  <para>
@@ -20,10 +24,14 @@
  </para>
  <orderedlist>
    <listitem>
-      A
+      <simpara>
+        A
+      </simpara>
    </listitem>
    <listitem>
-      B
+      <simpara>
+        B
+      </simpara>
    </listitem>
  </orderedlist>
  <para>
@@ -31,26 +39,38 @@
  </para>
  <itemizedlist>
    <listitem>
-      A
-      <itemizedlist>
-        <listitem>
-          A
-        </listitem>
-        <listitem>
-          B
-        </listitem>
-      </itemizedlist>
+      <simpara>
+        A
+        <itemizedlist>
+          <listitem>
+            <simpara>
+              A
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              B
+            </simpara>
+          </listitem>
+        </itemizedlist>
+      </simpara>
    </listitem>
    <listitem>
-      B
-      <itemizedlist>
-        <listitem>
-          A
-        </listitem>
-        <listitem>
-          B
-        </listitem>
-      </itemizedlist>
+      <simpara>
+        B
+        <itemizedlist>
+          <listitem>
+            <simpara>
+              A
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              B
+            </simpara>
+          </listitem>
+        </itemizedlist>
+      </simpara>
    </listitem>
  </itemizedlist>
  <para>
@@ -58,26 +78,38 @@
  </para>
  <orderedlist>
    <listitem>
-      A
-      <itemizedlist>
-        <listitem>
-          A
-        </listitem>
-        <listitem>
-          B
-        </listitem>
-      </itemizedlist>
+      <simpara>
+        A
+        <itemizedlist>
+          <listitem>
+            <simpara>
+              A
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              B
+            </simpara>
+          </listitem>
+        </itemizedlist>
+      </simpara>
    </listitem>
    <listitem>
-      B
-      <itemizedlist>
-        <listitem>
-          A
-        </listitem>
-        <listitem>
-          B
-        </listitem>
-      </itemizedlist>
+      <simpara>
+        B
+        <itemizedlist>
+          <listitem>
+            <simpara>
+              A
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              B
+            </simpara>
+          </listitem>
+        </itemizedlist>
+      </simpara>
    </listitem>
  </orderedlist>
  <para>
@@ -85,37 +117,55 @@
  </para>
  <orderedlist>
    <listitem>
-      A
-      <itemizedlist>
-        <listitem>
-          A
-        </listitem>
-        <listitem>
-          B
-          <itemizedlist>
-            <listitem>
-              C
-            </listitem>
-            <listitem>
-              D
-            </listitem>
-          </itemizedlist>
-        </listitem>
-        <listitem>
-          E
-        </listitem>
-        <listitem>
-          F
-          <itemizedlist>
-            <listitem>
-              G
-            </listitem>
-            <listitem>
-              H
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </itemizedlist>
+      <simpara>
+        A
+        <itemizedlist>
+          <listitem>
+            <simpara>
+              A
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              B
+              <itemizedlist>
+                <listitem>
+                  <simpara>
+                    C
+                  </simpara>
+                </listitem>
+                <listitem>
+                  <simpara>
+                    D
+                  </simpara>
+                </listitem>
+              </itemizedlist>
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              E
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              F
+              <itemizedlist>
+                <listitem>
+                  <simpara>
+                    G
+                  </simpara>
+                </listitem>
+                <listitem>
+                  <simpara>
+                    H
+                  </simpara>
+                </listitem>
+              </itemizedlist>
+            </simpara>
+          </listitem>
+        </itemizedlist>
+      </simpara>
    </listitem>
  </orderedlist>
  <para>
@@ -123,29 +173,43 @@
  </para>
  <orderedlist>
    <listitem>
-      A
-      <itemizedlist>
-        <listitem>
-          A
-        </listitem>
-        <listitem>
-          B
-          <orderedlist>
-            <listitem>
-              C
-            </listitem>
-            <listitem>
-              D
-            </listitem>
-          </orderedlist>
-        </listitem>
-      </itemizedlist>
+      <simpara>
+        A
+        <itemizedlist>
+          <listitem>
+            <simpara>
+              A
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              B
+              <orderedlist>
+                <listitem>
+                  <simpara>
+                    C
+                  </simpara>
+                </listitem>
+                <listitem>
+                  <simpara>
+                    D
+                  </simpara>
+                </listitem>
+              </orderedlist>
+            </simpara>
+          </listitem>
+        </itemizedlist>
+      </simpara>
    </listitem>
    <listitem>
-      G
+      <simpara>
+        G
+      </simpara>
    </listitem>
    <listitem>
-      H
+      <simpara>
+        H
+      </simpara>
    </listitem>
  </orderedlist>
 </article>
--- a/test/para-test.gold
+++ b/test/para-test.gold
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<article id="paragraph_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Paragraph Test</title>
+  <articleinfo>
+  </articleinfo>
+  <section id="paragraph_test.some_paragraphs">
+    <title><link linkend="paragraph_test.some_paragraphs">Some Paragraphs</link></title>
+    <para>
+      Shouldn't be a code block.
+    </para>
+    <para>
+      <emphasis role="bold">Should be bold</emphasis>.
+    </para>
+    <para>
+      Should be a single paragraph.
+    </para>
+    <para>
+      Single paragraph.
+    </para>
+    <para>
+      Single paragraph.
+    </para>
+    <para>
+      Single paragraph.
+    </para>
+    <para>
+      Single paragraph.
+    </para>
+    <para>
+      Lots of newlines round this paragraph.
+    </para>
+    <para>
+      Last paragraph.
+    </para>
+  </section>
+  <section id="paragraph_test.inside___breaking_comment__blocks">
+    <title><link linkend="paragraph_test.inside___breaking_comment__blocks">Inside
+    blocks</link></title>
+    <variablelist>
+      <title></title>
+      <varlistentry>
+        <term>Paragraphs</term>
+        <listitem>
+          <para>
+            Shouldn't be a code block.
+          </para>
+          <para>
+            <emphasis role="bold">Should be bold</emphasis>.
+          </para>
+          <para>
+            Should be a single paragraph.
+          </para>
+          <para>
+            Single paragraph.
+          </para>
+          <para>
+            Single paragraph.
+          </para>
+          <para>
+            Single paragraph.
+          </para>
+          <para>
+            Single paragraph.
+          </para>
+          <para>
+            Lots of newlines round this paragraph.
+          </para>
+          <para>
+            Last paragraph.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+</article>
--- a/test/para-test.quickbook
+++ b/test/para-test.quickbook
@@ -0,0 +1,81 @@
+[article Paragraph Test
+  [quickbook 1.5]
+]
+
+[section Some Paragraphs]
+
+[/ Leading comment ] Shouldn't be a code block.
+
+[/ Leading comment ]*Should be bold*.
+
+Should be a
+[/ Breaking comment]
+single paragraph.
+
+Single paragraph.
+[/ Breaking comment]
+
+Single paragraph.
+
+[/ Breaking comment]
+Single paragraph.
+
+Single paragraph.[/ Trailing comment]
+
+
+
+
+
+
+Lots of newlines round this paragraph.
+
+
+
+
+
+
+
+
+Last paragraph.[endsect]
+
+[section Inside
+[/Breaking comment]
+blocks]
+
+[variablelist
+[[Paragraphs][
+[/ Leading comment ] Shouldn't be a code block.
+
+[/ Leading comment ]*Should be bold*.
+
+Should be a
+[/ Breaking comment]
+single paragraph.
+
+Single paragraph.
+[/ Breaking comment]
+
+Single paragraph.
+
+[/ Breaking comment]
+Single paragraph.
+
+Single paragraph.[/ Trailing comment]
+
+
+
+
+
+
+Lots of newlines round this paragraph.
+
+
+
+
+
+
+
+
+Last paragraph.]]]
+
+[endsect]
--- a/test/preformatted.gold
+++ b/test/preformatted.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <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>
--- a/test/quickbook-manual.gold
+++ b/test/quickbook-manual.gold
--- a/test/section_1_4.gold
+++ b/test/section_1_4.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="section_id_1_4" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Section Id 1.4</title>
--- a/test/section_1_5.gold
+++ b/test/section_1_5.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="section_id_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Section Id 1.5</title>
--- a/test/simple_markup.gold
+++ b/test/simple_markup.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="simple_markup_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Simple Markup Test</title>
--- a/test/table_1_5.gold
+++ b/test/table_1_5.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="table_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Table 1.5</title>
  <articleinfo>
--- a/test/template-section.gold
+++ b/test/template-section.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="section_in_a_template" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Section in a template</title>
--- a/test/templates.gold
+++ b/test/templates.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article 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>
--- a/test/templates_1_4.gold
+++ b/test/templates_1_4.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="template_1_4" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Template 1.4</title>
--- a/test/templates_1_5.gold
+++ b/test/templates_1_5.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="template_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Template 1.5</title>
--- a/test/unicode-escape.gold
+++ b/test/unicode-escape.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="utf_8_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>UTF-8 test</title>
  <articleinfo>
@@ -10,76 +10,124 @@
  </bridgehead>
  <itemizedlist>
    <listitem>
-      &#x391;&#x3B1; Alpha
+      <simpara>
+        &#x391;&#x3B1; Alpha
+      </simpara>
    </listitem>
    <listitem>
-      &#x392;&#x3B2; Beta
+      <simpara>
+        &#x392;&#x3B2; Beta
+      </simpara>
    </listitem>
    <listitem>
-      &#x393;&#x3B3; Gamma
+      <simpara>
+        &#x393;&#x3B3; Gamma
+      </simpara>
    </listitem>
    <listitem>
-      &#x394;&#x3B4; Delta
+      <simpara>
+        &#x394;&#x3B4; Delta
+      </simpara>
    </listitem>
    <listitem>
-      &#x395;&#x3B5; Epsilon
+      <simpara>
+        &#x395;&#x3B5; Epsilon
+      </simpara>
    </listitem>
    <listitem>
-      &#x396;&#x3B6; Zeta
+      <simpara>
+        &#x396;&#x3B6; Zeta
+      </simpara>
    </listitem>
    <listitem>
-      &#x397;&#x3B7; Eta
+      <simpara>
+        &#x397;&#x3B7; Eta
+      </simpara>
    </listitem>
    <listitem>
-      &#x398;&#x3B8; Theta
+      <simpara>
+        &#x398;&#x3B8; Theta
+      </simpara>
    </listitem>
    <listitem>
-      &#x399;&#x3B9; Iota
+      <simpara>
+        &#x399;&#x3B9; Iota
+      </simpara>
    </listitem>
    <listitem>
-      &#x39A;&#x3BA; Kappa
+      <simpara>
+        &#x39A;&#x3BA; Kappa
+      </simpara>
    </listitem>
    <listitem>
-      &#x39B;&#x3BB; Lambda
+      <simpara>
+        &#x39B;&#x3BB; Lambda
+      </simpara>
    </listitem>
    <listitem>
-      &#x39C;&#x3BC; Mu
+      <simpara>
+        &#x39C;&#x3BC; Mu
+      </simpara>
    </listitem>
    <listitem>
-      &#x39D;&#x3BD; Nu
+      <simpara>
+        &#x39D;&#x3BD; Nu
+      </simpara>
    </listitem>
    <listitem>
-      &#x39E;&#x3BE; Xi
+      <simpara>
+        &#x39E;&#x3BE; Xi
+      </simpara>
    </listitem>
    <listitem>
-      &#x39F;&#x3BF; Omicron
+      <simpara>
+        &#x39F;&#x3BF; Omicron
+      </simpara>
    </listitem>
    <listitem>
-      &#x3A0;&#x3C0; Pi
+      <simpara>
+        &#x3A0;&#x3C0; Pi
+      </simpara>
    </listitem>
    <listitem>
-      &#x3A1;&#x3C1; Rho
+      <simpara>
+        &#x3A1;&#x3C1; Rho
+      </simpara>
    </listitem>
    <listitem>
-      &#x3A3;&#x3C3;&#x3C2; Sigma
+      <simpara>
+        &#x3A3;&#x3C3;&#x3C2; Sigma
+      </simpara>
    </listitem>
    <listitem>
-      &#x3A4;&#x3C4; Tau
+      <simpara>
+        &#x3A4;&#x3C4; Tau
+      </simpara>
    </listitem>
    <listitem>
-      &#x3A5;&#x3C5; Upsilon
+      <simpara>
+        &#x3A5;&#x3C5; Upsilon
+      </simpara>
    </listitem>
    <listitem>
-      &#x3A6;&#x3C6; Phi
+      <simpara>
+        &#x3A6;&#x3C6; Phi
+      </simpara>
    </listitem>
    <listitem>
-      &#x3A7;&#x3C7; Chi
+      <simpara>
+        &#x3A7;&#x3C7; Chi
+      </simpara>
    </listitem>
    <listitem>
-      &#x3A8;&#x3C8; Psi
+      <simpara>
+        &#x3A8;&#x3C8; Psi
+      </simpara>
    </listitem>
    <listitem>
-      &#x3A9;&#x3C9; Omega
+      <simpara>
+        &#x3A9;&#x3C9; Omega
+      </simpara>
    </listitem>
  </itemizedlist>
  <para>
@@ -87,16 +135,24 @@
  </para>
  <itemizedlist>
    <listitem>
-      &#x1F000; East Wind
+      <simpara>
+        &#x1F000; East Wind
+      </simpara>
    </listitem>
    <listitem>
-      &#x1F001; South Wind
+      <simpara>
+        &#x1F001; South Wind
+      </simpara>
    </listitem>
    <listitem>
-      &#x1F002; West Wind
+      <simpara>
+        &#x1F002; West Wind
+      </simpara>
    </listitem>
    <listitem>
-      &#x1F003; North Wind
+      <simpara>
+        &#x1F003; North Wind
+      </simpara>
    </listitem>
  </itemizedlist>
 </article>
--- a/test/utf-8-bom.gold
+++ b/test/utf-8-bom.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="utf_8_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>UTF-8 test</title>
  <articleinfo>
@@ -10,76 +10,124 @@
  </bridgehead>
  <itemizedlist>
    <listitem>
-      Αα Alpha
+      <simpara>
+        Αα Alpha
+      </simpara>
    </listitem>
    <listitem>
-      Ββ Beta
+      <simpara>
+        Ββ Beta
+      </simpara>
    </listitem>
    <listitem>
-      Γγ Gamma
+      <simpara>
+        Γγ Gamma
+      </simpara>
    </listitem>
    <listitem>
-      Δδ Delta
+      <simpara>
+        Δδ Delta
+      </simpara>
    </listitem>
    <listitem>
-      Εε Epsilon
+      <simpara>
+        Εε Epsilon
+      </simpara>
    </listitem>
    <listitem>
-      Ζζ Zeta
+      <simpara>
+        Ζζ Zeta
+      </simpara>
    </listitem>
    <listitem>
-      Ηη Eta
+      <simpara>
+        Ηη Eta
+      </simpara>
    </listitem>
    <listitem>
-      Θθ Theta
+      <simpara>
+        Θθ Theta
+      </simpara>
    </listitem>
    <listitem>
-      Ιι Iota
+      <simpara>
+        Ιι Iota
+      </simpara>
    </listitem>
    <listitem>
-      Κκ Kappa
+      <simpara>
+        Κκ Kappa
+      </simpara>
    </listitem>
    <listitem>
-      Λλ Lambda
+      <simpara>
+        Λλ Lambda
+      </simpara>
    </listitem>
    <listitem>
-      Μμ Mu
+      <simpara>
+        Μμ Mu
+      </simpara>
    </listitem>
    <listitem>
-      Νν Nu
+      <simpara>
+        Νν Nu
+      </simpara>
    </listitem>
    <listitem>
-      Ξξ Xi
+      <simpara>
+        Ξξ Xi
+      </simpara>
    </listitem>
    <listitem>
-      Οο Omicron
+      <simpara>
+        Οο Omicron
+      </simpara>
    </listitem>
    <listitem>
-      Ππ Pi
+      <simpara>
+        Ππ Pi
+      </simpara>
    </listitem>
    <listitem>
-      Ρρ Rho
+      <simpara>
+        Ρρ Rho
+      </simpara>
    </listitem>
    <listitem>
-      Σσς Sigma
+      <simpara>
+        Σσς Sigma
+      </simpara>
    </listitem>
    <listitem>
-      Ττ Tau
+      <simpara>
+        Ττ Tau
+      </simpara>
    </listitem>
    <listitem>
-      Υυ Upsilon
+      <simpara>
+        Υυ Upsilon
+      </simpara>
    </listitem>
    <listitem>
-      Φφ Phi
+      <simpara>
+        Φφ Phi
+      </simpara>
    </listitem>
    <listitem>
-      Χχ Chi
+      <simpara>
+        Χχ Chi
+      </simpara>
    </listitem>
    <listitem>
-      Ψψ Psi
+      <simpara>
+        Ψψ Psi
+      </simpara>
    </listitem>
    <listitem>
-      Ωω Omega
+      <simpara>
+        Ωω Omega
+      </simpara>
    </listitem>
  </itemizedlist>
 </article>
--- a/test/utf-8.gold
+++ b/test/utf-8.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="utf_8_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>UTF-8 test</title>
  <articleinfo>
@@ -10,76 +10,124 @@
  </bridgehead>
  <itemizedlist>
    <listitem>
-      Αα Alpha
+      <simpara>
+        Αα Alpha
+      </simpara>
    </listitem>
    <listitem>
-      Ββ Beta
+      <simpara>
+        Ββ Beta
+      </simpara>
    </listitem>
    <listitem>
-      Γγ Gamma
+      <simpara>
+        Γγ Gamma
+      </simpara>
    </listitem>
    <listitem>
-      Δδ Delta
+      <simpara>
+        Δδ Delta
+      </simpara>
    </listitem>
    <listitem>
-      Εε Epsilon
+      <simpara>
+        Εε Epsilon
+      </simpara>
    </listitem>
    <listitem>
-      Ζζ Zeta
+      <simpara>
+        Ζζ Zeta
+      </simpara>
    </listitem>
    <listitem>
-      Ηη Eta
+      <simpara>
+        Ηη Eta
+      </simpara>
    </listitem>
    <listitem>
-      Θθ Theta
+      <simpara>
+        Θθ Theta
+      </simpara>
    </listitem>
    <listitem>
-      Ιι Iota
+      <simpara>
+        Ιι Iota
+      </simpara>
    </listitem>
    <listitem>
-      Κκ Kappa
+      <simpara>
+        Κκ Kappa
+      </simpara>
    </listitem>
    <listitem>
-      Λλ Lambda
+      <simpara>
+        Λλ Lambda
+      </simpara>
    </listitem>
    <listitem>
-      Μμ Mu
+      <simpara>
+        Μμ Mu
+      </simpara>
    </listitem>
    <listitem>
-      Νν Nu
+      <simpara>
+        Νν Nu
+      </simpara>
    </listitem>
    <listitem>
-      Ξξ Xi
+      <simpara>
+        Ξξ Xi
+      </simpara>
    </listitem>
    <listitem>
-      Οο Omicron
+      <simpara>
+        Οο Omicron
+      </simpara>
    </listitem>
    <listitem>
-      Ππ Pi
+      <simpara>
+        Ππ Pi
+      </simpara>
    </listitem>
    <listitem>
-      Ρρ Rho
+      <simpara>
+        Ρρ Rho
+      </simpara>
    </listitem>
    <listitem>
-      Σσς Sigma
+      <simpara>
+        Σσς Sigma
+      </simpara>
    </listitem>
    <listitem>
-      Ττ Tau
+      <simpara>
+        Ττ Tau
+      </simpara>
    </listitem>
    <listitem>
-      Υυ Upsilon
+      <simpara>
+        Υυ Upsilon
+      </simpara>
    </listitem>
    <listitem>
-      Φφ Phi
+      <simpara>
+        Φφ Phi
+      </simpara>
    </listitem>
    <listitem>
-      Χχ Chi
+      <simpara>
+        Χχ Chi
+      </simpara>
    </listitem>
    <listitem>
-      Ψψ Psi
+      <simpara>
+        Ψψ Psi
+      </simpara>
    </listitem>
    <listitem>
-      Ωω Omega
+      <simpara>
+        Ωω Omega
+      </simpara>
    </listitem>
  </itemizedlist>
 </article>
--- a/test/xinclude.gold
+++ b/test/xinclude.gold
@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE article 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>
--- a/test/xml-escape_1_2.gold
+++ b/test/xml-escape_1_2.gold
@@ -1,28 +1,37 @@
 <?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="test_that______are_being_escaped_" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+<library id="test_that______are_being_escaped_" name="Test that &amp;, &lt; are being escaped."
+dirname="test_that______are_being_escaped_" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Test that &amp;, &lt; are being escaped.</title>
-  <articleinfo>
-    <articlepurpose>
+  <libraryinfo>
+    <librarypurpose>
      &amp; should be &amp;amp;, &lt; should &amp;lt;
-    </articlepurpose>
-  </articleinfo>
+    </librarypurpose>
+  </libraryinfo>
+  <title>Test that &amp;, &lt; are being escaped.</title>
  <section id="test_that______are_being_escaped_.escapes___explicitly_written_markup">
    <title>Escapes &amp; explicitly written markup</title>
    <itemizedlist>
      <listitem>
-        &amp; -&gt; &amp;amp;
+        <simpara>
+          &amp; -&gt; &amp;amp;
+        </simpara>
      </listitem>
      <listitem>
-        &lt; -&gt; &amp;lt;
+        <simpara>
+          &lt; -&gt; &amp;lt;
+        </simpara>
      </listitem>
      <listitem>
-        &gt; -&gt; &amp;gt;
+        <simpara>
+          &gt; -&gt; &amp;gt;
+        </simpara>
      </listitem>
      <listitem>
-        &quot; -&gt; &amp;quot;
+        <simpara>
+          &quot; -&gt; &amp;quot;
+        </simpara>
      </listitem>
    </itemizedlist>
  </section>
-</article>
+</library>
--- a/test/xml-escape_1_2.quickbook
+++ b/test/xml-escape_1_2.quickbook
@@ -1,4 +1,4 @@
-[article Test that &, < are being escaped.
+[library Test that &, < are being escaped.
    [quickbook 1.2]
    [purpose & should be &amp;, < should &lt;]
 ]
--- a/test/xml-escape_1_5.gold
+++ b/test/xml-escape_1_5.gold
@@ -1,29 +1,38 @@
 <?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="test_that______are_being_escaped_" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+<library id="test_that______are_being_escaped_" name="Test that &amp;, &lt; are being escaped."
+dirname="test_that______are_being_escaped_" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
 xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Test that &amp;, &lt; are being escaped.</title>
-  <articleinfo>
-    <articlepurpose>
+  <libraryinfo>
+    <librarypurpose>
      &amp; should be &amp;amp;, &lt; should &amp;lt;
-    </articlepurpose>
-  </articleinfo>
+    </librarypurpose>
+  </libraryinfo>
+  <title>Test that &amp;, &lt; are being escaped.</title>
  <section id="test_that______are_being_escaped_.escapes___explicitly_written_markup">
    <title><link linkend="test_that______are_being_escaped_.escapes___explicitly_written_markup">Escapes
    &amp; explicitly written markup</link></title>
    <itemizedlist>
      <listitem>
-        &amp; -&gt; &amp;amp;
+        <simpara>
+          &amp; -&gt; &amp;amp;
+        </simpara>
      </listitem>
      <listitem>
-        &lt; -&gt; &amp;lt;
+        <simpara>
+          &lt; -&gt; &amp;lt;
+        </simpara>
      </listitem>
      <listitem>
-        &gt; -&gt; &amp;gt;
+        <simpara>
+          &gt; -&gt; &amp;gt;
+        </simpara>
      </listitem>
      <listitem>
-        &quot; -&gt; &amp;quot;
+        <simpara>
+          &quot; -&gt; &amp;quot;
+        </simpara>
      </listitem>
    </itemizedlist>
  </section>
-</article>
+</library>
--- a/test/xml-escape_1_5.quickbook
+++ b/test/xml-escape_1_5.quickbook
@@ -1,4 +1,4 @@
-[article Test that &, < are being escaped.
+[library Test that &, < are being escaped.
    [quickbook 1.5]
    [purpose & should be &amp;, < should &lt;]
 ]