|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r73239 - in branches/quickbook-dev/tools: . auto_index auto_index/build auto_index/doc auto_index/doc/html auto_index/doc/html/boost_autoindex auto_index/doc/html/boost_autoindex/tut auto_index/doc/html/boost_autoindex/tut/configure auto_index/doc/html/images auto_index/doc/html/index auto_index/include auto_index/src auto_index/test boostbook/xsl build/v2/test build/v2/tools quickbook quickbook/doc quickbook/src quickbook/test quickbook/test/doc-info regression/src release
From: dnljms_at_[hidden]
Date: 2011-07-19 03:35:58
Author: danieljames
Date: 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
New Revision: 73239
URL: http://svn.boost.org/trac/boost/changeset/73239
Log:
Quickbook: Merge from trunk to quickbook-dev.
Added:
branches/quickbook-dev/tools/auto_index/
- copied from r73226, /trunk/tools/auto_index/
branches/quickbook-dev/tools/auto_index/build/
- copied from r73226, /trunk/tools/auto_index/build/
branches/quickbook-dev/tools/auto_index/build/Jamfile.v2
- copied unchanged from r73226, /trunk/tools/auto_index/build/Jamfile.v2
branches/quickbook-dev/tools/auto_index/doc/
- copied from r73226, /trunk/tools/auto_index/doc/
branches/quickbook-dev/tools/auto_index/doc/Jamfile.v2
- copied unchanged from r73226, /trunk/tools/auto_index/doc/Jamfile.v2
branches/quickbook-dev/tools/auto_index/doc/auto_index.qbk
- copied unchanged from r73226, /trunk/tools/auto_index/doc/auto_index.qbk
branches/quickbook-dev/tools/auto_index/doc/autoindex.idx
- copied unchanged from r73226, /trunk/tools/auto_index/doc/autoindex.idx
branches/quickbook-dev/tools/auto_index/doc/html/
- copied from r73226, /trunk/tools/auto_index/doc/html/
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/
- copied from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/comm_ref.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/comm_ref.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/overview.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/overview.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/qbk.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/qbk.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/script_ref.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/script_ref.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut/
- copied from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut/
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut/add_indexes.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut/add_indexes.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut/build.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut/build.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut/build_docs.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut/build_docs.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut/configure/
- copied from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut/configure/
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut/configure.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut/configure.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut/configure/optional.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut/configure/optional.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut/configure/options.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut/configure/options.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut/entries.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut/entries.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut/pis.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut/pis.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut/refine.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut/refine.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/tut/script.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/tut/script.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/workflow.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/workflow.html
branches/quickbook-dev/tools/auto_index/doc/html/boost_autoindex/xml.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boost_autoindex/xml.html
branches/quickbook-dev/tools/auto_index/doc/html/boostbook.css
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/boostbook.css
branches/quickbook-dev/tools/auto_index/doc/html/images/
- copied from r73226, /trunk/tools/auto_index/doc/html/images/
branches/quickbook-dev/tools/auto_index/doc/html/images/blank.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/blank.png
branches/quickbook-dev/tools/auto_index/doc/html/images/caution.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/caution.png
branches/quickbook-dev/tools/auto_index/doc/html/images/caution.svg
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/caution.svg
branches/quickbook-dev/tools/auto_index/doc/html/images/draft.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/draft.png
branches/quickbook-dev/tools/auto_index/doc/html/images/home.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/home.png
branches/quickbook-dev/tools/auto_index/doc/html/images/home.svg
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/home.svg
branches/quickbook-dev/tools/auto_index/doc/html/images/important.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/important.png
branches/quickbook-dev/tools/auto_index/doc/html/images/important.svg
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/important.svg
branches/quickbook-dev/tools/auto_index/doc/html/images/next.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/next.png
branches/quickbook-dev/tools/auto_index/doc/html/images/next.svg
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/next.svg
branches/quickbook-dev/tools/auto_index/doc/html/images/next_disabled.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/next_disabled.png
branches/quickbook-dev/tools/auto_index/doc/html/images/note.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/note.png
branches/quickbook-dev/tools/auto_index/doc/html/images/note.svg
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/note.svg
branches/quickbook-dev/tools/auto_index/doc/html/images/prev.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/prev.png
branches/quickbook-dev/tools/auto_index/doc/html/images/prev.svg
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/prev.svg
branches/quickbook-dev/tools/auto_index/doc/html/images/prev_disabled.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/prev_disabled.png
branches/quickbook-dev/tools/auto_index/doc/html/images/tip.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/tip.png
branches/quickbook-dev/tools/auto_index/doc/html/images/tip.svg
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/tip.svg
branches/quickbook-dev/tools/auto_index/doc/html/images/toc-blank.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/toc-blank.png
branches/quickbook-dev/tools/auto_index/doc/html/images/toc-minus.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/toc-minus.png
branches/quickbook-dev/tools/auto_index/doc/html/images/toc-plus.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/toc-plus.png
branches/quickbook-dev/tools/auto_index/doc/html/images/up.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/up.png
branches/quickbook-dev/tools/auto_index/doc/html/images/up.svg
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/up.svg
branches/quickbook-dev/tools/auto_index/doc/html/images/up_disabled.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/up_disabled.png
branches/quickbook-dev/tools/auto_index/doc/html/images/warning.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/warning.png
branches/quickbook-dev/tools/auto_index/doc/html/images/warning.svg
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/images/warning.svg
branches/quickbook-dev/tools/auto_index/doc/html/index/
- copied from r73226, /trunk/tools/auto_index/doc/html/index/
branches/quickbook-dev/tools/auto_index/doc/html/index.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/index.html
branches/quickbook-dev/tools/auto_index/doc/html/index/s07.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/index/s07.html
branches/quickbook-dev/tools/auto_index/doc/html/index/s08.html
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/index/s08.html
branches/quickbook-dev/tools/auto_index/doc/html/reference.css
- copied unchanged from r73226, /trunk/tools/auto_index/doc/html/reference.css
branches/quickbook-dev/tools/auto_index/doc/students_t_eg_1.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/students_t_eg_1.png
branches/quickbook-dev/tools/auto_index/doc/students_t_eg_2.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/students_t_eg_2.png
branches/quickbook-dev/tools/auto_index/doc/students_t_eg_3.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/students_t_eg_3.png
branches/quickbook-dev/tools/auto_index/doc/students_t_eg_4.png
- copied unchanged from r73226, /trunk/tools/auto_index/doc/students_t_eg_4.png
branches/quickbook-dev/tools/auto_index/include/
- copied from r73226, /trunk/tools/auto_index/include/
branches/quickbook-dev/tools/auto_index/include/auto_index_helpers.qbk
- copied unchanged from r73226, /trunk/tools/auto_index/include/auto_index_helpers.qbk
branches/quickbook-dev/tools/auto_index/index.html
- copied unchanged from r73226, /trunk/tools/auto_index/index.html
branches/quickbook-dev/tools/auto_index/src/
- copied from r73226, /trunk/tools/auto_index/src/
branches/quickbook-dev/tools/auto_index/src/auto_index.cpp
- copied unchanged from r73226, /trunk/tools/auto_index/src/auto_index.cpp
branches/quickbook-dev/tools/auto_index/src/auto_index.hpp
- copied unchanged from r73226, /trunk/tools/auto_index/src/auto_index.hpp
branches/quickbook-dev/tools/auto_index/src/file_scanning.cpp
- copied unchanged from r73226, /trunk/tools/auto_index/src/file_scanning.cpp
branches/quickbook-dev/tools/auto_index/src/index_generator.cpp
- copied unchanged from r73226, /trunk/tools/auto_index/src/index_generator.cpp
branches/quickbook-dev/tools/auto_index/src/tiny_xml.cpp
- copied unchanged from r73226, /trunk/tools/auto_index/src/tiny_xml.cpp
branches/quickbook-dev/tools/auto_index/src/tiny_xml.hpp
- copied unchanged from r73226, /trunk/tools/auto_index/src/tiny_xml.hpp
branches/quickbook-dev/tools/auto_index/test/
- copied from r73226, /trunk/tools/auto_index/test/
branches/quickbook-dev/tools/auto_index/test/Jamfile.v2
- copied unchanged from r73226, /trunk/tools/auto_index/test/Jamfile.v2
branches/quickbook-dev/tools/auto_index/test/index.idx
- copied unchanged from r73226, /trunk/tools/auto_index/test/index.idx
branches/quickbook-dev/tools/auto_index/test/test1.gold
- copied unchanged from r73226, /trunk/tools/auto_index/test/test1.gold
branches/quickbook-dev/tools/auto_index/test/test2.gold
- copied unchanged from r73226, /trunk/tools/auto_index/test/test2.gold
branches/quickbook-dev/tools/auto_index/test/test3.gold
- copied unchanged from r73226, /trunk/tools/auto_index/test/test3.gold
branches/quickbook-dev/tools/auto_index/test/type_traits.docbook
- copied unchanged from r73226, /trunk/tools/auto_index/test/type_traits.docbook
branches/quickbook-dev/tools/build/v2/tools/auto-index.jam
- copied unchanged from r73226, /trunk/tools/build/v2/tools/auto-index.jam
branches/quickbook-dev/tools/release/merge_release_cycle_init.bat
- copied unchanged from r73226, /trunk/tools/release/merge_release_cycle_init.bat
Properties modified:
branches/quickbook-dev/tools/ (props changed)
branches/quickbook-dev/tools/quickbook/ (props changed)
branches/quickbook-dev/tools/regression/src/library_status.cpp (props changed)
Text files modified:
branches/quickbook-dev/tools/boostbook/xsl/html-base.xsl | 4 +++
branches/quickbook-dev/tools/build/v2/test/BoostBuild.py | 4 +-
branches/quickbook-dev/tools/build/v2/test/unit_tests.py | 2
branches/quickbook-dev/tools/build/v2/tools/common.jam | 2
branches/quickbook-dev/tools/build/v2/tools/docutils.jam | 1
branches/quickbook-dev/tools/quickbook/doc/change_log.qbk | 2
branches/quickbook-dev/tools/quickbook/src/actions.cpp | 28 +++++++++++++++++------
branches/quickbook-dev/tools/quickbook/src/actions_class.cpp | 2 +
branches/quickbook-dev/tools/quickbook/src/actions_class.hpp | 2 +
branches/quickbook-dev/tools/quickbook/src/doc_info_actions.cpp | 2
branches/quickbook-dev/tools/quickbook/src/markups.cpp | 1
branches/quickbook-dev/tools/quickbook/test/blocks.gold | 2
branches/quickbook-dev/tools/quickbook/test/doc-info/duplicates-1.1.gold | 2
branches/quickbook-dev/tools/quickbook/test/doc-info/duplicates-1.5.gold | 2
branches/quickbook-dev/tools/quickbook/test/doc-info/source-mode-1.4.gold | 2
branches/quickbook-dev/tools/quickbook/test/doc-info/source-mode-1.5.gold | 2
branches/quickbook-dev/tools/quickbook/test/doc-info/source-mode-1.6.gold | 2
branches/quickbook-dev/tools/quickbook/test/list_test.gold | 2
branches/quickbook-dev/tools/quickbook/test/quickbook-manual.gold | 6 ++--
branches/quickbook-dev/tools/quickbook/test/xml-escape_1_2.gold | 2
branches/quickbook-dev/tools/quickbook/test/xml-escape_1_5.gold | 2
branches/quickbook-dev/tools/regression/src/compiler_status.cpp | 46 ++++++++++++++++++++--------------------
branches/quickbook-dev/tools/regression/src/process_jam_log.cpp | 3 +
23 files changed, 72 insertions(+), 51 deletions(-)
Modified: branches/quickbook-dev/tools/boostbook/xsl/html-base.xsl
==============================================================================
--- branches/quickbook-dev/tools/boostbook/xsl/html-base.xsl (original)
+++ branches/quickbook-dev/tools/boostbook/xsl/html-base.xsl 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -317,4 +317,8 @@
</xsl:choose>
</xsl:template>
+<xsl:template match="itemizedlist[@role = 'index']" mode="class.value">
+ <xsl:value-of select="'index'"/>
+</xsl:template>
+
</xsl:stylesheet>
Modified: branches/quickbook-dev/tools/build/v2/test/BoostBuild.py
==============================================================================
--- branches/quickbook-dev/tools/build/v2/test/BoostBuild.py (original)
+++ branches/quickbook-dev/tools/build/v2/test/BoostBuild.py 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -247,8 +247,8 @@
# Find where jam_src is located. Try for the debug version if it is
# lying around.
- dirs = [os.path.join('../engine/src', jam_build_dir + '.debug'),
- os.path.join('../engine/src', jam_build_dir),
+ dirs = [os.path.join('../engine', jam_build_dir + '.debug'),
+ os.path.join('../engine', jam_build_dir),
]
for d in dirs:
if os.path.exists(d):
Modified: branches/quickbook-dev/tools/build/v2/test/unit_tests.py
==============================================================================
--- branches/quickbook-dev/tools/build/v2/test/unit_tests.py (original)
+++ branches/quickbook-dev/tools/build/v2/test/unit_tests.py 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -8,6 +8,6 @@
t = BoostBuild.Tester(pass_toolset=0)
-t.run_build_system(extra_args="--debug --build-system=test")
+t.run_build_system(extra_args="--debug --build-system=test/test")
t.cleanup()
Modified: branches/quickbook-dev/tools/build/v2/tools/common.jam
==============================================================================
--- branches/quickbook-dev/tools/build/v2/tools/common.jam (original)
+++ branches/quickbook-dev/tools/build/v2/tools/common.jam 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -334,7 +334,7 @@
# first path found. Otherwise, returns an empty string. If 'path-last' is
# specified, PATH is searched after 'additional-paths'.
#
-local rule find-tool ( name : additional-paths * : path-last ? )
+rule find-tool ( name : additional-paths * : path-last ? )
{
local path = [ path.programs-path ] ;
local match = [ path.glob $(path) : $(name) $(name).exe ] ;
Modified: branches/quickbook-dev/tools/build/v2/tools/docutils.jam
==============================================================================
--- branches/quickbook-dev/tools/build/v2/tools/docutils.jam (original)
+++ branches/quickbook-dev/tools/build/v2/tools/docutils.jam 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -56,6 +56,7 @@
.setup = [
common.prepend-path-variable-command PYTHONPATH
: $(.docutils-dir) $(.docutils-dir)/extras ] ;
+ RST2XXX = [ common.find-tool rst2html ] ;
}
}
Modified: branches/quickbook-dev/tools/quickbook/doc/change_log.qbk
==============================================================================
--- branches/quickbook-dev/tools/quickbook/doc/change_log.qbk (original)
+++ branches/quickbook-dev/tools/quickbook/doc/change_log.qbk 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -236,7 +236,7 @@
* Go back to using invalid markup for lists. It generates better html.
* Better anchor placement for lists.
* Pass-thru comments in code snippets.
-* Use relative paths for `__FILENAME__` macro.
+* Use relative paths for '''<code>__FILENAME__</code>''' macro.
* Rewrite xinclude path generator so that it doesn't use deprecated
filesystem functions.
* Allow quickbook escapes inside comments in syntax highlighted code.
Modified: branches/quickbook-dev/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions.cpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/actions.cpp 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -83,6 +83,7 @@
void anchor_action(quickbook::actions&, value);
void link_action(quickbook::actions&, value);
void phrase_action(quickbook::actions&, value);
+ void footnote_action(quickbook::actions&, value);
void raw_phrase_action(quickbook::actions&, value);
void source_mode_action(quickbook::actions&, value);
void do_template_action(quickbook::actions&, value, file_position);
@@ -159,8 +160,9 @@
case phrase_tags::strikethrough:
case phrase_tags::quote:
case phrase_tags::replaceable:
- case phrase_tags::footnote:
return phrase_action(actions, v);
+ case phrase_tags::footnote:
+ return footnote_action(actions, v);
case phrase_tags::escape:
return raw_phrase_action(actions, v);
case source_mode_tags::cpp:
@@ -252,6 +254,21 @@
values.finish();
}
+ void footnote_action(quickbook::actions& actions, value phrase)
+ {
+ write_anchors(actions, actions.phrase);
+
+ value_consumer values = phrase;
+ actions.phrase
+ << "<footnote id=\""
+ << actions.doc_id << ".f"
+ << boost::lexical_cast<std::string>(actions.footnote_id_count++)
+ << "\"><para>"
+ << values.consume().get_boostbook()
+ << "</para></footnote>";
+ values.finish();
+ }
+
void raw_phrase_action(quickbook::actions& actions, value phrase)
{
write_anchors(actions, actions.phrase);
@@ -1132,11 +1149,6 @@
}
}
- namespace detail
- {
- int callout_id = 0;
- }
-
void call_template(quickbook::actions& actions, bool template_escape,
template_symbol const* symbol,
std::vector<template_body> const& args,
@@ -1242,7 +1254,7 @@
for(unsigned int i = 0; i < size; ++i)
{
std::string callout_id = actions.doc_id +
- boost::lexical_cast<std::string>(detail::callout_id + i);
+ boost::lexical_cast<std::string>(actions.callout_id_count + i);
std::string code;
code += "'''";
@@ -1268,7 +1280,7 @@
BOOST_FOREACH(value c, symbol->callouts)
{
std::string callout_id = actions.doc_id +
- boost::lexical_cast<std::string>(detail::callout_id++);
+ boost::lexical_cast<std::string>(actions.callout_id_count++);
std::string callout_value;
{
Modified: branches/quickbook-dev/tools/quickbook/src/actions_class.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions_class.cpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/actions_class.cpp 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -32,6 +32,8 @@
, warned_about_breaks(false)
, context(0)
, conditional(true)
+ , callout_id_count(0)
+ , footnote_id_count(0)
, imported(false)
, doc_type()
Modified: branches/quickbook-dev/tools/quickbook/src/actions_class.hpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions_class.hpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/actions_class.hpp 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -47,6 +47,8 @@
bool warned_about_breaks;
int context;
bool conditional;
+ int callout_id_count;
+ int footnote_id_count;
// state saved for files and templates.
bool imported;
Modified: branches/quickbook-dev/tools/quickbook/src/doc_info_actions.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/doc_info_actions.cpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/doc_info_actions.cpp 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -374,7 +374,7 @@
if (!license.empty())
{
- tmp << " <legalnotice>\n"
+ tmp << " <legalnotice id=\"legal." << actions.doc_id << "\">\n"
<< " <para>\n"
<< " " << doc_info_output(license, 103) << "\n"
<< " </para>\n"
Modified: branches/quickbook-dev/tools/quickbook/src/markups.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/markups.cpp (original)
+++ branches/quickbook-dev/tools/quickbook/src/markups.cpp 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -54,7 +54,6 @@
{ phrase_tags::strikethrough, "<emphasis role=\"strikethrough\">", "</emphasis>" },
{ phrase_tags::quote, "<quote>", "</quote>" },
{ phrase_tags::replaceable, "<replaceable>", "</replaceable>" },
- { phrase_tags::footnote, "<footnote><para>", "</para></footnote>" },
{ phrase_tags::escape, "<!--quickbook-escape-prefix-->", "<!--quickbook-escape-postfix-->" },
{ phrase_tags::break_mark, "<sbr/>\n", 0 }
};
Modified: branches/quickbook-dev/tools/quickbook/test/blocks.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/blocks.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/blocks.gold 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -75,7 +75,7 @@
</bridgehead>
<blockquote>
<para>
- Blockquote containing a footnote<footnote>
+ Blockquote containing a footnote<footnote id="various_blocks.f0">
<para>
Here it is!
</para>
Modified: branches/quickbook-dev/tools/quickbook/test/doc-info/duplicates-1.1.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/doc-info/duplicates-1.1.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/doc-info/duplicates-1.1.gold 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -17,7 +17,7 @@
<copyright>
<year>1963</year> <holder>Jane Doe</holder>
</copyright>
- <legalnotice>
+ <legalnotice id="legal.thing2">
<para>
Public Domain
</para>
Modified: branches/quickbook-dev/tools/quickbook/test/doc-info/duplicates-1.5.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/doc-info/duplicates-1.5.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/doc-info/duplicates-1.5.gold 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -17,7 +17,7 @@
<copyright>
<year>1963</year> <holder>Jane Doe</holder>
</copyright>
- <legalnotice>
+ <legalnotice id="legal.thing2">
<para>
Public Domain
</para>
Modified: branches/quickbook-dev/tools/quickbook/test/doc-info/source-mode-1.4.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/doc-info/source-mode-1.4.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/doc-info/source-mode-1.4.gold 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -3,7 +3,7 @@
<article id="c___test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>C++ test</title>
<articleinfo>
- <legalnotice>
+ <legalnotice id="legal.c___test">
<para>
<code><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase
role="special">(</phrase><phrase role="identifier">x</phrase><phrase role="special">):</phrase>
Modified: branches/quickbook-dev/tools/quickbook/test/doc-info/source-mode-1.5.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/doc-info/source-mode-1.5.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/doc-info/source-mode-1.5.gold 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -3,7 +3,7 @@
<article id="c___test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>C++ test</title>
<articleinfo>
- <legalnotice>
+ <legalnotice id="legal.c___test">
<para>
<code><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase
role="special">(</phrase><phrase role="identifier">x</phrase><phrase role="special">):</phrase>
Modified: branches/quickbook-dev/tools/quickbook/test/doc-info/source-mode-1.6.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/doc-info/source-mode-1.6.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/doc-info/source-mode-1.6.gold 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -3,7 +3,7 @@
<article id="c___test" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>C++ test</title>
<articleinfo>
- <legalnotice>
+ <legalnotice id="legal.c___test">
<para>
<code><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase
role="special">(</phrase><phrase role="identifier">x</phrase><phrase role="special">):</phrase>
Modified: branches/quickbook-dev/tools/quickbook/test/list_test.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/list_test.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/list_test.gold 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -231,7 +231,7 @@
</listitem>
<listitem>
<simpara>
- <footnote>
+ <footnote id="list_test.f0">
<para>
Footnote
</para>
Modified: branches/quickbook-dev/tools/quickbook/test/quickbook-manual.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/quickbook-manual.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/quickbook-manual.gold 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -15,7 +15,7 @@
<year>2002</year> <year>2004</year> <year>2006</year> <holder>Joel de Guzman,
Eric Niebler</holder>
</copyright>
- <legalnotice>
+ <legalnotice id="legal.quickbook">
<para>
Distributed under the Boost Software License, Version 1.0. (See accompanying
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>)
@@ -404,7 +404,7 @@
</para>
<para>
Unlike QuickBook's standard formatting scheme, the rules for simpler alternatives
- are much stricter<footnote>
+ are much stricter<footnote id="quickbook.f0">
<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.
@@ -1030,7 +1030,7 @@
<programlisting><!--quickbook-escape-prefix-->[footnote A sample footnote]
<!--quickbook-escape-postfix--></programlisting>
<para>
- will generate this<footnote>
+ will generate this<footnote id="quickbook.f1">
<para>
A sample footnote
</para>
Modified: branches/quickbook-dev/tools/quickbook/test/xml-escape_1_2.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/xml-escape_1_2.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/xml-escape_1_2.gold 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -4,7 +4,7 @@
dirname="test_that__amp____lt__are_being_escaped_" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<libraryinfo>
- <legalnotice>
+ <legalnotice id="legal.test_that__amp____lt__are_being_escaped_">
<para>
& should be &amp;, < should &lt;
</para>
Modified: branches/quickbook-dev/tools/quickbook/test/xml-escape_1_5.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/xml-escape_1_5.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/xml-escape_1_5.gold 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -4,7 +4,7 @@
dirname="test_that__amp____lt__are_being_escaped_" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
<libraryinfo>
- <legalnotice>
+ <legalnotice id="legal.test_that__amp____lt__are_being_escaped_">
<para>
& should be &amp;, < should &lt;
</para>
Modified: branches/quickbook-dev/tools/regression/src/compiler_status.cpp
==============================================================================
--- branches/quickbook-dev/tools/regression/src/compiler_status.cpp (original)
+++ branches/quickbook-dev/tools/regression/src/compiler_status.cpp 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -1,16 +1,17 @@
// Generate Compiler Status HTML from jam regression test output -----------//
-// Copyright Bryce Lelbach 2011
-// Copyright Beman Dawes 2002-2011.
+// Copyright Beman Dawes 2002.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-// See http://www.boost.org/tools/regression/ for documentation.
+// Distributed under the Boost Software License, Version 1.0.
+// See http://www.boost.org/LICENSE_1_0.txt
// See http://www.boost.org/tools/regression/ for documentation.
/*******************************************************************************
+ Please contact the maintainer, bdawes <at> acm <dot> org, before making
+ any non-trivial changes.
+
This program was designed to work unchanged on all platforms and
configurations. All output which is platform or configuration dependent
is obtained from external sources such as the .xml file from
@@ -197,11 +198,11 @@
if ( !fs::exists( dir_path ) ) return false;
for ( fs::directory_iterator itr( dir_path ); itr != end_itr; ++itr )
if ( fs::is_directory( *itr )
- && itr->path().string() != ignore_dir_named )
+ && itr->path().filename() != ignore_dir_named )
{
if ( find_file( *itr, name, path_found ) ) return true;
}
- else if ( itr->path().string() == name )
+ else if ( itr->path().filename() == name )
{
path_found = *itr;
return true;
@@ -287,16 +288,16 @@
// SunCC creates an internal subdirectory everywhere it writes
// object files. This confuses the target_directory() algorithm.
// This patch ignores the SunCC internal directory. Jens Maurer
- if ( (*itr).path().string() == "SunWS_cache" ) continue;
+ if ( itr->path().filename() == "SunWS_cache" ) continue;
// SGI does something similar for template instantiations. Jens Maurer
- if( (*itr).path().string() == "ii_files" ) continue;
+ if( itr->path().filename() == "ii_files" ) continue;
if ( child.empty() ) child = *itr;
else
{
std::cout << "Warning: only first of two target possibilities will be reported for: \n "
- << root.string() << ": " << child.string()
- << " and " << (*itr).path().string() << "\n";
+ << root.string() << ": " << child.filename()
+ << " and " << itr->path().filename() << "\n";
}
}
}
@@ -368,7 +369,7 @@
std::cerr << "warning: could not find build results for '"
<< relative << "'.\n";
std::cerr << "warning: tried directory "
- << bin_path.parent_path().string() << "\n";
+ << bin_path.string() << "\n";
bin_path = "";
}
}
@@ -745,7 +746,8 @@
{
results.push_back( std::string() );
do_row( *itr,
- itr->path().string().substr( 0, itr->path().string().size()-5 ),
+ itr->path().filename().string().substr( 0,
+ itr->path().filename().string().size()-5 ),
results[results.size()-1] );
}
}
@@ -761,15 +763,15 @@
for (; compiler_itr != end_itr; ++compiler_itr )
{
if ( fs::is_directory( *compiler_itr ) // check just to be sure
- && compiler_itr->path().string() != "test" ) // avoid strange directory (Jamfile bug?)
+ && compiler_itr->path().filename() != "test" ) // avoid strange directory (Jamfile bug?)
{
if ( specific_compiler.size() != 0
- && specific_compiler != compiler_itr->path().string() ) continue;
- toolsets.push_back( compiler_itr->path().string() );
- string desc( compiler_desc( compiler_itr->path().string() ) );
- string vers( version_desc( compiler_itr->path().string() ) );
+ && specific_compiler != compiler_itr->path().filename() ) continue;
+ toolsets.push_back( compiler_itr->path().filename().string() );
+ string desc( compiler_desc( compiler_itr->path().filename().string() ) );
+ string vers( version_desc( compiler_itr->path().filename().string() ) );
report << "<td>"
- << (desc.size() ? desc : compiler_itr->path().string())
+ << (desc.size() ? desc : compiler_itr->path().filename().string())
<< (vers.size() ? (string( "<br>" ) + vers ) : string( "" ))
<< "</td>\n";
error_count.push_back( 0 );
@@ -968,8 +970,6 @@
" status-file and links-file are paths to the output files.\n"
"Must be run from directory containing Jamfile\n"
" options: --compiler name Run for named compiler only\n"
- " --ignore-pass Do not report tests which pass all compilers\n"
- " --no-warn Warnings not reported if test passes\n"
" --locate-root path Path to ALL_LOCATE_TARGET for bjam;\n"
" default boost-root.\n"
" --comment path Path to file containing HTML\n"
@@ -1001,7 +1001,7 @@
jamfile_path = "Jamfile.v2";
else
jamfile_path = "Jamfile";
- jamfile_path = fs::system_complete( jamfile_path );
+ jamfile_path = fs::absolute( jamfile_path, fs::initial_path() );
jamfile.open( jamfile_path );
if ( !jamfile )
{
@@ -1019,7 +1019,7 @@
if ( argc == 4 )
{
fs::path links_path( argv[3] );
- links_name = links_path.string();
+ links_name = links_path.filename().string();
links_file.open( links_path );
if ( !links_file )
{
Modified: branches/quickbook-dev/tools/regression/src/process_jam_log.cpp
==============================================================================
--- branches/quickbook-dev/tools/regression/src/process_jam_log.cpp (original)
+++ branches/quickbook-dev/tools/regression/src/process_jam_log.cpp 2011-07-19 03:35:49 EDT (Tue, 19 Jul 2011)
@@ -798,7 +798,8 @@
// these actions are only used to stop the previous action
else if ( line_start.find( "-Archive" ) != string::npos
- || line_start.find( "MkDir" ) == 0 )
+ || line_start.find( "MkDir" ) == 0
+ || line_start.find( "common.mkdir" ) == 0 )
{
mgr.stop_message( content );
content.clear();
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