[Boost-commit] svn:boost r64990 - in trunk/tools/quickbook: detail test

Subject: [Boost-commit] svn:boost r64990 - in trunk/tools/quickbook: detail test
From: dnljms_at_[hidden]
Date: 2010-08-24 19:12:15

Author: danieljames
Date: 2010-08-24 19:12:10 EDT (Tue, 24 Aug 2010)
New Revision: 64990
URL: http://svn.boost.org/trac/boost/changeset/64990

Log:
Fix xml escaping for the license in quickbook 1.2 and less.
Text files modified: 
   trunk/tools/quickbook/detail/actions.cpp            |     6 +++---                                  
   trunk/tools/quickbook/test/xml-escape_1_2.gold      |     5 +++++                                   
   trunk/tools/quickbook/test/xml-escape_1_2.quickbook |     1 +                                       
   trunk/tools/quickbook/test/xml-escape_1_5.gold      |     5 +++++                                   
   trunk/tools/quickbook/test/xml-escape_1_5.quickbook |     1 +                                       
   5 files changed, 15 insertions(+), 3 deletions(-)

Modified: trunk/tools/quickbook/detail/actions.cpp
==============================================================================
--- trunk/tools/quickbook/detail/actions.cpp	(original)
+++ trunk/tools/quickbook/detail/actions.cpp	2010-08-24 19:12:10 EDT (Tue, 24 Aug 2010)
@@ -1762,9 +1762,9 @@
             {
                 out << "    <legalnotice>\n"
                     << "      <para>\n"
-                    << "        "
-                    << actions.doc_license_1_1
-                    << "\n"
+                    << "        ";
+                detail::print_string(actions.doc_license_1_1, out.get());
+                out << "\n"
                     << "      </para>\n"
                     << "    </legalnotice>\n"
                     << "\n"

Modified: trunk/tools/quickbook/test/xml-escape_1_2.gold
==============================================================================
--- trunk/tools/quickbook/test/xml-escape_1_2.gold	(original)
+++ trunk/tools/quickbook/test/xml-escape_1_2.gold	2010-08-24 19:12:10 EDT (Tue, 24 Aug 2010)
@@ -4,6 +4,11 @@
 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">
   <libraryinfo>
+    <legalnotice>
+      <para>
+        &amp; should be &amp;amp;, &lt; should &amp;lt;
+      </para>
+    </legalnotice>
     <librarypurpose>
       &amp; should be &amp;amp;, &lt; should &amp;lt;
     </librarypurpose>

Modified: trunk/tools/quickbook/test/xml-escape_1_2.quickbook
==============================================================================
--- trunk/tools/quickbook/test/xml-escape_1_2.quickbook	(original)
+++ trunk/tools/quickbook/test/xml-escape_1_2.quickbook	2010-08-24 19:12:10 EDT (Tue, 24 Aug 2010)
@@ -1,6 +1,7 @@
 [library Test that &, < are being escaped.
     [quickbook 1.2]
     [purpose & should be &amp;, < should &lt;]
+    [license & should be &amp;, < should &lt;]
 ]
 
 [section Escapes & explicitly written markup]

Modified: trunk/tools/quickbook/test/xml-escape_1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/xml-escape_1_5.gold	(original)
+++ trunk/tools/quickbook/test/xml-escape_1_5.gold	2010-08-24 19:12:10 EDT (Tue, 24 Aug 2010)
@@ -4,6 +4,11 @@
 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">
   <libraryinfo>
+    <legalnotice>
+      <para>
+        &amp; should be &amp;amp;, &lt; should &amp;lt;
+      </para>
+    </legalnotice>
     <librarypurpose>
       &amp; should be &amp;amp;, &lt; should &amp;lt;
     </librarypurpose>

Modified: trunk/tools/quickbook/test/xml-escape_1_5.quickbook
==============================================================================
--- trunk/tools/quickbook/test/xml-escape_1_5.quickbook	(original)
+++ trunk/tools/quickbook/test/xml-escape_1_5.quickbook	2010-08-24 19:12:10 EDT (Tue, 24 Aug 2010)
@@ -1,6 +1,7 @@
 [library Test that &, < are being escaped.
     [quickbook 1.5]
     [purpose & should be &amp;, < should &lt;]
+    [license & should be &amp;, < should &lt;]
 ]
 
 [section Escapes & explicitly written markup]