Subject: [Boost-commit] svn:boost r77346 - in trunk/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2012-03-15 18:59:50
Author: danieljames
Date: 2012-03-15 18:59:49 EDT (Thu, 15 Mar 2012)
New Revision: 77346
URL: http://svn.boost.org/trac/boost/changeset/77346
Log:
Quickbook: Fix indented code parsing in lists.
Text files modified:
trunk/tools/quickbook/src/main_grammar.cpp | 2 +-
trunk/tools/quickbook/test/list_test-1_6.gold | 28 ++++++++++++++++++++++++++++
trunk/tools/quickbook/test/list_test-1_6.quickbook | 12 ++++++++++++
3 files changed, 41 insertions(+), 1 deletions(-)
Modified: trunk/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/main_grammar.cpp (original)
+++ trunk/tools/quickbook/src/main_grammar.cpp 2012-03-15 18:59:49 EDT (Thu, 15 Mar 2012)
@@ -242,7 +242,7 @@
, no_eols(true)
, actions_(actions)
, check_indentation(*this, &main_grammar_local::check_indentation_impl)
- , check_code_block(*this, &main_grammar_local::check_indentation_impl)
+ , check_code_block(*this, &main_grammar_local::check_code_block_impl)
, start_blocks(*this, &main_grammar_local::start_blocks_impl)
, end_blocks(*this, &main_grammar_local::end_blocks_impl)
, in_list(*this)
Modified: trunk/tools/quickbook/test/list_test-1_6.gold
==============================================================================
--- trunk/tools/quickbook/test/list_test-1_6.gold (original)
+++ trunk/tools/quickbook/test/list_test-1_6.gold 2012-03-15 18:59:49 EDT (Thu, 15 Mar 2012)
@@ -495,4 +495,32 @@
</listitem>
</itemizedlist>
</section>
+ <section id="list_test.indented_code_blocks_in_lists">
+ <title><link linkend="list_test.indented_code_blocks_in_lists">Indented code
+ blocks in lists</link></title>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+<programlisting><phrase role="identifier">B</phrase>
+</programlisting>
+ <para>
+ C
+ </para>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ D
+<programlisting><phrase role="identifier">E</phrase>
+</programlisting>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ F
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </section>
</article>
Modified: trunk/tools/quickbook/test/list_test-1_6.quickbook
==============================================================================
--- trunk/tools/quickbook/test/list_test-1_6.quickbook (original)
+++ trunk/tools/quickbook/test/list_test-1_6.quickbook 2012-03-15 18:59:49 EDT (Thu, 15 Mar 2012)
@@ -133,3 +133,15 @@
D2
[endsect]
+
+[section Indented code blocks in lists]
+
+* A
+
+ B
+ C
+* D
+
+ E
+* F
+[endsect]