Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r65011 - in trunk/tools/quickbook: detail test
From: dnljms_at_[hidden]
Date: 2010-08-26 04:04:36


Author: danieljames
Date: 2010-08-26 04:04:08 EDT (Thu, 26 Aug 2010)
New Revision: 65011
URL: http://svn.boost.org/trac/boost/changeset/65011

Log:
Don't generate empty document info tags.
Text files modified:
   trunk/tools/quickbook/detail/actions.cpp | 36 +++++++++++++++++++++---------------
   trunk/tools/quickbook/test/blocks.gold | 5 +----
   trunk/tools/quickbook/test/callouts.gold | 2 --
   trunk/tools/quickbook/test/code-block-1.gold | 2 --
   trunk/tools/quickbook/test/code-block-2.gold | 2 --
   trunk/tools/quickbook/test/code-block-3.gold | 2 --
   trunk/tools/quickbook/test/code-block-teletype.gold | 2 --
   trunk/tools/quickbook/test/code-block.gold | 2 --
   trunk/tools/quickbook/test/code-snippet.gold | 2 --
   trunk/tools/quickbook/test/command_line_macro.gold | 2 --
   trunk/tools/quickbook/test/cond_phrase.gold | 2 --
   trunk/tools/quickbook/test/escape.gold | 2 --
   trunk/tools/quickbook/test/heading.gold | 5 +----
   trunk/tools/quickbook/test/heading_1_6.gold | 5 +----
   trunk/tools/quickbook/test/identifier_1_5.gold | 5 +----
   trunk/tools/quickbook/test/identifier_1_6.gold | 5 +----
   trunk/tools/quickbook/test/image_1_5.gold | 2 --
   trunk/tools/quickbook/test/import.gold | 2 --
   trunk/tools/quickbook/test/include_1_5.gold | 2 --
   trunk/tools/quickbook/test/include_1_6-2.gold | 2 --
   trunk/tools/quickbook/test/include_1_6.gold | 2 --
   trunk/tools/quickbook/test/link-side-by-side.gold | 2 --
   trunk/tools/quickbook/test/list_test.gold | 2 --
   trunk/tools/quickbook/test/mismatched-brackets-1.gold | 2 --
   trunk/tools/quickbook/test/mismatched-brackets-2.gold | 2 --
   trunk/tools/quickbook/test/para-test.gold | 2 --
   trunk/tools/quickbook/test/preformatted.gold | 2 --
   trunk/tools/quickbook/test/section_1_4.gold | 2 --
   trunk/tools/quickbook/test/section_1_5.gold | 2 --
   trunk/tools/quickbook/test/simple_markup.gold | 2 --
   trunk/tools/quickbook/test/table_1_5.gold | 2 --
   trunk/tools/quickbook/test/template-section.gold | 2 --
   trunk/tools/quickbook/test/templates.gold | 2 --
   trunk/tools/quickbook/test/templates_1_4.gold | 2 --
   trunk/tools/quickbook/test/templates_1_5.gold | 2 --
   trunk/tools/quickbook/test/unicode-escape.gold | 5 +----
   trunk/tools/quickbook/test/utf-8-bom.gold | 5 +----
   trunk/tools/quickbook/test/utf-8.gold | 5 +----
   trunk/tools/quickbook/test/variablelist.gold | 2 --
   trunk/tools/quickbook/test/xinclude.gold | 2 --
   40 files changed, 29 insertions(+), 109 deletions(-)

Modified: trunk/tools/quickbook/detail/actions.cpp
==============================================================================
--- trunk/tools/quickbook/detail/actions.cpp (original)
+++ trunk/tools/quickbook/detail/actions.cpp 2010-08-26 04:04:08 EDT (Thu, 26 Aug 2010)
@@ -8,6 +8,7 @@
     License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
+#include <sstream>
 #include <numeric>
 #include <functional>
 #include <algorithm>
@@ -1718,18 +1719,17 @@
     void write_document_info(collector& out, quickbook::actions& actions)
     {
         std::vector<std::string> invalid_attributes;
-
- out << " <" << actions.doc_type << "info>\n";
+ std::ostringstream tmp;
 
         if(!actions.doc_authors.empty())
         {
- out << " <authorgroup>\n";
+ tmp << " <authorgroup>\n";
             for(actions::author_list::const_iterator
                 it = actions.doc_authors.begin(),
                 end = actions.doc_authors.end();
                 it != end; ++it)
             {
- out << " <author>\n"
+ tmp << " <author>\n"
                     << " <firstname>"
                     << it->first.get(103)
                     << "</firstname>\n"
@@ -1738,7 +1738,7 @@
                     << "</surname>\n"
                     << " </author>\n";
             }
- out << " </authorgroup>\n";
+ tmp << " </authorgroup>\n";
         }
 
         if (!actions.doc_copyrights.empty())
@@ -1748,17 +1748,17 @@
                 end = actions.doc_copyrights.end();
                 it != end; ++it)
             {
- out << "\n" << " <copyright>\n";
+ tmp << "\n" << " <copyright>\n";
         
                 for(actions::string_list::const_iterator
                     it2 = it->first.begin(),
                     end = it->first.end();
                     it2 != end; ++it2)
                 {
- out << " <year>" << *it2 << "</year>\n";
+ tmp << " <year>" << *it2 << "</year>\n";
                 }
         
- out << " <holder>"
+ tmp << " <holder>"
                     << it->second.get(103)
                     << "</holder>\n"
                     << " </copyright>\n"
@@ -1769,7 +1769,7 @@
 
         if (!actions.doc_license.empty())
         {
- out << " <legalnotice>\n"
+ tmp << " <legalnotice>\n"
                 << " <para>\n"
                 << " " << actions.doc_license.get(103) << "\n"
                 << " </para>\n"
@@ -1785,7 +1785,7 @@
                 invalid_attributes.push_back("purpose");
             }
 
- out << " <" << actions.doc_type << "purpose>\n"
+ tmp << " <" << actions.doc_type << "purpose>\n"
                 << " " << actions.doc_purpose.get(103)
                 << " </" << actions.doc_type << "purpose>\n"
                 << "\n"
@@ -1804,7 +1804,7 @@
                 end = actions.doc_categories.end();
                 it != end; ++it)
             {
- out << " <" << actions.doc_type << "category name=\"category:"
+ tmp << " <" << actions.doc_type << "category name=\"category:"
                     << it->get(103)
                     << "\"></" << actions.doc_type << "category>\n"
                     << "\n"
@@ -1812,10 +1812,16 @@
             }
         }
 
- out << " </" << actions.doc_type << "info>\n"
- << "\n"
- ;
-
+ std::string value = tmp.str();
+ if(!value.empty())
+ {
+ out << " <" << actions.doc_type << "info>\n"
+ << value
+ << " </" << actions.doc_type << "info>\n"
+ << "\n"
+ ;
+ }
+
         if(!invalid_attributes.empty())
         {
             detail::outwarn(actions.filename.file_string(),1)

Modified: trunk/tools/quickbook/test/blocks.gold
==============================================================================
--- trunk/tools/quickbook/test/blocks.gold (original)
+++ trunk/tools/quickbook/test/blocks.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/callouts.gold
==============================================================================
--- trunk/tools/quickbook/test/callouts.gold (original)
+++ trunk/tools/quickbook/test/callouts.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/code-block-1.gold
==============================================================================
--- trunk/tools/quickbook/test/code-block-1.gold (original)
+++ trunk/tools/quickbook/test/code-block-1.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/code-block-2.gold
==============================================================================
--- trunk/tools/quickbook/test/code-block-2.gold (original)
+++ trunk/tools/quickbook/test/code-block-2.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/code-block-3.gold
==============================================================================
--- trunk/tools/quickbook/test/code-block-3.gold (original)
+++ trunk/tools/quickbook/test/code-block-3.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/code-block-teletype.gold
==============================================================================
--- trunk/tools/quickbook/test/code-block-teletype.gold (original)
+++ trunk/tools/quickbook/test/code-block-teletype.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/code-block.gold
==============================================================================
--- trunk/tools/quickbook/test/code-block.gold (original)
+++ trunk/tools/quickbook/test/code-block.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/code-snippet.gold
==============================================================================
--- trunk/tools/quickbook/test/code-snippet.gold (original)
+++ trunk/tools/quickbook/test/code-snippet.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/command_line_macro.gold
==============================================================================
--- trunk/tools/quickbook/test/command_line_macro.gold (original)
+++ trunk/tools/quickbook/test/command_line_macro.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/cond_phrase.gold
==============================================================================
--- trunk/tools/quickbook/test/cond_phrase.gold (original)
+++ trunk/tools/quickbook/test/cond_phrase.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/escape.gold
==============================================================================
--- trunk/tools/quickbook/test/escape.gold (original)
+++ trunk/tools/quickbook/test/escape.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/heading.gold
==============================================================================
--- trunk/tools/quickbook/test/heading.gold (original)
+++ trunk/tools/quickbook/test/heading.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/heading_1_6.gold
==============================================================================
--- trunk/tools/quickbook/test/heading_1_6.gold (original)
+++ trunk/tools/quickbook/test/heading_1_6.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/identifier_1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/identifier_1_5.gold (original)
+++ trunk/tools/quickbook/test/identifier_1_5.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/identifier_1_6.gold
==============================================================================
--- trunk/tools/quickbook/test/identifier_1_6.gold (original)
+++ trunk/tools/quickbook/test/identifier_1_6.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/image_1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/image_1_5.gold (original)
+++ trunk/tools/quickbook/test/image_1_5.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/import.gold
==============================================================================
--- trunk/tools/quickbook/test/import.gold (original)
+++ trunk/tools/quickbook/test/import.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/include_1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/include_1_5.gold (original)
+++ trunk/tools/quickbook/test/include_1_5.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/include_1_6-2.gold
==============================================================================
--- trunk/tools/quickbook/test/include_1_6-2.gold (original)
+++ trunk/tools/quickbook/test/include_1_6-2.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/include_1_6.gold
==============================================================================
--- trunk/tools/quickbook/test/include_1_6.gold (original)
+++ trunk/tools/quickbook/test/include_1_6.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/link-side-by-side.gold
==============================================================================
--- trunk/tools/quickbook/test/link-side-by-side.gold (original)
+++ trunk/tools/quickbook/test/link-side-by-side.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/list_test.gold
==============================================================================
--- trunk/tools/quickbook/test/list_test.gold (original)
+++ trunk/tools/quickbook/test/list_test.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/mismatched-brackets-1.gold
==============================================================================
--- trunk/tools/quickbook/test/mismatched-brackets-1.gold (original)
+++ trunk/tools/quickbook/test/mismatched-brackets-1.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/mismatched-brackets-2.gold
==============================================================================
--- trunk/tools/quickbook/test/mismatched-brackets-2.gold (original)
+++ trunk/tools/quickbook/test/mismatched-brackets-2.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/para-test.gold
==============================================================================
--- trunk/tools/quickbook/test/para-test.gold (original)
+++ trunk/tools/quickbook/test/para-test.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/preformatted.gold
==============================================================================
--- trunk/tools/quickbook/test/preformatted.gold (original)
+++ trunk/tools/quickbook/test/preformatted.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/section_1_4.gold
==============================================================================
--- trunk/tools/quickbook/test/section_1_4.gold (original)
+++ trunk/tools/quickbook/test/section_1_4.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/section_1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/section_1_5.gold (original)
+++ trunk/tools/quickbook/test/section_1_5.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/simple_markup.gold
==============================================================================
--- trunk/tools/quickbook/test/simple_markup.gold (original)
+++ trunk/tools/quickbook/test/simple_markup.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/table_1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/table_1_5.gold (original)
+++ trunk/tools/quickbook/test/table_1_5.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/template-section.gold
==============================================================================
--- trunk/tools/quickbook/test/template-section.gold (original)
+++ trunk/tools/quickbook/test/template-section.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/templates.gold
==============================================================================
--- trunk/tools/quickbook/test/templates.gold (original)
+++ trunk/tools/quickbook/test/templates.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/templates_1_4.gold
==============================================================================
--- trunk/tools/quickbook/test/templates_1_4.gold (original)
+++ trunk/tools/quickbook/test/templates_1_4.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/templates_1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/templates_1_5.gold (original)
+++ trunk/tools/quickbook/test/templates_1_5.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/unicode-escape.gold
==============================================================================
--- trunk/tools/quickbook/test/unicode-escape.gold (original)
+++ trunk/tools/quickbook/test/unicode-escape.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/utf-8-bom.gold
==============================================================================
--- trunk/tools/quickbook/test/utf-8-bom.gold (original)
+++ trunk/tools/quickbook/test/utf-8-bom.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/utf-8.gold
==============================================================================
--- trunk/tools/quickbook/test/utf-8.gold (original)
+++ trunk/tools/quickbook/test/utf-8.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/variablelist.gold
==============================================================================
--- trunk/tools/quickbook/test/variablelist.gold (original)
+++ trunk/tools/quickbook/test/variablelist.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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: trunk/tools/quickbook/test/xinclude.gold
==============================================================================
--- trunk/tools/quickbook/test/xinclude.gold (original)
+++ trunk/tools/quickbook/test/xinclude.gold 2010-08-26 04:04:08 EDT (Thu, 26 Aug 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>


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk