Subject: [Boost-commit] svn:boost r85340 - in trunk/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2013-08-13 18:22:06
Author: danieljames
Date: 2013-08-13 18:22:06 EDT (Tue, 13 Aug 2013)
New Revision: 85340
URL: http://svn.boost.org/trac/boost/changeset/85340
Log:
More consistent markup for lists in templates in lists.
Text files modified:
trunk/tools/quickbook/src/main_grammar.cpp | 2 --
trunk/tools/quickbook/test/templates-1_3.gold | 34 ++++++++++++++++++----------------
trunk/tools/quickbook/test/templates-1_5.gold | 34 ++++++++++++++++++----------------
trunk/tools/quickbook/test/templates-1_6.gold | 34 ++++++++++++++++++----------------
trunk/tools/quickbook/test/templates-1_7.gold | 34 ++++++++++++++++++----------------
5 files changed, 72 insertions(+), 66 deletions(-)
Modified: trunk/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/main_grammar.cpp Tue Aug 13 18:21:39 2013 (r85339)
+++ trunk/tools/quickbook/src/main_grammar.cpp 2013-08-13 18:22:06 EDT (Tue, 13 Aug 2013) (r85340)
@@ -1052,8 +1052,6 @@
void main_grammar_local::start_blocks_impl(parse_iterator, parse_iterator)
{
push_list_item(list_stack_item(list_stack_item::top_level));
- state_.in_list = false; // TODO: Is this right? Should already be false, but
- // not for templates in lists?
}
void main_grammar_local::start_nested_blocks_impl(parse_iterator, parse_iterator)
Modified: trunk/tools/quickbook/test/templates-1_3.gold
==============================================================================
--- trunk/tools/quickbook/test/templates-1_3.gold Tue Aug 13 18:21:39 2013 (r85339)
+++ trunk/tools/quickbook/test/templates-1_3.gold 2013-08-13 18:22:06 EDT (Tue, 13 Aug 2013) (r85340)
@@ -151,18 +151,20 @@
</para>
<itemizedlist>
<listitem>
- <itemizedlist>
- <listitem>
- <simpara>
- a
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- b
- </simpara>
- </listitem>
- </itemizedlist>
+ <simpara>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ b
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
</listitem>
<listitem>
<para/>
@@ -171,12 +173,12 @@
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
</listitem>
<listitem>
- <para>
+ <simpara>
Paragraphs 1
- </para>
- <para>
+ </simpara>
+ <simpara>
Paragraphs 2
- </para>
+ </simpara>
</listitem>
</itemizedlist>
</section>
Modified: trunk/tools/quickbook/test/templates-1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/templates-1_5.gold Tue Aug 13 18:21:39 2013 (r85339)
+++ trunk/tools/quickbook/test/templates-1_5.gold 2013-08-13 18:22:06 EDT (Tue, 13 Aug 2013) (r85340)
@@ -152,18 +152,20 @@
</para>
<itemizedlist>
<listitem>
- <itemizedlist>
- <listitem>
- <simpara>
- a
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- b
- </simpara>
- </listitem>
- </itemizedlist>
+ <simpara>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ b
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
</listitem>
<listitem>
<para/>
@@ -172,12 +174,12 @@
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
</listitem>
<listitem>
- <para>
+ <simpara>
Paragraphs 1
- </para>
- <para>
+ </simpara>
+ <simpara>
Paragraphs 2
- </para>
+ </simpara>
</listitem>
</itemizedlist>
</section>
Modified: trunk/tools/quickbook/test/templates-1_6.gold
==============================================================================
--- trunk/tools/quickbook/test/templates-1_6.gold Tue Aug 13 18:21:39 2013 (r85339)
+++ trunk/tools/quickbook/test/templates-1_6.gold 2013-08-13 18:22:06 EDT (Tue, 13 Aug 2013) (r85340)
@@ -152,18 +152,20 @@
</para>
<itemizedlist>
<listitem>
- <itemizedlist>
- <listitem>
- <simpara>
- a
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- b
- </simpara>
- </listitem>
- </itemizedlist>
+ <simpara>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ b
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
</listitem>
<listitem>
<para/>
@@ -172,12 +174,12 @@
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
</listitem>
<listitem>
- <para>
+ <simpara>
Paragraphs 1
- </para>
- <para>
+ </simpara>
+ <simpara>
Paragraphs 2
- </para>
+ </simpara>
</listitem>
</itemizedlist>
</section>
Modified: trunk/tools/quickbook/test/templates-1_7.gold
==============================================================================
--- trunk/tools/quickbook/test/templates-1_7.gold Tue Aug 13 18:21:39 2013 (r85339)
+++ trunk/tools/quickbook/test/templates-1_7.gold 2013-08-13 18:22:06 EDT (Tue, 13 Aug 2013) (r85340)
@@ -146,18 +146,20 @@
</para>
<itemizedlist>
<listitem>
- <itemizedlist>
- <listitem>
- <simpara>
- a
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- b
- </simpara>
- </listitem>
- </itemizedlist>
+ <simpara>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ b
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
</listitem>
<listitem>
<para/>
@@ -166,12 +168,12 @@
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
</listitem>
<listitem>
- <para>
+ <simpara>
Paragraphs 1
- </para>
- <para>
+ </simpara>
+ <simpara>
Paragraphs 2
- </para>
+ </simpara>
</listitem>
</itemizedlist>
</section>