|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r74348 - in trunk/tools/quickbook: src test test/doc-info test/snippets
From: dnljms_at_[hidden]
Date: 2011-09-11 12:59:39
Author: danieljames
Date: 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
New Revision: 74348
URL: http://svn.boost.org/trac/boost/changeset/74348
Log:
Quickbook: Clean up whitespace prior to programlisting.
Text files modified:
trunk/tools/quickbook/src/post_process.cpp | 11 +++
trunk/tools/quickbook/test/callouts.gold | 12 ----
trunk/tools/quickbook/test/code-block-1.gold | 1
trunk/tools/quickbook/test/code-block-2.gold | 1
trunk/tools/quickbook/test/code-block-3.gold | 2
trunk/tools/quickbook/test/code-block-cpp.gold | 4 -
trunk/tools/quickbook/test/code-block-python.gold | 2
trunk/tools/quickbook/test/code-block-teletype.gold | 1
trunk/tools/quickbook/test/code-block.gold | 5 -
trunk/tools/quickbook/test/doc-info/source-mode-1.4.gold | 5 -
trunk/tools/quickbook/test/doc-info/source-mode-1.5.gold | 7 --
trunk/tools/quickbook/test/doc-info/source-mode-1.6.gold | 7 --
trunk/tools/quickbook/test/import.gold | 3 -
trunk/tools/quickbook/test/preformatted.gold | 1
trunk/tools/quickbook/test/quickbook-manual.gold | 110 +--------------------------------------
trunk/tools/quickbook/test/snippets/pass_thru.gold | 3 -
trunk/tools/quickbook/test/templates.gold | 3 -
17 files changed, 15 insertions(+), 163 deletions(-)
Modified: trunk/tools/quickbook/src/post_process.cpp
==============================================================================
--- trunk/tools/quickbook/src/post_process.cpp (original)
+++ trunk/tools/quickbook/src/post_process.cpp 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -32,9 +32,14 @@
column = current_indent;
}
- void break_line()
+ void trim_spaces()
{
out.erase(out.find_last_not_of(' ')+1); // trim trailing spaces
+ }
+
+ void break_line()
+ {
+ trim_spaces();
out += '\n';
indent();
}
@@ -338,7 +343,9 @@
void do_code(iter_type f, iter_type l) const
{
- state.out += '\n';
+ state.printer_.trim_spaces();
+ if (state.out[state.out.size() - 1] != '\n')
+ state.out += '\n';
// print the string taking care of line
// ending CR/LF platform issues
for (iter_type i = f; i != l; ++i)
Modified: trunk/tools/quickbook/test/callouts.gold
==============================================================================
--- trunk/tools/quickbook/test/callouts.gold (original)
+++ trunk/tools/quickbook/test/callouts.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -10,7 +10,6 @@
Now we can define a function that simulates an ordinary six-sided die.
</para>
<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> <co id="callout_tests.c0" linkends="callout_tests.c1" />
<phrase role="special">}</phrase>
@@ -28,7 +27,6 @@
Example 2:
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
<co id="callout_tests.c2" linkends="callout_tests.c3" /><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>
@@ -48,7 +46,6 @@
Example 3:
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
<co id="callout_tests.c4" linkends="callout_tests.c5" /><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>
@@ -68,7 +65,6 @@
Example 3 (again!):
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
<co id="callout_tests.c6" linkends="callout_tests.c7" /><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>
@@ -88,7 +84,6 @@
Example 4:
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
<co id="callout_tests.c8" linkends="callout_tests.c9" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special"><</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special"><></phrase> <phrase role="special">></phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
<co id="callout_tests.c10" linkends="callout_tests.c11" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special"><></phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <co id="callout_tests.c12" linkends="callout_tests.c13" />
@@ -114,7 +109,6 @@
</callout>
</calloutlist>
<para>
-
<programlisting><co id="callout_tests.c14" linkends="callout_tests.c15" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special"><></phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <co id="callout_tests.c16" linkends="callout_tests.c17" />
</programlisting>
</para>
@@ -139,7 +133,6 @@
Now we can define a function that simulates an ordinary six-sided die.
</para>
<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> <co id="callout_tests.test_section.c0" linkends="callout_tests.test_section.c1" />
<phrase role="special">}</phrase>
@@ -157,7 +150,6 @@
Example 2:
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
<co id="callout_tests.test_section.c2" linkends="callout_tests.test_section.c3" /><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>
@@ -177,7 +169,6 @@
Example 3:
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
<co id="callout_tests.test_section.c4" linkends="callout_tests.test_section.c5" /><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>
@@ -197,7 +188,6 @@
Example 3 (again!):
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
<co id="callout_tests.test_section.c6" linkends="callout_tests.test_section.c7" /><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>
@@ -217,7 +207,6 @@
Example 4:
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">roll_die</phrase><phrase role="special">()</phrase> <phrase role="special">{</phrase>
<co id="callout_tests.test_section.c8" linkends="callout_tests.test_section.c9" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">variate_generator</phrase><phrase role="special"><</phrase><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">mt19937</phrase><phrase role="special">&,</phrase> <phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special"><></phrase> <phrase role="special">></phrase> <phrase role="identifier">die</phrase><phrase role="special">(</phrase><phrase role="identifier">gen</phrase><phrase role="special">,</phrase> <phrase role="identifier">dist</phrase><phrase role="special">);</phrase>
<co id="callout_tests.test_section.c10" linkends="callout_tests.test_section.c11" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special"><></phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <co id="callout_tests.test_section.c12" linkends="callout_tests.test_section.c13" />
@@ -243,7 +232,6 @@
</callout>
</calloutlist>
<para>
-
<programlisting><co id="callout_tests.test_section.c14" linkends="callout_tests.test_section.c15" /><phrase role="identifier">boost</phrase><phrase role="special">::</phrase><phrase role="identifier">uniform_int</phrase><phrase role="special"><></phrase> <phrase role="identifier">dist</phrase><phrase role="special">(</phrase><phrase role="number">1</phrase><phrase role="special">,</phrase> <phrase role="number">6</phrase><phrase role="special">);</phrase> <co id="callout_tests.test_section.c16" linkends="callout_tests.test_section.c17" />
</programlisting>
</para>
Modified: trunk/tools/quickbook/test/code-block-1.gold
==============================================================================
--- trunk/tools/quickbook/test/code-block-1.gold (original)
+++ trunk/tools/quickbook/test/code-block-1.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -8,7 +8,6 @@
<para>
A code block with proper indentation ;-)
</para>
-
<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special"><</phrase><phrase role="identifier">iostream</phrase><phrase role="special">></phrase>
<phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
Modified: trunk/tools/quickbook/test/code-block-2.gold
==============================================================================
--- trunk/tools/quickbook/test/code-block-2.gold (original)
+++ trunk/tools/quickbook/test/code-block-2.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -9,7 +9,6 @@
A code block with proper indentation ;-)
</para>
<para>
-
<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special"><</phrase><phrase role="identifier">iostream</phrase><phrase role="special">></phrase>
<phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
Modified: trunk/tools/quickbook/test/code-block-3.gold
==============================================================================
--- trunk/tools/quickbook/test/code-block-3.gold (original)
+++ trunk/tools/quickbook/test/code-block-3.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -6,7 +6,6 @@
<section id="code_block_3.python_code_block">
<title>Python code block</title>
<para>
-
<programlisting><phrase role="keyword">print</phrase> <phrase role="string">"\xfabln\xeck"</phrase>
</programlisting>
</para>
@@ -17,7 +16,6 @@
This isn't valid C++ but I think we should accept it;
</para>
<para>
-
<programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">cout</phrase><phrase role="special"><<</phrase><phrase role="string">"\xfabln\xeck"</phrase><phrase role="special"><<</phrase><phrase role="string">"\n"</phrase><phrase role="special">;</phrase>
</programlisting>
</para>
Modified: trunk/tools/quickbook/test/code-block-cpp.gold
==============================================================================
--- trunk/tools/quickbook/test/code-block-cpp.gold (original)
+++ trunk/tools/quickbook/test/code-block-cpp.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -2,7 +2,7 @@
<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="c___code_blocks" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>C++ Code Blocks</title>
+ <title>C++ Code Blocks</title>
<programlisting><phrase role="comment">// No escape</phrase>
<phrase role="comment">/* No escape */</phrase>
<phrase role="comment">/* No escape
@@ -17,13 +17,11 @@
<para>
A badly formed comment:
</para>
-
<programlisting><phrase role="comment">/* Oh dear
</phrase></programlisting>
<para>
A badly formed comment with an escape:
</para>
-
<programlisting><phrase role="comment">/* Oh dear <emphasis role="bold">bold</emphasis>
</phrase></programlisting>
</article>
Modified: trunk/tools/quickbook/test/code-block-python.gold
==============================================================================
--- trunk/tools/quickbook/test/code-block-python.gold (original)
+++ trunk/tools/quickbook/test/code-block-python.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -2,7 +2,7 @@
<!DOCTYPE article PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<article id="python_code_blocks" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>Python Code Blocks</title>
+ <title>Python Code Blocks</title>
<programlisting><phrase role="comment"># No escape</phrase>
<phrase role="comment"># Escape: <emphasis role="bold">bold</emphasis></phrase>
<phrase role="comment"># Escape: <emphasis role="underline">underline</emphasis><emphasis>italic</emphasis></phrase>
Modified: trunk/tools/quickbook/test/code-block-teletype.gold
==============================================================================
--- trunk/tools/quickbook/test/code-block-teletype.gold (original)
+++ trunk/tools/quickbook/test/code-block-teletype.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -5,7 +5,6 @@
<title>Code Block Teletype 1</title>
<section id="code_block_teletype_1.a_code_block">
<title><link linkend="code_block_teletype_1.a_code_block">A code block</link></title>
-
<programlisting>Just some plain text.
With some <emphasis role="bold">quickbook</emphasis> thrown in?
</programlisting>
Modified: trunk/tools/quickbook/test/code-block.gold
==============================================================================
--- trunk/tools/quickbook/test/code-block.gold (original)
+++ trunk/tools/quickbook/test/code-block.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -6,13 +6,11 @@
<para>
In a paragraph. Still in a paragraph.
</para>
-
<programlisting>In a code block.
</programlisting>
<para>
Back in a paragraph.
</para>
-
<programlisting> Code block line 1.
Code block line 2.
Code block line 3.
@@ -20,7 +18,6 @@
<para>
Paragraph.
</para>
-
<programlisting>Code block with no trailing blank lines.
</programlisting>
<para>
@@ -30,10 +27,8 @@
<phrase id="indented_code_blocks.code_blocks_separated_by_comment"/><link linkend="indented_code_blocks.code_blocks_separated_by_comment">Code
blocks separated by comment</link>
</bridgehead>
-
<programlisting>First code block.
</programlisting>
-
<programlisting>Second code block.
[/ Comment in second code block]
Still second code block.
Modified: trunk/tools/quickbook/test/doc-info/source-mode-1.4.gold
==============================================================================
--- trunk/tools/quickbook/test/doc-info/source-mode-1.4.gold (original)
+++ trunk/tools/quickbook/test/doc-info/source-mode-1.4.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -16,23 +16,18 @@
</articlepurpose>
</articleinfo>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
</para>
<para>
-
<programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">():</phrase></programlisting>
</para>
<para>
-
<programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">(</phrase><phrase role="identifier">x</phrase><phrase role="special">):</phrase></programlisting>
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
</para>
</article>
Modified: trunk/tools/quickbook/test/doc-info/source-mode-1.5.gold
==============================================================================
--- trunk/tools/quickbook/test/doc-info/source-mode-1.5.gold (original)
+++ trunk/tools/quickbook/test/doc-info/source-mode-1.5.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -15,31 +15,24 @@
</articlepurpose>
</articleinfo>
<para>
-
<programlisting>This shouldn't be highlighted.</programlisting>
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
</para>
<para>
-
<programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">():</phrase></programlisting>
</para>
<para>
-
<programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">(</phrase><phrase role="identifier">x</phrase><phrase role="special">):</phrase></programlisting>
</para>
<para>
-
<programlisting>This shouldn't be highlighted</programlisting>
</para>
<para>
-
<programlisting>This shouldn't be highlighted.</programlisting>
</para>
</article>
Modified: trunk/tools/quickbook/test/doc-info/source-mode-1.6.gold
==============================================================================
--- trunk/tools/quickbook/test/doc-info/source-mode-1.6.gold (original)
+++ trunk/tools/quickbook/test/doc-info/source-mode-1.6.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -15,31 +15,24 @@
</articlepurpose>
</articleinfo>
<para>
-
<programlisting>This shouldn't be highlighted.</programlisting>
</para>
<para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase></programlisting>
</para>
<para>
-
<programlisting>This shouldn't be highlighted.</programlisting>
</para>
<para>
-
<programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">():</phrase></programlisting>
</para>
<para>
-
<programlisting>This shouldn't be highlighted.</programlisting>
</para>
<para>
-
<programlisting>This shouldn't be highlighted</programlisting>
</para>
<para>
-
<programlisting>This shouldn't be highlighted.</programlisting>
</para>
</article>
Modified: trunk/tools/quickbook/test/import.gold
==============================================================================
--- trunk/tools/quickbook/test/import.gold (original)
+++ trunk/tools/quickbook/test/import.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -24,7 +24,6 @@
And any quickbook block markup.
</para>
<para>
-
<programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">string</phrase> <phrase role="identifier">foo</phrase><phrase role="special">()</phrase>
<phrase role="special">{</phrase>
<phrase role="comment">// return 'em, foo man!</phrase>
@@ -55,7 +54,6 @@
And any quickbook block markup.
</para>
<para>
-
<programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">():</phrase>
<phrase role="comment"># return 'em, foo man!</phrase>
<phrase role="keyword">return</phrase> <phrase role="string">"foo"</phrase>
@@ -84,7 +82,6 @@
And any quickbook block markup.
</para>
<para>
-
<programlisting><phrase role="keyword">char</phrase><phrase role="special">*</phrase> <phrase role="identifier">foo</phrase><phrase role="special">()</phrase>
<phrase role="special">{</phrase>
<phrase role="comment">// return 'em, foo man!</phrase>
Modified: trunk/tools/quickbook/test/preformatted.gold
==============================================================================
--- trunk/tools/quickbook/test/preformatted.gold (original)
+++ trunk/tools/quickbook/test/preformatted.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -8,7 +8,6 @@
<para>
Here's the ubiquitous <emphasis>Hello World</emphasis> program in C++.
</para>
-
<programlisting>#include <iostream>
int main()
Modified: trunk/tools/quickbook/test/quickbook-manual.gold
==============================================================================
--- trunk/tools/quickbook/test/quickbook-manual.gold (original)
+++ trunk/tools/quickbook/test/quickbook-manual.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -300,13 +300,10 @@
<para>
Can be placed anywhere.
</para>
-
<programlisting><!--quickbook-escape-prefix-->[/ comment (no output generated) ]<!--quickbook-escape-postfix-->
</programlisting>
-
<programlisting><!--quickbook-escape-prefix-->[/ comments can be nested [/ some more here] ]<!--quickbook-escape-postfix-->
</programlisting>
-
<programlisting><!--quickbook-escape-prefix-->[/ Quickbook blocks can nest inside comments. [*Comment this out too!] ]<!--quickbook-escape-postfix-->
</programlisting>
</section>
@@ -314,7 +311,6 @@
<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>
-
<programlisting><!--quickbook-escape-prefix-->['italic], [*bold], [_underline], [^teletype], [-strikethrough]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -328,7 +324,6 @@
<para>
Like all non-terminal phrase level elements, this can of course be nested:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[*['bold-italic]]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -344,7 +339,6 @@
When you want content that may or must be replaced by the user, use the
syntax:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[~replacement]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -356,7 +350,6 @@
</section>
<section id="quickbook.syntax.phrase.quotations">
<title><link linkend="quickbook.syntax.phrase.quotations">Quotations</link></title>
-
<programlisting><!--quickbook-escape-prefix-->["A question that sometimes drives me hazy: am I or are the others crazy?]--Einstein
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -374,7 +367,6 @@
<para>
Like all phrase elements, quotations may be nested. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->["Here's the rule for bargains: ["Do other men, for they would do you.] That's
the true business precept.]
<!--quickbook-escape-postfix--></programlisting>
@@ -392,7 +384,6 @@
Simple markup for formatting text, common in many applications, is now
supported:
</para>
-
<programlisting><!--quickbook-escape-prefix-->/italic/, *bold*, _underline_, =teletype=
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -656,7 +647,6 @@
"have" to "full" in the following paragraph will be
rendered as bold:
</para>
-
<programlisting><!--quickbook-escape-prefix-->Baa baa black sheep, *have you any wool?
Yes sir, yes sir, three bags full!*
One for the master, one for the dame,
@@ -670,7 +660,6 @@
<para>
But in the following paragraph, bold is not applied:
</para>
-
<programlisting><!--quickbook-escape-prefix-->Baa baa black sheep, *have you any wool?
Yes sir, yes sir, three bags full!
One for the master, one for the dame,
@@ -688,7 +677,6 @@
Inlining code in paragraphs is quite common when writing C++ documentation.
We provide a very simple markup for this. For example, this:
</para>
-
<programlisting><!--quickbook-escape-prefix-->This text has inlined code `int main() { return 0; }` in it.
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -725,7 +713,6 @@
the double-tick, instead of the single-tick, we are telling QuickBook to
use preformatted blocks of code. Example:
</para>
-
<programlisting>``
#include <iostream>
@@ -740,7 +727,6 @@
will generate:
</para>
<para>
-
<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special"><</phrase><phrase role="identifier">iostream</phrase><phrase role="special">></phrase>
<phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
@@ -765,7 +751,6 @@
where <literal>source-mode</literal> is one of the supported modes. For
example, this:
</para>
-
<programlisting><!--quickbook-escape-prefix-->Python's [python] `import` is rather like C++'s [c++] `#include`. A
C++ comment `// looks like this` whereas a Python comment [python]
`# looks like this`.
@@ -832,7 +817,6 @@
</section>
<section id="quickbook.syntax.phrase.line_break">
<title><link linkend="quickbook.syntax.phrase.line_break">line-break</link></title>
-
<programlisting><!--quickbook-escape-prefix-->[br]
<!--quickbook-escape-postfix--></programlisting>
<warning>
@@ -847,7 +831,6 @@
</section>
<section id="quickbook.syntax.phrase.anchors">
<title><link linkend="quickbook.syntax.phrase.anchors">Anchors</link></title>
-
<programlisting><!--quickbook-escape-prefix-->[#named_anchor]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -861,7 +844,6 @@
</section>
<section id="quickbook.syntax.phrase.links">
<title><link linkend="quickbook.syntax.phrase.links">Links</link></title>
-
<programlisting><!--quickbook-escape-prefix-->[@http://www.boost.org this is [*boost's] website....]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -874,13 +856,11 @@
<para>
URL links where the link text is the link itself is common. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->see http://spirit.sourceforge.net/
<!--quickbook-escape-postfix--></programlisting>
<para>
so, when the text is absent in a link markup, the URL is assumed. Example:
</para>
-
<programlisting>see <!--quickbook-escape-prefix-->[@http://spirit.sourceforge.net/]<!--quickbook-escape-postfix-->
</programlisting>
<para>
@@ -895,7 +875,6 @@
<para>
You can link within a document using:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[link section_id.normalized_header_text The link text]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -909,7 +888,6 @@
<para>
In addition, you can link internally to an XML refentry like:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[link xml.refentry The link text]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -920,7 +898,6 @@
Like URLs, the link text is optional. If this is not present, the link
text will automatically be the refentry. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[link xml.refentry]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -933,7 +910,6 @@
If you want to link to a function, class, member, enum, concept or header
in the reference section, you can use:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[funcref fully::qualified::function_name The link text]
[classref fully::qualified::class_name The link text]
[memberref fully::qualified::member_name The link text]
@@ -947,7 +923,6 @@
will automatically be the function, class, member, enum, macro, concept
or header. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[classref boost::bar::baz]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -959,7 +934,6 @@
<para>
The escape mark-up is used when we don't want to do any processing.
</para>
-
<programlisting>'''
escape (no processing/formatting)
'''
@@ -968,7 +942,6 @@
Escaping allows us to pass XML markup to <ulink url="http://www.boost.org/doc/html/boostbook.html">BoostBook</ulink>
or <ulink url="http://www.docbook.org/">DocBook</ulink>. For example:
</para>
-
<programlisting>'''
<emphasis role="bold">This is direct XML markup</emphasis>
'''
@@ -1014,7 +987,6 @@
</section>
<section id="quickbook.syntax.phrase.images">
<title><link linkend="quickbook.syntax.phrase.images">Images</link></title>
-
<programlisting><!--quickbook-escape-prefix-->[$image.jpg]
<!--quickbook-escape-postfix--></programlisting>
</section>
@@ -1026,7 +998,6 @@
role="special">]</phrase></code> block, and the text will be put at the
bottom of the current page. For example, this:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[footnote A sample footnote]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -1038,7 +1009,7 @@
</para>
<section id="quickbook.syntax.phrase.footnotes.macro_expansion">
<title><link linkend="quickbook.syntax.phrase.footnotes.macro_expansion">Macro
- Expansion</link></title>
+ Expansion</link></title>
<programlisting><!--quickbook-escape-prefix-->__a_macro_identifier__
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -1047,7 +1018,7 @@
</section>
<section id="quickbook.syntax.phrase.footnotes.template_expansion">
<title><link linkend="quickbook.syntax.phrase.footnotes.template_expansion">Template
- Expansion</link></title>
+ Expansion</link></title>
<programlisting><!--quickbook-escape-prefix-->[a_template_identifier]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -1065,7 +1036,6 @@
Every document must begin with a Document Info section, which should look
like this:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[document-type The Document Title
[quickbook 1.3]
[version 1.0]
@@ -1161,7 +1131,6 @@
<para>
Starting a new section is accomplished with:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[section:id The Section Title]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -1176,7 +1145,6 @@
<para>
End a section with:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[endsect]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -1188,7 +1156,6 @@
<para>
You can include another XML file with:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[xinclude file.xml]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -1210,7 +1177,7 @@
<title><link linkend="quickbook.syntax.block.lists">Lists</link></title>
<section id="quickbook.syntax.block.lists.ordered_lists">
<title><link linkend="quickbook.syntax.block.lists.ordered_lists">Ordered
- lists</link></title>
+ lists</link></title>
<programlisting># One
# Two
# Three
@@ -1242,7 +1209,6 @@
<para>
List hierarchies are supported. Example:
</para>
-
<programlisting># One
# Two
# Three
@@ -1328,7 +1294,6 @@
<para>
Long lines will be wrapped appropriately. Example:
</para>
-
<programlisting># A short 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.
@@ -1361,7 +1326,7 @@
</section>
<section id="quickbook.syntax.block.lists.unordered_lists">
<title><link linkend="quickbook.syntax.block.lists.unordered_lists">Unordered
- lists</link></title>
+ lists</link></title>
<programlisting><!--quickbook-escape-prefix-->* First
* Second
* Third
@@ -1392,7 +1357,6 @@
<para>
Mixed lists (ordered and unordered) are supported. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix--># One
# Two
# Three
@@ -1446,7 +1410,6 @@
<para>
And...
</para>
-
<programlisting><!--quickbook-escape-prefix--># 1
* 1.a
# 1.a.1
@@ -1544,7 +1507,6 @@
highlighted according to the current <link linkend="quickbook.syntax.phrase.source_mode">Source
Mode</link>:
</para>
-
<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special"><</phrase><phrase role="identifier">iostream</phrase><phrase role="special">></phrase>
<phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
@@ -1554,7 +1516,6 @@
<phrase role="keyword">return</phrase> <phrase role="number">0</phrase><phrase role="special">;</phrase>
<phrase role="special">}</phrase>
</programlisting>
-
<programlisting><phrase role="keyword">import</phrase> <phrase role="identifier">cgi</phrase>
<phrase role="keyword">def</phrase> <phrase role="identifier">cookForHtml</phrase><phrase role="special">(</phrase><phrase role="identifier">text</phrase><phrase role="special">):</phrase>
@@ -1565,7 +1526,6 @@
<para>
Macros that are already defined are expanded in source code. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[def __array__ [@http://www.boost.org/doc/html/array/reference.html array]]
[def __boost__ [@http://www.boost.org/libs/libraries.htm boost]]
@@ -1574,7 +1534,6 @@
<para>
Generates:
</para>
-
<programlisting><phrase role="keyword">using</phrase> <ulink url="http://www.boost.org/libs/libraries.htm">boost</ulink><phrase role="special">::</phrase><ulink url="http://www.boost.org/doc/html/array/reference.html">array</ulink><phrase role="special">;</phrase>
</programlisting>
</section>
@@ -1589,7 +1548,6 @@
and Python, the delimiter is the double tick (back-quote): "``"
and "``". Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->void ``[@http://en.wikipedia.org/wiki/Foo#Foo.2C_Bar_and_Baz foo]``()
{
}
@@ -1597,7 +1555,6 @@
<para>
Will generate:
</para>
-
<programlisting><phrase role="keyword">void</phrase> <ulink url="http://en.wikipedia.org/wiki/Foo#Foo.2C_Bar_and_Baz">foo</ulink><phrase role="special">()</phrase>
<phrase role="special">{</phrase>
<phrase role="special">}</phrase>
@@ -1613,7 +1570,6 @@
Sometimes, you don't want some preformatted text to be parsed as C++. In
such cases, use the <literal>[pre ... ]</literal> markup block.
</para>
-
<programlisting><!--quickbook-escape-prefix-->[pre
Some *preformatted* text Some *preformatted* text
@@ -1629,7 +1585,6 @@
level markup, pre (and Code) are the only ones that allow multiple newlines.
The markup above will generate:
</para>
-
<programlisting>Some <emphasis role="bold">preformatted</emphasis> text Some <emphasis role="bold">preformatted</emphasis> text
Some <emphasis role="bold">preformatted</emphasis> text Some <emphasis role="bold">preformatted</emphasis> text
@@ -1644,7 +1599,6 @@
</section>
<section id="quickbook.syntax.block.blockquote">
<title><link linkend="quickbook.syntax.block.blockquote">Blockquote</link></title>
-
<programlisting><!--quickbook-escape-prefix-->[:sometext...]<!--quickbook-escape-postfix-->
</programlisting>
<blockquote>
@@ -1655,7 +1609,6 @@
</section>
<section id="quickbook.syntax.block.admonitions">
<title><link linkend="quickbook.syntax.block.admonitions">Admonitions</link></title>
-
<programlisting><!--quickbook-escape-prefix-->[note This is a note]
[tip This is a tip]
[important This is important]
@@ -1698,7 +1651,6 @@
</section>
<section id="quickbook.syntax.block.headings">
<title><link linkend="quickbook.syntax.block.headings">Headings</link></title>
-
<programlisting><!--quickbook-escape-prefix-->[h1 Heading 1]
[h2 Heading 2]
[h3 Heading 3]
@@ -1739,7 +1691,6 @@
For example: Heading 1 in section Section 2 will be normalized to <literal>section_2.heading_1</literal>).
You can use:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[link section_id.normalized_header_text The link text]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -1754,7 +1705,6 @@
In cases when you don't want to care about the heading level (1 to 6),
you can use the <emphasis>Generic Heading</emphasis>:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[heading Heading]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -1767,7 +1717,6 @@
if you do not want to start a new section. In many cases, however, headings
in a particular section is just flat. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[section A]
[h2 X]
[h2 Y]
@@ -1781,7 +1730,6 @@
is rather tedious, however, to scan the section level everytime. If you
rewrite the example above as shown below, this will be automatic:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[section A]
[heading X]
[heading Y]
@@ -1799,7 +1747,6 @@
</section>
<section id="quickbook.syntax.block.macros">
<title><link linkend="quickbook.syntax.block.macros">Macros</link></title>
-
<programlisting><!--quickbook-escape-prefix-->[def macro_identifier some text]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -1809,7 +1756,6 @@
character or the underscore. The replacement text can be any phrase (even
marked up). Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[def sf_logo [$http://sourceforge.net/sflogo.php?group_id=28447&type=1]]
sf_logo
<!--quickbook-escape-postfix--></programlisting>
@@ -1841,7 +1787,6 @@
<para>
Some more examples:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[def :-) [$theme/smiley.png]]
[def __spirit__ [@http://spirit.sourceforge.net Spirit]]
<!--quickbook-escape-postfix--></programlisting>
@@ -1852,7 +1797,6 @@
<para>
Invoking these macros:
</para>
-
<programlisting><!--quickbook-escape-prefix-->Hi __spirit__ :-)
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -1964,7 +1908,6 @@
<para>
Example template:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[template person[name age what]
Hi, my name is [name]. I am [age] years old. I am a [what].
@@ -2022,13 +1965,11 @@
are actually two forms. Templates may be phrase or block level. Phrase
templates are of the form:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[template sample[arg1 arg2...argN] replacement text... ]
<!--quickbook-escape-postfix--></programlisting>
<para>
Block templates are of the form:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[template sample[arg1 arg2...argN]
replacement text...
]
@@ -2047,14 +1988,12 @@
<para>
You expand a template this way:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[template_identifier arg1..arg2..arg3]
<!--quickbook-escape-postfix--></programlisting>
<para>
At template expansion, you supply the actual arguments. The template will
be expanded with your supplied arguments. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[person James Bond..39..Spy]
[person Santa Clause..87..Big Red Fatso]
<!--quickbook-escape-postfix--></programlisting>
@@ -2089,14 +2028,12 @@
<para>
Nullary templates look and act like simple macros. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[template alpha[]'''&#945;''']
[template beta[]'''&#946;''']
<!--quickbook-escape-postfix--></programlisting>
<para>
Expanding:
</para>
-
<programlisting><!--quickbook-escape-prefix-->Some squigles...[*[alpha][beta]]<!--quickbook-escape-postfix--></programlisting>
<para>
We have:
@@ -2130,14 +2067,12 @@
indicates no arguments. If the template body does not look like a template
argument list, we can elide the empty brackets. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[template aristotle_quote Aristotle: [*['Education is the best provision
for the journey to old age.]]]
<!--quickbook-escape-postfix--></programlisting>
<para>
Expanding:
</para>
-
<programlisting><!--quickbook-escape-prefix-->Here's a quote from [aristotle_quote].
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -2155,13 +2090,11 @@
use the space escape: "<code><phrase role="special">\</phrase> </code>".
Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[template tag\ _tag]
<!--quickbook-escape-postfix--></programlisting>
<para>
Then expanding:
</para>
-
<programlisting><!--quickbook-escape-prefix-->`struct` x[tag];
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -2200,7 +2133,6 @@
<para>
For example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[template simple[a b c d] [a][b][c][d]]
[simple w x y z]
<!--quickbook-escape-postfix--></programlisting>
@@ -2220,7 +2152,6 @@
<para>
QuickBook only tries to get the arguments it needs. For example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[simple w x y z trail]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -2239,7 +2170,6 @@
separators. It is possible to combine <literal>".."</literal>
separators with the argument passing simplification presented above. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[simple what do you think ..m a n?]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -2261,25 +2191,21 @@
<link linkend="quickbook.syntax.block.templates.template_identifier">template
identifiers</link>. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[template ![bar] <!--quickbook-escape-postfix--><hey><!--quickbook-escape-prefix-->[bar]<!--quickbook-escape-postfix--></hey><!--quickbook-escape-prefix-->]
<!--quickbook-escape-postfix--></programlisting>
<para>
Now, expanding this:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[!baz]
<!--quickbook-escape-postfix--></programlisting>
<para>
We will have:
</para>
-
<programlisting><hey>baz</hey>
</programlisting>
</section>
<section id="quickbook.syntax.block.blurbs">
<title><link linkend="quickbook.syntax.block.blurbs">Blurbs</link></title>
-
<programlisting><!--quickbook-escape-prefix-->[blurb :-) [*An eye catching advertisement or note...]
__spirit__ is an object-oriented recursive-descent parser generator framework
@@ -2316,7 +2242,6 @@
</section>
<section id="quickbook.syntax.block.tables">
<title><link linkend="quickbook.syntax.block.tables">Tables</link></title>
-
<programlisting><!--quickbook-escape-prefix-->[table A Simple Table
[[Heading 1] [Heading 2] [Heading 3]]
[[R0-C0] [R0-C1] [R0-C2]]
@@ -2411,7 +2336,6 @@
in [ cells... ]. The syntax is free-format and allows big cells to be formatted
nicely. Example:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[table Table with fat cells
[[Heading 1] [Heading 2]]
[
@@ -2493,7 +2417,6 @@
<para>
Here's how to have preformatted blocks of code in a table cell:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[table Table with code
[[Comment] [Code]]
[
@@ -2536,7 +2459,6 @@
</entry>
<entry>
<para>
-
<programlisting><phrase role="preprocessor">#include</phrase> <phrase role="special"><</phrase><phrase role="identifier">iostream</phrase><phrase role="special">></phrase>
<phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
@@ -2554,7 +2476,6 @@
</section>
<section id="quickbook.syntax.block.variable_lists">
<title><link linkend="quickbook.syntax.block.variable_lists">Variable Lists</link></title>
-
<programlisting><!--quickbook-escape-prefix-->[variablelist A Variable List
[[term 1] [The definition of term 1]]
[[term 2] [The definition of term 2]]
@@ -2603,7 +2524,6 @@
<para>
You can include one QuickBook file from another. The syntax is simply:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[include someother.qbk]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -2629,7 +2549,6 @@
the id defaults to the filename ("someother", in the example
above). You can specify the id like this:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[include:someid someother.qbk]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -2659,7 +2578,6 @@
You can effortlessly import code snippets from source code into your QuickBook.
The following illustrates how this is done:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[import ../test/stub.cpp]
[foo]
[bar]
@@ -2667,7 +2585,6 @@
<para>
The first line:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[import ../test/stub.cpp]
<!--quickbook-escape-postfix--></programlisting>
<para>
@@ -2678,7 +2595,6 @@
above). This shall be the template identifier for that particular code
snippet. The second and third line above does the actual template expansion:
</para>
-
<programlisting><!--quickbook-escape-prefix-->[foo]
[bar]
<!--quickbook-escape-postfix--></programlisting>
@@ -2707,7 +2623,6 @@
And any quickbook block markup.
</para>
<para>
-
<programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">string</phrase> <phrase role="identifier">foo</phrase><phrase role="special">()</phrase>
<phrase role="special">{</phrase>
<phrase role="comment">// return 'em, foo man!</phrase>
@@ -2719,7 +2634,6 @@
This is the <emphasis role="bold"><emphasis>bar</emphasis></emphasis> function
</para>
<para>
-
<programlisting><phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">string</phrase> <phrase role="identifier">bar</phrase><phrase role="special">()</phrase>
<phrase role="special">{</phrase>
<phrase role="comment">// return 'em, bar man!</phrase>
@@ -2737,7 +2651,6 @@
Note how the code snippets in <ulink url="../../test/stub.cpp">stub.cpp</ulink>
get marked up. We use distinguishable comments following the form:
</para>
-
<programlisting><phrase role="comment">//[id</phrase>
<phrase role="identifier">some</phrase> <phrase role="identifier">code</phrase> <phrase role="identifier">here</phrase>
<phrase role="comment">//]</phrase>
@@ -2757,13 +2670,11 @@
<para>
Special comments of the form:
</para>
-
<programlisting><phrase role="comment">//` some [*quickbook] markup here</phrase>
</programlisting>
<para>
and:
</para>
-
<programlisting><phrase role="comment">/*` some [*quickbook] markup here */</phrase>
</programlisting>
<para>
@@ -2778,7 +2689,6 @@
<para>
Special comments of the form:
</para>
-
<programlisting><phrase role="comment">/*< some [*quickbook] markup here >*/</phrase>
</programlisting>
<para>
@@ -2788,7 +2698,6 @@
for details. Example:
</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> <co id="quickbook.syntax.block.import.c0" linkends="quickbook.syntax.block.import.c1" />
<phrase role="special">{</phrase>
<phrase role="keyword">return</phrase> <phrase role="string">"foo-bar"</phrase><phrase role="special">;</phrase> <co id="quickbook.syntax.block.import.c2" linkends="quickbook.syntax.block.import.c3" />
@@ -2920,7 +2829,6 @@
</simpara>
</listitem>
</orderedlist>
-
<programlisting><phrase role="identifier">using</phrase> <phrase role="identifier">xsltproc</phrase>
<phrase role="special">:</phrase> <phrase role="string">"C:/Users/example/Documents/boost/xml/bin/xsltproc.exe"</phrase>
<phrase role="special">;</phrase>
@@ -2974,7 +2882,6 @@
</simpara>
</listitem>
</orderedlist>
-
<programlisting><phrase role="identifier">using</phrase> <phrase role="identifier">quickbook</phrase>
<phrase role="special">:</phrase> <phrase role="string">"C:/Users/example/Documents/boost/xml/bin/quickbook.exe"</phrase>
<phrase role="special">;</phrase>
@@ -2994,7 +2901,6 @@
role="identifier">xml</phrase></code> packages. For example, using <code><phrase
role="identifier">apt</phrase><phrase role="special">-</phrase><phrase role="identifier">get</phrase></code>:
</para>
-
<programlisting><phrase role="identifier">sudo</phrase> <phrase role="identifier">apt</phrase><phrase role="special">-</phrase><phrase role="identifier">get</phrase> <phrase role="identifier">install</phrase> <phrase role="identifier">xsltprc</phrase> <phrase role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase role="identifier">xsl</phrase> <phrase role="identifier">docbook</phrase><phrase role="special">-</phrase><phrase role="identifier">xml</phrase>
</programlisting>
<para>
@@ -3014,7 +2920,6 @@
the <ulink url="http://boost.org/boost-build2/doc/html/bbv2/advanced/configuration.html">Boost
Build documentation</ulink>.
</para>
-
<programlisting><phrase role="identifier">using</phrase> <phrase role="identifier">xsltproc</phrase> <phrase role="special">;</phrase>
<phrase role="identifier">using</phrase> <phrase role="identifier">boostbook</phrase>
@@ -3064,7 +2969,6 @@
</simpara>
</listitem>
</orderedlist>
-
<programlisting><phrase role="identifier">using</phrase> <phrase role="identifier">quickbook</phrase>
<phrase role="special">:</phrase> <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><phrase role="special">/</phrase><phrase role="identifier">quickbook</phrase>
<phrase role="special">;</phrase>
@@ -3113,7 +3017,6 @@
You can use the following settings to highlight quickbook tags when editing
quickbook files.
</para>
-
<programlisting><!--quickbook-escape-prefix-->qbk=*.qbk
lexer.*.qbk=props
use.tabs.$(qbk)=0
@@ -3162,7 +3065,6 @@
<para>
For example:
</para>
-
<programlisting>using quickbook ;
xml my_doc : my_doc.qbk ;
@@ -3728,7 +3630,6 @@
</para>
</entry>
<entry>
-
<programlisting><!--quickbook-escape-prefix--># one
# two
# three
@@ -3748,7 +3649,6 @@
</para>
</entry>
<entry>
-
<programlisting><!--quickbook-escape-prefix-->* one
* two
* three
@@ -3989,7 +3889,6 @@
</para>
</entry>
<entry>
-
<programlisting><!--quickbook-escape-prefix-->[table Title
[[a][b][c]]
[[a][b][c]]
@@ -4009,7 +3908,6 @@
</para>
</entry>
<entry>
-
<programlisting><!--quickbook-escape-prefix-->[variablelist Title
[[a][b]]
[[a][b]]
Modified: trunk/tools/quickbook/test/snippets/pass_thru.gold
==============================================================================
--- trunk/tools/quickbook/test/snippets/pass_thru.gold (original)
+++ trunk/tools/quickbook/test/snippets/pass_thru.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -4,7 +4,6 @@
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Pass thru test</title>
<para>
-
<programlisting><phrase role="comment">/*=============================================================================
Copyright (c) 2011 Daniel James
@@ -15,7 +14,6 @@
</programlisting>
</para>
<para>
-
<programlisting><phrase role="keyword">struct</phrase> <phrase role="identifier">Foo</phrase><phrase role="special">{</phrase>
<phrase role="identifier">Foo</phrase><phrase role="special">();</phrase>
@@ -31,7 +29,6 @@
</programlisting>
</para>
<para>
-
<programlisting><phrase role="keyword">def</phrase> <phrase role="identifier">foo</phrase><phrase role="special">:</phrase>
<phrase role="keyword">print</phrase><phrase role="special">(</phrase><phrase role="string">'foo'</phrase><phrase role="special">)</phrase>
</programlisting>
Modified: trunk/tools/quickbook/test/templates.gold
==============================================================================
--- trunk/tools/quickbook/test/templates.gold (original)
+++ trunk/tools/quickbook/test/templates.gold 2011-09-11 12:59:36 EDT (Sun, 11 Sep 2011)
@@ -36,7 +36,6 @@
<para>
wxyz wxyz trail
</para>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase>
<phrase role="special">{</phrase>
<phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">cout</phrase> <phrase role="special"><<</phrase> "Hello, World" <phrase role="special"><<</phrase> <phrase role="identifier">std</phrase><phrase role="special">::</phrase><phrase role="identifier">endl</phrase><phrase role="special">;</phrase>
@@ -143,7 +142,6 @@
</listitem>
</itemizedlist>
<para/>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase>
</programlisting>
<para>
@@ -176,7 +174,6 @@
</listitem>
<listitem>
<simpara>
-
<programlisting><phrase role="keyword">int</phrase> <phrase role="identifier">main</phrase><phrase role="special">()</phrase> <phrase role="special">{}</phrase>
</programlisting>
</simpara>
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