Subject: [Boost-commit] svn:boost r69287 - in branches/quickbook-filenames/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2011-02-25 18:05:37
Author: danieljames
Date: 2011-02-25 18:05:36 EST (Fri, 25 Feb 2011)
New Revision: 69287
URL: http://svn.boost.org/trac/boost/changeset/69287
Log:
Invalid list markup again.
Text files modified:
branches/quickbook-filenames/tools/quickbook/src/actions.cpp | 13 -
branches/quickbook-filenames/tools/quickbook/test/list_test.gold | 236 ++++++++++++++++++++--------------------
branches/quickbook-filenames/tools/quickbook/test/quickbook-manual.gold | 212 +++++++++++++++++-----------------
3 files changed, 229 insertions(+), 232 deletions(-)
Modified: branches/quickbook-filenames/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/src/actions.cpp (original)
+++ branches/quickbook-filenames/tools/quickbook/src/actions.cpp 2011-02-25 18:05:36 EST (Fri, 25 Feb 2011)
@@ -402,15 +402,14 @@
{
char mark = list_marks.top().first;
list_marks.pop();
- actions.out << "</listitem>";
+ actions.out << "</simpara></listitem>";
actions.out << ((mark == '#') ? "\n</orderedlist>" : "\n</itemizedlist>");
}
-
- actions.out << "</listitem>";
+ actions.out << "</simpara></listitem>";
}
else
{
- actions.out << "</listitem>";
+ actions.out << "</simpara></listitem>";
}
if (mark != list_marks.top().first) // new_indent == list_indent
@@ -423,10 +422,8 @@
++actions.error_count;
}
- actions.out << "<listitem>";
- actions.out << "<simpara>\n";
+ actions.out << "<listitem><simpara>";
actions.out << content;
- actions.out << "\n</simpara>";
}
assert(!list_marks.empty());
@@ -434,7 +431,7 @@
{
char mark = list_marks.top().first;
list_marks.pop();
- actions.out << "</listitem>";
+ actions.out << "</simpara></listitem>";
actions.out << ((mark == '#') ? "\n</orderedlist>" : "\n</itemizedlist>");
}
}
Modified: branches/quickbook-filenames/tools/quickbook/test/list_test.gold
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/test/list_test.gold (original)
+++ branches/quickbook-filenames/tools/quickbook/test/list_test.gold 2011-02-25 18:05:36 EST (Fri, 25 Feb 2011)
@@ -39,36 +39,36 @@
<listitem>
<simpara>
A
+ <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>
</listitem>
<listitem>
<simpara>
B
+ <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>
</listitem>
</itemizedlist>
<para>
@@ -78,36 +78,36 @@
<listitem>
<simpara>
A
+ <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>
</listitem>
<listitem>
<simpara>
B
+ <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>
</listitem>
</orderedlist>
<para>
@@ -117,53 +117,53 @@
<listitem>
<simpara>
A
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ C
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ D
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ E
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ F
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ G
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ H
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ </itemizedlist>
</simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- C
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- D
- </simpara>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <simpara>
- E
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- F
- </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- G
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- H
- </simpara>
- </listitem>
- </itemizedlist>
- </listitem>
- </itemizedlist>
</listitem>
</orderedlist>
<para>
@@ -173,31 +173,31 @@
<listitem>
<simpara>
A
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ <orderedlist>
+ <listitem>
+ <simpara>
+ C
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ D
+ </simpara>
+ </listitem>
+ </orderedlist>
+ </simpara>
+ </listitem>
+ </itemizedlist>
</simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- <orderedlist>
- <listitem>
- <simpara>
- C
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- D
- </simpara>
- </listitem>
- </orderedlist>
- </listitem>
- </itemizedlist>
</listitem>
<listitem>
<simpara>
Modified: branches/quickbook-filenames/tools/quickbook/test/quickbook-manual.gold
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/test/quickbook-manual.gold (original)
+++ branches/quickbook-filenames/tools/quickbook/test/quickbook-manual.gold 2011-02-25 18:05:36 EST (Fri, 25 Feb 2011)
@@ -1272,48 +1272,48 @@
<listitem>
<simpara>
Three
+ <orderedlist>
+ <listitem>
+ <simpara>
+ Three.a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three.b
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three.c
+ </simpara>
+ </listitem>
+ </orderedlist>
</simpara>
- <orderedlist>
- <listitem>
- <simpara>
- Three.a
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Three.b
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Three.c
- </simpara>
- </listitem>
- </orderedlist>
</listitem>
<listitem>
<simpara>
Fourth
+ <orderedlist>
+ <listitem>
+ <simpara>
+ Four.a
+ <orderedlist>
+ <listitem>
+ <simpara>
+ Four.a.i
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Four.a.ii
+ </simpara>
+ </listitem>
+ </orderedlist>
+ </simpara>
+ </listitem>
+ </orderedlist>
</simpara>
- <orderedlist>
- <listitem>
- <simpara>
- Four.a
- </simpara>
- <orderedlist>
- <listitem>
- <simpara>
- Four.a.i
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Four.a.ii
- </simpara>
- </listitem>
- </orderedlist>
- </listitem>
- </orderedlist>
</listitem>
<listitem>
<simpara>
@@ -1418,24 +1418,24 @@
<listitem>
<simpara>
Three
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ Three.a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three.b
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three.c
+ </simpara>
+ </listitem>
+ </itemizedlist>
</simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- Three.a
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Three.b
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- Three.c
- </simpara>
- </listitem>
- </itemizedlist>
</listitem>
<listitem>
<simpara>
@@ -1467,72 +1467,72 @@
<listitem>
<simpara>
1
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ 1.a
+ <orderedlist>
+ <listitem>
+ <simpara>
+ 1.a.1
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 1.a.2
+ </simpara>
+ </listitem>
+ </orderedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 1.b
+ </simpara>
+ </listitem>
+ </itemizedlist>
</simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- 1.a
- </simpara>
- <orderedlist>
- <listitem>
- <simpara>
- 1.a.1
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- 1.a.2
- </simpara>
- </listitem>
- </orderedlist>
- </listitem>
- <listitem>
- <simpara>
- 1.b
- </simpara>
- </listitem>
- </itemizedlist>
</listitem>
<listitem>
<simpara>
2
- </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- 2.a
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- 2.b
- </simpara>
- <orderedlist>
- <listitem>
- <simpara>
- 2.b.1
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- 2.b.2
- </simpara>
- <itemizedlist>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ 2.a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 2.b
+ <orderedlist>
<listitem>
<simpara>
- 2.b.2.a
+ 2.b.1
</simpara>
</listitem>
<listitem>
<simpara>
- 2.b.2.b
+ 2.b.2
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ 2.b.2.a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 2.b.2.b
+ </simpara>
+ </listitem>
+ </itemizedlist>
</simpara>
</listitem>
- </itemizedlist>
- </listitem>
- </orderedlist>
- </listitem>
- </itemizedlist>
+ </orderedlist>
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
</listitem>
</orderedlist>
</section>