Subject: [Boost-commit] svn:boost r75759 - in trunk/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2011-11-30 16:22:43
Author: danieljames
Date: 2011-11-30 16:22:41 EST (Wed, 30 Nov 2011)
New Revision: 75759
URL: http://svn.boost.org/trac/boost/changeset/75759
Log:
Quickbook: Fix paragraph separator at end of string.
Text files modified:
trunk/tools/quickbook/src/main_grammar.cpp | 1 +
trunk/tools/quickbook/test/templates-1_5.gold | 3 +++
trunk/tools/quickbook/test/templates-1_5.quickbook | 8 ++++++++
3 files changed, 12 insertions(+), 0 deletions(-)
Modified: trunk/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/main_grammar.cpp (original)
+++ trunk/tools/quickbook/src/main_grammar.cpp 2011-11-30 16:22:41 EST (Wed, 30 Nov 2011)
@@ -370,6 +370,7 @@
>> cl::eps_p
( *cl::blank_p
>> ( cl::eol_p
+ | cl::end_p
| cl::eps_p(local.in_list) >> (cl::ch_p('*') | '#')
)
)
Modified: trunk/tools/quickbook/test/templates-1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/templates-1_5.gold (original)
+++ trunk/tools/quickbook/test/templates-1_5.gold 2011-11-30 16:22:41 EST (Wed, 30 Nov 2011)
@@ -36,4 +36,7 @@
<para>
Some *text* A <emphasis>paragraph</emphasis>.
</para>
+ <para>
+ <index type="things"><title>Things</title></index>
+ </para>
</article>
Modified: trunk/tools/quickbook/test/templates-1_5.quickbook
==============================================================================
--- trunk/tools/quickbook/test/templates-1_5.quickbook (original)
+++ trunk/tools/quickbook/test/templates-1_5.quickbook 2011-11-30 16:22:41 EST (Wed, 30 Nov 2011)
@@ -62,3 +62,11 @@
[block]
[`phrase]
[`block]
+
+[/ Trailing newline shouldn't be included]
+
+[template named_index[type title]
+'''<index type="'''[type]'''"><title>'''[title]'''</title></index>'''
+]
+
+[named_index things Things]
\ No newline at end of file