|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r63267 - in branches/release/tools/quickbook: . detail doc test
From: daniel_james_at_[hidden]
Date: 2010-06-23 15:33:41
Author: danieljames
Date: 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
New Revision: 63267
URL: http://svn.boost.org/trac/boost/changeset/63267
Log:
Merge quickbook.
Added:
branches/release/tools/quickbook/test/blocks.gold
- copied unchanged from r62478, /trunk/tools/quickbook/test/blocks.gold
branches/release/tools/quickbook/test/blocks.quickbook
- copied unchanged from r62478, /trunk/tools/quickbook/test/blocks.quickbook
branches/release/tools/quickbook/test/cond_phrase.gold
- copied unchanged from r62478, /trunk/tools/quickbook/test/cond_phrase.gold
branches/release/tools/quickbook/test/cond_phrase.quickbook
- copied unchanged from r62478, /trunk/tools/quickbook/test/cond_phrase.quickbook
branches/release/tools/quickbook/test/doc-info-1.gold
- copied unchanged from r62478, /trunk/tools/quickbook/test/doc-info-1.gold
branches/release/tools/quickbook/test/doc-info-1.quickbook
- copied unchanged from r62478, /trunk/tools/quickbook/test/doc-info-1.quickbook
branches/release/tools/quickbook/test/doc-info-2.gold
- copied unchanged from r62478, /trunk/tools/quickbook/test/doc-info-2.gold
branches/release/tools/quickbook/test/doc-info-2.quickbook
- copied unchanged from r62478, /trunk/tools/quickbook/test/doc-info-2.quickbook
branches/release/tools/quickbook/test/list_test.gold
- copied, changed from r62478, /trunk/tools/quickbook/test/list_test.gold
branches/release/tools/quickbook/test/list_test.quickbook
- copied unchanged from r62478, /trunk/tools/quickbook/test/list_test.quickbook
branches/release/tools/quickbook/test/para-test.gold
- copied unchanged from r62724, /trunk/tools/quickbook/test/para-test.gold
branches/release/tools/quickbook/test/para-test.quickbook
- copied unchanged from r62724, /trunk/tools/quickbook/test/para-test.quickbook
Properties modified:
branches/release/tools/quickbook/ (props changed)
Text files modified:
branches/release/tools/quickbook/Jamfile.v2 | 2
branches/release/tools/quickbook/block.hpp | 9
branches/release/tools/quickbook/code_snippet.hpp | 10
branches/release/tools/quickbook/detail/actions.cpp | 109 ++-
branches/release/tools/quickbook/detail/actions_class.cpp | 6
branches/release/tools/quickbook/detail/actions_class.hpp | 2
branches/release/tools/quickbook/detail/input_path.cpp | 79 +++
branches/release/tools/quickbook/detail/markups.cpp | 8
branches/release/tools/quickbook/detail/post_process.cpp | 18
branches/release/tools/quickbook/detail/quickbook.cpp | 6
branches/release/tools/quickbook/detail/utils.cpp | 6
branches/release/tools/quickbook/doc/Jamfile.v2 | 4
branches/release/tools/quickbook/doc/quickbook.qbk | 24
branches/release/tools/quickbook/doc_info.hpp | 5
branches/release/tools/quickbook/test/Jamfile.v2 | 6
branches/release/tools/quickbook/test/callouts.gold | 8
branches/release/tools/quickbook/test/code-block-1.gold | 2
branches/release/tools/quickbook/test/code-block-2.gold | 2
branches/release/tools/quickbook/test/code-block-3.gold | 2
branches/release/tools/quickbook/test/code-block-teletype.gold | 2
branches/release/tools/quickbook/test/code-snippet.gold | 6
branches/release/tools/quickbook/test/code-snippet.quickbook | 2
branches/release/tools/quickbook/test/escape.gold | 2
branches/release/tools/quickbook/test/heading.gold | 2
branches/release/tools/quickbook/test/image_1_5.gold | 2
branches/release/tools/quickbook/test/import.gold | 26
branches/release/tools/quickbook/test/include_1_5.gold | 2
branches/release/tools/quickbook/test/link-side-by-side.gold | 2
branches/release/tools/quickbook/test/list_test.gold | 236 +++++-----
branches/release/tools/quickbook/test/preformatted.gold | 2
branches/release/tools/quickbook/test/quickbook-manual.gold | 913 ++++++++++++++++++++++++---------------
branches/release/tools/quickbook/test/section_1_4.gold | 2
branches/release/tools/quickbook/test/section_1_5.gold | 2
branches/release/tools/quickbook/test/simple_markup.gold | 2
branches/release/tools/quickbook/test/table_1_5.gold | 2
branches/release/tools/quickbook/test/template-section.gold | 2
branches/release/tools/quickbook/test/templates.gold | 2
branches/release/tools/quickbook/test/templates_1_4.gold | 2
branches/release/tools/quickbook/test/templates_1_5.gold | 2
branches/release/tools/quickbook/test/unicode-escape.gold | 114 +++-
branches/release/tools/quickbook/test/utf-8-bom.gold | 98 +++-
branches/release/tools/quickbook/test/utf-8.gold | 98 +++-
branches/release/tools/quickbook/test/xinclude.gold | 2
43 files changed, 1161 insertions(+), 672 deletions(-)
Modified: branches/release/tools/quickbook/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/Jamfile.v2 (original)
+++ branches/release/tools/quickbook/Jamfile.v2 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -30,6 +30,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/release/tools/quickbook/block.hpp
==============================================================================
--- branches/release/tools/quickbook/block.hpp (original)
+++ branches/release/tools/quickbook/block.hpp 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -58,7 +58,7 @@
| code
| list [actions.list]
| hr [actions.hr]
- | comment >> *eol
+ | comment >> +eol
| paragraph [actions.paragraph]
| eol
)
@@ -79,7 +79,8 @@
']' |
if_p(var(no_eols))
[
- eol >> eol // Make sure that we don't go
+ eol >> *blank_p >> eol_p
+ // Make sure that we don't go
] // past a single block, except
; // when preformatted.
@@ -173,7 +174,7 @@
inside_paragraph =
phrase [actions.inside_paragraph]
>> *(
- eol >> eol >> phrase [actions.inside_paragraph]
+ +eol >> phrase [actions.inside_paragraph]
)
;
@@ -408,7 +409,7 @@
;
paragraph_end =
- '[' >> space >> paragraph_end_markups >> hard_space | eol >> eol
+ '[' >> space >> paragraph_end_markups >> hard_space | eol >> *blank_p >> eol_p
;
paragraph =
Modified: branches/release/tools/quickbook/code_snippet.hpp
==============================================================================
--- branches/release/tools/quickbook/code_snippet.hpp (original)
+++ branches/release/tools/quickbook/code_snippet.hpp 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -30,9 +30,7 @@
void pass_thru(iterator first, iterator last);
void escaped_comment(iterator first, iterator last);
void compile(iterator first, iterator last);
- void callout(iterator first, iterator last, char const* role);
- void inline_callout(iterator first, iterator last);
- void line_callout(iterator first, iterator last);
+ void callout(iterator first, iterator last);
std::string code;
std::string snippet;
@@ -109,7 +107,7 @@
rule<Scanner>
start_, snippet, identifier, code_elements, escaped_comment,
- inline_callout, line_callout, ignore;
+ ignore;
rule<Scanner> const&
start() const { return start_; }
@@ -168,13 +166,13 @@
inline_callout =
"/*<"
- >> (*(anychar_p - ">*/")) [boost::bind(&actions_type::inline_callout, &actions, _1, _2)]
+ >> (*(anychar_p - ">*/")) [boost::bind(&actions_type::callout, &actions, _1, _2)]
>> ">*/"
;
line_callout =
"/*<<"
- >> (*(anychar_p - ">>*/")) [boost::bind(&actions_type::line_callout, &actions, _1, _2)]
+ >> (*(anychar_p - ">>*/")) [boost::bind(&actions_type::callout, &actions, _1, _2)]
>> ">>*/"
>> *space_p
;
Modified: branches/release/tools/quickbook/detail/actions.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/actions.cpp (original)
+++ branches/release/tools/quickbook/detail/actions.cpp 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -14,6 +14,7 @@
#include <boost/filesystem/convenience.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string/join.hpp>
#include "./quickbook.hpp"
#include "./actions.hpp"
#include "./utils.hpp"
@@ -171,7 +172,7 @@
list_marks.pop();
out << std::string((mark == '#') ? "\n</orderedlist>" : "\n</itemizedlist>");
if (list_marks.size() >= 1)
- out << std::string("\n</listitem>");
+ out << list_item_post;
}
list_indent = -1; // reset
@@ -211,12 +212,12 @@
{
// Make this new list a child of the previous list.
// The previous listelem has already ended so we erase
- // </listitem> to accomodate this sub-list. We'll close
+ // list_item_post to accomodate this sub-list. We'll close
// the listelem later.
std::string str;
out.swap(str);
- std::string::size_type pos = str.rfind("\n</listitem>");
+ std::string::size_type pos = str.rfind(list_item_post);
BOOST_ASSERT(pos <= str.size());
str.erase(str.begin()+pos, str.end());
out << str;
@@ -235,7 +236,7 @@
list_marks.pop();
out << std::string((mark == '#') ? "\n</orderedlist>" : "\n</itemizedlist>");
if (list_marks.size() >= 1)
- out << std::string("\n</listitem>");
+ out << list_item_post;
}
}
@@ -452,12 +453,12 @@
fs::path const img_path(image_fileref);
attribute_map::iterator it = attributes.find("alt");
- std::string alt_text = it != attributes.end() ? it->second : fs::basename(img_path);
+ std::string alt_text = it != attributes.end() ? it->second : img_path.stem();
attributes.erase("alt");
attributes.insert(attribute_map::value_type("fileref", image_fileref));
- if(fs::extension(img_path) == ".svg")
+ if(img_path.extension() == ".svg")
{
//
// SVG's need special handling:
@@ -754,7 +755,7 @@
else if (!is_block)
{
// do a phrase level parse
- iterator first(body.begin(), body.end(), actions.filename.native_file_string().c_str());
+ iterator first(body.begin(), body.end(), actions.filename.file_string().c_str());
first.set_position(template_pos);
iterator last(body.end(), body.end());
r = boost::spirit::classic::parse(first, last, phrase_p).full;
@@ -769,7 +770,7 @@
body.push_back('\n');
while (iter != body.end() && ((*iter == '\r') || (*iter == '\n')))
++iter; // skip initial newlines
- iterator first(iter, body.end(), actions.filename.native_file_string().c_str());
+ iterator first(iter, body.end(), actions.filename.file_string().c_str());
first.set_position(template_pos);
iterator last(body.end(), body.end());
r = boost::spirit::classic::parse(first, last, block_p).full;
@@ -1111,7 +1112,6 @@
{
std::string::size_type const n =
qualified_section_id.find_last_of('.');
- if(std::string::npos != n);
qualified_section_id.erase(n, std::string::npos);
}
}
@@ -1149,7 +1149,7 @@
if (!path.is_complete())
{
fs::path infile = fs::complete(actions.filename).normalize();
- path = (infile.branch_path() / path).normalize();
+ path = (infile.parent_path() / path).normalize();
fs::path outdir = fs::complete(actions.outdir).normalize();
path = path_difference(outdir, path);
}
@@ -1174,31 +1174,19 @@
int callout_id = 0;
}
- void code_snippet_actions::callout(iterator first, iterator last, char const* role)
+ void code_snippet_actions::callout(iterator first, iterator last)
{
using detail::callout_id;
code += "``'''";
- code += std::string("<phrase role=\"") + role + "\">";
code += "<co id=\"";
code += doc_id + boost::lexical_cast<std::string>(callout_id + callouts.size()) + "co\" ";
code += "linkends=\"";
code += doc_id + boost::lexical_cast<std::string>(callout_id + callouts.size()) + "\" />";
- code += "</phrase>";
code += "'''``";
callouts.push_back(std::string(first, last));
}
- void code_snippet_actions::inline_callout(iterator first, iterator last)
- {
- callout(first, last, "callout_bug");
- }
-
- void code_snippet_actions::line_callout(iterator first, iterator last)
- {
- callout(first, last, "line_callout_bug");
- }
-
void code_snippet_actions::escaped_comment(iterator first, iterator last)
{
if (!code.empty())
@@ -1301,7 +1289,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())
@@ -1315,7 +1303,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))
{
@@ -1330,8 +1318,8 @@
void import_action::operator()(iterator first, iterator last) const
{
- fs::path path = include_search(actions.filename.branch_path(), std::string(first,last));
- std::string ext = fs::extension(path);
+ fs::path path = include_search(actions.filename.parent_path(), std::string(first,last));
+ std::string ext = path.extension();
std::vector<template_symbol> storage;
actions.error_count +=
load_snippets(path.string(), storage, ext, actions.doc_id);
@@ -1355,7 +1343,7 @@
void include_action::operator()(iterator first, iterator last) const
{
- fs::path filein = include_search(actions.filename.branch_path(), std::string(first,last));
+ fs::path filein = include_search(actions.filename.parent_path(), std::string(first,last));
std::string doc_type, doc_id, doc_dirname, doc_last_revision;
// swap the filenames
@@ -1381,10 +1369,10 @@
}
// update the __FILENAME__ macro
- *boost::spirit::classic::find(actions.macro, "__FILENAME__") = actions.filename.native_file_string();
+ *boost::spirit::classic::find(actions.macro, "__FILENAME__") = actions.filename.file_string();
// parse the file
- quickbook::parse(actions.filename.native_file_string().c_str(), actions, true);
+ quickbook::parse(actions.filename.file_string().c_str(), actions, true);
// restore the values
std::swap(actions.filename, filein);
@@ -1470,7 +1458,7 @@
qbk_major_version = 1;
qbk_minor_version = 1;
qbk_version_n = 101;
- 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;
}
@@ -1480,7 +1468,9 @@
}
out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
- << "<!DOCTYPE library PUBLIC \"-//Boost//DTD BoostBook XML V1.0//EN\"\n"
+ << "<!DOCTYPE "
+ << actions.doc_type
+ << " PUBLIC \"-//Boost//DTD BoostBook XML V1.0//EN\"\n"
<< " \"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd\">\n"
<< '<' << actions.doc_type << "\n"
<< " id=\"" << actions.doc_id << "\"\n";
@@ -1534,6 +1524,8 @@
void write_document_info(collector& out, quickbook::actions& actions)
{
+ std::vector<std::string> invalid_attributes;
+
out << " <" << actions.doc_type << "info>\n";
if(!actions.doc_authors.empty())
@@ -1574,25 +1566,56 @@
if (!actions.doc_purpose.empty())
{
- out << " <" << actions.doc_type << "purpose>\n"
- << " " << actions.doc_purpose
- << " </" << actions.doc_type << "purpose>\n"
- << "\n"
- ;
+ if (actions.doc_type == "library")
+ {
+ out << " <" << actions.doc_type << "purpose>\n"
+ << " " << actions.doc_purpose
+ << " </" << actions.doc_type << "purpose>\n"
+ << "\n"
+ ;
+ }
+ else
+ {
+ invalid_attributes.push_back("purpose");
+ }
}
- if (!actions.doc_category.empty())
+ if (!actions.doc_categories.empty())
{
- out << " <" << actions.doc_type << "category name=\"category:"
- << actions.doc_category
- << "\"></" << actions.doc_type << "category>\n"
- << "\n"
- ;
+ if (actions.doc_type == "library")
+ {
+ for(actions::string_list::const_iterator
+ it = actions.doc_categories.begin(),
+ end = actions.doc_categories.end();
+ it != end; ++it)
+ {
+ out << " <" << actions.doc_type << "category name=\"category:"
+ << *it
+ << "\"></" << actions.doc_type << "category>\n"
+ << "\n"
+ ;
+ }
+ }
+ else
+ {
+ invalid_attributes.push_back("category");
+ }
}
out << " </" << actions.doc_type << "info>\n"
<< "\n"
;
+
+ if(!invalid_attributes.empty())
+ {
+ detail::outwarn(actions.filename.file_string(),1)
+ << (invalid_attributes.size() > 1 ?
+ "Invalid attributes" : "Invalid attribute")
+ << " for '" << actions.doc_type << "': "
+ << boost::algorithm::join(invalid_attributes, ", ")
+ << "\n"
+ ;
+ }
}
void phrase_to_string_action::operator()(iterator first, iterator last) const
Modified: branches/release/tools/quickbook/detail/actions_class.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/actions_class.cpp (original)
+++ branches/release/tools/quickbook/detail/actions_class.cpp 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -26,7 +26,7 @@
, doc_dirname()
, doc_copyrights()
, doc_purpose()
- , doc_category()
+ , doc_categories()
, doc_authors()
, doc_license()
, doc_last_revision()
@@ -43,7 +43,7 @@
, list_buffer()
// state
- , filename(fs::complete(fs::path(filein_, fs::native)))
+ , filename(fs::complete(fs::path(filein_)))
, outdir(outdir_)
, macro()
, section_level(0)
@@ -185,7 +185,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/release/tools/quickbook/detail/actions_class.hpp
==============================================================================
--- branches/release/tools/quickbook/detail/actions_class.hpp (original)
+++ branches/release/tools/quickbook/detail/actions_class.hpp 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -40,7 +40,7 @@
std::string doc_dirname;
copyright_list doc_copyrights;
std::string doc_purpose;
- std::string doc_category;
+ string_list doc_categories;
author_list doc_authors;
std::string doc_license;
std::string doc_last_revision;
Modified: branches/release/tools/quickbook/detail/input_path.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/input_path.cpp (original)
+++ branches/release/tools/quickbook/detail/input_path.cpp 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -9,12 +9,30 @@
#include <boost/program_options.hpp>
#include "./input_path.hpp"
-#if defined(__cygwin__) || defined(__CYGWIN__)
+#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
+
#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/release/tools/quickbook/detail/markups.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/markups.cpp (original)
+++ branches/release/tools/quickbook/detail/markups.cpp 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -31,8 +31,8 @@
const char* hr_ = "<para/>";
const char* blurb_pre = "<sidebar role=\"blurb\">\n";
const char* blurb_post = "</sidebar>\n";
- const char* blockquote_pre = "<blockquote><para>";
- const char* blockquote_post = "</para></blockquote>";
+ const char* blockquote_pre = "<blockquote>";
+ const char* blockquote_post = "</blockquote>";
const char* preformatted_pre = "<programlisting>";
const char* preformatted_post = "</programlisting>";
const char* warning_pre = "<warning>";
@@ -45,8 +45,8 @@
const char* note_post = "</note>";
const char* tip_pre = "<tip>";
const char* tip_post = "</tip>";
- const char* list_item_pre = "<listitem>\n";
- const char* list_item_post = "\n</listitem>";
+ const char* list_item_pre = "<listitem><simpara>\n";
+ const char* list_item_post = "\n</simpara></listitem>";
const char* bold_pre_ = "<emphasis role=\"bold\">";
const char* bold_post_ = "</emphasis>";
const char* italic_pre_ = "<emphasis>";
Modified: branches/release/tools/quickbook/detail/post_process.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/post_process.cpp (original)
+++ branches/release/tools/quickbook/detail/post_process.cpp 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -184,7 +184,6 @@
, "caution"
, "copyright"
, "entry"
- , "footnote"
, "important"
, "informaltable"
, "itemizedlist"
@@ -195,6 +194,7 @@
, "para"
, "row"
, "section"
+ , "simpara"
, "table"
, "tbody"
, "textobject"
@@ -266,7 +266,7 @@
{
definition(tidy_grammar const& self)
{
- tag = (lexeme_d[+(alpha_p | '_' | ':')]) [bind(&tidy_grammar::do_tag, &self, _1, _2)];
+ tag = (lexeme_d[+(alpha_p | '_' | ':')]) [boost::bind(&tidy_grammar::do_tag, &self, _1, _2)];
code =
"<programlisting>"
@@ -282,14 +282,14 @@
str_p("<!--quickbook-escape-prefix-->") >>
(*(anychar_p - str_p("<!--quickbook-escape-postfix-->")))
[
- bind(&tidy_grammar::do_escape, &self, _1, _2)
+ boost::bind(&tidy_grammar::do_escape, &self, _1, _2)
]
>> lexeme_d
[
str_p("<!--quickbook-escape-postfix-->") >>
(*space_p)
[
- bind(&tidy_grammar::do_escape_post, &self, _1, _2)
+ boost::bind(&tidy_grammar::do_escape_post, &self, _1, _2)
]
]
;
@@ -306,11 +306,11 @@
markup =
escape
- | code [bind(&tidy_grammar::do_code, &self, _1, _2)]
- | start_end_tag [bind(&tidy_grammar::do_start_end_tag, &self, _1, _2)]
- | start_tag [bind(&tidy_grammar::do_start_tag, &self, _1, _2)]
- | end_tag [bind(&tidy_grammar::do_end_tag, &self, _1, _2)]
- | content [bind(&tidy_grammar::do_content, &self, _1, _2)]
+ | code [boost::bind(&tidy_grammar::do_code, &self, _1, _2)]
+ | start_end_tag [boost::bind(&tidy_grammar::do_start_end_tag, &self, _1, _2)]
+ | start_tag [boost::bind(&tidy_grammar::do_start_tag, &self, _1, _2)]
+ | end_tag [boost::bind(&tidy_grammar::do_end_tag, &self, _1, _2)]
+ | content [boost::bind(&tidy_grammar::do_content, &self, _1, _2)]
;
tidy = +markup;
Modified: branches/release/tools/quickbook/detail/quickbook.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/quickbook.cpp (original)
+++ branches/release/tools/quickbook/detail/quickbook.cpp 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -29,7 +29,7 @@
#pragma warning(disable:4355)
#endif
-#define QUICKBOOK_VERSION "Quickbook Version 1.5.1"
+#define QUICKBOOK_VERSION "Quickbook Version 1.5.2"
namespace quickbook
{
@@ -196,7 +196,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)
@@ -238,7 +238,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/release/tools/quickbook/detail/utils.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/utils.cpp (original)
+++ branches/release/tools/quickbook/detail/utils.cpp 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -211,9 +211,9 @@
{
if(begin == end) return "";
- const char utf8[] = {0xef, 0xbb, 0xbf};
- const char utf32be[] = {0, 0, 0xfe, 0xff};
- const char utf32le[] = {0xff, 0xfe, 0, 0};
+ const char* utf8 = "\xef\xbb\xbf" ;
+ const char* utf32be = "\0\0\xfe\xff";
+ const char* utf32le = "\xff\xfe\0\0";
unsigned char c = *begin;
switch(c)
Modified: branches/release/tools/quickbook/doc/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/doc/Jamfile.v2 (original)
+++ branches/release/tools/quickbook/doc/Jamfile.v2 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -15,15 +15,13 @@
xml quickbook : quickbook.qbk ;
-path-constant images : ../../../doc/html ;
+path-constant images : ../../../doc/src ;
boostbook standalone
:
quickbook
:
<xsl:param>boost.root=../../../..
- <xsl:param>boost.libraries=../../../../libs/libraries.htm
- <xsl:param>html.stylesheet=../../../../doc/html/boostbook.css
<xsl:param>generate.section.toc.level=3
<xsl:param>chunk.section.depth=2
<xsl:param>chunk.first.sections=1
Modified: branches/release/tools/quickbook/doc/quickbook.qbk
==============================================================================
--- branches/release/tools/quickbook/doc/quickbook.qbk (original)
+++ branches/release/tools/quickbook/doc/quickbook.qbk 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -19,10 +19,7 @@
[/ Some links]
-[def __note__ [$images/note.png]]
-[def __alert__ [$images/alert.png]]
-[def __tip__ [$images/tip.png]]
-[def :-) [$images/smiley.png]]
+[def :-) [$../src/images/smiley.png]]
[def __spirit__ [@http://spirit.sourceforge.net Spirit]]
[def __boostbook__ [@http://www.boost.org/doc/html/boostbook.html BoostBook]]
[def __docbook__ [@http://www.docbook.org/ DocBook]]
@@ -192,6 +189,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]
@@ -2074,7 +2084,7 @@
powerful. The following sections list the settings for some editors which can
help make editing quickbook files a bit easier.
-[blurb __note__ You may submit your settings, tips, and suggestions to the
+[note You may submit your settings, tips, and suggestions to the
authors, or through the [@https://lists.sourceforge.net/lists/listinfo/boost-
docs Boost Docs mailing list].]
@@ -2085,7 +2095,7 @@
The Scintilla Text Editor (SciTE) is a free source code editor for Win32 and X.
It uses the SCIntilla source code editing component.
-[blurb __tip__ SciTE can be downloaded from [@http://www.scintilla.org/SciTE.html]]
+[tip SciTE can be downloaded from [@http://www.scintilla.org/SciTE.html]]
You can use the following settings to highlight quickbook tags when
editing quickbook files.
@@ -2104,7 +2114,7 @@
comment.box.end.props=]
''']
-[blurb __note__ Thanks to Rene Rivera for the above SciTE settings.]
+[note Thanks to Rene Rivera for the above SciTE settings.]
[endsect] [/scite]
Modified: branches/release/tools/quickbook/doc_info.hpp
==============================================================================
--- branches/release/tools/quickbook/doc_info.hpp (original)
+++ branches/release/tools/quickbook/doc_info.hpp 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -117,7 +117,7 @@
doc_category =
"category" >> hard_space
- >> (*(anychar_p - ']')) [assign_a(actions.doc_category)]
+ >> (*(anychar_p - ']')) [push_back_a(actions.doc_categories)]
;
doc_author =
@@ -179,8 +179,9 @@
bool unused;
std::pair<std::string, std::string> name;
std::pair<std::vector<std::string>, std::string> copyright;
+ std::string category;
rule<Scanner> doc_info, doc_title, doc_version, doc_id, doc_dirname,
- doc_copyright, doc_purpose,doc_category, doc_authors,
+ doc_copyright, doc_purpose, doc_category, doc_authors,
doc_author, comment, space, hard_space, doc_license,
doc_last_revision, doc_source_mode, phrase, quickbook_version;
phrase_grammar<Actions> common;
Modified: branches/release/tools/quickbook/test/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/test/Jamfile.v2 (original)
+++ branches/release/tools/quickbook/test/Jamfile.v2 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -30,10 +30,16 @@
[ 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 blocks ]
[ quickbook-fail-test fail-include ]
[ quickbook-fail-test fail-import ]
[ quickbook-fail-test fail-template-arguments1 ]
Modified: branches/release/tools/quickbook/test/callouts.gold
==============================================================================
--- branches/release/tools/quickbook/test/callouts.gold (original)
+++ branches/release/tools/quickbook/test/callouts.gold 2010-06-23 15:33:37 EDT (Wed, 23 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> <!--quickbook-escape-prefix--><phrase role="callout_bug"><co id="callout_tests0co" linkends="callout_tests0" /></phrase><!--quickbook-escape-postfix-->
+ <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> <!--quickbook-escape-prefix--><co id="callout_tests0co" linkends="callout_tests0" /><!--quickbook-escape-postfix-->
<phrase role="special">}</phrase>
</programlisting>
@@ -31,7 +31,7 @@
<para>
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
- <!--quickbook-escape-prefix--><phrase role="line_callout_bug"><co id="callout_tests1co" linkends="callout_tests1" /></phrase><!--quickbook-escape-postfix--><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>
+ <!--quickbook-escape-prefix--><co id="callout_tests1co" linkends="callout_tests1" /><!--quickbook-escape-postfix--><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>
@@ -55,7 +55,7 @@
<para>
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
- <!--quickbook-escape-prefix--><phrase role="line_callout_bug"><co id="callout_tests2co" linkends="callout_tests2" /></phrase><!--quickbook-escape-postfix--><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>
+ <!--quickbook-escape-prefix--><co id="callout_tests2co" linkends="callout_tests2" /><!--quickbook-escape-postfix--><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/release/tools/quickbook/test/code-block-1.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-block-1.gold (original)
+++ branches/release/tools/quickbook/test/code-block-1.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/code-block-2.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-block-2.gold (original)
+++ branches/release/tools/quickbook/test/code-block-2.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/code-block-3.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-block-3.gold (original)
+++ branches/release/tools/quickbook/test/code-block-3.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/code-block-teletype.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-block-teletype.gold (original)
+++ branches/release/tools/quickbook/test/code-block-teletype.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/code-snippet.gold
==============================================================================
--- branches/release/tools/quickbook/test/code-snippet.gold (original)
+++ branches/release/tools/quickbook/test/code-snippet.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/code-snippet.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/code-snippet.quickbook (original)
+++ branches/release/tools/quickbook/test/code-snippet.quickbook 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/escape.gold
==============================================================================
--- branches/release/tools/quickbook/test/escape.gold (original)
+++ branches/release/tools/quickbook/test/escape.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/heading.gold
==============================================================================
--- branches/release/tools/quickbook/test/heading.gold (original)
+++ branches/release/tools/quickbook/test/heading.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/image_1_5.gold
==============================================================================
--- branches/release/tools/quickbook/test/image_1_5.gold (original)
+++ branches/release/tools/quickbook/test/image_1_5.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/import.gold
==============================================================================
--- branches/release/tools/quickbook/test/import.gold (original)
+++ branches/release/tools/quickbook/test/import.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/include_1_5.gold
==============================================================================
--- branches/release/tools/quickbook/test/include_1_5.gold (original)
+++ branches/release/tools/quickbook/test/include_1_5.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/link-side-by-side.gold
==============================================================================
--- branches/release/tools/quickbook/test/link-side-by-side.gold (original)
+++ branches/release/tools/quickbook/test/link-side-by-side.gold 2010-06-23 15:33:37 EDT (Wed, 23 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>
Copied: branches/release/tools/quickbook/test/list_test.gold (from r62478, /trunk/tools/quickbook/test/list_test.gold)
==============================================================================
--- /trunk/tools/quickbook/test/list_test.gold (original)
+++ branches/release/tools/quickbook/test/list_test.gold 2010-06-23 15:33:37 EDT (Wed, 23 Jun 2010)
@@ -41,36 +41,36 @@
<listitem>
<simpara>
A
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
</simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- </listitem>
- </itemizedlist>
</listitem>
<listitem>
<simpara>
B
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
</simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- </listitem>
- </itemizedlist>
</listitem>
</itemizedlist>
<para>
@@ -80,36 +80,36 @@
<listitem>
<simpara>
A
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
</simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- </listitem>
- </itemizedlist>
</listitem>
<listitem>
<simpara>
B
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ </simpara>
+ </listitem>
+ </itemizedlist>
</simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- </listitem>
- </itemizedlist>
</listitem>
</orderedlist>
<para>
@@ -119,53 +119,53 @@
<listitem>
<simpara>
A
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ C
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ D
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ E
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ F
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ G
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ H
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </simpara>
+ </listitem>
+ </itemizedlist>
</simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- C
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- D
- </simpara>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <simpara>
- E
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- F
- </simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- G
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- H
- </simpara>
- </listitem>
- </itemizedlist>
- </listitem>
- </itemizedlist>
</listitem>
</orderedlist>
<para>
@@ -175,31 +175,31 @@
<listitem>
<simpara>
A
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ A
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ B
+ <orderedlist>
+ <listitem>
+ <simpara>
+ C
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ D
+ </simpara>
+ </listitem>
+ </orderedlist>
+ </simpara>
+ </listitem>
+ </itemizedlist>
</simpara>
- <itemizedlist>
- <listitem>
- <simpara>
- A
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- B
- </simpara>
- <orderedlist>
- <listitem>
- <simpara>
- C
- </simpara>
- </listitem>
- <listitem>
- <simpara>
- D
- </simpara>
- </listitem>
- </orderedlist>
- </listitem>
- </itemizedlist>
</listitem>
<listitem>
<simpara>
Modified: branches/release/tools/quickbook/test/preformatted.gold
==============================================================================
--- branches/release/tools/quickbook/test/preformatted.gold (original)
+++ branches/release/tools/quickbook/test/preformatted.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/quickbook-manual.gold
==============================================================================
--- branches/release/tools/quickbook/test/quickbook-manual.gold (original)
+++ branches/release/tools/quickbook/test/quickbook-manual.gold 2010-06-23 15:33:37 EDT (Wed, 23 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> <!--quickbook-escape-prefix--><phrase role="callout_bug"><co id="quickbook0co" linkends="quickbook0" /></phrase><!--quickbook-escape-postfix-->
+<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> <!--quickbook-escape-prefix--><co id="quickbook0co" linkends="quickbook0" /><!--quickbook-escape-postfix-->
<phrase role="special">{</phrase>
- <phrase role="keyword">return</phrase> <phrase role="string">"foo-bar"</phrase><phrase role="special">;</phrase> <!--quickbook-escape-prefix--><phrase role="callout_bug"><co id="quickbook1co" linkends="quickbook1" /></phrase><!--quickbook-escape-postfix-->
+ <phrase role="keyword">return</phrase> <phrase role="string">"foo-bar"</phrase><phrase role="special">;</phrase> <!--quickbook-escape-prefix--><co id="quickbook1co" linkends="quickbook1" /><!--quickbook-escape-postfix-->
<phrase role="special">}</phrase>
</programlisting>
</para>
@@ -2650,9 +2844,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>
@@ -2663,67 +2855,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>
@@ -2742,34 +2947,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>
@@ -2829,29 +3042,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>
@@ -2883,9 +3104,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>
@@ -2941,9 +3160,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/release/tools/quickbook/test/section_1_4.gold
==============================================================================
--- branches/release/tools/quickbook/test/section_1_4.gold (original)
+++ branches/release/tools/quickbook/test/section_1_4.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/section_1_5.gold
==============================================================================
--- branches/release/tools/quickbook/test/section_1_5.gold (original)
+++ branches/release/tools/quickbook/test/section_1_5.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/simple_markup.gold
==============================================================================
--- branches/release/tools/quickbook/test/simple_markup.gold (original)
+++ branches/release/tools/quickbook/test/simple_markup.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/table_1_5.gold
==============================================================================
--- branches/release/tools/quickbook/test/table_1_5.gold (original)
+++ branches/release/tools/quickbook/test/table_1_5.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/template-section.gold
==============================================================================
--- branches/release/tools/quickbook/test/template-section.gold (original)
+++ branches/release/tools/quickbook/test/template-section.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/templates.gold
==============================================================================
--- branches/release/tools/quickbook/test/templates.gold (original)
+++ branches/release/tools/quickbook/test/templates.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/templates_1_4.gold
==============================================================================
--- branches/release/tools/quickbook/test/templates_1_4.gold (original)
+++ branches/release/tools/quickbook/test/templates_1_4.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/templates_1_5.gold
==============================================================================
--- branches/release/tools/quickbook/test/templates_1_5.gold (original)
+++ branches/release/tools/quickbook/test/templates_1_5.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/unicode-escape.gold
==============================================================================
--- branches/release/tools/quickbook/test/unicode-escape.gold (original)
+++ branches/release/tools/quickbook/test/unicode-escape.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/utf-8-bom.gold
==============================================================================
--- branches/release/tools/quickbook/test/utf-8-bom.gold (original)
+++ branches/release/tools/quickbook/test/utf-8-bom.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/utf-8.gold
==============================================================================
--- branches/release/tools/quickbook/test/utf-8.gold (original)
+++ branches/release/tools/quickbook/test/utf-8.gold 2010-06-23 15:33:37 EDT (Wed, 23 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/release/tools/quickbook/test/xinclude.gold
==============================================================================
--- branches/release/tools/quickbook/test/xinclude.gold (original)
+++ branches/release/tools/quickbook/test/xinclude.gold 2010-06-23 15:33:37 EDT (Wed, 23 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>
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