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

Subject: [Boost-commit] svn:boost r84936 - in trunk/tools/quickbook: doc src test
From: dnljms_at_[hidden]
Date: 2013-07-01 15:35:37

Author: danieljames
Date: 2013-07-01 15:35:37 EDT (Mon, 01 Jul 2013)
New Revision: 84936
URL: http://svn.boost.org/trac/boost/changeset/84936

Log:
Don't break out of a list after a block tag.

Text files modified: 
   trunk/tools/quickbook/doc/change_log.qbk           |     1                                         
   trunk/tools/quickbook/src/main_grammar.cpp         |     2                                         
   trunk/tools/quickbook/test/list_test-1_6.gold      |    48 ++++++++++++++++++++++++++++++++++++++++
   trunk/tools/quickbook/test/list_test-1_6.quickbook |    12 ++++++++++                              
   4 files changed, 62 insertions(+), 1 deletions(-)

Modified: trunk/tools/quickbook/doc/change_log.qbk
==============================================================================
--- trunk/tools/quickbook/doc/change_log.qbk	Mon Jul  1 15:35:12 2013	(r84935)
+++ trunk/tools/quickbook/doc/change_log.qbk	2013-07-01 15:35:37 EDT (Mon, 01 Jul 2013)	(r84936)
@@ -301,4 +301,5 @@
 
 * Remove nested blocks in lists from 1.6, move to 1.7.
   (Can still nest block elements in lists though).
+* Don't break out of lists after a nested block element.
 * Check for errors when writing dependency files.

Modified: trunk/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/main_grammar.cpp	Mon Jul  1 15:35:12 2013	(r84935)
+++ trunk/tools/quickbook/src/main_grammar.cpp	2013-07-01 15:35:37 EDT (Mon, 01 Jul 2013)	(r84936)
@@ -418,7 +418,7 @@
 
         local.list_item =
                 local.element(local.list_item.context)
-            >>  !eol                            [local.list.still_in_block = false]
+            >>  !(qbk_ver(0, 106u) >> eol)      [local.list.still_in_block = false]
             |   local.paragraph_separator       [local.list.still_in_block = false]
             |   local.common(element_info::in_phrase)
             ;

Modified: trunk/tools/quickbook/test/list_test-1_6.gold
==============================================================================
--- trunk/tools/quickbook/test/list_test-1_6.gold	Mon Jul  1 15:35:12 2013	(r84935)
+++ trunk/tools/quickbook/test/list_test-1_6.gold	2013-07-01 15:35:37 EDT (Mon, 01 Jul 2013)	(r84936)
@@ -309,6 +309,54 @@
         </footnote>
       </simpara>
     </listitem>
+    <listitem>
+      <simpara>
+        <informaltable frame="all">
+          <tgroup cols="1">
+            <thead>
+              <row>
+                <entry>
+                  <para>
+                    Heading
+                  </para>
+                </entry>
+              </row>
+            </thead>
+            <tbody>
+              <row>
+                <entry>
+                  <para>
+                    Cell
+                  </para>
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+        Some text.
+      </simpara>
+    </listitem>
+    <listitem>
+      <simpara>
+        [section Doesn't expand] Blah, blah. [endsect]
+      </simpara>
+    </listitem>
+    <listitem>
+      <simpara>
+        <para>
+          Paragraph cheat 1.
+        </para>
+        Paragraph cheat 2.
+      </simpara>
+    </listitem>
+    <listitem>
+      <simpara>
+        <para>
+          Paragraph cheat 3.
+        </para>
+        Paragraph cheat 4.
+      </simpara>
+    </listitem>
   </itemizedlist>
   <para>
     Don't end list with comment 1:

Modified: trunk/tools/quickbook/test/list_test-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/list_test-1_6.quickbook	Mon Jul  1 15:35:12 2013	(r84935)
+++ trunk/tools/quickbook/test/list_test-1_6.quickbook	2013-07-01 15:35:37 EDT (Mon, 01 Jul 2013)	(r84936)
@@ -73,6 +73,18 @@
 *   [*Bold]
 *   ["Quoted]
 *   [footnote Footnote]
+*   [table [[Heading]][[Cell]]]
+    Some text.
+*   [section Doesn't expand]
+    Blah, blah.
+    [endsect]
+
+* Paragraph cheat 1.
+  [block]
+  Paragraph cheat 2.
+* Paragraph cheat 3.
+  [block]
+  Paragraph cheat 4.
 
 Don't end list with comment 1: