[Boost-commit] svn:boost r65160 - in branches/quickbook-1.5-spirit2: . test

Subject: [Boost-commit] svn:boost r65160 - in branches/quickbook-1.5-spirit2: . test
From: dnljms_at_[hidden]
Date: 2010-09-01 03:53:41

Author: danieljames
Date: 2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
New Revision: 65160
URL: http://svn.boost.org/trac/boost/changeset/65160

Log:
Merge more changes from trunk.

Renaming parse methods and not outputting empty document info. Also, some other changes that don't really apply.

Properties modified: 
   branches/quickbook-1.5-spirit2/   (props changed)
Text files modified: 
   branches/quickbook-1.5-spirit2/block_actions.cpp               |     2                                         
   branches/quickbook-1.5-spirit2/boostbook.cpp                   |    41 +++++++++++++++++++++++---------------- 
   branches/quickbook-1.5-spirit2/quickbook.cpp                   |    14 ++++++------                            
   branches/quickbook-1.5-spirit2/quickbook.hpp                   |     2                                         
   branches/quickbook-1.5-spirit2/test/blocks.gold                |     5 ---                                     
   branches/quickbook-1.5-spirit2/test/callouts.gold              |     2 -                                       
   branches/quickbook-1.5-spirit2/test/code-block-1.gold          |     2 -                                       
   branches/quickbook-1.5-spirit2/test/code-block-2.gold          |     2 -                                       
   branches/quickbook-1.5-spirit2/test/code-block-3.gold          |     2 -                                       
   branches/quickbook-1.5-spirit2/test/code-block-teletype.gold   |     2 -                                       
   branches/quickbook-1.5-spirit2/test/code-block.gold            |     2 -                                       
   branches/quickbook-1.5-spirit2/test/code-snippet.gold          |     2 -                                       
   branches/quickbook-1.5-spirit2/test/command_line_macro.gold    |     2 -                                       
   branches/quickbook-1.5-spirit2/test/cond_phrase.gold           |     2 -                                       
   branches/quickbook-1.5-spirit2/test/escape.gold                |     2 -                                       
   branches/quickbook-1.5-spirit2/test/heading.gold               |     5 ---                                     
   branches/quickbook-1.5-spirit2/test/heading_1_6.gold           |     5 ---                                     
   branches/quickbook-1.5-spirit2/test/identifier_1_5.gold        |     5 ---                                     
   branches/quickbook-1.5-spirit2/test/identifier_1_6.gold        |     5 ---                                     
   branches/quickbook-1.5-spirit2/test/image_1_5.gold             |     2 -                                       
   branches/quickbook-1.5-spirit2/test/import.gold                |     2 -                                       
   branches/quickbook-1.5-spirit2/test/include_1_5.gold           |     2 -                                       
   branches/quickbook-1.5-spirit2/test/include_1_6-2.gold         |     2 -                                       
   branches/quickbook-1.5-spirit2/test/include_1_6.gold           |     2 -                                       
   branches/quickbook-1.5-spirit2/test/link-side-by-side.gold     |     2 -                                       
   branches/quickbook-1.5-spirit2/test/list_test.gold             |     2 -                                       
   branches/quickbook-1.5-spirit2/test/mismatched-brackets-1.gold |     2 -                                       
   branches/quickbook-1.5-spirit2/test/mismatched-brackets-2.gold |     2 -                                       
   branches/quickbook-1.5-spirit2/test/para-test.gold             |     2 -                                       
   branches/quickbook-1.5-spirit2/test/preformatted.gold          |     2 -                                       
   branches/quickbook-1.5-spirit2/test/section_1_4.gold           |     2 -                                       
   branches/quickbook-1.5-spirit2/test/section_1_5.gold           |     2 -                                       
   branches/quickbook-1.5-spirit2/test/simple_markup.gold         |     2 -                                       
   branches/quickbook-1.5-spirit2/test/table_1_5.gold             |     2 -                                       
   branches/quickbook-1.5-spirit2/test/template-section.gold      |     2 -                                       
   branches/quickbook-1.5-spirit2/test/templates.gold             |     2 -                                       
   branches/quickbook-1.5-spirit2/test/templates_1_4.gold         |     2 -                                       
   branches/quickbook-1.5-spirit2/test/templates_1_5.gold         |     2 -                                       
   branches/quickbook-1.5-spirit2/test/unicode-escape.gold        |     5 ---                                     
   branches/quickbook-1.5-spirit2/test/utf-8-bom.gold             |     5 ---                                     
   branches/quickbook-1.5-spirit2/test/utf-8.gold                 |     5 ---                                     
   branches/quickbook-1.5-spirit2/test/variablelist.gold          |     2 -                                       
   branches/quickbook-1.5-spirit2/test/xinclude.gold              |     2 -                                       
   43 files changed, 41 insertions(+), 120 deletions(-)

Modified: branches/quickbook-1.5-spirit2/block_actions.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/block_actions.cpp	(original)
+++ branches/quickbook-1.5-spirit2/block_actions.cpp	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -373,7 +373,7 @@
             quickbook::macro(state.filename.native());
 
         // parse the file
-        quickbook::parse(state.filename.native().c_str(), state, true);
+        quickbook::parse_file(state.filename.native().c_str(), state, true);
 
         // restore the values
         std::swap(state.filename, filein);

Modified: branches/quickbook-1.5-spirit2/boostbook.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/boostbook.cpp	(original)
+++ branches/quickbook-1.5-spirit2/boostbook.cpp	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -474,36 +474,33 @@
             title += "</title>\n";
         }
 
-        // For 'library', the title comes after the info block.
-        if(info.doc_type != "library") state.block << title;
-
         // Info tag
-
-        state.block << "<" << info.doc_type << "info>\n";
+        
+        std::ostringstream tmp;
 
         if(!info.doc_authors.empty())
         {
-            state.block << "<authorgroup>\n";
+            tmp << "<authorgroup>\n";
             BOOST_FOREACH(doc_info::author const& author, info.doc_authors) {
-                state.block
+                tmp
                     << "<author>\n"
                     << "<firstname>" << author.firstname.get(106) << "</firstname>\n"
                     << "<surname>" << author.surname.get(106) << "</surname>\n"
                     << "</author>\n";
             }
-            state.block << "</authorgroup>\n";
+            tmp << "</authorgroup>\n";
         }
 
         BOOST_FOREACH(doc_info::copyright_entry const& copyright,
             info.doc_copyrights)
         {
-            state.block << "<copyright>\n";
+            tmp << "<copyright>\n";
 
             BOOST_FOREACH(unsigned int year, copyright.years) {
-                state.block << "<year>" << year << "</year>\n";
+                tmp << "<year>" << year << "</year>\n";
             }
 
-            state.block
+            tmp
                 << "<holder>" << copyright.holder.get(106) << "</holder>\n"
                 << "</copyright>\n"
             ;
@@ -511,7 +508,7 @@
 
         if (!info.doc_license.empty())
         {
-            state.block
+            tmp
                 << "<legalnotice>\n"
                 << "<para>\n"
                 << info.doc_license.get(103)
@@ -524,7 +521,7 @@
 
         if (!info.doc_purpose.empty())
         {
-            state.block
+            tmp
                 << "<" << info.doc_type << "purpose>\n"
                 << info.doc_purpose.get(103)
                 << "</" << info.doc_type << "purpose>\n"
@@ -534,7 +531,7 @@
 
         BOOST_FOREACH(docinfo_string const& category, info.doc_categories)
         {
-            state.block
+            tmp
                 << "<" << info.doc_type << "category name=\"category:"
                 << category.get(106)
                 << "\"></" << info.doc_type << "category>\n"
@@ -542,9 +539,19 @@
             ;
         }
 
-        state.block
-            << "</" << info.doc_type << "info>\n"
-        ;
+        std::string info_block = tmp.str();
+
+        // For 'library', the title comes after the info block.
+        if(info.doc_type != "library") state.block << title;
+
+        if(!info_block.empty())
+        {
+            state.block
+                << "<" << info.doc_type << "info>\n"
+                << info_block
+                << "</" << info.doc_type << "info>\n"
+                ;
+        }
 
         if(info.doc_type == "library") state.block << title;
     }

Modified: branches/quickbook-1.5-spirit2/quickbook.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/quickbook.cpp	(original)
+++ branches/quickbook-1.5-spirit2/quickbook.cpp	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -69,7 +69,7 @@
     //
     ///////////////////////////////////////////////////////////////////////////
     int
-    parse(char const* filein_, state& state_, bool ignore_docinfo)
+    parse_file(char const* filein_, state& state_, bool ignore_docinfo)
     {
         using std::cerr;
         using std::vector;
@@ -124,10 +124,10 @@
     }
 
     static int
-    parse(char const* filein_, fs::path const& outdir, string_stream& out, std::string const& encoder)
+    parse_document(char const* filein_, fs::path const& outdir, string_stream& out, std::string const& encoder)
     {
         quickbook::state state(filein_, outdir, out, create_encoder(encoder));
-        bool r = parse(filein_, state);
+        bool r = parse_file(filein_, state);
         if (state.section_level != 0)
             detail::outwarn(filein_)
                 << "Warning missing [endsect] detected at end of file."
@@ -143,7 +143,7 @@
     }
 
     static int
-    parse(
+    parse_document(
         char const* filein_
       , char const* fileout_
       , int indent
@@ -159,7 +159,7 @@
         if (pretty_print)
         {
             string_stream buffer;
-            result = parse(filein_, outdir, buffer, encoder);
+            result = parse_document(filein_, outdir, buffer, encoder);
             if (result == 0)
             {
                 result = post_process(buffer.str(), fileout, indent, linewidth);
@@ -168,7 +168,7 @@
         else
         {
             string_stream buffer;
-            result = parse(filein_, outdir, buffer, encoder);
+            result = parse_document(filein_, outdir, buffer, encoder);
             fileout << buffer.str();
         }
         return result;
@@ -320,7 +320,7 @@
                 << fileout
                 << std::endl;
 
-            return quickbook::parse(filein.c_str(), fileout.c_str(), indent, linewidth, pretty_print, encoder);
+            return quickbook::parse_document(filein.c_str(), fileout.c_str(), indent, linewidth, pretty_print, encoder);
         }
         else
         {

Modified: branches/quickbook-1.5-spirit2/quickbook.hpp
==============================================================================
--- branches/quickbook-1.5-spirit2/quickbook.hpp	(original)
+++ branches/quickbook-1.5-spirit2/quickbook.hpp	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -26,7 +26,7 @@
     extern std::vector<std::string> preset_defines;
 
     // forward declarations
-    int parse(char const* filein_, state&, bool ignore_docinfo = false);
+    int parse_file(char const* filein_, state&, bool ignore_docinfo = false);
 }
 
 #endif

Modified: branches/quickbook-1.5-spirit2/test/blocks.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/blocks.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/blocks.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -2,10 +2,7 @@
 <!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"/>
+  <title>Various blocks</title> <anchor id="various_blocks.blockquotes"/>
   <bridgehead renderas="sect2">
     <link linkend="various_blocks.blockquotes">Blockquotes</link>
   </bridgehead>

Modified: branches/quickbook-1.5-spirit2/test/callouts.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/callouts.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/callouts.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <para>
     Example 1:
   </para>

Modified: branches/quickbook-1.5-spirit2/test/code-block-1.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/code-block-1.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/code-block-1.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
   <section id="code_block_1.a_code_block">
     <title>A code block</title>
     <para>

Modified: branches/quickbook-1.5-spirit2/test/code-block-2.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/code-block-2.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/code-block-2.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
   <section id="code_block_2.a_code_block">
     <title>A code block</title>
     <para>

Modified: branches/quickbook-1.5-spirit2/test/code-block-3.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/code-block-3.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/code-block-3.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <section id="code_block_3.python_code_block">
     <title>Python code block</title>
     <para>

Modified: branches/quickbook-1.5-spirit2/test/code-block-teletype.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/code-block-teletype.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/code-block-teletype.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <section id="code_block_teletype_1.a_code_block">
     <title><link linkend="code_block_teletype_1.a_code_block">A code block</link></title>
     

Modified: branches/quickbook-1.5-spirit2/test/code-block.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/code-block.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/code-block.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <article id="indented_code_blocks" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>Indented code blocks</title>
-  <articleinfo>
-  </articleinfo>
   <para>
     In a paragraph. Still in a paragraph.
   </para>

Modified: branches/quickbook-1.5-spirit2/test/code-snippet.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/code-snippet.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/code-snippet.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
   <section id="code_snippets.a_code_snippet">
     <title>A code snippet</title>
     <para>

Modified: branches/quickbook-1.5-spirit2/test/command_line_macro.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/command_line_macro.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/command_line_macro.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <article id="command_line_macro" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>Command Line Macro</title>
-  <articleinfo>
-  </articleinfo>
   <para>
     <emphasis role="bold">bold</emphasis>
   </para>

Modified: branches/quickbook-1.5-spirit2/test/cond_phrase.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/cond_phrase.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/cond_phrase.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <para>
     This should show
   </para>

Modified: branches/quickbook-1.5-spirit2/test/escape.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/escape.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/escape.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -2,8 +2,6 @@
 <!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>
-  </articleinfo>
   <section id="escape.escape">
     <title>Escape</title>
     <para>

Modified: branches/quickbook-1.5-spirit2/test/heading.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/heading.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/heading.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -1,10 +1,7 @@
 <?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="header" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Header</title>
-  <articleinfo>
-  </articleinfo>
-  <anchor id="header.header_test"/>
+  <title>Header</title> <anchor id="header.header_test"/>
   <bridgehead renderas="sect2">
     <link linkend="header.header_test">Header Test</link>
   </bridgehead>

Modified: branches/quickbook-1.5-spirit2/test/heading_1_6.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/heading_1_6.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/heading_1_6.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -1,10 +1,7 @@
 <?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="header" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Header</title>
-  <articleinfo>
-  </articleinfo>
-  <anchor id="header.header_test"/>
+  <title>Header</title> <anchor id="header.header_test"/>
   <bridgehead renderas="sect2">
     <link linkend="header.header_test">Header Test</link>
   </bridgehead>

Modified: branches/quickbook-1.5-spirit2/test/identifier_1_5.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/identifier_1_5.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/identifier_1_5.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -2,10 +2,7 @@
 <!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="identifiers_in_quickbook_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Identifiers in quickbook 1.5</title>
-  <articleinfo>
-  </articleinfo>
-  <anchor id="identifiers_in_quickbook_1_5.test_heading_with__code__phrase_role__identifier__code__phrase___code_"/>
+  <title>Identifiers in quickbook 1.5</title> <anchor id="identifiers_in_quickbook_1_5.test_heading_with__code__phrase_role__identifier__code__phrase___code_"/>
   <bridgehead renderas="sect2">
     <link linkend="identifiers_in_quickbook_1_5.test_heading_with__code__phrase_role__identifier__code__phrase___code_">Test
     heading with <code><phrase role="identifier">code</phrase></code></link>

Modified: branches/quickbook-1.5-spirit2/test/identifier_1_6.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/identifier_1_6.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/identifier_1_6.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -2,10 +2,7 @@
 <!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="identifiers_in_quickbook_1_6" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Identifiers in quickbook 1.6</title>
-  <articleinfo>
-  </articleinfo>
-  <anchor id="identifiers_in_quickbook_1_6.test_heading_with__code_"/>
+  <title>Identifiers in quickbook 1.6</title> <anchor id="identifiers_in_quickbook_1_6.test_heading_with__code_"/>
   <bridgehead renderas="sect2">
     <link linkend="identifiers_in_quickbook_1_6.test_heading_with__code_">Test heading
     with <code><phrase role="identifier">code</phrase></code></link>

Modified: branches/quickbook-1.5-spirit2/test/image_1_5.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/image_1_5.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/image_1_5.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -2,8 +2,6 @@
 <!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>
-  </articleinfo>
   <para>
     <inlinemediaobject><imageobject><imagedata fileref="test.gif"></imagedata></imageobject>
     <textobject>

Modified: branches/quickbook-1.5-spirit2/test/import.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/import.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/import.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -2,8 +2,6 @@
 <!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>
-  </articleinfo>
   <para>
     This is the <emphasis role="bold"><emphasis>foo</emphasis></emphasis> function.
   </para>

Modified: branches/quickbook-1.5-spirit2/test/include_1_5.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/include_1_5.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/include_1_5.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <section id="include_test_sub_document.test">
     <title><link linkend="include_test_sub_document.test">Test</link></title>
     <para>

Modified: branches/quickbook-1.5-spirit2/test/include_1_6-2.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/include_1_6-2.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/include_1_6-2.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <section id="include-test.test">
     <title><link linkend="include-test.test">Test</link></title>
     <para>

Modified: branches/quickbook-1.5-spirit2/test/include_1_6.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/include_1_6.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/include_1_6.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <section id="include-test.test">
     <title><link linkend="include-test.test">Test</link></title>
     <para>

Modified: branches/quickbook-1.5-spirit2/test/link-side-by-side.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/link-side-by-side.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/link-side-by-side.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
   <section id="side_by_side_links.side_by_side_links">
     <title>Side-by-side links</title>
     <para>

Modified: branches/quickbook-1.5-spirit2/test/list_test.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/list_test.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/list_test.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -2,8 +2,6 @@
 <!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>
-  </articleinfo>
   <para>
     Simple list:
   </para>

Modified: branches/quickbook-1.5-spirit2/test/mismatched-brackets-1.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/mismatched-brackets-1.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/mismatched-brackets-1.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <article id="mismatched_brackets" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>Mismatched brackets</title>
-  <articleinfo>
-  </articleinfo>
   <para>
     [foo
   </para>

Modified: branches/quickbook-1.5-spirit2/test/mismatched-brackets-2.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/mismatched-brackets-2.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/mismatched-brackets-2.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <article id="mismatched_brackets" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>Mismatched brackets</title>
-  <articleinfo>
-  </articleinfo>
   <para>
     [foo Eek
   </para>

Modified: branches/quickbook-1.5-spirit2/test/para-test.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/para-test.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/para-test.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>

Modified: branches/quickbook-1.5-spirit2/test/preformatted.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/preformatted.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/preformatted.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
   <section id="preformatted.preformatted">
     <title>Preformatted</title>
     <para>

Modified: branches/quickbook-1.5-spirit2/test/section_1_4.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/section_1_4.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/section_1_4.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <section id="section_id_1_4.id_test1">
     <title><link linkend="section_id_1_4.id_test1">Quickbook section id test</link></title>
   </section>

Modified: branches/quickbook-1.5-spirit2/test/section_1_5.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/section_1_5.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/section_1_5.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <section id="section_id_1_5.id_test1">
     <title><link linkend="section_id_1_5.id_test1">Quickbook section id test</link></title>
   </section>

Modified: branches/quickbook-1.5-spirit2/test/simple_markup.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/simple_markup.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/simple_markup.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <section id="simple_markup_test.simple_markup">
     <title><link linkend="simple_markup_test.simple_markup">Simple Markup</link></title>
     <para>

Modified: branches/quickbook-1.5-spirit2/test/table_1_5.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/table_1_5.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/table_1_5.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -2,8 +2,6 @@
 <!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>
-  </articleinfo>
   <table frame="all" id="table_1_5.table1">
     <title>Table 1</title>
     <tgroup cols="1">

Modified: branches/quickbook-1.5-spirit2/test/template-section.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/template-section.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/template-section.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <para>
     Some text before the section.
   </para>

Modified: branches/quickbook-1.5-spirit2/test/templates.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/templates.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/templates.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -2,8 +2,6 @@
 <!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>
-  </articleinfo>
   <section id="templates.templates">
     <title><link linkend="templates.templates">Templates</link></title>
     <para>

Modified: branches/quickbook-1.5-spirit2/test/templates_1_4.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/templates_1_4.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/templates_1_4.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <para>
     dynamic scoping
   </para>

Modified: branches/quickbook-1.5-spirit2/test/templates_1_5.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/templates_1_5.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/templates_1_5.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <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>
-  <articleinfo>
-  </articleinfo>
   <para>
     static scoping
   </para>

Modified: branches/quickbook-1.5-spirit2/test/unicode-escape.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/unicode-escape.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/unicode-escape.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="utf_8_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>UTF-8 test</title>
-  <articleinfo>
-  </articleinfo>
-  <anchor id="utf_8_test.i__xf1_t__xeb_rn__xe2_ti__xf4_n__xe0_liz__xe6_ti__xf8_n"/>
+  <title>UTF-8 test</title> <anchor id="utf_8_test.i__xf1_t__xeb_rn__xe2_ti__xf4_n__xe0_liz__xe6_ti__xf8_n"/>
   <bridgehead renderas="sect2">
     <link linkend="utf_8_test.i__xf1_t__xeb_rn__xe2_ti__xf4_n__xe0_liz__xe6_ti__xf8_n">I&#xF1;t&#xEB;rn&#xE2;ti&#xF4;n&#xE0;liz&#xE6;ti&#xF8;n</link>
   </bridgehead>

Modified: branches/quickbook-1.5-spirit2/test/utf-8-bom.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/utf-8-bom.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/utf-8-bom.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="utf_8_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>UTF-8 test</title>
-  <articleinfo>
-  </articleinfo>
-  <anchor id="utf_8_test.i__t__rn__ti__n__liz__ti__n"/>
+  <title>UTF-8 test</title> <anchor id="utf_8_test.i__t__rn__ti__n__liz__ti__n"/>
   <bridgehead renderas="sect2">
     <link linkend="utf_8_test.i__t__rn__ti__n__liz__ti__n">Iñtërnâtiônà lizætiøn</link>
   </bridgehead>

Modified: branches/quickbook-1.5-spirit2/test/utf-8.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/utf-8.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/utf-8.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <article id="utf_8_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>UTF-8 test</title>
-  <articleinfo>
-  </articleinfo>
-  <anchor id="utf_8_test.i__t__rn__ti__n__liz__ti__n"/>
+  <title>UTF-8 test</title> <anchor id="utf_8_test.i__t__rn__ti__n__liz__ti__n"/>
   <bridgehead renderas="sect2">
     <link linkend="utf_8_test.i__t__rn__ti__n__liz__ti__n">Iñtërnâtiônà lizætiøn</link>
   </bridgehead>

Modified: branches/quickbook-1.5-spirit2/test/variablelist.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/variablelist.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/variablelist.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -3,8 +3,6 @@
 <article id="variable_list_tests" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
  xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>Variable List Tests</title>
-  <articleinfo>
-  </articleinfo>
   <variablelist>
     <title>Empty</title>
   </variablelist>

Modified: branches/quickbook-1.5-spirit2/test/xinclude.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/xinclude.gold	(original)
+++ branches/quickbook-1.5-spirit2/test/xinclude.gold	2010-09-01 03:53:12 EDT (Wed, 01 Sep 2010)
@@ -2,7 +2,5 @@
 <!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>
-  </articleinfo>
   <xi:include href="../../../../../../../../../tools/quickbook/test/stub.xml" />
 </article>