Subject: [Boost-commit] svn:boost r85216 - in trunk/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2013-08-05 18:16:01
Author: danieljames
Date: 2013-08-05 18:16:01 EDT (Mon, 05 Aug 2013)
New Revision: 85216
URL: http://svn.boost.org/trac/boost/changeset/85216
Log:
Fix skipping template body containing an escaped template call.
Text files modified:
trunk/tools/quickbook/src/main_grammar.cpp | 1 +
trunk/tools/quickbook/test/templates-1_6.gold | 7 +++++++
trunk/tools/quickbook/test/templates-1_6.quickbook | 11 +++++++++++
3 files changed, 19 insertions(+), 0 deletions(-)
Modified: trunk/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/main_grammar.cpp Mon Aug 5 16:26:34 2013 (r85215)
+++ trunk/tools/quickbook/src/main_grammar.cpp 2013-08-05 18:16:01 EDT (Mon, 05 Aug 2013) (r85216)
@@ -595,6 +595,7 @@
skip_entity =
'['
+ >> !cl::ch_p('`')
>> *(~cl::eps_p(']') >> skip_entity)
>> !cl::ch_p(']')
| local.skip_code_block
Modified: trunk/tools/quickbook/test/templates-1_6.gold
==============================================================================
--- trunk/tools/quickbook/test/templates-1_6.gold Mon Aug 5 16:26:34 2013 (r85215)
+++ trunk/tools/quickbook/test/templates-1_6.gold 2013-08-05 18:16:01 EDT (Mon, 05 Aug 2013) (r85216)
@@ -235,4 +235,11 @@
<index type="things"><title>Things</title></index>
</para>
</section>
+ <section id="template_1_6.template_body">
+ <title><link linkend="template_1_6.template_body">Skipping the template body
+ correctly</link></title>
+ <para>
+ <emphasis>Argument</emphasis>
+ </para>
+ </section>
</article>
Modified: trunk/tools/quickbook/test/templates-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/templates-1_6.quickbook Mon Aug 5 16:26:34 2013 (r85215)
+++ trunk/tools/quickbook/test/templates-1_6.quickbook 2013-08-05 18:16:01 EDT (Mon, 05 Aug 2013) (r85216)
@@ -279,3 +279,14 @@
[named_index things Things]
[endsect]
+
+[/-------------------------------- Skipping template body ]
+
+[section:template_body Skipping the template body correctly]
+
+[template args1[x] [`x]]
+
+[args1 <emphasis>Argument</emphasis>]
+
+
+[endsect]