|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r62701 - in trunk/tools/quickbook: detail doc test
From: daniel_james_at_[hidden]
Date: 2010-06-09 20:15:42
Author: danieljames
Date: 2010-06-09 20:15:41 EDT (Wed, 09 Jun 2010)
New Revision: 62701
URL: http://svn.boost.org/trac/boost/changeset/62701
Log:
Nested lists inside `<simplepara>`.
Not valid, but generates better html. Maybe I should use `<para>` inside
list items, and remove the margin using CSS.
Text files modified:
trunk/tools/quickbook/detail/actions.cpp | 8
trunk/tools/quickbook/doc/quickbook.qbk | 6 +
trunk/tools/quickbook/test/quickbook-manual.gold | 212 ++++++++++++++++++++--------------------
3 files changed, 116 insertions(+), 110 deletions(-)
Modified: trunk/tools/quickbook/detail/actions.cpp
==============================================================================
--- trunk/tools/quickbook/detail/actions.cpp (original)
+++ trunk/tools/quickbook/detail/actions.cpp 2010-06-09 20:15:41 EDT (Wed, 09 Jun 2010)
@@ -172,7 +172,7 @@
list_marks.pop();
out << std::string((mark == '#') ? "\n</orderedlist>" : "\n</itemizedlist>");
if (list_marks.size() >= 1)
- out << std::string("</listitem>");
+ out << list_item_post;
}
list_indent = -1; // reset
@@ -212,12 +212,12 @@
{
// Make this new list a child of the previous list.
// The previous listelem has already ended so we erase
- // </listitem> to accomodate this sub-list. We'll close
+ // list_item_post to accomodate this sub-list. We'll close
// the listelem later.
std::string str;
out.swap(str);
- std::string::size_type pos = str.rfind("</listitem>");
+ std::string::size_type pos = str.rfind(list_item_post);
BOOST_ASSERT(pos <= str.size());
str.erase(str.begin()+pos, str.end());
out << str;
@@ -236,7 +236,7 @@
list_marks.pop();
out << std::string((mark == '#') ? "\n</orderedlist>" : "\n</itemizedlist>");
if (list_marks.size() >= 1)
- out << std::string("</listitem>");
+ out << list_item_post;
}
}
Modified: trunk/tools/quickbook/doc/quickbook.qbk
==============================================================================
--- trunk/tools/quickbook/doc/quickbook.qbk (original)
+++ trunk/tools/quickbook/doc/quickbook.qbk 2010-06-09 20:15:41 EDT (Wed, 09 Jun 2010)
@@ -198,6 +198,12 @@
* Warn about invalid doc_info members.
* Support multiple categories in library doc_info.
* Use the cygwin 1.7 API for better path handling.
+* Fix some corner cases for paragraph detection:
+ * A line containing only a comment is no longer interpreted as a
+ paragraph break.
+ * If a line starts with a comment, interpret it as a paragraph even if it's
+ followed by whitespace or a list character.
+ * Don't treat 4+ consecutive blank lines as multiple paragraph breaks.
[endsect]
Modified: trunk/tools/quickbook/test/quickbook-manual.gold
==============================================================================
--- trunk/tools/quickbook/test/quickbook-manual.gold (original)
+++ trunk/tools/quickbook/test/quickbook-manual.gold 2010-06-09 20:15:41 EDT (Wed, 09 Jun 2010)
@@ -1269,48 +1269,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>
@@ -1415,24 +1415,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>
@@ -1464,72 +1464,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>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk