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

Subject: [Boost-commit] svn:boost r67636 - in trunk/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2011-01-03 17:13:56

Author: danieljames
Date: 2011-01-03 17:13:54 EST (Mon, 03 Jan 2011)
New Revision: 67636
URL: http://svn.boost.org/trac/boost/changeset/67636

Log:
Make the newline after block markup optional.
Text files modified: 
   trunk/tools/quickbook/src/main_grammar.cpp  |     4 ++--                                    
   trunk/tools/quickbook/test/blocks.gold      |    23 +++++++++++++++++++++++                 
   trunk/tools/quickbook/test/blocks.quickbook |     6 +++++-                                  
   3 files changed, 30 insertions(+), 3 deletions(-)

Modified: trunk/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/main_grammar.cpp	(original)
+++ trunk/tools/quickbook/src/main_grammar.cpp	2011-01-03 17:13:54 EST (Mon, 03 Jan 2011)
@@ -100,7 +100,7 @@
         local.top_level
             =   local.blocks
             >>  *(
-                    local.block_markup >> local.blocks
+                    local.block_markup >> !(+eol >> local.blocks)
                 |   local.paragraph_separator >> local.blocks
                 |   common
                 |   cl::space_p                 [actions.space_char]
@@ -130,7 +130,7 @@
         local.block_markup
             =   local.block_markup_start        [actions.inside_paragraph]
             >>  (   local.block_keyword_rule
-                >>  (   (space >> ']' >> +eol)
+                >>  (   (space >> ']')
                     |   cl::eps_p               [actions.error]
                     )
                 |   cl::eps_p                   [actions.error]

Modified: trunk/tools/quickbook/test/blocks.gold
==============================================================================
--- trunk/tools/quickbook/test/blocks.gold	(original)
+++ trunk/tools/quickbook/test/blocks.gold	2011-01-03 17:13:54 EST (Mon, 03 Jan 2011)
@@ -86,4 +86,27 @@
   <para>
     [tipping point]
   </para>
+  <para>
+    Multiple paragraphs because of the inline blocks.
+  </para>
+  <warning>
+    <para>
+      Warning
+    </para>
+  </warning>
+  <para>
+    This line should appear as a separate paragraph.
+  </para>
+  <warning>
+    <para>
+      Warning
+    </para>
+  </warning>
+  <itemizedlist>
+    <listitem>
+      <simpara>
+        This should be a list item because it's preceded by block markup.
+      </simpara>
+    </listitem>
+  </itemizedlist>
 </article>

Modified: trunk/tools/quickbook/test/blocks.quickbook
==============================================================================
--- trunk/tools/quickbook/test/blocks.quickbook	(original)
+++ trunk/tools/quickbook/test/blocks.quickbook	2011-01-03 17:13:54 EST (Mon, 03 Jan 2011)
@@ -39,4 +39,8 @@
 [/ Unfortunately footnotes currently can't contain blocks.]
 
 [/ Quickbook shouldn't think that this is a tip]
-[tipping point]
\ No newline at end of file
+[tipping point]
+
+Multiple paragraphs because of the inline blocks. [warning Warning] This
+line should appear as a separate paragraph.[warning Warning]
+* This should be a list item because it's preceded by block markup.
\ No newline at end of file