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

Subject: [Boost-commit] svn:boost r63813 - in trunk/tools/quickbook: detail test
From: daniel_james_at_[hidden]
Date: 2010-07-10 11:03:08

Author: danieljames
Date: 2010-07-10 11:03:07 EDT (Sat, 10 Jul 2010)
New Revision: 63813
URL: http://svn.boost.org/trac/boost/changeset/63813

Log:
Make repeated quickbook image attributes a warning rather than an error.
Removed:
   trunk/tools/quickbook/test/fail-image_1_5.quickbook
Text files modified: 
   trunk/tools/quickbook/detail/actions.cpp       |     3 +--                                     
   trunk/tools/quickbook/test/Jamfile.v2          |     1 -                                       
   trunk/tools/quickbook/test/image_1_5.gold      |     7 +++++++                                 
   trunk/tools/quickbook/test/image_1_5.quickbook |     5 ++++-                                   
   4 files changed, 12 insertions(+), 4 deletions(-)

Modified: trunk/tools/quickbook/detail/actions.cpp
==============================================================================
--- trunk/tools/quickbook/detail/actions.cpp	(original)
+++ trunk/tools/quickbook/detail/actions.cpp	2010-07-10 11:03:07 EDT (Sat, 10 Jul 2010)
@@ -473,9 +473,8 @@
                 attribute_map::value_type(attribute_name, std::string(first, last))
             ).second)
         {
-            detail::outerr(pos.file,pos.line)
+            detail::outwarn(pos.file,pos.line)
                 << "Repeated attribute: " << attribute_name << ".\n";
-            ++error_count;
         }
     }
 

Modified: trunk/tools/quickbook/test/Jamfile.v2
==============================================================================
--- trunk/tools/quickbook/test/Jamfile.v2	(original)
+++ trunk/tools/quickbook/test/Jamfile.v2	2010-07-10 11:03:07 EDT (Sat, 10 Jul 2010)
@@ -65,7 +65,6 @@
     [ quickbook-fail-test fail-template-section-1 ]
     [ quickbook-fail-test fail-template-section-2 ]
     [ quickbook-fail-test fail-template-section-3 ]
-    [ quickbook-fail-test fail-image_1_5 ]
     [ quickbook-test utf-8 ]
     [ quickbook-test utf-8-bom ]
     [ quickbook-test unicode-escape ]

Deleted: trunk/tools/quickbook/test/fail-image_1_5.quickbook
==============================================================================
--- trunk/tools/quickbook/test/fail-image_1_5.quickbook	2010-07-10 11:03:07 EDT (Sat, 10 Jul 2010)
+++ (empty file)
@@ -1,5 +0,0 @@
-[article Images 1.5
-    [quickbook 1.5]
-]
-
-[$test.gif [width 10cm] [height 10cm] [width 10cm]]

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-07-10 11:03:07 EDT (Sat, 10 Jul 2010)
@@ -56,4 +56,11 @@
     </textobject>
     </inlinemediaobject>
   </para>
+  <para>
+    <inlinemediaobject><imageobject><imagedata fileref="test.gif" height="10cm" width="10cm"></imagedata></imageobject>
+    <textobject>
+      <phrase>test</phrase>
+    </textobject>
+    </inlinemediaobject>
+  </para>
 </article>

Modified: trunk/tools/quickbook/test/image_1_5.quickbook
==============================================================================
--- trunk/tools/quickbook/test/image_1_5.quickbook	(original)
+++ trunk/tools/quickbook/test/image_1_5.quickbook	2010-07-10 11:03:07 EDT (Sat, 10 Jul 2010)
@@ -13,4 +13,7 @@
 
 [$ [/comment] test.gif  ]
 [$ [/comment] test.gif [/comment] ]
-[$ [/comment] test.gif [/comment] [alt comment] ]
\ No newline at end of file
+[$ [/comment] test.gif [/comment] [alt comment] ]
+
+[/ This should warn about repeated attribute and then ignore it. ]
+[$test.gif [width 10cm] [height 10cm] [width 20cm]]