boost/quickbook
2
0
Fork 0
mirror of https://github.com/boostorg/quickbook.git synced 2026-01-19 04:22:16 +00:00
Code Issues Projects Releases Wiki Activity

More consistent markup for lists in templates in lists.

Browse Source 
[SVN r85340]
This commit is contained in:
Daniel James
2013-08-13 22:22:06 +00:00
parent 8e8635dc79
commit d4c1fbc9d4
5 changed files with 72 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main_grammar.cpp
View File

@@ -1052,8 +1052,6 @@ namespace quickbook
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)

34
test/templates-1_3.gold
View File

@@ -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>

34
test/templates-1_5.gold
View File

@@ -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>

34
test/templates-1_6.gold
View File

@@ -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>

34
test/templates-1_7.gold
View File

@@ -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>