Subject: [Boost-commit] svn:boost r74307 - in branches/release/tools/quickbook: . src test
From: dnljms_at_[hidden]
Date: 2011-09-08 03:30:21
Author: danieljames
Date: 2011-09-08 03:30:20 EDT (Thu, 08 Sep 2011)
New Revision: 74307
URL: http://svn.boost.org/trac/boost/changeset/74307
Log:
Quickbook: Merge from trunk.
Added:
branches/release/tools/quickbook/test/heading_1_1.gold
- copied unchanged from r74306, /trunk/tools/quickbook/test/heading_1_1.gold
branches/release/tools/quickbook/test/heading_1_1.quickbook
- copied unchanged from r74306, /trunk/tools/quickbook/test/heading_1_1.quickbook
branches/release/tools/quickbook/test/heading_1_3.gold
- copied unchanged from r74306, /trunk/tools/quickbook/test/heading_1_3.gold
branches/release/tools/quickbook/test/heading_1_3.quickbook
- copied unchanged from r74306, /trunk/tools/quickbook/test/heading_1_3.quickbook
Removed:
branches/release/tools/quickbook/test/heading.gold
branches/release/tools/quickbook/test/heading.quickbook
branches/release/tools/quickbook/test/table_1_3.xml
Properties modified:
branches/release/tools/quickbook/ (props changed)
Text files modified:
branches/release/tools/quickbook/src/id_generator.cpp | 18 ++++++++++++------
branches/release/tools/quickbook/test/Jamfile.v2 | 3 ++-
2 files changed, 14 insertions(+), 7 deletions(-)
Modified: branches/release/tools/quickbook/src/id_generator.cpp
==============================================================================
--- branches/release/tools/quickbook/src/id_generator.cpp (original)
+++ branches/release/tools/quickbook/src/id_generator.cpp 2011-09-08 03:30:20 EDT (Thu, 08 Sep 2011)
@@ -124,7 +124,9 @@
{
std::string result;
- id_data& data = ids.emplace(value, value, category).first->second;
+ id_data& data = ids.emplace(boost::unordered::piecewise_construct,
+ boost::make_tuple(value),
+ boost::make_tuple(value, category)).first->second;
// Doesn't check if explicit ids collide, could probably be a warning.
if (category == explicit_id)
@@ -208,8 +210,10 @@
// Not caring too much about 'category' and 'used', would want to if
// still creating ids.
std::pair<boost::unordered_map<std::string, id_data>::iterator, bool>
- insert = ids.emplace(placeholder->final_id, placeholder->final_id,
- placeholder->category, true);
+ insert = ids.emplace(boost::unordered::piecewise_construct,
+ boost::make_tuple(placeholder->final_id),
+ boost::make_tuple(placeholder->final_id,
+ placeholder->category, true));
if (insert.first->second.generation_data)
{
@@ -256,8 +260,10 @@
placeholder->data->generation_data->parent + name;
std::pair<boost::unordered_map<std::string, id_data>::iterator, bool>
- insert = ids.emplace(placeholder->final_id, placeholder->final_id,
- placeholder->category, true);
+ insert = ids.emplace(boost::unordered::piecewise_construct,
+ boost::make_tuple(placeholder->final_id),
+ boost::make_tuple(placeholder->final_id,
+ placeholder->category, true));
++placeholder->data->generation_data->count;
@@ -390,7 +396,7 @@
it = std::find_first_of(
it + 1, end, tag_end.begin(), tag_end.end());
- while (true) {
+ for (;;) {
while(it != end &&
std::find(whitespace.begin(),
whitespace.end(), *it)
Modified: branches/release/tools/quickbook/test/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/test/Jamfile.v2 (original)
+++ branches/release/tools/quickbook/test/Jamfile.v2 2011-09-08 03:30:20 EDT (Thu, 08 Sep 2011)
@@ -46,7 +46,8 @@
[ quickbook-test include_1_6-2 ]
[ quickbook-test section_1_4 ]
[ quickbook-test section_1_5 ]
- [ quickbook-test heading ]
+ [ quickbook-test heading_1_1 ]
+ [ quickbook-test heading_1_3 ]
[ quickbook-test heading_1_6 ]
[ quickbook-test identifier_1_5 ]
[ quickbook-test identifier_1_6 ]
Deleted: branches/release/tools/quickbook/test/heading.gold
==============================================================================
--- branches/release/tools/quickbook/test/heading.gold 2011-09-08 03:30:20 EDT (Thu, 08 Sep 2011)
+++ (empty file)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="header" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Header</title> <anchor id="header.header_test"/>
- <bridgehead renderas="sect2" id="header.h0">
- <link linkend="header.header_test">Header Test</link>
- </bridgehead>
- <para>
- Testing headers without sections.
- </para>
- <anchor id="header._not_an_id"/>
- <bridgehead renderas="sect2" id="header.h1">
- <link linkend="header._not_an_id">:Not an Id</link>
- </bridgehead>
- <para>
- Paragraph.
- </para>
- <anchor id="header._not_an_id_again"/>
- <bridgehead renderas="sect3" id="header.h2">
- <link linkend="header._not_an_id_again">:Not an Id again</link>
- </bridgehead>
- <para>
- Paragraph.
- </para>
-</article>
Deleted: branches/release/tools/quickbook/test/heading.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/heading.quickbook 2011-09-08 03:30:20 EDT (Thu, 08 Sep 2011)
+++ (empty file)
@@ -1,16 +0,0 @@
-[article Header
- [quickbook 1.5]
- [id header]
-]
-
-[heading Header Test]
-
-Testing headers without sections.
-
-[heading:Not an Id]
-
-Paragraph.
-
-[h3:Not an Id again]
-
-Paragraph.
\ No newline at end of file
Deleted: branches/release/tools/quickbook/test/table_1_3.xml
==============================================================================
--- branches/release/tools/quickbook/test/table_1_3.xml 2011-09-08 03:30:20 EDT (Thu, 08 Sep 2011)
+++ (empty file)
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
-<article id="table_1_3" last-revision="$Date: 2011/07/28 22:16:53 $" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Table 1.3</title>
- <table frame="all">
- <title>Table 2</title>
- <tgroup cols="1">
- <thead>
- <row>
- <entry>
- <para>
- Heading
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- cell
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <informaltable frame="all">
- <tgroup cols="1">
- <thead>
- <row>
- <entry>
- <para>
- Heading
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- cell
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- <table frame="all">
- <title>Title</title>
- <tgroup cols="1">
- <thead>
- <row>
- <entry>
- <para>
- Heading
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- cell
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table frame="all">
- <title>Title</title>
- <tgroup cols="1">
- <thead>
- <row>
- <entry>
- <para>
- Heading
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- cell
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table frame="all">
- <title>Title [/ ] containing a comment</title>
- <tgroup cols="1">
- <thead>
- <row>
- <entry>
- <para>
- Heading
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- cell
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table frame="all">
- <title>Title</title>
- <tgroup cols="1">
- <thead>
- <row>
- <entry>
- <para>
- Heading
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- cell
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table frame="all">
- <title>[[Title]]</title>
- <tgroup cols="1">
- <thead>
- <row>
- <entry>
- <para>
- Heading
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- cell
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <section id="table_1_3.section1">
- <title><link linkend="table_1_3.section1">Section 1</link></title>
- <table frame="all">
- <title>A & B</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>
- <para>
- A
- </para>
- </entry>
- <entry>
- <para>
- B
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- a
- </para>
- </entry>
- <entry>
- <para>
- b
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table frame="all">
- <title>Empty Table</title>
- <tgroup cols="0">
- <tbody>
- </tbody>
- </tgroup>
- </table>
- <table frame="all">
- <title>Table with an empty cell</title>
- <tgroup cols="1">
- <tbody>
- <row>
- <entry>
- <para>
- x
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table frame="all">
- <title>Indentation</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>
- <para>
- Header 1. Paragraph 1
- </para>
- <para>
- Header 1. Paragraph 2
- </para>
- </entry>
- <entry>
- <para>
- Header 2
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- Row 1. Cell 1.
- </para>
- </entry>
- <entry>
- <para>
- Row 1. Cell 2.
- </para>
- <para>
- Row 1. Cell 2. Paragraph 2.
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table frame="all">
- <title>Nested Tables</title>
- <tgroup cols="1">
- <thead>
- <row>
- <entry>
- <para>
- Header 1
- </para>
- </entry>
- <entry>
- <para>
- Header 2
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <table frame="all">
- <title>Inner Table</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>
- <para>
- 1.1
- </para>
- </entry>
- <entry>
- <para>
- 1.2
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- 2.1
- </para>
- </entry>
- <entry>
- <para>
- 2.2
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </entry>
- </row>
- <row>
- <entry>
- <para>
- Something.
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <anchor id="id1"/>
- <table frame="all">
- <title>Table with anchors</title>
- <tgroup cols="1">
- <thead>
- <row>
- <entry>
- <para>
- <anchor id="id2"/>a<anchor id="id3"/>
- </para>
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
- <para>
- b
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
-</article>