[Boost-commit] svn:boost r71059 - in branches/quickbook-dev/tools/quickbook: src test

Subject: [Boost-commit] svn:boost r71059 - in branches/quickbook-dev/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2011-04-06 19:58:26

Author: danieljames
Date: 2011-04-06 19:58:25 EDT (Wed, 06 Apr 2011)
New Revision: 71059
URL: http://svn.boost.org/trac/boost/changeset/71059

Log:
Quickbook: If a phrase template turns out to be a block template, treat it as a complete block.
Text files modified: 
   branches/quickbook-dev/tools/quickbook/src/actions.cpp          |     1 +                                       
   branches/quickbook-dev/tools/quickbook/test/templates.gold      |    25 +++++++++++++++++++++++--               
   branches/quickbook-dev/tools/quickbook/test/templates.quickbook |    11 +++++++----                             
   3 files changed, 31 insertions(+), 6 deletions(-)

Modified: branches/quickbook-dev/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions.cpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/actions.cpp	2011-04-06 19:58:25 EDT (Wed, 06 Apr 2011)
@@ -1230,6 +1230,7 @@
             actions.paragraph(); // For paragraphs before the template call.
             actions.out << block;
             actions.phrase << phrase;
+            actions.paragraph();
         }
         else {
             actions.phrase << phrase;

Modified: branches/quickbook-dev/tools/quickbook/test/templates.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/templates.gold	(original)
+++ branches/quickbook-dev/tools/quickbook/test/templates.gold	2011-04-06 19:58:25 EDT (Wed, 06 Apr 2011)
@@ -67,6 +67,9 @@
   <section id="templates.nested_templates">
     <title><link linkend="templates.nested_templates">Nested Templates</link></title>
     <para>
+      Pre
+    </para>
+    <para>
       Start block template.
     </para>
     <para>
@@ -82,6 +85,12 @@
       End block template.
     </para>
     <para>
+      Post
+    </para>
+    <para>
+      Pre
+    </para>
+    <para>
       Start block template.
     </para>
     <para>
@@ -91,6 +100,12 @@
       End block template.
     </para>
     <para>
+      Post
+    </para>
+    <para>
+      Pre
+    </para>
+    <para>
       Start phrase template.
     </para>
     <para>
@@ -103,8 +118,14 @@
       End block template.
     </para>
     <para>
-      End phrase template. Start phrase template. Start phrase template. Hello! End
-      phrase template. End phrase template.
+      End phrase template.
+    </para>
+    <para>
+      Post
+    </para>
+    <para>
+      Pre Start phrase template. Start phrase template. Hello! End phrase template.
+      End phrase template. Post
     </para>
   </section>
   <section id="templates.block_markup">

Modified: branches/quickbook-dev/tools/quickbook/test/templates.quickbook
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/templates.quickbook	(original)
+++ branches/quickbook-dev/tools/quickbook/test/templates.quickbook	2011-04-06 19:58:25 EDT (Wed, 06 Apr 2011)
@@ -160,10 +160,13 @@
 
 [template phrase[content] Start phrase template. [content] End phrase template.]
 
-[block [block Hello!]]
-[block [phrase Hello!]]
-[phrase [block Hello!]]
-[phrase [phrase Hello!]]
+Pre [block [block Hello!]] Post
+
+Pre [block [phrase Hello!]] Post
+
+Pre [phrase [block Hello!]] Post
+
+Pre [phrase [phrase Hello!]] Post
 
 [endsect]