Subject: [Boost-commit] svn:boost r67329 - trunk/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2010-12-19 08:30:46
Author: danieljames
Date: 2010-12-19 08:30:43 EST (Sun, 19 Dec 2010)
New Revision: 67329
URL: http://svn.boost.org/trac/boost/changeset/67329
Log:
Don't treat lines containing comments as blank.
Text files modified:
trunk/tools/quickbook/src/block_grammar.cpp | 6 +++---
trunk/tools/quickbook/src/phrase_grammar.cpp | 6 ++++--
2 files changed, 7 insertions(+), 5 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:30:43 EST (Sun, 19 Dec 2010)
@@ -475,8 +475,8 @@
local.list_item =
*( common
| (cl::anychar_p -
- ( cl::eol_p >> *cl::blank_p >> cl::eps_p(cl::ch_p('*') | '#')
- | (local.eol >> local.eol)
+ ( cl::eol_p >> *cl::blank_p
+ >> (cl::ch_p('*') | '#' | cl::eol_p)
)
) [actions.plain_char]
)
@@ -490,7 +490,7 @@
>> ( block_keyword_rules >> (cl::eps_p - (cl::alnum_p | '_'))
| block_symbol_rules
)
- | local.eol >> *cl::blank_p >> cl::eol_p
+ | cl::eol_p >> *cl::blank_p >> cl::eol_p
;
local.paragraph =
Modified: trunk/tools/quickbook/src/phrase_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/phrase_grammar.cpp (original)
+++ trunk/tools/quickbook/src/phrase_grammar.cpp 2010-12-19 08:30:43 EST (Sun, 19 Dec 2010)
@@ -101,7 +101,8 @@
']' |
cl::if_p(var(no_eols))
[
- local.eol >> local.eol // Make sure that we don't go
+ cl::eol_p >> *cl::blank_p >> cl::eol_p
+ // Make sure that we don't go
] // past a single block, except
; // when preformatted.
@@ -213,7 +214,8 @@
(
*(cl::anychar_p -
( '`'
- | (local.eol >> local.eol)// Make sure that we don't go
+ | (cl::eol_p >> *cl::blank_p >> cl::eol_p)
+ // Make sure that we don't go
) // past a single block
) >> cl::eps_p('`')
) [actions.inline_code]