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

Subject: [Boost-commit] svn:boost r86648 - trunk/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2013-11-12 04:17:18

Author: danieljames
Date: 2013-11-12 04:17:18 EST (Tue, 12 Nov 2013)
New Revision: 86648
URL: http://svn.boost.org/trac/boost/changeset/86648

Log:
Don't disable the newline after block handler in 1.7.

It isn't needed, although it does mean that this might be surprising:
{{{
* xxx xxx xxx
xxx xxx xxx
[block]
yyy yyy yyy
}}}

which is now equivalent to:

{{{
* xxx xxx xxx
  xxx xxx xxx

  [block]

yyy yyy yyy
}}}

Text files modified: 
   trunk/tools/quickbook/src/main_grammar.cpp |    10 ++++++----                              
   1 files changed, 6 insertions(+), 4 deletions(-)

Modified: trunk/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/main_grammar.cpp	Tue Nov 12 04:16:59 2013	(r86647)
+++ trunk/tools/quickbook/src/main_grammar.cpp	2013-11-12 04:17:18 EST (Tue, 12 Nov 2013)	(r86648)
@@ -488,10 +488,12 @@
                 // If the element is a block, then a newline will end the
                 // current syntactic block.
                 //
-                // Note that we don't do this for lists from 1.6 onwards to
-                // avoid messing up nested block elements. TODO: This is a bit
-                // iffy.
-            >>  !(  cl::eps_p(in_list) >> qbk_ver(106u)
+                // Note that we don't do this for lists in 1.6, as it causes
+                // the list block to end. The support for nested syntactic
+                // blocks in 1.7 will fix that. Although it does mean the
+                // following line will need to be indented. TODO: Flag that
+                // the indentation check shouldn't be made?
+            >>  !(  cl::eps_p(in_list) >> qbk_ver(106u, 107u)
                 |   cl::eps_p
                     (
                         ph::static_cast_<int>(local.syntactic_block_item.is_block_mask) &