Skip to content

Commit d4c1fbc

Browse files
danieljamesdanieljames
committed
More consistent markup for lists in templates in lists.
[SVN r85340]
1 parent 8e8635d commit d4c1fbc

File tree

5 files changed

+72
-66
lines changed

5 files changed

+72
-66
lines changed

‎src/main_grammar.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,8 +1052,6 @@ namespace quickbook
10521052
void main_grammar_local::start_blocks_impl(parse_iterator, parse_iterator)
10531053
{
10541054
push_list_item(list_stack_item(list_stack_item::top_level));
1055-
state_.in_list = false; // TODO: Is this right? Should already be false, but
1056-
// not for templates in lists?
10571055
}
10581056

10591057
void main_grammar_local::start_nested_blocks_impl(parse_iterator, parse_iterator)

‎test/templates-1_3.gold

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -151,18 +151,20 @@
151151
</para>
152152
<itemizedlist>
153153
<listitem>
154-
<itemizedlist>
155-
<listitem>
156-
<simpara>
157-
a
158-
</simpara>
159-
</listitem>
160-
<listitem>
161-
<simpara>
162-
b
163-
</simpara>
164-
</listitem>
165-
</itemizedlist>
154+
<simpara>
155+
<itemizedlist>
156+
<listitem>
157+
<simpara>
158+
a
159+
</simpara>
160+
</listitem>
161+
<listitem>
162+
<simpara>
163+
b
164+
</simpara>
165+
</listitem>
166+
</itemizedlist>
167+
</simpara>
166168
</listitem>
167169
<listitem>
168170
<para/>
@@ -171,12 +173,12 @@
171173
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
172174
</listitem>
173175
<listitem>
174-
<para>
176+
<simpara>
175177
Paragraphs 1
176-
</para>
177-
<para>
178+
</simpara>
179+
<simpara>
178180
Paragraphs 2
179-
</para>
181+
</simpara>
180182
</listitem>
181183
</itemizedlist>
182184
</section>

‎test/templates-1_5.gold

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,20 @@
152152
</para>
153153
<itemizedlist>
154154
<listitem>
155-
<itemizedlist>
156-
<listitem>
157-
<simpara>
158-
a
159-
</simpara>
160-
</listitem>
161-
<listitem>
162-
<simpara>
163-
b
164-
</simpara>
165-
</listitem>
166-
</itemizedlist>
155+
<simpara>
156+
<itemizedlist>
157+
<listitem>
158+
<simpara>
159+
a
160+
</simpara>
161+
</listitem>
162+
<listitem>
163+
<simpara>
164+
b
165+
</simpara>
166+
</listitem>
167+
</itemizedlist>
168+
</simpara>
167169
</listitem>
168170
<listitem>
169171
<para/>
@@ -172,12 +174,12 @@
172174
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
173175
</listitem>
174176
<listitem>
175-
<para>
177+
<simpara>
176178
Paragraphs 1
177-
</para>
178-
<para>
179+
</simpara>
180+
<simpara>
179181
Paragraphs 2
180-
</para>
182+
</simpara>
181183
</listitem>
182184
</itemizedlist>
183185
</section>

‎test/templates-1_6.gold

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,20 @@
152152
</para>
153153
<itemizedlist>
154154
<listitem>
155-
<itemizedlist>
156-
<listitem>
157-
<simpara>
158-
a
159-
</simpara>
160-
</listitem>
161-
<listitem>
162-
<simpara>
163-
b
164-
</simpara>
165-
</listitem>
166-
</itemizedlist>
155+
<simpara>
156+
<itemizedlist>
157+
<listitem>
158+
<simpara>
159+
a
160+
</simpara>
161+
</listitem>
162+
<listitem>
163+
<simpara>
164+
b
165+
</simpara>
166+
</listitem>
167+
</itemizedlist>
168+
</simpara>
167169
</listitem>
168170
<listitem>
169171
<para/>
@@ -172,12 +174,12 @@
172174
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
173175
</listitem>
174176
<listitem>
175-
<para>
177+
<simpara>
176178
Paragraphs 1
177-
</para>
178-
<para>
179+
</simpara>
180+
<simpara>
179181
Paragraphs 2
180-
</para>
182+
</simpara>
181183
</listitem>
182184
</itemizedlist>
183185
</section>

‎test/templates-1_7.gold

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -146,18 +146,20 @@
146146
</para>
147147
<itemizedlist>
148148
<listitem>
149-
<itemizedlist>
150-
<listitem>
151-
<simpara>
152-
a
153-
</simpara>
154-
</listitem>
155-
<listitem>
156-
<simpara>
157-
b
158-
</simpara>
159-
</listitem>
160-
</itemizedlist>
149+
<simpara>
150+
<itemizedlist>
151+
<listitem>
152+
<simpara>
153+
a
154+
</simpara>
155+
</listitem>
156+
<listitem>
157+
<simpara>
158+
b
159+
</simpara>
160+
</listitem>
161+
</itemizedlist>
162+
</simpara>
161163
</listitem>
162164
<listitem>
163165
<para/>
@@ -166,12 +168,12 @@
166168
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
167169
</listitem>
168170
<listitem>
169-
<para>
171+
<simpara>
170172
Paragraphs 1
171-
</para>
172-
<para>
173+
</simpara>
174+
<simpara>
173175
Paragraphs 2
174-
</para>
176+
</simpara>
175177
</listitem>
176178
</itemizedlist>
177179
</section>

0 commit comments

Comments
 (0)