Subject: [Boost-commit] svn:boost r85050 - in branches/release/tools/quickbook: . doc src test test/command-line test/doc-info test/include test/snippets test/unit test/versions test/xinclude
From: dnljms_at_[hidden]
Date: 2013-07-15 17:45:25
Author: danieljames
Date: 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013)
New Revision: 85050
URL: http://svn.boost.org/trac/boost/changeset/85050
Log:
Merge quickbook. Starting 1.6 alpha, plus some 1.7 development.
Added:
branches/release/tools/quickbook/test/list_test-1_6-fail.quickbook
- copied unchanged from r85049, trunk/tools/quickbook/test/list_test-1_6-fail.quickbook
branches/release/tools/quickbook/test/list_test-1_7.gold
- copied unchanged from r85049, trunk/tools/quickbook/test/list_test-1_7.gold
branches/release/tools/quickbook/test/list_test-1_7.quickbook
- copied unchanged from r85049, trunk/tools/quickbook/test/list_test-1_7.quickbook
Properties modified:
branches/release/tools/quickbook/ (props changed)
Text files modified:
branches/release/tools/quickbook/doc/1_6.qbk | 70 ++--
branches/release/tools/quickbook/doc/Jamfile.v2 | 2
branches/release/tools/quickbook/doc/change_log.qbk | 7
branches/release/tools/quickbook/src/dependency_tracker.cpp | 18 +
branches/release/tools/quickbook/src/dependency_tracker.hpp | 1
branches/release/tools/quickbook/src/doc_info_actions.cpp | 19 +
branches/release/tools/quickbook/src/main_grammar.cpp | 46 --
branches/release/tools/quickbook/src/quickbook.cpp | 11
branches/release/tools/quickbook/test/Jamfile.v2 | 4
branches/release/tools/quickbook/test/command-line/Jamfile.v2 | 4
branches/release/tools/quickbook/test/doc-info/Jamfile.v2 | 2
branches/release/tools/quickbook/test/include/Jamfile.v2 | 2
branches/release/tools/quickbook/test/list_test-1_6-fail.quickbook | 46 +++
branches/release/tools/quickbook/test/list_test-1_6.gold | 112 +-------
branches/release/tools/quickbook/test/list_test-1_6.quickbook | 49 ---
branches/release/tools/quickbook/test/list_test-1_7.gold | 483 ++++++++++++++++++++++++++++++++++++++++
branches/release/tools/quickbook/test/list_test-1_7.quickbook | 134 +++++++++++
branches/release/tools/quickbook/test/snippets/Jamfile.v2 | 2
branches/release/tools/quickbook/test/unit/Jamfile.v2 | 2
branches/release/tools/quickbook/test/versions/Jamfile.v2 | 2
branches/release/tools/quickbook/test/xinclude/Jamfile.v2 | 2
21 files changed, 796 insertions(+), 222 deletions(-)
Modified: branches/release/tools/quickbook/doc/1_6.qbk
==============================================================================
--- branches/release/tools/quickbook/doc/1_6.qbk Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/doc/1_6.qbk 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -8,7 +8,7 @@
]
[chapter Language Versions
- [quickbook 1.6]
+ [quickbook 1.7]
[compatibility-mode 1.5]
[id quickbook.versions]
[source-mode teletype]
@@ -313,40 +313,6 @@
[endsect]
-[section:listparagraphs Pargraphs in lists]
-
-I'm still refining this, but paragraphs and block elements can now be used
-in lists:
-
-[pre
-* Para 1
-
- Para 2
- * Nested Para 1
-
- Nested Para 2
-
- Code block
- Para 3
-]
-
-generates:
-
-* Para 1
-
- Para 2
- * Nested Para 1
-
- Nested Para 2
-
- Code block
- Para 3
-
-The docbook markup that this generates is pretty bad, but seems to create okay
-html.
-
-[endsect]
-
[endsect] [/ Quickbok 1.6]
[section:1_7 Quickbook 1.7]
@@ -414,6 +380,40 @@
[endsect] [/escaped_docinfo_attributes]
+[section:listparagraphs Pargraphs in lists]
+
+I'm still refining this, but paragraphs and block elements can now be used
+in lists:
+
+[pre
+* Para 1
+
+ Para 2
+ * Nested Para 1
+
+ Nested Para 2
+
+ Code block
+ Para 3
+]
+
+generates:
+
+* Para 1
+
+ Para 2
+ * Nested Para 1
+
+ Nested Para 2
+
+ Code block
+ Para 3
+
+The docbook markup that this generates is pretty bad, but seems to create okay
+html.
+
+[endsect]
+
[section:templates_in_link_values Templates in link values]
There's very premilinary support for calling templates in link values. A lot
Modified: branches/release/tools/quickbook/doc/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/doc/Jamfile.v2 Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/doc/Jamfile.v2 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -8,7 +8,7 @@
# http://www.boost.org/LICENSE_1_0.txt)
#==============================================================================
-project boost/quickbook/doc ;
+project quickbook/doc ;
using boostbook ;
using quickbook ;
Modified: branches/release/tools/quickbook/doc/change_log.qbk
==============================================================================
--- branches/release/tools/quickbook/doc/change_log.qbk Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/doc/change_log.qbk 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -296,3 +296,10 @@
* Convert to use `boost::string_ref`.
* Clean up the source map implementation (used to get the correct
location for error messages in things like templates and snippets).
+
+[heading Version 1.6.0 alpha]
+
+* Remove nested blocks in lists from 1.6, move to 1.7.
+ (Can still nest block elements in lists though).
+* Don't break out of lists after a nested block element.
+* Check for errors when writing dependency files.
Modified: branches/release/tools/quickbook/src/dependency_tracker.cpp
==============================================================================
--- branches/release/tools/quickbook/src/dependency_tracker.cpp Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/src/dependency_tracker.cpp 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -9,6 +9,7 @@
#include "dependency_tracker.hpp"
#include "input_path.hpp"
#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/fstream.hpp>
#include <boost/foreach.hpp>
namespace quickbook
@@ -90,7 +91,7 @@
static std::string get_path(fs::path const& path,
dependency_tracker::flags f)
{
- std::string generic = detail::path_to_generic(path);
+ std::string generic = quickbook::detail::path_to_generic(path);
if (f & dependency_tracker::escaped) {
generic = escaped_path(generic);
@@ -105,6 +106,21 @@
return found;
}
+ void dependency_tracker::write_dependencies(fs::path const& file_out,
+ flags f)
+ {
+ fs::ofstream out(file_out);
+
+ if (out.fail()) {
+ throw std::runtime_error(
+ "Error opening dependency file " +
+ quickbook::detail::path_to_generic(file_out));
+ }
+
+ out.exceptions(std::ios::badbit);
+ write_dependencies(out, f);
+ }
+
void dependency_tracker::write_dependencies(std::ostream& out,
flags f)
{
Modified: branches/release/tools/quickbook/src/dependency_tracker.hpp
==============================================================================
--- branches/release/tools/quickbook/src/dependency_tracker.hpp Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/src/dependency_tracker.hpp 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -35,6 +35,7 @@
// list of dependencies. Returns true if file exists.
bool add_dependency(fs::path const&);
+ void write_dependencies(fs::path const&, flags = default_);
void write_dependencies(std::ostream&, flags = default_);
};
}
Modified: branches/release/tools/quickbook/src/doc_info_actions.cpp
==============================================================================
--- branches/release/tools/quickbook/src/doc_info_actions.cpp Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/src/doc_info_actions.cpp 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -208,12 +208,21 @@
unsigned new_version = get_version(state, use_doc_info, qbk_version);
- if (new_version != qbk_version_n && new_version >= 106)
+ if (new_version != qbk_version_n)
{
- detail::outwarn(state.current_file->path)
- << "Quickbook " << (new_version / 100) << "." << (new_version % 100)
- << " is still under development and is "
- "likely to change in the future." << std::endl;
+ if (new_version >= 107u)
+ {
+ detail::outwarn(state.current_file->path)
+ << "Quickbook " << (new_version / 100) << "." << (new_version % 100)
+ << " is still under development and is "
+ "likely to change in the future." << std::endl;
+ }
+ else if (new_version >= 106u)
+ {
+ detail::outwarn(state.current_file->path)
+ << "Quickbook " << (new_version / 100) << "." << (new_version % 100)
+ << " is in alpha." << std::endl;
+ }
}
if (new_version) {
Modified: branches/release/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- branches/release/tools/quickbook/src/main_grammar.cpp Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/src/main_grammar.cpp 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -90,37 +90,6 @@
string_iterator last);
void clear_stack();
- struct in_list_impl {
- main_grammar_local& l;
-
- in_list_impl(main_grammar_local& l) :
- l(l) {}
-
- bool operator()() const {
- return !l.list_stack.top().root;
- }
- };
-
- struct set_no_eols_scoped : scoped_action_base
- {
- set_no_eols_scoped(main_grammar_local& l)
- : l(l) {}
-
- bool start() {
- saved_no_eols = l.no_eols;
- l.no_eols = false;
-
- return true;
- }
-
- void cleanup() {
- l.no_eols = saved_no_eols;
- }
-
- main_grammar_local& l;
- bool saved_no_eols;
- };
-
////////////////////////////////////////////////////////////////////////
// Local members
@@ -438,8 +407,8 @@
>> (cl::ch_p('*') | '#')
>> (*cl::blank_p) [local.list.still_in_block = true]
>> *( cl::eps_p(local.list.still_in_block)
- >> ( qbk_ver(106u) >> local.list_item(element_info::only_block)
- | qbk_ver(0, 106u) >> local.list_item(element_info::only_list_block)
+ >> ( qbk_ver(107u) >> local.list_item(element_info::only_block)
+ | qbk_ver(0, 107u) >> local.list_item(element_info::only_list_block)
)
)
// TODO: This is sometimes called in the wrong place. Currently
@@ -449,7 +418,7 @@
local.list_item =
local.element(local.list_item.context)
- >> !eol [local.list.still_in_block = false]
+ >> !(qbk_ver(0, 106u) >> eol) [local.list.still_in_block = false]
| local.paragraph_separator [local.list.still_in_block = false]
| local.common(element_info::in_phrase)
;
@@ -470,7 +439,6 @@
inside_paragraph =
state.values.save()
[ *( local.paragraph_separator [paragraph]
- >> *eol
| ~cl::eps_p(']')
>> local.common(element_info::in_nested_block)
)
@@ -1054,6 +1022,14 @@
block_type = block_types::paragraph;
}
+
+ if (qbk_version_n == 106u && !list_stack.top().root) {
+ detail::outerr(state_.current_file, first)
+ << "Nested blocks in lists won't be supported in "
+ << "quickbook 1.6"
+ << std::endl;
+ ++state_.error_count;
+ }
}
else {
clear_stack();
Modified: branches/release/tools/quickbook/src/quickbook.cpp
==============================================================================
--- branches/release/tools/quickbook/src/quickbook.cpp Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/src/quickbook.cpp 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -40,7 +40,7 @@
#pragma warning(disable:4355)
#endif
-#define QUICKBOOK_VERSION "Quickbook Version 1.5.9"
+#define QUICKBOOK_VERSION "Quickbook Version 1.6.0 alpha (dev)"
namespace quickbook
{
@@ -162,15 +162,14 @@
if (!options_.deps_out.empty())
{
- fs::ofstream out(options_.deps_out);
- state.dependencies.write_dependencies(out,
+ state.dependencies.write_dependencies(options_.deps_out,
options_.deps_out_flags);
}
if (!options_.locations_out.empty())
{
fs::ofstream out(options_.locations_out);
- state.dependencies.write_dependencies(out,
+ state.dependencies.write_dependencies(options_.locations_out,
dependency_tracker::checked);
}
}
@@ -178,6 +177,10 @@
detail::outerr(filein_) << e.what() << std::endl;
result = 1;
}
+ catch (std::runtime_error& e) {
+ detail::outerr() << e.what() << std::endl;
+ result = 1;
+ }
if (!fileout_.empty() && result == 0)
{
Modified: branches/release/tools/quickbook/test/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/test/Jamfile.v2 Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/test/Jamfile.v2 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -6,7 +6,7 @@
# http://www.boost.org/LICENSE_1_0.txt)
#
-project test
+project quickbook/test
: requirements
<toolset>msvc:<debug-symbols>off
;
@@ -70,6 +70,8 @@
[ quickbook-test link-1_7 ]
[ quickbook-test list_test-1_5 ]
[ quickbook-test list_test-1_6 ]
+ [ quickbook-error-test list_test-1_6-fail ]
+ [ quickbook-test list_test-1_7 ]
[ quickbook-test macro-1_5 ]
[ quickbook-test macro-1_6 ]
[ quickbook-error-test mismatched_brackets-1_1-fail ]
Modified: branches/release/tools/quickbook/test/command-line/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/test/command-line/Jamfile.v2 Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/test/command-line/Jamfile.v2 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -7,7 +7,7 @@
# http://www.boost.org/LICENSE_1_0.txt)
#
-project quickook/tests/command-line ;
+project quickbook/tests/command-line ;
import quickbook-testing : quickbook-test quickbook-fail-test quickbook-error-test ;
@@ -25,4 +25,4 @@
output_nested_in_file :
basic-1_6.quickbook :
<testing.arg>--output-file=basic-1_6.quickbook/basic.xml ]
- ;
\ No newline at end of file
+ ;
Modified: branches/release/tools/quickbook/test/doc-info/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/test/doc-info/Jamfile.v2 Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/test/doc-info/Jamfile.v2 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -6,7 +6,7 @@
# http://www.boost.org/LICENSE_1_0.txt)
#
-project quickook/tests/doc-info ;
+project quickbook/tests/doc-info ;
import quickbook-testing : quickbook-test quickbook-error-test ;
Modified: branches/release/tools/quickbook/test/include/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/test/include/Jamfile.v2 Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/test/include/Jamfile.v2 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -6,7 +6,7 @@
# http://www.boost.org/LICENSE_1_0.txt)
#
-project test/includes
+project quickbook/test/includes
: requirements
<toolset>msvc:<debug-symbols>off
;
Copied: branches/release/tools/quickbook/test/list_test-1_6-fail.quickbook (from r85049, trunk/tools/quickbook/test/list_test-1_6-fail.quickbook)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/tools/quickbook/test/list_test-1_6-fail.quickbook 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050, copy of r85049, trunk/tools/quickbook/test/list_test-1_6-fail.quickbook)
@@ -0,0 +1,46 @@
+[article List Test
+[quickbook 1.6]
+]
+
+Markup in list:
+
+* [table [[Heading]][[Cell]]]
+* [heading The heading for a list item]
+
+ The content of the list item.
+
+[section Paragraphs in list items]
+
+* A1
+
+ A2
+
+* B1
+ * C1
+
+ C2
+
+ B2
+
+* D1
+ * E1
+
+ E2
+
+ E3
+
+ D2
+
+[endsect]
+
+[section Indented code blocks in lists]
+
+* A
+
+ B
+ C
+* D
+
+ E
+* F
+[endsect]
Modified: branches/release/tools/quickbook/test/list_test-1_6.gold
==============================================================================
--- branches/release/tools/quickbook/test/list_test-1_6.gold Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/test/list_test-1_6.gold 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -333,17 +333,28 @@
</tbody>
</tgroup>
</informaltable>
+ Some text.
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ [section Doesn't expand] Blah, blah. [endsect]
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ <para>
+ Paragraph cheat 1.
+ </para>
+ Paragraph cheat 2.
</simpara>
</listitem>
<listitem>
<simpara>
- <bridgehead renderas="sect2" id="list_test.h0">
- <phrase id="list_test.the_heading_for_a_list_item"/><link linkend="list_test.the_heading_for_a_list_item">The
- heading for a list item</link>
- </bridgehead>
<para>
- The content of the list item.
+ Paragraph cheat 3.
</para>
+ Paragraph cheat 4.
</simpara>
</listitem>
</itemizedlist>
@@ -426,99 +437,12 @@
<itemizedlist>
<listitem>
<simpara>
- One
- </simpara>
- </listitem>
- </itemizedlist>
- <section id="list_test.list_immediately_following_mark0.nested_section">
- <title><link linkend="list_test.list_immediately_following_mark0.nested_section">Nested
- section</link></title>
- <itemizedlist>
- <listitem>
- <simpara>
- Two
- </simpara>
- </listitem>
- </itemizedlist>
- </section>
- </section>
- <section id="list_test.paragraphs_in_list_items">
- <title><link linkend="list_test.paragraphs_in_list_items">Paragraphs in list
- items</link></title>
- <itemizedlist>
- <listitem>
- <simpara>
- A1
- <para>
- A2
- </para>
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B1
- <itemizedlist>
- <listitem>
- <simpara>
- C1
- <para>
- C2
- </para>
- </simpara>
- </listitem>
- </itemizedlist>
- <para>
- B2
- </para>
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- D1
- <itemizedlist>
- <listitem>
- <simpara>
- E1
- <para>
- E2
- </para>
- <para>
- E3
- </para>
- </simpara>
- </listitem>
- </itemizedlist>
- <para>
- D2
- </para>
- </simpara>
- </listitem>
- </itemizedlist>
- </section>
- <section id="list_test.indented_code_blocks_in_lists">
- <title><link linkend="list_test.indented_code_blocks_in_lists">Indented code
- blocks in lists</link></title>
- <itemizedlist>
- <listitem>
- <simpara>
- A
-<programlisting><phrase role="identifier">B</phrase>
-</programlisting>
- <para>
- C
- </para>
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- D
-<programlisting><phrase role="identifier">E</phrase>
-</programlisting>
+ One [section Nested section]
</simpara>
</listitem>
<listitem>
<simpara>
- F
+ Two [endsect]
</simpara>
</listitem>
</itemizedlist>
Modified: branches/release/tools/quickbook/test/list_test-1_6.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/list_test-1_6.quickbook Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/test/list_test-1_6.quickbook 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -74,9 +74,17 @@
* ["Quoted]
* [footnote Footnote]
* [table [[Heading]][[Cell]]]
-* [heading The heading for a list item]
-
- The content of the list item.
+ Some text.
+* [section Doesn't expand]
+ Blah, blah.
+ [endsect]
+
+* Paragraph cheat 1.
+ [block]
+ Paragraph cheat 2.
+* Paragraph cheat 3.
+ [block]
+ Paragraph cheat 4.
Don't end list with comment 1:
@@ -108,40 +116,5 @@
[section Nested section]
* Two
[endsect]
-[endsect]
-
-[section Paragraphs in list items]
-
-* A1
-
- A2
-
-* B1
- * C1
-
- C2
-
- B2
-
-* D1
- * E1
-
- E2
-
- E3
-
- D2
-
-[endsect]
-
-[section Indented code blocks in lists]
-
-* A
-
- B
- C
-* D
- E
-* F
[endsect]
Copied: branches/release/tools/quickbook/test/list_test-1_7.gold (from r85049, trunk/tools/quickbook/test/list_test-1_7.gold)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/tools/quickbook/test/list_test-1_7.gold 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050, copy of r85049, trunk/tools/quickbook/test/list_test-1_7.gold)
@@ -0,0 +1,483 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<article id="list_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>List Test</title>
+ <para>
+ Simple list:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Simple list:
+ </para>
+ <orderedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </orderedlist>
+ <para>
+ Two level list:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Two level list:
+ </para>
+ <orderedlist>
+ <listitem>
+ <simpara>
+ A
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ </orderedlist>
+ <para>
+ Three level list:
+ </para>
+ <orderedlist>
+ <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>
+ </listitem>
+ </orderedlist>
+ <para>
+ Three level list:
+ </para>
+ <orderedlist>
+ <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>
+ </listitem>
+ <listitem>
+ <simpara>
+ G
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ H
+ </simpara>
+ </listitem>
+ </orderedlist>
+ <para>
+ Inconsistent Indentation:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A1
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ B1
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B2
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ C1
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ C2
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B3
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B4
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B5
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ C3
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B6
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ A2
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ A3
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Markup in list:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ <emphasis role="bold">Bold</emphasis>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ <emphasis role="bold">Bold</emphasis>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ <quote>Quoted</quote>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ <footnote id="list_test.f0">
+ <para>
+ Footnote
+ </para>
+ </footnote>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ <informaltable frame="all">
+ <tgroup cols="1">
+ <thead>
+ <row>
+ <entry>
+ <para>
+ Heading
+ </para>
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <para>
+ Cell
+ </para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ <bridgehead renderas="sect2" id="list_test.h0">
+ <phrase id="list_test.the_heading_for_a_list_item"/><link linkend="list_test.the_heading_for_a_list_item">The
+ heading for a list item</link>
+ </bridgehead>
+ <para>
+ The content of the list item.
+ </para>
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Don't end list with comment 1:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A1
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ A2
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ A3
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ A4
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Don't end list with comment 2:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A1
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ B1
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B2
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B3
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ <section id="list_test.paragraphs_in_list_items">
+ <title><link linkend="list_test.paragraphs_in_list_items">Paragraphs in list
+ items</link></title>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A1
+ <para>
+ A2
+ </para>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B1
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ C1
+ <para>
+ C2
+ </para>
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ <para>
+ B2
+ </para>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ D1
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ E1
+ <para>
+ E2
+ </para>
+ <para>
+ E3
+ </para>
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ <para>
+ D2
+ </para>
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </section>
+ <section id="list_test.indented_code_blocks_in_lists">
+ <title><link linkend="list_test.indented_code_blocks_in_lists">Indented code
+ blocks in lists</link></title>
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+<programlisting><phrase role="identifier">B</phrase>
+</programlisting>
+ <para>
+ C
+ </para>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ D
+<programlisting><phrase role="identifier">E</phrase>
+</programlisting>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ F
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </section>
+</article>
Copied: branches/release/tools/quickbook/test/list_test-1_7.quickbook (from r85049, trunk/tools/quickbook/test/list_test-1_7.quickbook)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/tools/quickbook/test/list_test-1_7.quickbook 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050, copy of r85049, trunk/tools/quickbook/test/list_test-1_7.quickbook)
@@ -0,0 +1,134 @@
+[article List Test
+[quickbook 1.7]
+]
+
+Simple list:
+
+* A
+* B
+
+Simple list:
+
+#A
+#B
+
+Two level list:
+
+* A
+ * A
+ * B
+* B
+ * A
+ * B
+
+Two level list:
+
+# A
+ * A
+ * B
+# B
+ * A
+ * B
+
+Three level list:
+
+# A
+ * A
+ * B
+ * C
+ * D
+ * E
+ * F
+ * G
+ * H
+
+Three level list:
+
+# A
+ * A
+ * B
+ # C
+ # D
+# G
+# H
+
+Inconsistent Indentation:
+
+* A1
+ * B1
+ * B2
+ * C1
+ * C2
+ * B3
+ * B4
+ * B5
+ * C3
+ * B6
+ * A2
+* A3
+
+Markup in list:
+
+* *Bold*
+* [*Bold]
+* ["Quoted]
+* [footnote Footnote]
+* [table [[Heading]][[Cell]]]
+* [heading The heading for a list item]
+
+ The content of the list item.
+
+Don't end list with comment 1:
+
+* A1
+* A2
+
+[/ End list?]
+* A3
+* A4
+
+Don't end list with comment 2:
+
+* A1
+ * B1
+
+[/ End list?]
+ * B2
+ * B3
+
+[section Paragraphs in list items]
+
+* A1
+
+ A2
+
+* B1
+ * C1
+
+ C2
+
+ B2
+
+* D1
+ * E1
+
+ E2
+
+ E3
+
+ D2
+
+[endsect]
+
+[section Indented code blocks in lists]
+
+* A
+
+ B
+ C
+* D
+
+ E
+* F
+
+[endsect]
Modified: branches/release/tools/quickbook/test/snippets/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/test/snippets/Jamfile.v2 Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/test/snippets/Jamfile.v2 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -6,7 +6,7 @@
# http://www.boost.org/LICENSE_1_0.txt)
#
-project quickook/tests/snippets ;
+project quickbook/test/snippets ;
import quickbook-testing : quickbook-test quickbook-error-test ;
Modified: branches/release/tools/quickbook/test/unit/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/test/unit/Jamfile.v2 Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/test/unit/Jamfile.v2 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -8,7 +8,7 @@
import testing ;
-project quickbook-unit-tests
+project quickbook/test/unit-tests
: requirements
<include>../../src
<warnings>all
Modified: branches/release/tools/quickbook/test/versions/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/test/versions/Jamfile.v2 Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/test/versions/Jamfile.v2 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -6,7 +6,7 @@
# http://www.boost.org/LICENSE_1_0.txt)
#
-project test/versions
+project quickbook/test/versions
: requirements
<toolset>msvc:<debug-symbols>off
;
Modified: branches/release/tools/quickbook/test/xinclude/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/test/xinclude/Jamfile.v2 Mon Jul 15 17:40:08 2013 (r85049)
+++ branches/release/tools/quickbook/test/xinclude/Jamfile.v2 2013-07-15 17:45:25 EDT (Mon, 15 Jul 2013) (r85050)
@@ -6,7 +6,7 @@
# http://www.boost.org/LICENSE_1_0.txt)
#
-project test/xinclude
+project quickbook/test/xinclude
: requirements
<toolset>msvc:<debug-symbols>off
;