Subject: [Boost-commit] svn:boost r71061 - in branches/quickbook-dev/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2011-04-06 19:59:03
Author: danieljames
Date: 2011-04-06 19:59:02 EDT (Wed, 06 Apr 2011)
New Revision: 71061
URL: http://svn.boost.org/trac/boost/changeset/71061
Log:
Quickbook: Avoid empty simple markups.
Text files modified:
branches/quickbook-dev/tools/quickbook/src/main_grammar.cpp | 2 +-
branches/quickbook-dev/tools/quickbook/test/simple_markup.gold | 3 +++
branches/quickbook-dev/tools/quickbook/test/simple_markup.quickbook | 2 ++
3 files changed, 6 insertions(+), 1 deletions(-)
Modified: branches/quickbook-dev/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/main_grammar.cpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/main_grammar.cpp 2011-04-06 19:59:02 EDT (Wed, 06 Apr 2011)
@@ -385,7 +385,7 @@
[
actions.scoped_output()
[
- (*( ~cl::eps_p(local.simple_markup_end)
+ (+( ~cl::eps_p(local.simple_markup_end)
>> local.nested_char
)) [actions.docinfo_value(ph::arg1, ph::arg2)]
]
Modified: branches/quickbook-dev/tools/quickbook/test/simple_markup.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/simple_markup.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/simple_markup.gold 2011-04-06 19:59:02 EDT (Wed, 06 Apr 2011)
@@ -46,5 +46,8 @@
<para>
/not italic/
</para>
+ <para>
+ These shouldn't be interepted as markup: == // **
+ </para>
</section>
</article>
Modified: branches/quickbook-dev/tools/quickbook/test/simple_markup.quickbook
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/simple_markup.quickbook (original)
+++ branches/quickbook-dev/tools/quickbook/test/simple_markup.quickbook 2011-04-06 19:59:02 EDT (Wed, 06 Apr 2011)
@@ -33,4 +33,6 @@
/not italic\/
+These shouldn't be interepted as markup: == // **
+
[endsect]
\ No newline at end of file