|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r64827 - in trunk/tools/quickbook: . test
From: daniel_james_at_[hidden]
Date: 2010-08-15 12:44:39
Author: danieljames
Date: 2010-08-15 12:44:33 EDT (Sun, 15 Aug 2010)
New Revision: 64827
URL: http://svn.boost.org/trac/boost/changeset/64827
Log:
Trim space after element ids.
Text files modified:
trunk/tools/quickbook/block.hpp | 15 ++++++++-------
trunk/tools/quickbook/test/heading_1_6.gold | 4 ++--
trunk/tools/quickbook/test/include_1_5.gold | 4 ++--
trunk/tools/quickbook/test/include_1_6-2.gold | 4 ++--
trunk/tools/quickbook/test/include_1_6.gold | 4 ++--
trunk/tools/quickbook/test/quickbook-manual.gold | 30 +++++++++++++++---------------
trunk/tools/quickbook/test/section_1_4.gold | 8 ++++----
trunk/tools/quickbook/test/section_1_5.gold | 6 +++---
trunk/tools/quickbook/test/table_1_5.gold | 2 +-
9 files changed, 39 insertions(+), 38 deletions(-)
Modified: trunk/tools/quickbook/block.hpp
==============================================================================
--- trunk/tools/quickbook/block.hpp (original)
+++ trunk/tools/quickbook/block.hpp 2010-08-15 12:44:33 EDT (Sun, 15 Aug 2010)
@@ -159,6 +159,7 @@
"section"
>> hard_space
>> element_id
+ >> space
>> phrase [actions.begin_section]
;
@@ -170,13 +171,13 @@
h1 | h2 | h3 | h4 | h5 | h6 | h
;
- h = "heading" >> hard_space >> element_id_1_6 >> phrase [actions.h];
- h1 = "h1" >> hard_space >> element_id_1_6 >> phrase [actions.h1];
- h2 = "h2" >> hard_space >> element_id_1_6 >> phrase [actions.h2];
- h3 = "h3" >> hard_space >> element_id_1_6 >> phrase [actions.h3];
- h4 = "h4" >> hard_space >> element_id_1_6 >> phrase [actions.h4];
- h5 = "h5" >> hard_space >> element_id_1_6 >> phrase [actions.h5];
- h6 = "h6" >> hard_space >> element_id_1_6 >> phrase [actions.h6];
+ h = "heading" >> hard_space >> element_id_1_6 >> space >> phrase [actions.h];
+ h1 = "h1" >> hard_space >> element_id_1_6 >> space >> phrase [actions.h1];
+ h2 = "h2" >> hard_space >> element_id_1_6 >> space >> phrase [actions.h2];
+ h3 = "h3" >> hard_space >> element_id_1_6 >> space >> phrase [actions.h3];
+ h4 = "h4" >> hard_space >> element_id_1_6 >> space >> phrase [actions.h4];
+ h5 = "h5" >> hard_space >> element_id_1_6 >> space >> phrase [actions.h5];
+ h6 = "h6" >> hard_space >> element_id_1_6 >> space >> phrase [actions.h6];
static const bool true_ = true;
static const bool false_ = false;
Modified: trunk/tools/quickbook/test/heading_1_6.gold
==============================================================================
--- trunk/tools/quickbook/test/heading_1_6.gold (original)
+++ trunk/tools/quickbook/test/heading_1_6.gold 2010-08-15 12:44:33 EDT (Sun, 15 Aug 2010)
@@ -13,14 +13,14 @@
</para>
<anchor id="header.heading_id"/>
<bridgehead renderas="sect2">
- <link linkend="header.heading_id"> Heading with an id</link>
+ <link linkend="header.heading_id">Heading with an id</link>
</bridgehead>
<para>
Paragraph.
</para>
<anchor id="header.heading_id2"/>
<bridgehead renderas="sect3">
- <link linkend="header.heading_id2"> Heading with an id</link>
+ <link linkend="header.heading_id2">Heading with an id</link>
</bridgehead>
<para>
Paragraph.
Modified: trunk/tools/quickbook/test/include_1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/include_1_5.gold (original)
+++ trunk/tools/quickbook/test/include_1_5.gold 2010-08-15 12:44:33 EDT (Sun, 15 Aug 2010)
@@ -6,13 +6,13 @@
<articleinfo>
</articleinfo>
<section id="include_test_sub_document.test">
- <title><link linkend="include_test_sub_document.test"> Test</link></title>
+ <title><link linkend="include_test_sub_document.test">Test</link></title>
<para>
Just testing.
</para>
</section>
<section id="foo.test">
- <title><link linkend="foo.test"> Test</link></title>
+ <title><link linkend="foo.test">Test</link></title>
<para>
Just testing.
</para>
Modified: trunk/tools/quickbook/test/include_1_6-2.gold
==============================================================================
--- trunk/tools/quickbook/test/include_1_6-2.gold (original)
+++ trunk/tools/quickbook/test/include_1_6-2.gold 2010-08-15 12:44:33 EDT (Sun, 15 Aug 2010)
@@ -6,13 +6,13 @@
<articleinfo>
</articleinfo>
<section id="include-test.test">
- <title><link linkend="include-test.test"> Test</link></title>
+ <title><link linkend="include-test.test">Test</link></title>
<para>
Just testing.
</para>
</section>
<section id="foo.test">
- <title><link linkend="foo.test"> Test</link></title>
+ <title><link linkend="foo.test">Test</link></title>
<para>
Just testing.
</para>
Modified: trunk/tools/quickbook/test/include_1_6.gold
==============================================================================
--- trunk/tools/quickbook/test/include_1_6.gold (original)
+++ trunk/tools/quickbook/test/include_1_6.gold 2010-08-15 12:44:33 EDT (Sun, 15 Aug 2010)
@@ -6,13 +6,13 @@
<articleinfo>
</articleinfo>
<section id="include-test.test">
- <title><link linkend="include-test.test"> Test</link></title>
+ <title><link linkend="include-test.test">Test</link></title>
<para>
Just testing.
</para>
</section>
<section id="foo.test">
- <title><link linkend="foo.test"> Test</link></title>
+ <title><link linkend="foo.test">Test</link></title>
<para>
Just testing.
</para>
Modified: trunk/tools/quickbook/test/quickbook-manual.gold
==============================================================================
--- trunk/tools/quickbook/test/quickbook-manual.gold (original)
+++ trunk/tools/quickbook/test/quickbook-manual.gold 2010-08-15 12:44:33 EDT (Sun, 15 Aug 2010)
@@ -26,7 +26,7 @@
</articlepurpose>
</articleinfo>
<section id="quickbook.intro">
- <title><link linkend="quickbook.intro"> Introduction</link></title>
+ <title><link linkend="quickbook.intro">Introduction</link></title>
<blockquote>
<para>
<emphasis role="bold"><emphasis><quote>Why program by hand in five days what
@@ -102,7 +102,7 @@
</itemizedlist>
</section>
<section id="quickbook.change_log">
- <title><link linkend="quickbook.change_log"> Change Log</link></title> <anchor
+ <title><link linkend="quickbook.change_log">Change Log</link></title> <anchor
id="quickbook.change_log.version_1_3"/>
<bridgehead renderas="sect3">
<link linkend="quickbook.change_log.version_1_3">Version 1.3</link>
@@ -279,7 +279,7 @@
</itemizedlist>
</section>
<section id="quickbook.syntax">
- <title><link linkend="quickbook.syntax"> Syntax Summary</link></title>
+ <title><link linkend="quickbook.syntax">Syntax Summary</link></title>
<para>
A QuickBook document is composed of one or more blocks. An example of a block
is the paragraph or a C++ code snippet. Some blocks have special mark-ups.
@@ -311,7 +311,7 @@
</programlisting>
</section>
<section id="quickbook.syntax.phrase">
- <title><link linkend="quickbook.syntax.phrase"> Phrase Level Elements</link></title>
+ <title><link linkend="quickbook.syntax.phrase">Phrase Level Elements</link></title>
<section id="quickbook.syntax.phrase.font_styles">
<title><link linkend="quickbook.syntax.phrase.font_styles">Font Styles</link></title>
@@ -928,7 +928,7 @@
</para>
</section>
<section id="quickbook.syntax.phrase.code_links">
- <title><link linkend="quickbook.syntax.phrase.code_links"> Code Links</link></title>
+ <title><link linkend="quickbook.syntax.phrase.code_links">Code Links</link></title>
<para>
If you want to link to a function, class, member, enum, concept or header
in the reference section, you can use:
@@ -1058,7 +1058,7 @@
</section>
</section>
<section id="quickbook.syntax.block">
- <title><link linkend="quickbook.syntax.block"> Block Level Elements</link></title>
+ <title><link linkend="quickbook.syntax.block">Block Level Elements</link></title>
<section id="quickbook.syntax.block.document">
<title><link linkend="quickbook.syntax.block.document">Document</link></title>
<para>
@@ -1579,8 +1579,8 @@
</programlisting>
</section>
<section id="quickbook.syntax.block.escape_back">
- <title><link linkend="quickbook.syntax.block.escape_back"> Escaping Back
- To QuickBook</link></title>
+ <title><link linkend="quickbook.syntax.block.escape_back">Escaping Back To
+ QuickBook</link></title>
<para>
Inside code, code blocks and inline code, QuickBook does not allow any
markup to avoid conflicts with the target syntax (e.g. c++). In case you
@@ -2814,7 +2814,7 @@
</section>
</section>
<section id="quickbook.install">
- <title><link linkend="quickbook.install"> Installation and configuration</link></title>
+ <title><link linkend="quickbook.install">Installation and configuration</link></title>
<para>
This section provides some guidelines on how to install and configure BoostBook
and Quickbook under several operating systems.
@@ -2828,7 +2828,7 @@
trying again. Otherwise your configuration fixes will not take any effect.
</para>
<section id="quickbook.install.windows">
- <title><link linkend="quickbook.install.windows"> Windows 2000, XP, 2003, Vista</link></title>
+ <title><link linkend="quickbook.install.windows">Windows 2000, XP, 2003, Vista</link></title>
<blockquote>
<para>
<emphasis>Section contributed by Julio M. Merino Vidal</emphasis>
@@ -2979,7 +2979,7 @@
</programlisting>
</section>
<section id="quickbook.install.linux">
- <title><link linkend="quickbook.install.linux"> Debian, Ubuntu</link></title>
+ <title><link linkend="quickbook.install.linux">Debian, Ubuntu</link></title>
<para>
The following instructions apply to Debian and its derivatives. They are
based on a Ubuntu Edgy install but should work on other Debian based systems.
@@ -3070,7 +3070,7 @@
</section>
</section>
<section id="quickbook.editors">
- <title><link linkend="quickbook.editors"> Editor Support</link></title>
+ <title><link linkend="quickbook.editors">Editor Support</link></title>
<para>
Editing quickbook files is usually done with text editors both simple and powerful.
The following sections list the settings for some editors which can help make
@@ -3088,7 +3088,7 @@
</para>
</sidebar>
<section id="quickbook.editors.scite">
- <title><link linkend="quickbook.editors.scite"> Scintilla Text Editor</link></title>
+ <title><link linkend="quickbook.editors.scite">Scintilla Text Editor</link></title>
<blockquote>
<para>
<emphasis>Section contributed by Dean Michael Berris</emphasis>
@@ -3136,7 +3136,7 @@
</section>
</section>
<section id="quickbook.faq">
- <title><link linkend="quickbook.faq"> Frequently Asked Questions</link></title>
+ <title><link linkend="quickbook.faq">Frequently Asked Questions</link></title>
<anchor id="quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_"/>
<bridgehead renderas="sect3">
<link linkend="quickbook.faq.can_i_use_quickbook_for_non_boost_documentation_">Can
@@ -3178,7 +3178,7 @@
</programlisting>
</section>
<section id="quickbook.ref">
- <title><link linkend="quickbook.ref"> Quick Reference</link></title>
+ <title><link linkend="quickbook.ref">Quick Reference</link></title>
<para>
[cpp]
</para>
Modified: trunk/tools/quickbook/test/section_1_4.gold
==============================================================================
--- trunk/tools/quickbook/test/section_1_4.gold (original)
+++ trunk/tools/quickbook/test/section_1_4.gold 2010-08-15 12:44:33 EDT (Sun, 15 Aug 2010)
@@ -6,13 +6,13 @@
<articleinfo>
</articleinfo>
<section id="section_id_1_4.id_test1">
- <title><link linkend="section_id_1_4.id_test1"> Quickbook section id test</link></title>
+ <title><link linkend="section_id_1_4.id_test1">Quickbook section id test</link></title>
</section>
<section id="section_id_1_4.id_test2">
- <title><link linkend="section_id_1_4.id_test2"> Quickbook section id test</link></title>
+ <title><link linkend="section_id_1_4.id_test2">Quickbook section id test</link></title>
</section>
- <section id="section_id_1_4._quickbook_section_no_id_test_1">
- <title><link linkend="section_id_1_4._quickbook_section_no_id_test_1"> Quickbook
+ <section id="section_id_1_4.quickbook_section_no_id_test_1">
+ <title><link linkend="section_id_1_4.quickbook_section_no_id_test_1">Quickbook
section no id test 1</link></title>
</section>
<section id="section_id_1_4.___quickbook_section_no_id_test_2">
Modified: trunk/tools/quickbook/test/section_1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/section_1_5.gold (original)
+++ trunk/tools/quickbook/test/section_1_5.gold 2010-08-15 12:44:33 EDT (Sun, 15 Aug 2010)
@@ -6,13 +6,13 @@
<articleinfo>
</articleinfo>
<section id="section_id_1_5.id_test1">
- <title><link linkend="section_id_1_5.id_test1"> Quickbook section id test</link></title>
+ <title><link linkend="section_id_1_5.id_test1">Quickbook section id test</link></title>
</section>
<section id="section_id_1_5.id_test2">
- <title><link linkend="section_id_1_5.id_test2"> Quickbook section id test</link></title>
+ <title><link linkend="section_id_1_5.id_test2">Quickbook section id test</link></title>
</section>
<section id="section_id_1_5.id_test3">
- <title><link linkend="section_id_1_5.id_test3"> Quickbook section id test</link></title>
+ <title><link linkend="section_id_1_5.id_test3">Quickbook section id test</link></title>
</section>
<section id="section_id_1_5.___quickbook_section_no_id_test">
<title><link linkend="section_id_1_5.___quickbook_section_no_id_test">++ Quickbook
Modified: trunk/tools/quickbook/test/table_1_5.gold
==============================================================================
--- trunk/tools/quickbook/test/table_1_5.gold (original)
+++ trunk/tools/quickbook/test/table_1_5.gold 2010-08-15 12:44:33 EDT (Sun, 15 Aug 2010)
@@ -118,7 +118,7 @@
</tgroup>
</table>
<section id="table_1_5.section1">
- <title><link linkend="table_1_5.section1"> Section 1</link></title>
+ <title><link linkend="table_1_5.section1">Section 1</link></title>
<table frame="all" id="table_1_5.section1.table1">
<title>Table 1</title>
<tgroup cols="1">
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