Subject: [Boost-commit] svn:boost r62467 - in trunk/tools/quickbook: detail test
From: daniel_james_at_[hidden]
Date: 2010-06-06 03:21:39
Author: danieljames
Date: 2010-06-06 03:21:38 EDT (Sun, 06 Jun 2010)
New Revision: 62467
URL: http://svn.boost.org/trac/boost/changeset/62467
Log:
Avoid double <para> in <blockquote>. Refs #1281.
Text files modified:
trunk/tools/quickbook/detail/markups.cpp | 4 ++--
trunk/tools/quickbook/test/quickbook-manual.gold | 32 ++++++++++----------------------
2 files changed, 12 insertions(+), 24 deletions(-)
Modified: trunk/tools/quickbook/detail/markups.cpp
==============================================================================
--- trunk/tools/quickbook/detail/markups.cpp (original)
+++ trunk/tools/quickbook/detail/markups.cpp 2010-06-06 03:21:38 EDT (Sun, 06 Jun 2010)
@@ -31,8 +31,8 @@
const char* hr_ = "<para/>";
const char* blurb_pre = "<sidebar role=\"blurb\">\n";
const char* blurb_post = "</sidebar>\n";
- const char* blockquote_pre = "<blockquote><para>";
- const char* blockquote_post = "</para></blockquote>";
+ const char* blockquote_pre = "<blockquote>";
+ const char* blockquote_post = "</blockquote>";
const char* preformatted_pre = "<programlisting>";
const char* preformatted_post = "</programlisting>";
const char* warning_pre = "<warning>";
Modified: trunk/tools/quickbook/test/quickbook-manual.gold
==============================================================================
--- trunk/tools/quickbook/test/quickbook-manual.gold (original)
+++ trunk/tools/quickbook/test/quickbook-manual.gold 2010-06-06 03:21:38 EDT (Sun, 06 Jun 2010)
@@ -29,13 +29,11 @@
<title><link linkend="quickbook.intro"> Introduction</link></title>
<blockquote>
<para>
- <para>
- <emphasis role="bold"><emphasis><quote>Why program by hand in five days
- what you can spend five years of your life automating?</quote></emphasis></emphasis>
- </para>
- <para>
- -- Terrence Parr, author ANTLR/PCCTS
- </para>
+ <emphasis role="bold"><emphasis><quote>Why program by hand in five days what
+ you can spend five years of your life automating?</quote></emphasis></emphasis>
+ </para>
+ <para>
+ -- Terrence Parr, author ANTLR/PCCTS
</para>
</blockquote>
<para>
@@ -46,9 +44,7 @@
</para>
<blockquote>
<para>
- <para>
- <ulink url="../quickbook.qbk">quickbook.qbk</ulink>
- </para>
+ <ulink url="../quickbook.qbk">quickbook.qbk</ulink>
</para>
</blockquote>
<para>
@@ -1476,9 +1472,7 @@
</programlisting>
<blockquote>
<para>
- <para>
- Indents the paragraph. This applies to one paragraph only.
- </para>
+ Indents the paragraph. This applies to one paragraph only.
</para>
</blockquote>
</section>
@@ -2650,9 +2644,7 @@
</para>
<blockquote>
<para>
- <para>
- <emphasis>Section contributed by Julio M. Merino Vidal</emphasis>
- </para>
+ <emphasis>Section contributed by Julio M. Merino Vidal</emphasis>
</para>
</blockquote>
<para>
@@ -2883,9 +2875,7 @@
<title><link linkend="quickbook.editors.scite"> Scintilla Text Editor</link></title>
<blockquote>
<para>
- <para>
- <emphasis>Section contributed by Dean Michael Berris</emphasis>
- </para>
+ <emphasis>Section contributed by Dean Michael Berris</emphasis>
</para>
</blockquote>
<para>
@@ -2941,9 +2931,7 @@
</para>
<blockquote>
<para>
- <para>
- <emphasis>Faq contributed by Michael Marcin</emphasis>
- </para>
+ <emphasis>Faq contributed by Michael Marcin</emphasis>
</para>
</blockquote>
<para>