[Boost-commit] svn:boost r85341 - in trunk/tools/quickbook: src test

Subject: [Boost-commit] svn:boost r85341 - in trunk/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2013-08-13 18:22:28

Author: danieljames
Date: 2013-08-13 18:22:28 EDT (Tue, 13 Aug 2013)
New Revision: 85341
URL: http://svn.boost.org/trac/boost/changeset/85341

Log:
Fix bug where list tags were confused with markup lists.

Text files modified: 
   trunk/tools/quickbook/src/main_grammar.cpp        |     2 +-                                      
   trunk/tools/quickbook/test/elements-1_6.gold      |     8 ++++++++                                
   trunk/tools/quickbook/test/elements-1_6.quickbook |    10 +++++++++-                              
   3 files changed, 18 insertions(+), 2 deletions(-)

Modified: trunk/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/main_grammar.cpp	Tue Aug 13 18:22:06 2013	(r85340)
+++ trunk/tools/quickbook/src/main_grammar.cpp	2013-08-13 18:22:28 EDT (Tue, 13 Aug 2013)	(r85341)
@@ -268,7 +268,7 @@
 
         bool operator()() const {
             return !l.list_stack.empty() &&
-                l.list_stack.top().type & list_stack_item::is_list;
+                l.list_stack.top().type == list_stack_item::syntactic_list;
         }
     };
 

Modified: trunk/tools/quickbook/test/elements-1_6.gold
==============================================================================
--- trunk/tools/quickbook/test/elements-1_6.gold	Tue Aug 13 18:22:06 2013	(r85340)
+++ trunk/tools/quickbook/test/elements-1_6.gold	2013-08-13 18:22:28 EDT (Tue, 13 Aug 2013)	(r85341)
@@ -27,6 +27,14 @@
       </simpara>
     </listitem>
   </itemizedlist>
+  <orderedlist>
+    <listitem>
+      <simpara>
+        Check that <emphasis role="bold">bold text</emphasis> isn't confused with
+        a list.
+      </simpara>
+    </listitem>
+  </orderedlist>
   <simplesect><title>A <emphasis role="bold">simplesect</emphasis>!</title></simplesect>
 
 </article>

Modified: trunk/tools/quickbook/test/elements-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/elements-1_6.quickbook	Tue Aug 13 18:22:06 2013	(r85340)
+++ trunk/tools/quickbook/test/elements-1_6.quickbook	2013-08-13 18:22:28 EDT (Tue, 13 Aug 2013)	(r85341)
@@ -8,6 +8,14 @@
 
 [itemized_list [item1][item2]]
 
+[ordered_list
+    [
+        Check that
+        *bold text*
+        isn't confused with a list.
+    ]
+]
+
 [block'''<simplesect><title>'''A *simplesect*!'''</title>''']
 
-[block'''</simplesect>''']
\ No newline at end of file
+[block'''</simplesect>''']