|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r62830 - in branches/quickbook-1.5-spirit2: . doc test
From: daniel_james_at_[hidden]
Date: 2010-06-12 04:30:02
Author: danieljames
Date: 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
New Revision: 62830
URL: http://svn.boost.org/trac/boost/changeset/62830
Log:
Merge the 1.5.2 changes from trunk.
Added:
branches/quickbook-1.5-spirit2/test/blocks.gold
- copied unchanged from r62826, /trunk/tools/quickbook/test/blocks.gold
branches/quickbook-1.5-spirit2/test/blocks.quickbook
- copied unchanged from r62826, /trunk/tools/quickbook/test/blocks.quickbook
branches/quickbook-1.5-spirit2/test/doc-info-2.gold
- copied unchanged from r62826, /trunk/tools/quickbook/test/doc-info-2.gold
branches/quickbook-1.5-spirit2/test/doc-info-2.quickbook
- copied unchanged from r62826, /trunk/tools/quickbook/test/doc-info-2.quickbook
branches/quickbook-1.5-spirit2/test/para-test.gold
- copied unchanged from r62826, /trunk/tools/quickbook/test/para-test.gold
branches/quickbook-1.5-spirit2/test/para-test.quickbook
- copied unchanged from r62826, /trunk/tools/quickbook/test/para-test.quickbook
Properties modified:
branches/quickbook-1.5-spirit2/ (props changed)
Text files modified:
branches/quickbook-1.5-spirit2/Jamfile.v2 | 2
branches/quickbook-1.5-spirit2/block_actions.cpp | 16
branches/quickbook-1.5-spirit2/block_grammar.cpp | 6
branches/quickbook-1.5-spirit2/block_markup_grammar.cpp | 5
branches/quickbook-1.5-spirit2/boostbook.cpp | 19
branches/quickbook-1.5-spirit2/code_snippet_grammar.cpp | 2
branches/quickbook-1.5-spirit2/doc/quickbook.qbk | 13
branches/quickbook-1.5-spirit2/doc_info.hpp | 3
branches/quickbook-1.5-spirit2/doc_info_actions.cpp | 50 ++
branches/quickbook-1.5-spirit2/doc_info_grammar.cpp | 6
branches/quickbook-1.5-spirit2/input_path.cpp | 81 +++
branches/quickbook-1.5-spirit2/parse_utils.hpp | 48 ++
branches/quickbook-1.5-spirit2/phrase_image.cpp | 4
branches/quickbook-1.5-spirit2/post_process.cpp | 2
branches/quickbook-1.5-spirit2/quickbook.cpp | 6
branches/quickbook-1.5-spirit2/state.cpp | 4
branches/quickbook-1.5-spirit2/strings.hpp | 1
branches/quickbook-1.5-spirit2/template.cpp | 4
branches/quickbook-1.5-spirit2/test/Jamfile.v2 | 3
branches/quickbook-1.5-spirit2/test/callouts.gold | 8
branches/quickbook-1.5-spirit2/test/code-block-1.gold | 2
branches/quickbook-1.5-spirit2/test/code-block-2.gold | 2
branches/quickbook-1.5-spirit2/test/code-block-3.gold | 2
branches/quickbook-1.5-spirit2/test/code-block-teletype.gold | 2
branches/quickbook-1.5-spirit2/test/code-snippet.gold | 6
branches/quickbook-1.5-spirit2/test/code-snippet.quickbook | 2
branches/quickbook-1.5-spirit2/test/cond_phrase.gold | 2
branches/quickbook-1.5-spirit2/test/doc-info-1.gold | 5
branches/quickbook-1.5-spirit2/test/doc-info-1.quickbook | 2
branches/quickbook-1.5-spirit2/test/escape.gold | 2
branches/quickbook-1.5-spirit2/test/heading.gold | 2
branches/quickbook-1.5-spirit2/test/image_1_5.gold | 2
branches/quickbook-1.5-spirit2/test/import.gold | 26
branches/quickbook-1.5-spirit2/test/include_1_5.gold | 2
branches/quickbook-1.5-spirit2/test/include_1_6-2.gold | 2
branches/quickbook-1.5-spirit2/test/include_1_6.gold | 2
branches/quickbook-1.5-spirit2/test/link-side-by-side.gold | 2
branches/quickbook-1.5-spirit2/test/list_test.gold | 262 +++++++----
branches/quickbook-1.5-spirit2/test/preformatted.gold | 2
branches/quickbook-1.5-spirit2/test/quickbook-manual.gold | 913 ++++++++++++++++++++++++---------------
branches/quickbook-1.5-spirit2/test/section_1_4.gold | 2
branches/quickbook-1.5-spirit2/test/section_1_5.gold | 2
branches/quickbook-1.5-spirit2/test/simple_markup.gold | 2
branches/quickbook-1.5-spirit2/test/table_1_5.gold | 2
branches/quickbook-1.5-spirit2/test/template-section.gold | 2
branches/quickbook-1.5-spirit2/test/templates.gold | 2
branches/quickbook-1.5-spirit2/test/templates_1_4.gold | 2
branches/quickbook-1.5-spirit2/test/templates_1_5.gold | 2
branches/quickbook-1.5-spirit2/test/unicode-escape.gold | 114 +++-
branches/quickbook-1.5-spirit2/test/utf-8-bom.gold | 98 +++-
branches/quickbook-1.5-spirit2/test/utf-8.gold | 98 +++-
branches/quickbook-1.5-spirit2/test/xinclude.gold | 2
branches/quickbook-1.5-spirit2/test/xml-escape_1_2.gold | 31
branches/quickbook-1.5-spirit2/test/xml-escape_1_2.quickbook | 2
branches/quickbook-1.5-spirit2/test/xml-escape_1_5.gold | 31
branches/quickbook-1.5-spirit2/test/xml-escape_1_5.quickbook | 2
56 files changed, 1283 insertions(+), 636 deletions(-)
Modified: branches/quickbook-1.5-spirit2/Jamfile.v2
==============================================================================
--- branches/quickbook-1.5-spirit2/Jamfile.v2 (original)
+++ branches/quickbook-1.5-spirit2/Jamfile.v2 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -49,6 +49,8 @@
/boost//program_options
/boost//filesystem
: #<define>QUICKBOOK_NO_DATES
+ # Still using 'normalize' which has been deprecated.
+ #<define>BOOST_FILESYSTEM_NO_DEPRECATED
<toolset>msvc:<cxxflags>/wd4355
<toolset>msvc:<cxxflags>/wd4511
<toolset>msvc:<cxxflags>/wd4512
Modified: branches/quickbook-1.5-spirit2/block_actions.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/block_actions.cpp (original)
+++ branches/quickbook-1.5-spirit2/block_actions.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -243,7 +243,7 @@
fs::path include_search(fs::path const & current, std::string const & name)
{
- fs::path path(name,fs::native);
+ fs::path path(name);
// If the path is relative, try and resolve it.
if (!path.is_complete())
@@ -257,7 +257,7 @@
// Search in each of the include path locations.
BOOST_FOREACH(std::string const & p, include_path)
{
- fs::path full(p,fs::native);
+ fs::path full(p);
full /= path;
if (fs::exists(full))
{
@@ -295,7 +295,7 @@
if (!path.is_complete())
{
fs::path infile = fs::complete(state.filename).normalize();
- path = (infile.branch_path() / path).normalize();
+ path = (infile.parent_path() / path).normalize();
fs::path outdir = fs::complete(state.outdir).normalize();
path = path_difference(outdir, path);
}
@@ -312,7 +312,7 @@
nothing process(quickbook::state& state, include const& x)
{
- fs::path filein = include_search(state.filename.branch_path(), x.path);
+ fs::path filein = include_search(state.filename.parent_path(), x.path);
raw_string doc_id;
// swap the filenames
@@ -342,10 +342,10 @@
// update the __FILENAME__ macro
*state.macro.find("__FILENAME__") =
- quickbook::macro(state.filename.native_file_string());
+ quickbook::macro(state.filename.file_string());
// parse the file
- quickbook::parse(state.filename.native_file_string().c_str(), state, true);
+ quickbook::parse(state.filename.file_string().c_str(), state, true);
// restore the values
std::swap(state.filename, filein);
@@ -369,8 +369,8 @@
nothing process(quickbook::state& state, import const& x)
{
- fs::path path = include_search(state.filename.branch_path(), x.path);
- std::string ext = fs::extension(path);
+ fs::path path = include_search(state.filename.parent_path(), x.path);
+ std::string ext = path.extension();
std::vector<define_template> storage;
state.error_count +=
load_snippets(path.string(), storage, ext, state.doc_id);
Modified: branches/quickbook-1.5-spirit2/block_grammar.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/block_grammar.cpp (original)
+++ branches/quickbook-1.5-spirit2/block_grammar.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -55,7 +55,7 @@
| code [actions.process]
| list [actions.process]
| hr [actions.process]
- | comment >> *eol
+ | comment >> +eol
| paragraph [actions.process]
| eol
)
@@ -102,7 +102,7 @@
*( common
| (qi::char_ -
( qi::eol >> *qi::blank >> &(qi::char_('*') | '#')
- | (eol >> eol)
+ | (eol >> *qi::blank >> qi::eol)
)
) [actions.process]
)
@@ -136,7 +136,7 @@
;
paragraph_end =
- '[' >> space >> paragraph_end_markups >> hard_space | eol >> eol
+ '[' >> space >> paragraph_end_markups >> hard_space | eol >> *qi::blank >> qi::eol
;
paragraph_end_markups =
Modified: branches/quickbook-1.5-spirit2/block_markup_grammar.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/block_markup_grammar.cpp (original)
+++ branches/quickbook-1.5-spirit2/block_markup_grammar.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -374,8 +374,7 @@
inside_paragraph =
qi::eps [actions.phrase_push]
>> inside_paragraph2 [actions.process]
- >> *( eol
- >> eol
+ >> *( +eol
>> inside_paragraph2 [actions.process]
)
>> qi::eps [actions.phrase_pop]
@@ -397,7 +396,7 @@
// Make sure that we don't go past a single block, except when
// preformatted.
phrase_end =
- ']' | qi::eps(ph::ref(no_eols)) >> eol >> eol
+ ']' | qi::eps(ph::ref(no_eols)) >> eol >> *qi::blank >> qi::eol
;
// Identifiers
Modified: branches/quickbook-1.5-spirit2/boostbook.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/boostbook.cpp (original)
+++ branches/quickbook-1.5-spirit2/boostbook.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -63,14 +63,14 @@
{ "h5", "<bridgehead renderas=\"sect5\">", "</bridgehead>" },
{ "h6", "<bridgehead renderas=\"sect6\">", "</bridgehead>" },
{ "blurb", "<sidebar role=\"blurb\">\n", "</sidebar>\n" },
- { "blockquote", "<blockquote><para>", "</para></blockquote>" },
+ { "blockquote", "<blockquote>", "</blockquote>" },
{ "preformatted", "<programlisting>", "</programlisting>" },
{ "warning", "<warning>", "</warning>" },
{ "caution", "<caution>", "</caution>" },
{ "important", "<important>", "</important>" },
{ "note", "<note>", "</note>" },
{ "tip", "<tip>", "</tip>" },
- { "list_item", "<listitem>\n", "\n</listitem>" },
+ { "list_item", "<listitem><simpara>\n", "\n</simpara></listitem>" },
{ "bold", "<emphasis role=\"bold\">", "</emphasis>" },
{ "italic", "<emphasis>", "</emphasis>" },
{ "underline", "<emphasis role=\"underline\">", "</emphasis>" },
@@ -354,9 +354,9 @@
for(std::vector<list_item2>::const_iterator
it = x.items.begin(), end = x.items.end(); it != end; ++it)
{
- state.phrase << "<listitem>\n" << it->content;
+ state.phrase << "<listitem><simpara>\n" << it->content;
if(!it->sublist.items.empty()) (*this)(state, it->sublist);
- state.phrase << std::string("\n</listitem>");
+ state.phrase << std::string("\n</simpara></listitem>");
}
state.phrase << std::string(x.mark == '#' ? "\n</orderedlist>" : "\n</itemizedlist>");
@@ -365,11 +365,10 @@
void boostbook_encoder::operator()(quickbook::state& state, callout_link const& x)
{
state.phrase
- << "<phrase role=\"" << x.role << "\">"
<< "<co id=\"" << x.identifier << "co\""
<< " linkends=\"" << x.identifier << "\""
<< " />"
- << "</phrase>";
+ ;
}
void boostbook_encoder::operator()(quickbook::state& state, callout_list const& x)
@@ -412,7 +411,9 @@
state.phrase
<< "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
- << "<!DOCTYPE library PUBLIC \"-//Boost//DTD BoostBook XML V1.0//EN\""
+ << "<!DOCTYPE "
+ << info.doc_type
+ << " PUBLIC \"-//Boost//DTD BoostBook XML V1.0//EN\""
<< " \"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd\">";
// Document tag
@@ -505,11 +506,11 @@
;
}
- if (!info.doc_category.empty())
+ BOOST_FOREACH(raw_string const& category, info.doc_categories)
{
state.phrase
<< "<" << info.doc_type << "category name=\"category:"
- << encode(info.doc_category)
+ << encode(category)
<< "\"></" << info.doc_type << "category>\n"
<< "\n"
;
Modified: branches/quickbook-1.5-spirit2/code_snippet_grammar.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/code_snippet_grammar.cpp (original)
+++ branches/quickbook-1.5-spirit2/code_snippet_grammar.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -36,8 +36,6 @@
code_elements;
qi::rule<iterator, std::string()>
identifier;
- qi::rule<iterator, quickbook::callout()>
- inline_callout, line_callout;
qi::rule<iterator, quickbook::escaped_comment()>
escaped_comment;
};
Modified: branches/quickbook-1.5-spirit2/doc/quickbook.qbk
==============================================================================
--- branches/quickbook-1.5-spirit2/doc/quickbook.qbk (original)
+++ branches/quickbook-1.5-spirit2/doc/quickbook.qbk 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -192,6 +192,19 @@
* Add command line flag to define macros at the command line,
e.g. `quickbook "-D__italic_foo__=/foo/"`.
+[h3 Version 1.5.2 - Boost 1.44.0]
+
+* Generate more valid boostbook (still invalid in a few places).
+* 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]
[section:syntax Syntax Summary]
Modified: branches/quickbook-1.5-spirit2/doc_info.hpp
==============================================================================
--- branches/quickbook-1.5-spirit2/doc_info.hpp (original)
+++ branches/quickbook-1.5-spirit2/doc_info.hpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -24,6 +24,7 @@
typedef std::vector<unsigned int> copyright_years;
typedef std::pair<copyright_years, std::string> copyright_entry;
typedef std::vector<copyright_entry> copyright_list;
+ typedef std::vector<raw_string> category_list;
typedef std::pair<std::string, std::string> author;
typedef std::vector<author> author_list;
typedef boost::variant<raw_string, std::string> variant_string;
@@ -36,7 +37,7 @@
raw_string doc_dirname;
copyright_list doc_copyrights;
variant_string doc_purpose;
- raw_string doc_category;
+ category_list doc_categories;
author_list doc_authors;
variant_string doc_license;
raw_string doc_last_revision;
Modified: branches/quickbook-1.5-spirit2/doc_info_actions.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/doc_info_actions.cpp (original)
+++ branches/quickbook-1.5-spirit2/doc_info_actions.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -12,6 +12,7 @@
#include <string>
#include <vector>
#include <utility>
+#include <boost/algorithm/string/join.hpp>
#include "fwd.hpp"
#include "collector.hpp"
#include "quickbook.hpp"
@@ -21,6 +22,27 @@
namespace quickbook
{
+ namespace
+ {
+ struct empty_visitor {
+ typedef bool result_type;
+
+ template <typename T>
+ bool operator()(T const& x) const {
+ return x.empty();
+ }
+ };
+
+ struct clear_visitor {
+ typedef void result_type;
+
+ template <typename T>
+ void operator()(T& x) const {
+ return x.clear();
+ }
+ };
+ }
+
doc_info process(quickbook::state& state, doc_info const& x)
{
doc_info info = x;
@@ -56,6 +78,34 @@
info.doc_last_revision = strdate;
}
+ std::vector<std::string> invalid_attributes;
+
+ if (info.doc_type != "library")
+ {
+ if (!boost::apply_visitor(empty_visitor(), info.doc_purpose))
+ {
+ boost::apply_visitor(clear_visitor(), info.doc_purpose);
+ invalid_attributes.push_back("purpose");
+ }
+
+ if (!info.doc_categories.empty())
+ {
+ info.doc_categories.clear();
+ invalid_attributes.push_back("category");
+ }
+ }
+
+ if(!invalid_attributes.empty())
+ {
+ detail::outwarn(state.filename.file_string(),1)
+ << (invalid_attributes.size() > 1 ?
+ "Invalid attributes" : "Invalid attribute")
+ << " for '" << info.doc_type << "': "
+ << boost::algorithm::join(invalid_attributes, ", ")
+ << "\n"
+ ;
+ }
+
return info;
}
}
Modified: branches/quickbook-1.5-spirit2/doc_info_grammar.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/doc_info_grammar.cpp (original)
+++ branches/quickbook-1.5-spirit2/doc_info_grammar.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -44,7 +44,7 @@
qbk_minor_version = 1;
// TODO:
- //detail::outwarn(actions.filename.native_file_string(),1)
+ //detail::outwarn(actions.filename.file_string(),1)
// << "Warning: Quickbook version undefined. "
// "Version 1.1 is assumed" << std::endl;
}
@@ -95,9 +95,9 @@
doc_version [member_assign(&doc_info::doc_version)]
| doc_id [member_assign(&doc_info::doc_id)]
| doc_dirname [member_assign(&doc_info::doc_dirname)]
- | doc_copyright [ph::push_back(ph::bind(&doc_info::doc_copyrights, qi::_val), qi::_1)]
+ | doc_copyright [member_push(&doc_info::doc_copyrights)]
| doc_purpose [member_assign(&doc_info::doc_purpose)]
- | doc_category [member_assign(&doc_info::doc_category)]
+ | doc_category [member_push(&doc_info::doc_categories)]
| doc_authors [member_assign(&doc_info::doc_authors)]
| doc_license [member_assign(&doc_info::doc_license)]
| doc_last_revision [member_assign(&doc_info::doc_last_revision)]
Modified: branches/quickbook-1.5-spirit2/input_path.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/input_path.cpp (original)
+++ branches/quickbook-1.5-spirit2/input_path.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -7,14 +7,32 @@
=============================================================================*/
#include <boost/program_options.hpp>
-#include "input_path.hpp"
+#include "./input_path.hpp"
+
+#if !(defined(__cygwin__) || defined(__CYGWIN__))
+
+// Everything but cygwin
+
+namespace quickbook { namespace detail
+{
+ void validate(boost::any& v,
+ const std::vector<std::string>& values,
+ input_path*, int)
+ {
+ std::string path
+ = boost::program_options::validators::get_single_string(values);
+
+ v = input_path(path);
+ }
+}}
+
+#elif defined(QUICKBOOK_CYGWIN_1_5)
+
+// Cygwin 1.5.x
-#if defined(__cygwin__) || defined(__CYGWIN__)
#include <boost/filesystem/config.hpp>
#include <windows.h>
#include <sys/cygwin.h>
-#endif
-
namespace quickbook { namespace detail
{
@@ -25,18 +43,63 @@
std::string path
= boost::program_options::validators::get_single_string(values);
-#if !(defined(__cygwin__) || defined(__CYGWIN__))
- v = input_path(path);
-#elif defined(BOOST_WINDOWS_PATH)
char result[MAX_PATH + 1];
+
+#if defined(BOOST_WINDOWS_PATH)
cygwin_conv_to_win32_path(path.c_str(), result);
- v = input_path(result);
#elif defined(BOOST_POSIX_PATH)
- char result[MAX_PATH + 1];
cygwin_conv_to_posix_path(path.c_str(), result);
+#else
+# error "Bosot filesystem path type doesn't seem to be set."
+#endif
+
v = input_path(result);
+ }
+}}
+
+#else
+
+// Cygwin 1.7.x
+
+#include <boost/filesystem/config.hpp>
+#include <boost/scoped_array.hpp>
+#include <boost/program_options/errors.hpp>
+#include <windows.h>
+#include <sys/cygwin.h>
+
+namespace quickbook { namespace detail
+{
+ void validate(boost::any& v,
+ const std::vector<std::string>& values,
+ input_path*, int)
+ {
+ std::string path
+ = boost::program_options::validators::get_single_string(values);
+
+#if defined(BOOST_WINDOWS_PATH)
+ cygwin_conv_path_t flags = CCP_POSIX_TO_WIN_A | CCP_RELATIVE;
+#elif defined(BOOST_POSIX_PATH)
+ cygwin_conv_path_t flags = CCP_WIN_A_TO_POSIX | CCP_RELATIVE;
#else
# error "Bosot filesystem path type doesn't seem to be set."
#endif
+
+ ssize_t size = cygwin_conv_path(flags, path.c_str(), NULL, 0);
+
+ if (size < 0) {
+ throw boost::program_options::validation_error(
+ boost::program_options::validation_error::invalid_option_value);
+ }
+
+ boost::scoped_array<char> result(new char[size]);
+
+ if(cygwin_conv_path(flags, path.c_str(), result.get(), size)) {
+ throw boost::program_options::validation_error(
+ boost::program_options::validation_error::invalid_option_value);
+ }
+
+ v = input_path(result.get());
}
}}
+
+#endif
Modified: branches/quickbook-1.5-spirit2/parse_utils.hpp
==============================================================================
--- branches/quickbook-1.5-spirit2/parse_utils.hpp (original)
+++ branches/quickbook-1.5-spirit2/parse_utils.hpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -63,6 +63,54 @@
member_assign_type<Struct, Member> member_assign(Member Struct::*mem_ptr) {
return member_assign_type<Struct, Member>(mem_ptr);
}
+
+ // member_push - action to push the attribute to a member of the
+ // rule's attributte.
+
+ template <typename Struct, typename Member>
+ struct member_push_type {
+ member_push_type(Member Struct::*mem_ptr) : mem_ptr_(mem_ptr) {}
+
+ template <typename Context>
+ void operator()(Member& attrib, Context& context, bool& pass) const {
+ ph::bind(mem_ptr_, spirit::_val)(attrib, context, pass)
+ .push_back(attrib);
+ }
+
+ template <typename Attrib, typename Context>
+ void operator()(Attrib& attrib, Context& context, bool& pass) const {
+ ph::bind(mem_ptr_, spirit::_val)(attrib, context, pass)
+ .push_back(typename Member::value_type(attrib));
+ }
+
+ Member Struct::*mem_ptr_;
+ };
+
+ template <typename Struct>
+ struct member_push_type<Struct, std::vector<std::string> > {
+ member_push_type(std::vector<std::string> Struct::*mem_ptr) : mem_ptr_(mem_ptr) {}
+
+ template <typename Context>
+ void operator()(std::string& attrib, Context& context, bool& pass) const {
+ ph::bind(mem_ptr_, spirit::_val)(attrib, context, pass)
+ .push_back(attrib);
+ }
+
+ template <typename Attrib, typename Context>
+ void operator()(Attrib& attrib, Context& context, bool& pass) const {
+ ph::bind(mem_ptr_, spirit::_val)(attrib, context, pass)
+ .push_back(std::string(attrib.begin(), attrib.end()));
+ }
+
+ std::vector<std::string> Struct::*mem_ptr_;
+ };
+
+ template <typename Struct, typename Member>
+ member_push_type<Struct, Member> member_push(Member Struct::*mem_ptr) {
+ return member_push_type<Struct, Member>(mem_ptr);
+ }
+
+
}
#endif
Modified: branches/quickbook-1.5-spirit2/phrase_image.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/phrase_image.cpp (original)
+++ branches/quickbook-1.5-spirit2/phrase_image.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -48,9 +48,9 @@
fs::path const img_path(x.image_filename);
attributes.insert(attribute("fileref", x.image_filename));
// Note: If there is already an alt attribute this is a no-op.
- attributes.insert(attribute("alt", fs::basename(img_path)));
+ attributes.insert(attribute("alt", img_path.stem()));
- if(fs::extension(img_path) == ".svg")
+ if(img_path.extension() == ".svg")
{
//
// SVG's need special handling:
Modified: branches/quickbook-1.5-spirit2/post_process.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/post_process.cpp (original)
+++ branches/quickbook-1.5-spirit2/post_process.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -193,7 +193,6 @@
, "caution"
, "copyright"
, "entry"
- , "footnote"
, "important"
, "informaltable"
, "itemizedlist"
@@ -204,6 +203,7 @@
, "para"
, "row"
, "section"
+ , "simpara"
, "table"
, "tbody"
, "textobject"
Modified: branches/quickbook-1.5-spirit2/quickbook.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/quickbook.cpp (original)
+++ branches/quickbook-1.5-spirit2/quickbook.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -30,7 +30,7 @@
#pragma warning(disable:4355)
#endif
-#define QUICKBOOK_VERSION "Quickbook Version 1.5.2"
+#define QUICKBOOK_VERSION "Quickbook Spirit 2 port"
namespace quickbook
{
@@ -153,7 +153,7 @@
{
int result = 0;
std::ofstream fileout(fileout_);
- fs::path outdir = fs::path(fileout_, fs::native).branch_path();
+ fs::path outdir = fs::path(fileout_).parent_path();
if (outdir.empty())
outdir = ".";
if (pretty_print)
@@ -203,7 +203,7 @@
using boost::program_options::positional_options_description;
// First thing, the filesystem should record the current working directory.
- boost::filesystem::initial_path();
+ boost::filesystem::initial_path<boost::filesystem::path>();
options_description desc("Allowed options");
desc.add_options()
Modified: branches/quickbook-1.5-spirit2/state.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/state.cpp (original)
+++ branches/quickbook-1.5-spirit2/state.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -33,7 +33,7 @@
, encoder(encoder)
// state
- , filename(fs::complete(fs::path(filein_, fs::native)))
+ , filename(fs::complete(fs::path(filein_)))
, outdir(outdir_)
, macro()
, section_level(0)
@@ -50,7 +50,7 @@
// turn off __FILENAME__ macro on debug mode = true
std::string filename_str = debug_mode ?
std::string("NO_FILENAME_MACRO_GENERATED_IN_DEBUG_MODE") :
- filename.native_file_string();
+ filename.file_string();
// add the predefined macros
macro.add
Modified: branches/quickbook-1.5-spirit2/strings.hpp
==============================================================================
--- branches/quickbook-1.5-spirit2/strings.hpp (original)
+++ branches/quickbook-1.5-spirit2/strings.hpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -31,6 +31,7 @@
std::string::const_iterator begin() const { return value.begin(); }
std::string::const_iterator end() const { return value.end(); }
bool empty() const { return value.empty(); }
+ void clear() { value.clear(); }
std::string value;
};
Modified: branches/quickbook-1.5-spirit2/template.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/template.cpp (original)
+++ branches/quickbook-1.5-spirit2/template.cpp 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -328,7 +328,7 @@
quickbook_grammar g(actions);
// do a phrase level parse
- iterator first(body.begin(), body.end(), state.filename.native_file_string().c_str());
+ iterator first(body.begin(), body.end(), state.filename.file_string().c_str());
first.set_position(template_pos);
iterator last(body.end(), body.end());
r = boost::spirit::qi::parse(first, last, g.simple_phrase) && first == last;
@@ -344,7 +344,7 @@
// the need to check for end of file in the grammar.
body += "\n\n";
- iterator first(body.begin(), body.end(), state.filename.native_file_string().c_str());
+ iterator first(body.begin(), body.end(), state.filename.file_string().c_str());
first.set_position(template_pos);
iterator last(body.end(), body.end());
Modified: branches/quickbook-1.5-spirit2/test/Jamfile.v2
==============================================================================
--- branches/quickbook-1.5-spirit2/test/Jamfile.v2 (original)
+++ branches/quickbook-1.5-spirit2/test/Jamfile.v2 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -32,15 +32,18 @@
[ quickbook-test section_1_4 ]
[ quickbook-test section_1_5 ]
[ quickbook-test heading ]
+ [ quickbook-test para-test ]
[ quickbook-test table_1_5 ]
[ quickbook-test image_1_5 ]
[ quickbook-test list_test ]
[ quickbook-test cond_phrase ]
[ quickbook-test doc-info-1 ]
+ [ quickbook-test doc-info-2 ]
[ quickbook-test callouts ]
[ quickbook-test simple_markup ]
[ quickbook-test xml-escape_1_2 ]
[ quickbook-test xml-escape_1_5 ]
+ [ quickbook-test blocks ]
[ quickbook-fail-test fail-include ]
[ quickbook-fail-test fail-import ]
[ quickbook-fail-test fail-template-arguments1 ]
Modified: branches/quickbook-1.5-spirit2/test/callouts.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/callouts.gold (original)
+++ branches/quickbook-1.5-spirit2/test/callouts.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="callout_tests" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Callout Tests</title>
@@ -15,7 +15,7 @@
<para>
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
- <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special"><></phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <phrase role="callout_bug"><co id="callout_tests0co" linkends="callout_tests0" /></phrase>
+ <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special"><></phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <co id="callout_tests0co" linkends="callout_tests0" />
<phrase role="special">}</phrase>
</programlisting>
@@ -35,7 +35,7 @@
<para>
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
- <phrase role="line_callout_bug"><co id="callout_tests1co" linkends="callout_tests1" /></phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special"><</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special"><></phrase> <phrase role="special">></phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
+ <co id="callout_tests1co" linkends="callout_tests1" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special"><</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special"><></phrase> <phrase role="special">></phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
<phrase role="special">}</phrase>
</programlisting>
@@ -57,7 +57,7 @@
<para>
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
- <phrase role="line_callout_bug"><co id="callout_tests2co" linkends="callout_tests2" /></phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special"><</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special"><></phrase> <phrase role="special">></phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
+ <co id="callout_tests2co" linkends="callout_tests2" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special"><</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special"><></phrase> <phrase role="special">></phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
<phrase role="special">}</phrase>
</programlisting>
Modified: branches/quickbook-1.5-spirit2/test/code-block-1.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/code-block-1.gold (original)
+++ branches/quickbook-1.5-spirit2/test/code-block-1.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="code_block_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Code Block 1</title>
Modified: branches/quickbook-1.5-spirit2/test/code-block-2.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/code-block-2.gold (original)
+++ branches/quickbook-1.5-spirit2/test/code-block-2.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="code_block_2" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Code Block 2</title>
Modified: branches/quickbook-1.5-spirit2/test/code-block-3.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/code-block-3.gold (original)
+++ branches/quickbook-1.5-spirit2/test/code-block-3.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="code_block_3" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Code Block 3</title>
Modified: branches/quickbook-1.5-spirit2/test/code-block-teletype.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/code-block-teletype.gold (original)
+++ branches/quickbook-1.5-spirit2/test/code-block-teletype.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="code_block_teletype_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Code Block Teletype 1</title>
Modified: branches/quickbook-1.5-spirit2/test/code-snippet.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/code-snippet.gold (original)
+++ branches/quickbook-1.5-spirit2/test/code-snippet.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="code_snippets" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Code Snippets</title>
@@ -16,5 +16,9 @@
<phrase role="special">}</phrase></code>, should be properly formatted and
not glued to the surrounding text.
</para>
+ <para>
+ There shoud be no spacees around (<code><phrase role="keyword">this</phrase></code>),
+ and spaces around <code><phrase role="keyword">this</phrase></code> code.
+ </para>
</section>
</article>
Modified: branches/quickbook-1.5-spirit2/test/code-snippet.quickbook
==============================================================================
--- branches/quickbook-1.5-spirit2/test/code-snippet.quickbook (original)
+++ branches/quickbook-1.5-spirit2/test/code-snippet.quickbook 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -7,4 +7,6 @@
value = 0; }`, should be properly formatted and not glued to the surrounding
text.
+There shoud be no spacees around (`this`), and spaces around `this` code.
+
[endsect]
Modified: branches/quickbook-1.5-spirit2/test/cond_phrase.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/cond_phrase.gold (original)
+++ branches/quickbook-1.5-spirit2/test/cond_phrase.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="coniditional_phrase_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Coniditional Phrase Test</title>
Modified: branches/quickbook-1.5-spirit2/test/doc-info-1.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/doc-info-1.gold (original)
+++ branches/quickbook-1.5-spirit2/test/doc-info-1.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="document_information_1" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Document Information 1</title>
<articleinfo>
- <articlepurpose>
- Inline code test: <code>1 + 2</code>
- </articlepurpose>
</articleinfo>
<para>
The body is largely irrelevant.
Modified: branches/quickbook-1.5-spirit2/test/doc-info-1.quickbook
==============================================================================
--- branches/quickbook-1.5-spirit2/test/doc-info-1.quickbook (original)
+++ branches/quickbook-1.5-spirit2/test/doc-info-1.quickbook 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -2,6 +2,8 @@
[quickbook 1.5]
[source-mode teletype]
[purpose Inline code test: `1 + 2`]
+[category tests]
+[category irrelevance]
]
The body is largely irrelevant.
\ No newline at end of file
Modified: branches/quickbook-1.5-spirit2/test/escape.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/escape.gold (original)
+++ branches/quickbook-1.5-spirit2/test/escape.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="escape" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Escape</title>
<articleinfo>
Modified: branches/quickbook-1.5-spirit2/test/heading.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/heading.gold (original)
+++ branches/quickbook-1.5-spirit2/test/heading.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="header" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Header</title>
<articleinfo>
Modified: branches/quickbook-1.5-spirit2/test/image_1_5.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/image_1_5.gold (original)
+++ branches/quickbook-1.5-spirit2/test/image_1_5.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="images_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Images 1.5</title>
<articleinfo>
Modified: branches/quickbook-1.5-spirit2/test/import.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/import.gold (original)
+++ branches/quickbook-1.5-spirit2/test/import.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="import" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Import</title>
<articleinfo>
@@ -13,10 +13,14 @@
</para>
<itemizedlist>
<listitem>
- lists
+ <simpara>
+ lists
+ </simpara>
</listitem>
<listitem>
- etc.
+ <simpara>
+ etc.
+ </simpara>
</listitem>
</itemizedlist>
<para>
@@ -42,10 +46,14 @@
</para>
<itemizedlist>
<listitem>
- lists
+ <simpara>
+ lists
+ </simpara>
</listitem>
<listitem>
- etc.
+ <simpara>
+ etc.
+ </simpara>
</listitem>
</itemizedlist>
<para>
@@ -69,10 +77,14 @@
</para>
<itemizedlist>
<listitem>
- lists
+ <simpara>
+ lists
+ </simpara>
</listitem>
<listitem>
- etc.
+ <simpara>
+ etc.
+ </simpara>
</listitem>
</itemizedlist>
<para>
Modified: branches/quickbook-1.5-spirit2/test/include_1_5.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/include_1_5.gold (original)
+++ branches/quickbook-1.5-spirit2/test/include_1_5.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="include-test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Include Test</title>
Modified: branches/quickbook-1.5-spirit2/test/include_1_6-2.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/include_1_6-2.gold (original)
+++ branches/quickbook-1.5-spirit2/test/include_1_6-2.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="include-test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Include Test</title>
Modified: branches/quickbook-1.5-spirit2/test/include_1_6.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/include_1_6.gold (original)
+++ branches/quickbook-1.5-spirit2/test/include_1_6.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="include-test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Include Test</title>
Modified: branches/quickbook-1.5-spirit2/test/link-side-by-side.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/link-side-by-side.gold (original)
+++ branches/quickbook-1.5-spirit2/test/link-side-by-side.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="side_by_side_links" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Side-by-side links</title>
Modified: branches/quickbook-1.5-spirit2/test/list_test.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/list_test.gold (original)
+++ branches/quickbook-1.5-spirit2/test/list_test.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!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>
<articleinfo>
@@ -9,10 +9,14 @@
</para>
<itemizedlist>
<listitem>
- A
+ <simpara>
+ A
+ </simpara>
</listitem>
<listitem>
- B
+ <simpara>
+ B
+ </simpara>
</listitem>
</itemizedlist>
<para>
@@ -20,10 +24,14 @@
</para>
<orderedlist>
<listitem>
- A
+ <simpara>
+ A
+ </simpara>
</listitem>
<listitem>
- B
+ <simpara>
+ B
+ </simpara>
</listitem>
</orderedlist>
<para>
@@ -31,26 +39,38 @@
</para>
<itemizedlist>
<listitem>
- A
- <itemizedlist>
- <listitem>
- A
- </listitem>
- <listitem>
- B
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- B
- <itemizedlist>
- <listitem>
- A
- </listitem>
- <listitem>
- B
- </listitem>
- </itemizedlist>
+ <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>
@@ -58,26 +78,38 @@
</para>
<orderedlist>
<listitem>
- A
- <itemizedlist>
- <listitem>
- A
- </listitem>
- <listitem>
- B
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- B
- <itemizedlist>
- <listitem>
- A
- </listitem>
- <listitem>
- B
- </listitem>
- </itemizedlist>
+ <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>
@@ -85,37 +117,55 @@
</para>
<orderedlist>
<listitem>
- A
- <itemizedlist>
- <listitem>
- A
- </listitem>
- <listitem>
- B
- <itemizedlist>
- <listitem>
- C
- </listitem>
- <listitem>
- D
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- E
- </listitem>
- <listitem>
- F
- <itemizedlist>
- <listitem>
- G
- </listitem>
- <listitem>
- H
- </listitem>
- </itemizedlist>
- </listitem>
- </itemizedlist>
+ <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>
@@ -123,29 +173,43 @@
</para>
<orderedlist>
<listitem>
- A
- <itemizedlist>
- <listitem>
- A
- </listitem>
- <listitem>
- B
- <orderedlist>
- <listitem>
- C
- </listitem>
- <listitem>
- D
- </listitem>
- </orderedlist>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- G
- </listitem>
- <listitem>
- H
+ <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>
</article>
Modified: branches/quickbook-1.5-spirit2/test/preformatted.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/preformatted.gold (original)
+++ branches/quickbook-1.5-spirit2/test/preformatted.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="preformatted" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Preformatted</title>
Modified: branches/quickbook-1.5-spirit2/test/quickbook-manual.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/quickbook-manual.gold (original)
+++ branches/quickbook-1.5-spirit2/test/quickbook-manual.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="quickbook" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Quickbook 1.4</title>
<articleinfo>
@@ -21,21 +21,16 @@
file LICENSE_1_0.txt or copy at <ulink url="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt>)
</para>
</legalnotice>
- <articlepurpose>
- <emphasis>WikiWiki</emphasis> style documentation tool
- </articlepurpose>
</articleinfo>
<section id="quickbook.intro">
<title><link linkend="quickbook.intro"> Introduction</link></title>
<blockquote>
<para>
- <para>
- <emphasis role="bold"><emphasis><quote>Why program by hand in five days
- what you can spend five years of your life automating?</quote></emphasis></emphasis>
- </para>
- <para>
- -- Terrence Parr, author ANTLR/PCCTS
- </para>
+ <emphasis role="bold"><emphasis><quote>Why program by hand in five days what
+ you can spend five years of your life automating?</quote></emphasis></emphasis>
+ </para>
+ <para>
+ -- Terrence Parr, author ANTLR/PCCTS
</para>
</blockquote>
<para>
@@ -46,9 +41,7 @@
</para>
<blockquote>
<para>
- <para>
- <ulink url="../quickbook.qbk">quickbook.qbk</ulink>
- </para>
+ <ulink url="../quickbook.qbk">quickbook.qbk</ulink>
</para>
</blockquote>
<para>
@@ -72,24 +65,36 @@
</para>
<itemizedlist>
<listitem>
- generate <ulink url="http://www.boost.org/doc/html/boostbook.html">BoostBook</ulink>
- xml, to generate HTML, PostScript and PDF
+ <simpara>
+ generate <ulink url="http://www.boost.org/doc/html/boostbook.html">BoostBook</ulink>
+ xml, to generate HTML, PostScript and PDF
+ </simpara>
</listitem>
<listitem>
- simple markup to link to Doxygen-generated entities
+ <simpara>
+ simple markup to link to Doxygen-generated entities
+ </simpara>
</listitem>
<listitem>
- macro system for simple text substitution
+ <simpara>
+ macro system for simple text substitution
+ </simpara>
</listitem>
<listitem>
- simple markup for italics, bold, preformatted, blurbs, code samples, tables,
- URLs, anchors, images, etc.
+ <simpara>
+ simple markup for italics, bold, preformatted, blurbs, code samples, tables,
+ URLs, anchors, images, etc.
+ </simpara>
</listitem>
<listitem>
- automatic syntax coloring of code samples
+ <simpara>
+ automatic syntax coloring of code samples
+ </simpara>
</listitem>
<listitem>
- CSS support
+ <simpara>
+ CSS support
+ </simpara>
</listitem>
</itemizedlist>
</section>
@@ -101,112 +106,172 @@
</bridgehead>
<itemizedlist>
<listitem>
- Quickbook file inclusion [include].
+ <simpara>
+ Quickbook file inclusion [include].
+ </simpara>
</listitem>
<listitem>
- Better xml output (pretty layout). Check out the generated XML.
+ <simpara>
+ Better xml output (pretty layout). Check out the generated XML.
+ </simpara>
</listitem>
<listitem>
- Regression testing facility: to make sure your document will always be compatible
- (full backward compatibility) regardless of changes to QuickBook.
+ <simpara>
+ Regression testing facility: to make sure your document will always be
+ compatible (full backward compatibility) regardless of changes to QuickBook.
+ </simpara>
</listitem>
<listitem>
- Code cleanup and refactoring.
+ <simpara>
+ Code cleanup and refactoring.
+ </simpara>
</listitem>
<listitem>
- Allow phrase markup in the doc-info.
+ <simpara>
+ Allow phrase markup in the doc-info.
+ </simpara>
</listitem>
<listitem>
- Preformatted code blocks via ``code`` (double ticks) allows code in tables
- and lists, for example.
+ <simpara>
+ Preformatted code blocks via ``code`` (double ticks) allows code in tables
+ and lists, for example.
+ </simpara>
</listitem>
<listitem>
- Quickbook versioning; allows full backward compatibility. You have to add
- [quickbook 1.3] to the doc-info header to enable the new features. Without
- this, QuickBook will assume that the document is a pre-1.3 document.
+ <simpara>
+ Quickbook versioning; allows full backward compatibility. You have to add
+ [quickbook 1.3] to the doc-info header to enable the new features. Without
+ this, QuickBook will assume that the document is a pre-1.3 document.
+ </simpara>
</listitem>
<listitem>
- Better (intuitive) paragraph termination. Some markups may terminate a paragraph.
- Example:
+ <simpara>
+ Better (intuitive) paragraph termination. Some markups may terminate a
+ paragraph. Example:
<programlisting><phrase role="special">[</phrase><phrase role="identifier">section</phrase> <phrase role="identifier">x</phrase><phrase role="special">]</phrase>
<phrase role="identifier">blah</phrase><phrase role="special">...</phrase>
<phrase role="special">[</phrase><phrase role="identifier">endsect</phrase><phrase role="special">]</phrase></programlisting>
+ </simpara>
</listitem>
<listitem>
- Fully qualified section and headers. Subsection names are concatenated to
- the ID to avoid clashing. Example: <code><phrase role="identifier">doc_name</phrase><phrase
- role="special">.</phrase><phrase role="identifier">sect_name</phrase><phrase
- role="special">.</phrase><phrase role="identifier">sub_sect_name</phrase><phrase
- role="special">.</phrase><phrase role="identifier">sub_sub_sect_name</phrase></code>
+ <simpara>
+ Fully qualified section and headers. Subsection names are concatenated
+ to the ID to avoid clashing. Example: <code><phrase role="identifier">doc_name</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">sect_name</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">sub_sect_name</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">sub_sub_sect_name</phrase></code>
+ </simpara>
</listitem>
<listitem>
- Better &nbsp; and whitespace handling in code snippets.
+ <simpara>
+ Better &nbsp; and whitespace handling in code snippets.
+ </simpara>
</listitem>
<listitem>
- [xinclude] fixes up the relative path to the target XML file when input_directory
- is not the same as the output_directory.
+ <simpara>
+ [xinclude] fixes up the relative path to the target XML file when input_directory
+ is not the same as the output_directory.
+ </simpara>
</listitem>
<listitem>
- Allow untitled tables.
+ <simpara>
+ Allow untitled tables.
+ </simpara>
</listitem>
<listitem>
- Allow phrase markups in section titles.
+ <simpara>
+ Allow phrase markups in section titles.
+ </simpara>
</listitem>
<listitem>
- Allow escaping back to QuickBook from code, code blocks and inline code.
+ <simpara>
+ Allow escaping back to QuickBook from code, code blocks and inline code.
+ </simpara>
</listitem>
<listitem>
- Footnotes, with the [footnote This is the footnote] syntax.
+ <simpara>
+ Footnotes, with the [footnote This is the footnote] syntax.
+ </simpara>
</listitem>
<listitem>
- Post-processor bug fix for escaped XML code that it does not recognize.
+ <simpara>
+ Post-processor bug fix for escaped XML code that it does not recognize.
+ </simpara>
</listitem>
<listitem>
- Replaceable, with the [~replacement] syntax.
+ <simpara>
+ Replaceable, with the [~replacement] syntax.
+ </simpara>
</listitem>
<listitem>
- Generic Headers
+ <simpara>
+ Generic Headers
+ </simpara>
</listitem>
<listitem>
- Code changes to allow full recursion (i.e. Collectors and push/pop functions)
+ <simpara>
+ Code changes to allow full recursion (i.e. Collectors and push/pop functions)
+ </simpara>
</listitem>
<listitem>
- Various code cleanup/maintenance
+ <simpara>
+ Various code cleanup/maintenance
+ </simpara>
</listitem>
<listitem>
- Templates!
+ <simpara>
+ Templates!
+ </simpara>
</listitem>
<listitem>
- [conceptref] for referencing BoostBook <concept> entities.
+ <simpara>
+ [conceptref] for referencing BoostBook <concept> entities.
+ </simpara>
</listitem>
<listitem>
- Allow escape of spaces. The escaped space is removed from the output. Syntax:
- <code><phrase role="special">\</phrase> </code>.
+ <simpara>
+ Allow escape of spaces. The escaped space is removed from the output. Syntax:
+ <code><phrase role="special">\</phrase> </code>.
+ </simpara>
</listitem>
<listitem>
- Nested comments are now allowed.
+ <simpara>
+ Nested comments are now allowed.
+ </simpara>
</listitem>
<listitem>
- Quickbook blocks can nest inside comments.
+ <simpara>
+ Quickbook blocks can nest inside comments.
+ </simpara>
</listitem>
<listitem>
- <link linkend="quickbook.syntax.block.import">Import</link> facility.
+ <simpara>
+ <link linkend="quickbook.syntax.block.import">Import</link> facility.
+ </simpara>
</listitem>
<listitem>
- Callouts on imported code
+ <simpara>
+ Callouts on imported code
+ </simpara>
</listitem>
<listitem>
- Simple markups can now span a whole block.
+ <simpara>
+ Simple markups can now span a whole block.
+ </simpara>
</listitem>
<listitem>
- <link linkend="quickbook.syntax.block.blurbs">Blurbs</link>, <link linkend="quickbook.syntax.block.admonitions">Admonitions</link>
- and table cells (see <link linkend="quickbook.syntax.block.tables">Tables</link>)
- may now contain paragraphs.
+ <simpara>
+ <link linkend="quickbook.syntax.block.blurbs">Blurbs</link>, <link linkend="quickbook.syntax.block.admonitions">Admonitions</link>
+ and table cells (see <link linkend="quickbook.syntax.block.tables">Tables</link>)
+ may now contain paragraphs.
+ </simpara>
</listitem>
<listitem>
- <code><phrase role="special">\</phrase><phrase role="identifier">n</phrase></code>
- and <code><phrase role="special">[</phrase><phrase role="identifier">br</phrase><phrase
- role="special">]</phrase></code> are now deprecated.
+ <simpara>
+ <code><phrase role="special">\</phrase><phrase role="identifier">n</phrase></code>
+ and <code><phrase role="special">[</phrase><phrase role="identifier">br</phrase><phrase
+ role="special">]</phrase></code> are now deprecated.
+ </simpara>
</listitem>
</itemizedlist>
</section>
@@ -336,47 +401,59 @@
</para>
<para>
Unlike QuickBook's standard formatting scheme, the rules for simpler alternatives
- are much stricter
- <footnote>
- <para>
- Thanks to David Barrett, author of <ulink url="http://quinthar.com/qwikiwiki/index.php?page=Home">Qwiki</ulink>,
- for sharing these samples and teaching me these obscure formatting
- rules. I wasn't sure at all if <ulink url="http://spirit.sourceforge.net">Spirit</ulink>,
- being more or less a formal EBNF parser, can handle the context sensitivity
- and ambiguity.
- </para>
- </footnote>
- .
+ are much stricter<footnote>
+ <para>
+ Thanks to David Barrett, author of <ulink url="http://quinthar.com/qwikiwiki/index.php?page=Home">Qwiki</ulink>,
+ for sharing these samples and teaching me these obscure formatting rules.
+ I wasn't sure at all if <ulink url="http://spirit.sourceforge.net">Spirit</ulink>,
+ being more or less a formal EBNF parser, can handle the context sensitivity
+ and ambiguity.
+ </para>
+ </footnote>.
</para>
<itemizedlist>
<listitem>
- Simple markups cannot nest. You can combine a simple markup with a nestable
- markup.
+ <simpara>
+ Simple markups cannot nest. You can combine a simple markup with a
+ nestable markup.
+ </simpara>
</listitem>
<listitem>
- Simple markups cannot contain any other form of quickbook markup.
+ <simpara>
+ Simple markups cannot contain any other form of quickbook markup.
+ </simpara>
</listitem>
<listitem>
- A non-space character must follow the leading markup
+ <simpara>
+ A non-space character must follow the leading markup
+ </simpara>
</listitem>
<listitem>
- A non-space character must precede the trailing markup
+ <simpara>
+ A non-space character must precede the trailing markup
+ </simpara>
</listitem>
<listitem>
- A space or a punctuation must follow the trailing markup
+ <simpara>
+ A space or a punctuation must follow the trailing markup
+ </simpara>
</listitem>
<listitem>
- If the matching markup cannot be found within a block, the formatting
- will not be applied. This is to ensure that un-matched formatting markups,
- which can be a common mistake, does not corrupt anything past a single
- block. We do not want the rest of the document to be rendered bold just
- because we forgot a trailing '*'. A single block is terminated by two
- end of lines or the close bracket: ']'.
+ <simpara>
+ If the matching markup cannot be found within a block, the formatting
+ will not be applied. This is to ensure that un-matched formatting markups,
+ which can be a common mistake, does not corrupt anything past a single
+ block. We do not want the rest of the document to be rendered bold
+ just because we forgot a trailing '*'. A single block is terminated
+ by two end of lines or the close bracket: ']'.
+ </simpara>
</listitem>
<listitem>
- A line starting with the star will be interpreted as an unordered list.
- See <link linkend="quickbook.syntax.block.lists.unordered_lists">Unordered
- lists</link>.
+ <simpara>
+ A line starting with the star will be interpreted as an unordered list.
+ See <link linkend="quickbook.syntax.block.lists.unordered_lists">Unordered
+ lists</link>.
+ </simpara>
</listitem>
</itemizedlist>
<table frame="all">
@@ -950,13 +1027,11 @@
<programlisting><!--quickbook-escape-prefix-->[footnote A sample footnote]
<!--quickbook-escape-postfix--></programlisting>
<para>
- will generate this
- <footnote>
- <para>
- A sample footnote
- </para>
- </footnote>
- .
+ will generate this<footnote>
+ <para>
+ A sample footnote
+ </para>
+ </footnote>.
</para>
<section id="quickbook.syntax.phrase.footnotes.macro_expansion">
<title><link linkend="quickbook.syntax.phrase.footnotes.macro_expansion">Macro
@@ -1006,37 +1081,59 @@
</para>
<itemizedlist>
<listitem>
- book
+ <simpara>
+ book
+ </simpara>
</listitem>
<listitem>
- article
+ <simpara>
+ article
+ </simpara>
</listitem>
<listitem>
- library
+ <simpara>
+ library
+ </simpara>
</listitem>
<listitem>
- chapter
+ <simpara>
+ chapter
+ </simpara>
</listitem>
<listitem>
- part
+ <simpara>
+ part
+ </simpara>
</listitem>
<listitem>
- appendix
+ <simpara>
+ appendix
+ </simpara>
</listitem>
<listitem>
- preface
+ <simpara>
+ preface
+ </simpara>
</listitem>
<listitem>
- qandadiv
+ <simpara>
+ qandadiv
+ </simpara>
</listitem>
<listitem>
- qandaset
+ <simpara>
+ qandaset
+ </simpara>
</listitem>
<listitem>
- reference
+ <simpara>
+ reference
+ </simpara>
</listitem>
<listitem>
- set
+ <simpara>
+ set
+ </simpara>
</listitem>
</itemizedlist>
<para>
@@ -1120,13 +1217,19 @@
</para>
<orderedlist>
<listitem>
- One
+ <simpara>
+ One
+ </simpara>
</listitem>
<listitem>
- Two
+ <simpara>
+ Two
+ </simpara>
</listitem>
<listitem>
- Three
+ <simpara>
+ Three
+ </simpara>
</listitem>
</orderedlist>
</section>
@@ -1154,43 +1257,65 @@
</para>
<orderedlist>
<listitem>
- One
- </listitem>
- <listitem>
- Two
- </listitem>
- <listitem>
- Three
- <orderedlist>
- <listitem>
- Three.a
- </listitem>
- <listitem>
- Three.b
- </listitem>
- <listitem>
- Three.c
- </listitem>
- </orderedlist>
- </listitem>
- <listitem>
- Fourth
- <orderedlist>
- <listitem>
- Four.a
- <orderedlist>
- <listitem>
- Four.a.i
- </listitem>
- <listitem>
- Four.a.ii
- </listitem>
- </orderedlist>
- </listitem>
- </orderedlist>
+ <simpara>
+ One
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Two
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three
+ <orderedlist>
+ <listitem>
+ <simpara>
+ Three.a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three.b
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three.c
+ </simpara>
+ </listitem>
+ </orderedlist>
+ </simpara>
+ </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>
</listitem>
<listitem>
- Five
+ <simpara>
+ Five
+ </simpara>
</listitem>
</orderedlist>
</section>
@@ -1211,16 +1336,23 @@
</programlisting>
<orderedlist>
<listitem>
- A short item.
- </listitem>
- <listitem>
- A very long item. A very long item. A very long item. A very long item.
- A very long item. A very long item. A very long item. A very long item.
- A very long item. A very long item. A very long item. A very long item.
- A very long item. A very long item. A very long item.
- </listitem>
- <listitem>
- A short item.
+ <simpara>
+ A short item.
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ A very long item. A very long item. A very long item. A very long
+ item. A very long item. A very long item. A very long item. A very
+ long item. A very long item. A very long item. A very long item.
+ A very long item. A very long item. A very long item. A very long
+ item.
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ A short item.
+ </simpara>
</listitem>
</orderedlist>
</section>
@@ -1236,13 +1368,19 @@
</para>
<itemizedlist>
<listitem>
- First
+ <simpara>
+ First
+ </simpara>
</listitem>
<listitem>
- Second
+ <simpara>
+ Second
+ </simpara>
</listitem>
<listitem>
- Third
+ <simpara>
+ Third
+ </simpara>
</listitem>
</itemizedlist>
</section>
@@ -1265,27 +1403,41 @@
</para>
<orderedlist>
<listitem>
- One
- </listitem>
- <listitem>
- Two
- </listitem>
- <listitem>
- Three
- <itemizedlist>
- <listitem>
- Three.a
- </listitem>
- <listitem>
- Three.b
- </listitem>
- <listitem>
- Three.c
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- Four
+ <simpara>
+ One
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Two
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ Three.a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three.b
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Three.c
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ Four
+ </simpara>
</listitem>
</orderedlist>
<para>
@@ -1310,50 +1462,74 @@
</para>
<orderedlist>
<listitem>
- 1
- <itemizedlist>
- <listitem>
- 1.a
- <orderedlist>
- <listitem>
- 1.a.1
- </listitem>
- <listitem>
- 1.a.2
- </listitem>
- </orderedlist>
- </listitem>
- <listitem>
- 1.b
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- 2
- <itemizedlist>
- <listitem>
- 2.a
- </listitem>
- <listitem>
- 2.b
- <orderedlist>
- <listitem>
- 2.b.1
- </listitem>
- <listitem>
- 2.b.2
- <itemizedlist>
+ <simpara>
+ 1
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ 1.a
+ <orderedlist>
<listitem>
- 2.b.2.a
+ <simpara>
+ 1.a.1
+ </simpara>
</listitem>
<listitem>
- 2.b.2.b
+ <simpara>
+ 1.a.2
+ </simpara>
</listitem>
- </itemizedlist>
- </listitem>
- </orderedlist>
- </listitem>
- </itemizedlist>
+ </orderedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 1.b
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 2
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ 2.a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 2.b
+ <orderedlist>
+ <listitem>
+ <simpara>
+ 2.b.1
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 2.b.2
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ 2.b.2.a
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ 2.b.2.b
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ </orderedlist>
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
</listitem>
</orderedlist>
</section>
@@ -1476,9 +1652,7 @@
</programlisting>
<blockquote>
<para>
- <para>
- Indents the paragraph. This applies to one paragraph only.
- </para>
+ Indents the paragraph. This applies to one paragraph only.
</para>
</blockquote>
</section>
@@ -1810,12 +1984,16 @@
</para>
<itemizedlist>
<listitem>
- An initial alphabetic character or the underscore, followed by zero or
- more alphanumeric characters or the underscore. This is similar to your
- typical C/C++ identifier.
+ <simpara>
+ An initial alphabetic character or the underscore, followed by zero
+ or more alphanumeric characters or the underscore. This is similar
+ to your typical C/C++ identifier.
+ </simpara>
</listitem>
<listitem>
- A single character punctuation (a non-alphanumeric printable character)
+ <simpara>
+ A single character punctuation (a non-alphanumeric printable character)
+ </simpara>
</listitem>
</itemizedlist>
<anchor id="quickbook.syntax.block.templates.formal_template_arguments"/>
@@ -1938,16 +2116,20 @@
</para>
<itemizedlist>
<listitem>
- The explicit <link linkend="quickbook.syntax.block.templates.template_expansion">template
- expansion syntax</link>. This is an advantage because, now, we don't
- have to use obscure naming conventions like double underscores (e.g.
- __alpha__) to avoid unwanted macro replacement.
+ <simpara>
+ The explicit <link linkend="quickbook.syntax.block.templates.template_expansion">template
+ expansion syntax</link>. This is an advantage because, now, we don't
+ have to use obscure naming conventions like double underscores (e.g.
+ __alpha__) to avoid unwanted macro replacement.
+ </simpara>
</listitem>
<listitem>
- The template is expanded at the point where it is invoked. A macro is
- expanded immediately at its point of declaration. This is subtle and
- can cause a slight difference in behavior especially if you refer to
- other macros and templates in the body.
+ <simpara>
+ The template is expanded at the point where it is invoked. A macro
+ is expanded immediately at its point of declaration. This is subtle
+ and can cause a slight difference in behavior especially if you refer
+ to other macros and templates in the body.
+ </simpara>
</listitem>
</itemizedlist>
<para>
@@ -2011,12 +2193,16 @@
</para>
<itemizedlist>
<listitem>
- Break the last argument into two, at the first space found (<literal>'',
- '\n', \t' or '\r'</literal>).
+ <simpara>
+ Break the last argument into two, at the first space found (<literal>'',
+ '\n', \t' or '\r'</literal>).
+ </simpara>
</listitem>
<listitem>
- Repeat until there are enough arguments or if there are no more spaces
- found (in which case, an error is reported).
+ <simpara>
+ Repeat until there are enough arguments or if there are no more spaces
+ found (in which case, an error is reported).
+ </simpara>
</listitem>
</itemizedlist>
<para>
@@ -2434,11 +2620,15 @@
</para>
<itemizedlist>
<listitem>
- The __FILENAME__ predefined macro will reflect the name of the file currently being
- processed.
+ <simpara>
+ The __FILENAME__ predefined macro will reflect the name of the file currently being
+ processed.
+ </simpara>
</listitem>
<listitem>
- Any macros defined in the included file are scoped to that file.
+ <simpara>
+ Any macros defined in the included file are scoped to that file.
+ </simpara>
</listitem>
</itemizedlist>
<para>
@@ -2514,10 +2704,14 @@
</para>
<itemizedlist>
<listitem>
- lists
+ <simpara>
+ lists
+ </simpara>
</listitem>
<listitem>
- etc.
+ <simpara>
+ etc.
+ </simpara>
</listitem>
</itemizedlist>
<para>
@@ -2612,9 +2806,9 @@
<para>
<para>
-<programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">string</phrase> <phrase role="identifier">foo_bar</phrase><phrase role="special">()</phrase> <phrase role="callout_bug"><co id="quickbook0co" linkends="quickbook0" /></phrase>
+<programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">string</phrase> <phrase role="identifier">foo_bar</phrase><phrase role="special">()</phrase> <co id="quickbook0co" linkends="quickbook0" />
<phrase role="special">{</phrase>
- <phrase role="keyword">return</phrase> <phrase role="string">"foo-bar"</phrase><phrase role="special">;</phrase> <phrase role="callout_bug"><co id="quickbook1co" linkends="quickbook1" /></phrase>
+ <phrase role="keyword">return</phrase> <phrase role="string">"foo-bar"</phrase><phrase role="special">;</phrase> <co id="quickbook1co" linkends="quickbook1" />
<phrase role="special">}</phrase>
</programlisting>
</para>
@@ -2659,9 +2853,7 @@
</para>
<blockquote>
<para>
- <para>
- <emphasis>Section contributed by Julio M. Merino Vidal</emphasis>
- </para>
+ <emphasis>Section contributed by Julio M. Merino Vidal</emphasis>
</para>
</blockquote>
<para>
@@ -2672,67 +2864,80 @@
</para>
<orderedlist>
<listitem>
- First of all you need to have a copy of <code><phrase role="identifier">xsltproc</phrase></code>
- for Windows. There are many ways to get this tool, but to keep things simple,
- use the <ulink url="http://www.zlatkovic.com/pub/libxml/">binary packages</ulink>
- made by Igor Zlatkovic. At the very least, you need to download the following
- packages: <code><phrase role="identifier">iconv</phrase></code>, <code><phrase
- role="identifier">zlib</phrase></code>, <code><phrase role="identifier">libxml2</phrase></code>
- and <code><phrase role="identifier">libxslt</phrase></code>.
+ <simpara>
+ First of all you need to have a copy of <code><phrase role="identifier">xsltproc</phrase></code>
+ for Windows. There are many ways to get this tool, but to keep things
+ simple, use the <ulink url="http://www.zlatkovic.com/pub/libxml/">binary
+ packages</ulink> made by Igor Zlatkovic. At the very least, you need
+ to download the following packages: <code><phrase role="identifier">iconv</phrase></code>,
+ <code><phrase role="identifier">zlib</phrase></code>, <code><phrase role="identifier">libxml2</phrase></code>
+ and <code><phrase role="identifier">libxslt</phrase></code>.
+ </simpara>
</listitem>
<listitem>
- Unpack all these packages in the same directory so that you get unique
- <code><phrase role="identifier">bin</phrase></code>, <code><phrase role="identifier">include</phrase></code>
- and <code><phrase role="identifier">lib</phrase></code> directories within
- the hierarchy. These instructions use <code><phrase role="identifier">C</phrase><phrase
- role="special">:\</phrase><phrase role="identifier">Users</phrase><phrase
- role="special">\</phrase><phrase role="identifier">example</phrase><phrase
- role="special">\</phrase><phrase role="identifier">Documents</phrase><phrase
- role="special">\</phrase><phrase role="identifier">boost</phrase><phrase
- role="special">\</phrase><phrase role="identifier">xml</phrase></code>
- as the root for all files.
+ <simpara>
+ Unpack all these packages in the same directory so that you get unique
+ <code><phrase role="identifier">bin</phrase></code>, <code><phrase role="identifier">include</phrase></code>
+ and <code><phrase role="identifier">lib</phrase></code> directories within
+ the hierarchy. These instructions use <code><phrase role="identifier">C</phrase><phrase
+ role="special">:\</phrase><phrase role="identifier">Users</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">example</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">Documents</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">boost</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">xml</phrase></code>
+ as the root for all files.
+ </simpara>
</listitem>
<listitem>
- From the command line, go to the <code><phrase role="identifier">bin</phrase></code>
- directory and launch <code><phrase role="identifier">xsltproc</phrase><phrase
- role="special">.</phrase><phrase role="identifier">exe</phrase></code>
- to ensure it works. You should get usage information on screen.
+ <simpara>
+ From the command line, go to the <code><phrase role="identifier">bin</phrase></code>
+ directory and launch <code><phrase role="identifier">xsltproc</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">exe</phrase></code>
+ to ensure it works. You should get usage information on screen.
+ </simpara>
</listitem>
<listitem>
- Download <ulink url="http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip">Docbook
- XML 4.2</ulink> and unpack it in the same directory used above. That is:
- <code><phrase role="identifier">C</phrase><phrase role="special">:\</phrase><phrase
- role="identifier">Users</phrase><phrase role="special">\</phrase><phrase
- role="identifier">example</phrase><phrase role="special">\</phrase><phrase
- role="identifier">Documents</phrase><phrase role="special">\</phrase><phrase
- role="identifier">boost</phrase><phrase role="special">\</phrase><phrase
- role="identifier">xml</phrase><phrase role="special">\</phrase><phrase
- role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase
- role="identifier">xml</phrase></code>.
+ <simpara>
+ Download <ulink url="http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip">Docbook
+ XML 4.2</ulink> and unpack it in the same directory used above. That
+ is: <code><phrase role="identifier">C</phrase><phrase role="special">:\</phrase><phrase
+ role="identifier">Users</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">example</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">Documents</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">boost</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">xml</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase
+ role="identifier">xml</phrase></code>.
+ </simpara>
</listitem>
<listitem>
- Download the latest <ulink url="http://sourceforge.net/project/showfiles.php?group_id=21935&package_id=16608">Docbook
- XSL</ulink> version and unpack it, again in the same directory used before.
- To make things easier, rename the directory created during the extraction
- to <code><phrase role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase
- role="identifier">xsl</phrase></code> (bypassing the version name): <code><phrase
- role="identifier">C</phrase><phrase role="special">:\</phrase><phrase role="identifier">Users</phrase><phrase
- role="special">\</phrase><phrase role="identifier">example</phrase><phrase
- role="special">\</phrase><phrase role="identifier">Documents</phrase><phrase
- role="special">\</phrase><phrase role="identifier">boost</phrase><phrase
- role="special">\</phrase><phrase role="identifier">xml</phrase><phrase
- role="special">\</phrase><phrase role="identifier">docbook</phrase><phrase
- role="special">-</phrase><phrase role="identifier">xsl</phrase></code>.
+ <simpara>
+ Download the latest <ulink url="http://sourceforge.net/project/showfiles.php?group_id=21935&package_id=16608">Docbook
+ XSL</ulink> version and unpack it, again in the same directory used before.
+ To make things easier, rename the directory created during the extraction
+ to <code><phrase role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase
+ role="identifier">xsl</phrase></code> (bypassing the version name):
+ <code><phrase role="identifier">C</phrase><phrase role="special">:\</phrase><phrase
+ role="identifier">Users</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">example</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">Documents</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">boost</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">xml</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase
+ role="identifier">xsl</phrase></code>.
+ </simpara>
</listitem>
<listitem>
- Add the following to your <code><phrase role="identifier">user</phrase><phrase
- role="special">-</phrase><phrase role="identifier">config</phrase><phrase
- role="special">.</phrase><phrase role="identifier">jam</phrase></code>
- file, which should live in your home directory (<code><phrase role="special">%</phrase><phrase
- role="identifier">HOMEDRIVE</phrase><phrase role="special">%%</phrase><phrase
- role="identifier">HOMEPATH</phrase><phrase role="special">%</phrase></code>).
- You must already have it somewhere or otherwise you could not be building
- Boost (i.e. missing tools configuration).
+ <simpara>
+ Add the following to your <code><phrase role="identifier">user</phrase><phrase
+ role="special">-</phrase><phrase role="identifier">config</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">jam</phrase></code>
+ file, which should live in your home directory (<code><phrase role="special">%</phrase><phrase
+ role="identifier">HOMEDRIVE</phrase><phrase role="special">%%</phrase><phrase
+ role="identifier">HOMEPATH</phrase><phrase role="special">%</phrase></code>).
+ You must already have it somewhere or otherwise you could not be building
+ Boost (i.e. missing tools configuration).
+ </simpara>
</listitem>
</orderedlist>
@@ -2751,34 +2956,42 @@
</para>
<orderedlist>
<listitem>
- Go to Quickbook's source directory (<code><phrase role="identifier">BOOST_ROOT</phrase><phrase
- role="special">\</phrase><phrase role="identifier">tools</phrase><phrase
- role="special">\</phrase><phrase role="identifier">quickbook</phrase></code>).
+ <simpara>
+ Go to Quickbook's source directory (<code><phrase role="identifier">BOOST_ROOT</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">tools</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">quickbook</phrase></code>).
+ </simpara>
</listitem>
<listitem>
- Build the utility by issuing <code><phrase role="identifier">bjam</phrase>
- <phrase role="special">--</phrase><phrase role="identifier">v2</phrase></code>.
+ <simpara>
+ Build the utility by issuing <code><phrase role="identifier">bjam</phrase>
+ <phrase role="special">--</phrase><phrase role="identifier">v2</phrase></code>.
+ </simpara>
</listitem>
<listitem>
- Copy the resulting <code><phrase role="identifier">quickbook</phrase><phrase
- role="special">.</phrase><phrase role="identifier">exe</phrase></code>
- binary (located under the <code><phrase role="identifier">BOOST_ROOT</phrase><phrase
- role="special">\</phrase><phrase role="identifier">bin</phrase><phrase
- role="special">.</phrase><phrase role="identifier">v2</phrase></code> hierarchy)
- to a safe place. Following our previous example, you can install it into:
- <code><phrase role="identifier">C</phrase><phrase role="special">:\</phrase><phrase
- role="identifier">Users</phrase><phrase role="special">\</phrase><phrase
- role="identifier">example</phrase><phrase role="special">\</phrase><phrase
- role="identifier">Documents</phrase><phrase role="special">\</phrase><phrase
- role="identifier">boost</phrase><phrase role="special">\</phrase><phrase
- role="identifier">xml</phrase><phrase role="special">\</phrase><phrase
- role="identifier">bin</phrase></code>.
+ <simpara>
+ Copy the resulting <code><phrase role="identifier">quickbook</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">exe</phrase></code>
+ binary (located under the <code><phrase role="identifier">BOOST_ROOT</phrase><phrase
+ role="special">\</phrase><phrase role="identifier">bin</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">v2</phrase></code>
+ hierarchy) to a safe place. Following our previous example, you can install
+ it into: <code><phrase role="identifier">C</phrase><phrase role="special">:\</phrase><phrase
+ role="identifier">Users</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">example</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">Documents</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">boost</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">xml</phrase><phrase role="special">\</phrase><phrase
+ role="identifier">bin</phrase></code>.
+ </simpara>
</listitem>
<listitem>
- Add the following to your <code><phrase role="identifier">user</phrase><phrase
- role="special">-</phrase><phrase role="identifier">config</phrase><phrase
- role="special">.</phrase><phrase role="identifier">jam</phrase></code>
- file:
+ <simpara>
+ Add the following to your <code><phrase role="identifier">user</phrase><phrase
+ role="special">-</phrase><phrase role="identifier">config</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">jam</phrase></code>
+ file:
+ </simpara>
</listitem>
</orderedlist>
@@ -2838,29 +3051,37 @@
</para>
<orderedlist>
<listitem>
- Go to Quickbook's source directory (<code><phrase role="identifier">BOOST_ROOT</phrase><phrase
- role="special">/</phrase><phrase role="identifier">tools</phrase><phrase
- role="special">/</phrase><phrase role="identifier">quickbook</phrase></code>).
+ <simpara>
+ Go to Quickbook's source directory (<code><phrase role="identifier">BOOST_ROOT</phrase><phrase
+ role="special">/</phrase><phrase role="identifier">tools</phrase><phrase
+ role="special">/</phrase><phrase role="identifier">quickbook</phrase></code>).
+ </simpara>
</listitem>
<listitem>
- Build the utility by issuing <code><phrase role="identifier">bjam</phrase>
- <phrase role="special">--</phrase><phrase role="identifier">v2</phrase></code>.
+ <simpara>
+ Build the utility by issuing <code><phrase role="identifier">bjam</phrase>
+ <phrase role="special">--</phrase><phrase role="identifier">v2</phrase></code>.
+ </simpara>
</listitem>
<listitem>
- Copy the resulting <code><phrase role="identifier">quickbook</phrase></code>
- binary (located under the <code><phrase role="identifier">BOOST_ROOT</phrase><phrase
- role="special">/</phrase><phrase role="identifier">bin</phrase><phrase
- role="special">.</phrase><phrase role="identifier">v2</phrase></code> hierarchy)
- to a safe place. The traditional location is <code><phrase role="special">/</phrase><phrase
- role="identifier">usr</phrase><phrase role="special">/</phrase><phrase
- role="identifier">local</phrase><phrase role="special">/</phrase><phrase
- role="identifier">bin</phrase></code>.
+ <simpara>
+ Copy the resulting <code><phrase role="identifier">quickbook</phrase></code>
+ binary (located under the <code><phrase role="identifier">BOOST_ROOT</phrase><phrase
+ role="special">/</phrase><phrase role="identifier">bin</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">v2</phrase></code>
+ hierarchy) to a safe place. The traditional location is <code><phrase
+ role="special">/</phrase><phrase role="identifier">usr</phrase><phrase
+ role="special">/</phrase><phrase role="identifier">local</phrase><phrase
+ role="special">/</phrase><phrase role="identifier">bin</phrase></code>.
+ </simpara>
</listitem>
<listitem>
- Add the following to your <code><phrase role="identifier">user</phrase><phrase
- role="special">-</phrase><phrase role="identifier">config</phrase><phrase
- role="special">.</phrase><phrase role="identifier">jam</phrase></code>
- file, using the full path of the quickbook executable:
+ <simpara>
+ Add the following to your <code><phrase role="identifier">user</phrase><phrase
+ role="special">-</phrase><phrase role="identifier">config</phrase><phrase
+ role="special">.</phrase><phrase role="identifier">jam</phrase></code>
+ file, using the full path of the quickbook executable:
+ </simpara>
</listitem>
</orderedlist>
@@ -2892,9 +3113,7 @@
<title><link linkend="quickbook.editors.scite"> Scintilla Text Editor</link></title>
<blockquote>
<para>
- <para>
- <emphasis>Section contributed by Dean Michael Berris</emphasis>
- </para>
+ <emphasis>Section contributed by Dean Michael Berris</emphasis>
</para>
</blockquote>
<para>
@@ -2950,9 +3169,7 @@
</para>
<blockquote>
<para>
- <para>
- <emphasis>Faq contributed by Michael Marcin</emphasis>
- </para>
+ <emphasis>Faq contributed by Michael Marcin</emphasis>
</para>
</blockquote>
<para>
Modified: branches/quickbook-1.5-spirit2/test/section_1_4.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/section_1_4.gold (original)
+++ branches/quickbook-1.5-spirit2/test/section_1_4.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="section_id_1_4" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Section Id 1.4</title>
Modified: branches/quickbook-1.5-spirit2/test/section_1_5.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/section_1_5.gold (original)
+++ branches/quickbook-1.5-spirit2/test/section_1_5.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="section_id_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Section Id 1.5</title>
Modified: branches/quickbook-1.5-spirit2/test/simple_markup.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/simple_markup.gold (original)
+++ branches/quickbook-1.5-spirit2/test/simple_markup.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="simple_markup_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Simple Markup Test</title>
Modified: branches/quickbook-1.5-spirit2/test/table_1_5.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/table_1_5.gold (original)
+++ branches/quickbook-1.5-spirit2/test/table_1_5.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="table_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Table 1.5</title>
<articleinfo>
Modified: branches/quickbook-1.5-spirit2/test/template-section.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/template-section.gold (original)
+++ branches/quickbook-1.5-spirit2/test/template-section.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="section_in_a_template" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Section in a template</title>
Modified: branches/quickbook-1.5-spirit2/test/templates.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/templates.gold (original)
+++ branches/quickbook-1.5-spirit2/test/templates.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="templates" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Templates</title>
<articleinfo>
Modified: branches/quickbook-1.5-spirit2/test/templates_1_4.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/templates_1_4.gold (original)
+++ branches/quickbook-1.5-spirit2/test/templates_1_4.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="template_1_4" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Template 1.4</title>
Modified: branches/quickbook-1.5-spirit2/test/templates_1_5.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/templates_1_5.gold (original)
+++ branches/quickbook-1.5-spirit2/test/templates_1_5.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="template_1_5" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Template 1.5</title>
Modified: branches/quickbook-1.5-spirit2/test/unicode-escape.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/unicode-escape.gold (original)
+++ branches/quickbook-1.5-spirit2/test/unicode-escape.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="utf_8_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>UTF-8 test</title>
<articleinfo>
@@ -10,76 +10,124 @@
</bridgehead>
<itemizedlist>
<listitem>
- Αα Alpha
+ <simpara>
+ Αα Alpha
+ </simpara>
</listitem>
<listitem>
- Ββ Beta
+ <simpara>
+ Ββ Beta
+ </simpara>
</listitem>
<listitem>
- Γγ Gamma
+ <simpara>
+ Γγ Gamma
+ </simpara>
</listitem>
<listitem>
- Δδ Delta
+ <simpara>
+ Δδ Delta
+ </simpara>
</listitem>
<listitem>
- Εε Epsilon
+ <simpara>
+ Εε Epsilon
+ </simpara>
</listitem>
<listitem>
- Ζζ Zeta
+ <simpara>
+ Ζζ Zeta
+ </simpara>
</listitem>
<listitem>
- Ηη Eta
+ <simpara>
+ Ηη Eta
+ </simpara>
</listitem>
<listitem>
- Θθ Theta
+ <simpara>
+ Θθ Theta
+ </simpara>
</listitem>
<listitem>
- Ιι Iota
+ <simpara>
+ Ιι Iota
+ </simpara>
</listitem>
<listitem>
- Κκ Kappa
+ <simpara>
+ Κκ Kappa
+ </simpara>
</listitem>
<listitem>
- Λλ Lambda
+ <simpara>
+ Λλ Lambda
+ </simpara>
</listitem>
<listitem>
- Μμ Mu
+ <simpara>
+ Μμ Mu
+ </simpara>
</listitem>
<listitem>
- Νν Nu
+ <simpara>
+ Νν Nu
+ </simpara>
</listitem>
<listitem>
- Ξξ Xi
+ <simpara>
+ Ξξ Xi
+ </simpara>
</listitem>
<listitem>
- Οο Omicron
+ <simpara>
+ Οο Omicron
+ </simpara>
</listitem>
<listitem>
- Ππ Pi
+ <simpara>
+ Ππ Pi
+ </simpara>
</listitem>
<listitem>
- Ρρ Rho
+ <simpara>
+ Ρρ Rho
+ </simpara>
</listitem>
<listitem>
- Σσς Sigma
+ <simpara>
+ Σσς Sigma
+ </simpara>
</listitem>
<listitem>
- Ττ Tau
+ <simpara>
+ Ττ Tau
+ </simpara>
</listitem>
<listitem>
- Υυ Upsilon
+ <simpara>
+ Υυ Upsilon
+ </simpara>
</listitem>
<listitem>
- Φφ Phi
+ <simpara>
+ Φφ Phi
+ </simpara>
</listitem>
<listitem>
- Χχ Chi
+ <simpara>
+ Χχ Chi
+ </simpara>
</listitem>
<listitem>
- Ψψ Psi
+ <simpara>
+ Ψψ Psi
+ </simpara>
</listitem>
<listitem>
- Ωω Omega
+ <simpara>
+ Ωω Omega
+ </simpara>
</listitem>
</itemizedlist>
<para>
@@ -87,16 +135,24 @@
</para>
<itemizedlist>
<listitem>
- 🀀 East Wind
+ <simpara>
+ 🀀 East Wind
+ </simpara>
</listitem>
<listitem>
- 🀁 South Wind
+ <simpara>
+ 🀁 South Wind
+ </simpara>
</listitem>
<listitem>
- 🀂 West Wind
+ <simpara>
+ 🀂 West Wind
+ </simpara>
</listitem>
<listitem>
- 🀃 North Wind
+ <simpara>
+ 🀃 North Wind
+ </simpara>
</listitem>
</itemizedlist>
</article>
Modified: branches/quickbook-1.5-spirit2/test/utf-8-bom.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/utf-8-bom.gold (original)
+++ branches/quickbook-1.5-spirit2/test/utf-8-bom.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="utf_8_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>UTF-8 test</title>
<articleinfo>
@@ -10,76 +10,124 @@
</bridgehead>
<itemizedlist>
<listitem>
- Αα Alpha
+ <simpara>
+ Αα Alpha
+ </simpara>
</listitem>
<listitem>
- Ββ Beta
+ <simpara>
+ Ββ Beta
+ </simpara>
</listitem>
<listitem>
- Γγ Gamma
+ <simpara>
+ Γγ Gamma
+ </simpara>
</listitem>
<listitem>
- Δδ Delta
+ <simpara>
+ Δδ Delta
+ </simpara>
</listitem>
<listitem>
- Εε Epsilon
+ <simpara>
+ Εε Epsilon
+ </simpara>
</listitem>
<listitem>
- Ζζ Zeta
+ <simpara>
+ Ζζ Zeta
+ </simpara>
</listitem>
<listitem>
- Ηη Eta
+ <simpara>
+ Ηη Eta
+ </simpara>
</listitem>
<listitem>
- Θθ Theta
+ <simpara>
+ Θθ Theta
+ </simpara>
</listitem>
<listitem>
- Ιι Iota
+ <simpara>
+ Ιι Iota
+ </simpara>
</listitem>
<listitem>
- Κκ Kappa
+ <simpara>
+ Κκ Kappa
+ </simpara>
</listitem>
<listitem>
- Λλ Lambda
+ <simpara>
+ Λλ Lambda
+ </simpara>
</listitem>
<listitem>
- Μμ Mu
+ <simpara>
+ Μμ Mu
+ </simpara>
</listitem>
<listitem>
- Îν Nu
+ <simpara>
+ Îν Nu
+ </simpara>
</listitem>
<listitem>
- Ξξ Xi
+ <simpara>
+ Ξξ Xi
+ </simpara>
</listitem>
<listitem>
- Οο Omicron
+ <simpara>
+ Οο Omicron
+ </simpara>
</listitem>
<listitem>
- Ππ Pi
+ <simpara>
+ Ππ Pi
+ </simpara>
</listitem>
<listitem>
- Î¡Ï Rho
+ <simpara>
+ Î¡Ï Rho
+ </simpara>
</listitem>
<listitem>
- Σσς Sigma
+ <simpara>
+ Σσς Sigma
+ </simpara>
</listitem>
<listitem>
- Ττ Tau
+ <simpara>
+ Ττ Tau
+ </simpara>
</listitem>
<listitem>
- Υυ Upsilon
+ <simpara>
+ Υυ Upsilon
+ </simpara>
</listitem>
<listitem>
- Φφ Phi
+ <simpara>
+ Φφ Phi
+ </simpara>
</listitem>
<listitem>
- Χχ Chi
+ <simpara>
+ Χχ Chi
+ </simpara>
</listitem>
<listitem>
- Ψψ Psi
+ <simpara>
+ Ψψ Psi
+ </simpara>
</listitem>
<listitem>
- Ωω Omega
+ <simpara>
+ Ωω Omega
+ </simpara>
</listitem>
</itemizedlist>
</article>
Modified: branches/quickbook-1.5-spirit2/test/utf-8.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/utf-8.gold (original)
+++ branches/quickbook-1.5-spirit2/test/utf-8.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="utf_8_test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>UTF-8 test</title>
<articleinfo>
@@ -10,76 +10,124 @@
</bridgehead>
<itemizedlist>
<listitem>
- Αα Alpha
+ <simpara>
+ Αα Alpha
+ </simpara>
</listitem>
<listitem>
- Ββ Beta
+ <simpara>
+ Ββ Beta
+ </simpara>
</listitem>
<listitem>
- Γγ Gamma
+ <simpara>
+ Γγ Gamma
+ </simpara>
</listitem>
<listitem>
- Δδ Delta
+ <simpara>
+ Δδ Delta
+ </simpara>
</listitem>
<listitem>
- Εε Epsilon
+ <simpara>
+ Εε Epsilon
+ </simpara>
</listitem>
<listitem>
- Ζζ Zeta
+ <simpara>
+ Ζζ Zeta
+ </simpara>
</listitem>
<listitem>
- Ηη Eta
+ <simpara>
+ Ηη Eta
+ </simpara>
</listitem>
<listitem>
- Θθ Theta
+ <simpara>
+ Θθ Theta
+ </simpara>
</listitem>
<listitem>
- Ιι Iota
+ <simpara>
+ Ιι Iota
+ </simpara>
</listitem>
<listitem>
- Κκ Kappa
+ <simpara>
+ Κκ Kappa
+ </simpara>
</listitem>
<listitem>
- Λλ Lambda
+ <simpara>
+ Λλ Lambda
+ </simpara>
</listitem>
<listitem>
- Μμ Mu
+ <simpara>
+ Μμ Mu
+ </simpara>
</listitem>
<listitem>
- Îν Nu
+ <simpara>
+ Îν Nu
+ </simpara>
</listitem>
<listitem>
- Ξξ Xi
+ <simpara>
+ Ξξ Xi
+ </simpara>
</listitem>
<listitem>
- Οο Omicron
+ <simpara>
+ Οο Omicron
+ </simpara>
</listitem>
<listitem>
- Ππ Pi
+ <simpara>
+ Ππ Pi
+ </simpara>
</listitem>
<listitem>
- Î¡Ï Rho
+ <simpara>
+ Î¡Ï Rho
+ </simpara>
</listitem>
<listitem>
- Σσς Sigma
+ <simpara>
+ Σσς Sigma
+ </simpara>
</listitem>
<listitem>
- Ττ Tau
+ <simpara>
+ Ττ Tau
+ </simpara>
</listitem>
<listitem>
- Υυ Upsilon
+ <simpara>
+ Υυ Upsilon
+ </simpara>
</listitem>
<listitem>
- Φφ Phi
+ <simpara>
+ Φφ Phi
+ </simpara>
</listitem>
<listitem>
- Χχ Chi
+ <simpara>
+ Χχ Chi
+ </simpara>
</listitem>
<listitem>
- Ψψ Psi
+ <simpara>
+ Ψψ Psi
+ </simpara>
</listitem>
<listitem>
- Ωω Omega
+ <simpara>
+ Ωω Omega
+ </simpara>
</listitem>
</itemizedlist>
</article>
Modified: branches/quickbook-1.5-spirit2/test/xinclude.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/xinclude.gold (original)
+++ branches/quickbook-1.5-spirit2/test/xinclude.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="include" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Include</title>
<articleinfo>
Modified: branches/quickbook-1.5-spirit2/test/xml-escape_1_2.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/xml-escape_1_2.gold (original)
+++ branches/quickbook-1.5-spirit2/test/xml-escape_1_2.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,28 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="test_that______are_being_escaped_" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+<library id="test_that______are_being_escaped_" name="Test that &, < are being escaped."
+dirname="test_that______are_being_escaped_" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Test that &, < are being escaped.</title>
- <articleinfo>
- <articlepurpose>
+ <libraryinfo>
+ <librarypurpose>
& should be &amp;, < should &lt;
- </articlepurpose>
- </articleinfo>
+ </librarypurpose>
+ </libraryinfo>
+ <title>Test that &, < are being escaped.</title>
<section id="test_that______are_being_escaped_.escapes___explicitly_written_markup">
<title>Escapes & explicitly written markup</title>
<itemizedlist>
<listitem>
- & -> &amp;
+ <simpara>
+ & -> &amp;
+ </simpara>
</listitem>
<listitem>
- < -> &lt;
+ <simpara>
+ < -> &lt;
+ </simpara>
</listitem>
<listitem>
- > -> &gt;
+ <simpara>
+ > -> &gt;
+ </simpara>
</listitem>
<listitem>
- " -> &quot;
+ <simpara>
+ " -> &quot;
+ </simpara>
</listitem>
</itemizedlist>
</section>
-</article>
+</library>
Modified: branches/quickbook-1.5-spirit2/test/xml-escape_1_2.quickbook
==============================================================================
--- branches/quickbook-1.5-spirit2/test/xml-escape_1_2.quickbook (original)
+++ branches/quickbook-1.5-spirit2/test/xml-escape_1_2.quickbook 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,4 +1,4 @@
-[article Test that &, < are being escaped.
+[library Test that &, < are being escaped.
[quickbook 1.2]
[purpose & should be &, < should <]
]
Modified: branches/quickbook-1.5-spirit2/test/xml-escape_1_5.gold
==============================================================================
--- branches/quickbook-1.5-spirit2/test/xml-escape_1_5.gold (original)
+++ branches/quickbook-1.5-spirit2/test/xml-escape_1_5.gold 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,29 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="test_that______are_being_escaped_" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+<library id="test_that______are_being_escaped_" name="Test that &, < are being escaped."
+dirname="test_that______are_being_escaped_" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Test that &, < are being escaped.</title>
- <articleinfo>
- <articlepurpose>
+ <libraryinfo>
+ <librarypurpose>
& should be &amp;, < should &lt;
- </articlepurpose>
- </articleinfo>
+ </librarypurpose>
+ </libraryinfo>
+ <title>Test that &, < are being escaped.</title>
<section id="test_that______are_being_escaped_.escapes___explicitly_written_markup">
<title><link linkend="test_that______are_being_escaped_.escapes___explicitly_written_markup">Escapes
& explicitly written markup</link></title>
<itemizedlist>
<listitem>
- & -> &amp;
+ <simpara>
+ & -> &amp;
+ </simpara>
</listitem>
<listitem>
- < -> &lt;
+ <simpara>
+ < -> &lt;
+ </simpara>
</listitem>
<listitem>
- > -> &gt;
+ <simpara>
+ > -> &gt;
+ </simpara>
</listitem>
<listitem>
- " -> &quot;
+ <simpara>
+ " -> &quot;
+ </simpara>
</listitem>
</itemizedlist>
</section>
-</article>
+</library>
Modified: branches/quickbook-1.5-spirit2/test/xml-escape_1_5.quickbook
==============================================================================
--- branches/quickbook-1.5-spirit2/test/xml-escape_1_5.quickbook (original)
+++ branches/quickbook-1.5-spirit2/test/xml-escape_1_5.quickbook 2010-06-12 04:29:53 EDT (Sat, 12 Jun 2010)
@@ -1,4 +1,4 @@
-[article Test that &, < are being escaped.
+[library Test that &, < are being escaped.
[quickbook 1.5]
[purpose & should be &, < should <]
]
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