[Boost-commit] svn:boost r67330 - trunk/tools/quickbook/src

Subject: [Boost-commit] svn:boost r67330 - trunk/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2010-12-19 08:31:18

Author: danieljames
Date: 2010-12-19 08:31:17 EST (Sun, 19 Dec 2010)
New Revision: 67330
URL: http://svn.boost.org/trac/boost/changeset/67330

Log:
Move block and paragraph rules together.
Text files modified: 
   trunk/tools/quickbook/src/block_grammar.cpp |    46 ++++++++++++++++++++--------------------
   1 files changed, 23 insertions(+), 23 deletions(-)

Modified: trunk/tools/quickbook/src/block_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/block_grammar.cpp	(original)
+++ trunk/tools/quickbook/src/block_grammar.cpp	2010-12-19 08:31:17 EST (Sun, 19 Dec 2010)
@@ -64,15 +64,36 @@
         }
 
         local.blocks =
-           *(   local.block_markup
-            |   local.code
+           *(   local.code
             |   local.list                      [actions.list]
             |   local.hr                        [actions.hr]
             |   +local.eol
+            |   local.block_markup
             |   local.paragraph                 [actions.inside_paragraph]
             )
             ;
 
+        local.paragraph =
+           +(   common
+            |   (cl::eps_p -                    // Make sure we don't go past
+                    local.paragraph_end)        // a single block.
+            >>  (   cl::space_p                 [actions.space_char]
+                |   cl::anychar_p               [actions.plain_char]
+                )
+            )
+            >> (cl::eps_p('[') | +local.eol)
+            ;
+
+        // Note: Not using local.block_markup_start here as it would change
+        // block_keyword_rule.
+        local.paragraph_end
+            =   '[' >> local.space
+            >>  (   block_keyword_rules >> (cl::eps_p - (cl::alnum_p | '_'))
+                |   block_symbol_rules
+                )
+            |   cl::eol_p >> *cl::blank_p >> cl::eol_p
+            ;
+
         local.space =
             *(cl::space_p | local.comment)
             ;
@@ -483,27 +504,6 @@
             >> +local.eol
             ;
 
-        // Note: Not using local.block_markup_start here as it would change
-        // block_keyword_rule.
-        local.paragraph_end
-            =   '[' >> local.space
-            >>  (   block_keyword_rules >> (cl::eps_p - (cl::alnum_p | '_'))
-                |   block_symbol_rules
-                )
-            |   cl::eol_p >> *cl::blank_p >> cl::eol_p
-            ;
-
-        local.paragraph =
-           +(   common
-            |   (cl::eps_p -                    // Make sure we don't go past
-                    local.paragraph_end)        // a single block.
-            >>  (   cl::space_p                 [actions.space_char]
-                |   cl::anychar_p               [actions.plain_char]
-                )
-            )
-            >> (cl::eps_p('[') | +local.eol)
-            ;
-
         local.inner_phrase =
                 cl::eps_p                       [actions.inner_phrase_pre]
             >>  local.phrase