Merge the 1.5.2 changes from trunk.

[SVN r62830]
This commit is contained in:
Daniel James
2010-06-12 08:29:53 +00:00
parent f50dee9a1c
commit e529faf7ba
62 changed files with 1569 additions and 612 deletions

View File

@@ -55,7 +55,7 @@ namespace quickbook
| code [actions.process]
| list [actions.process]
| hr [actions.process]
| comment >> *eol
| comment >> +eol
| paragraph [actions.process]
| eol
)
@@ -102,7 +102,7 @@ namespace quickbook
*( common
| (qi::char_ -
( qi::eol >> *qi::blank >> &(qi::char_('*') | '#')
| (eol >> eol)
| (eol >> *qi::blank >> qi::eol)
)
) [actions.process]
)
@@ -136,7 +136,7 @@ namespace quickbook
;
paragraph_end =
'[' >> space >> paragraph_end_markups >> hard_space | eol >> eol
'[' >> space >> paragraph_end_markups >> hard_space | eol >> *qi::blank >> qi::eol
;
paragraph_end_markups =