[Boost-commit] svn:boost r62468 - in trunk/tools/quickbook: detail test

Subject: [Boost-commit] svn:boost r62468 - in trunk/tools/quickbook: detail test
From: daniel_james_at_[hidden]
Date: 2010-06-06 03:22:10

Author: danieljames
Date: 2010-06-06 03:22:08 EDT (Sun, 06 Jun 2010)
New Revision: 62468
URL: http://svn.boost.org/trac/boost/changeset/62468

Log:
Avoid extra space around footnotes.
Added:
   trunk/tools/quickbook/test/blocks.gold   (contents, props changed)
   trunk/tools/quickbook/test/blocks.quickbook   (contents, props changed)
Text files modified: 
   trunk/tools/quickbook/detail/post_process.cpp    |     1 -                                       
   trunk/tools/quickbook/test/Jamfile.v2            |     1 +                                       
   trunk/tools/quickbook/test/quickbook-manual.gold |    32 ++++++++++++++------------------        
   3 files changed, 15 insertions(+), 19 deletions(-)

Modified: trunk/tools/quickbook/detail/post_process.cpp
==============================================================================
--- trunk/tools/quickbook/detail/post_process.cpp	(original)
+++ trunk/tools/quickbook/detail/post_process.cpp	2010-06-06 03:22:08 EDT (Sun, 06 Jun 2010)
@@ -184,7 +184,6 @@
         , "caution"
         , "copyright"
         , "entry"
-        , "footnote"
         , "important"
         , "informaltable"
         , "itemizedlist"

Modified: trunk/tools/quickbook/test/Jamfile.v2
==============================================================================
--- trunk/tools/quickbook/test/Jamfile.v2	(original)
+++ trunk/tools/quickbook/test/Jamfile.v2	2010-06-06 03:22:08 EDT (Sun, 06 Jun 2010)
@@ -37,6 +37,7 @@
     [ quickbook-test doc-info-1 ]
     [ quickbook-test callouts ]
     [ quickbook-test simple_markup ]
+    [ quickbook-test blocks ]
     [ quickbook-fail-test fail-include ]
     [ quickbook-fail-test fail-import ]
     [ quickbook-fail-test fail-template-arguments1 ]

Added: trunk/tools/quickbook/test/blocks.gold
==============================================================================
--- (empty file)
+++ trunk/tools/quickbook/test/blocks.gold	2010-06-06 03:22:08 EDT (Sun, 06 Jun 2010)
@@ -0,0 +1,89 @@
+<?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="various_blocks" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Various blocks</title>
+  <articleinfo>
+  </articleinfo>
+  <anchor id="various_blocks.blockquotes"/>
+  <bridgehead renderas="sect2">
+    <link linkend="various_blocks.blockquotes">Blockquotes</link>
+  </bridgehead>
+  <para>
+    Here's a blockquote:
+  </para>
+  <blockquote>
+    <para>
+      Blockquote.
+    </para>
+  </blockquote>
+  <para>
+    And another:
+  </para>
+  <blockquote>
+    <para>
+      Blockquote first paragraph.
+    </para>
+    <para>
+      Blockquote second paragraph.
+    </para>
+  </blockquote>
+  <anchor id="various_blocks.admonitions"/>
+  <bridgehead renderas="sect2">
+    <link linkend="various_blocks.admonitions">Admonitions</link>
+  </bridgehead>
+  <warning>
+    <para>
+      Warning
+    </para>
+  </warning>
+  <caution>
+    <para>
+      Caution
+    </para>
+  </caution>
+  <important>
+    <para>
+      Important
+    </para>
+  </important>
+  <note>
+    <para>
+      Note
+    </para>
+  </note>
+  <tip>
+    <para>
+      Tip
+    </para>
+  </tip>
+  <warning>
+    <para>
+      Warning first paragraph.
+    </para>
+    <para>
+      Warning second paragraph.
+    </para>
+  </warning>
+  <anchor id="various_blocks.blurb"/>
+  <bridgehead renderas="sect2">
+    <link linkend="various_blocks.blurb">Blurb</link>
+  </bridgehead>
+  <sidebar role="blurb">
+  <para>
+    Blurb
+  </para>
+  </sidebar> <anchor id="various_blocks.inline_blocks"/>
+  <bridgehead renderas="sect2">
+    <link linkend="various_blocks.inline_blocks">Inline blocks</link>
+  </bridgehead>
+  <blockquote>
+    <para>
+      Blockquote containing a footnote<footnote>
+      <para>
+        Here it is!
+      </para>
+      </footnote>.
+    </para>
+  </blockquote>
+</article>

Added: trunk/tools/quickbook/test/blocks.quickbook
==============================================================================
--- (empty file)
+++ trunk/tools/quickbook/test/blocks.quickbook	2010-06-06 03:22:08 EDT (Sun, 06 Jun 2010)
@@ -0,0 +1,39 @@
+[article Various blocks
+[quickbook 1.5]
+]
+
+[heading Blockquotes]
+
+Here's a blockquote:
+
+[:Blockquote.]
+
+And another:
+
+[:
+Blockquote first paragraph.
+
+Blockquote second paragraph.
+]
+
+[heading Admonitions]
+
+[warning Warning]
+[caution Caution]
+[important Important]
+[note Note]
+[tip Tip]
+
+[warning Warning first paragraph.
+
+Warning second paragraph.]
+
+[heading Blurb]
+
+[blurb Blurb]
+
+[heading Inline blocks]
+
+[: Blockquote containing a footnote[footnote Here it is!].]
+
+[/ Unfortunately footnotes currently can't contain blocks.]
\ No newline at end of file

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:22:08 EDT (Sun, 06 Jun 2010)
@@ -332,17 +332,15 @@
         </para>
         <para>
           Unlike QuickBook's standard formatting scheme, the rules for simpler alternatives
-          are much stricter
-          <footnote>
-            <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. I wasn't sure at all if <ulink url="http://spirit.sourceforge.net">Spirit</ulink>,
-              being more or less a formal EBNF parser, can handle the context sensitivity
-              and ambiguity.
-            </para>
-          </footnote>
-          .
+          are much stricter<footnote>
+          <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.
+            I wasn't sure at all if <ulink url="http://spirit.sourceforge.net">Spirit</ulink>,
+            being more or less a formal EBNF parser, can handle the context sensitivity
+            and ambiguity.
+          </para>
+          </footnote>.
         </para>
         <itemizedlist>
           <listitem>
@@ -946,13 +944,11 @@
 <programlisting><!--quickbook-escape-prefix-->[footnote A sample footnote]
 <!--quickbook-escape-postfix--></programlisting>
         <para>
-          will generate this
-          <footnote>
-            <para>
-              A sample footnote
-            </para>
-          </footnote>
-          .
+          will generate this<footnote>
+          <para>
+            A sample footnote
+          </para>
+          </footnote>.
         </para>
         <section id="quickbook.syntax.phrase.footnotes.macro_expansion">
           <title><link linkend="quickbook.syntax.phrase.footnotes.macro_expansion">Macro