[Boost-commit] svn:boost r58601 - in branches/release/tools/quickbook: . detail doc test

Subject: [Boost-commit] svn:boost r58601 - in branches/release/tools/quickbook: . detail doc test
From: daniel_james_at_[hidden]
Date: 2009-12-30 14:11:22

Author: danieljames
Date: 2009-12-30 14:11:22 EST (Wed, 30 Dec 2009)
New Revision: 58601
URL: http://svn.boost.org/trac/boost/changeset/58601

Log:
Merge quickbook.

* Fix callout bug.
* Typo in table documentation.

Added:
   branches/release/tools/quickbook/test/callouts.cpp
      - copied unchanged from r58040, /trunk/tools/quickbook/test/callouts.cpp
   branches/release/tools/quickbook/test/callouts.gold
      - copied unchanged from r58040, /trunk/tools/quickbook/test/callouts.gold
   branches/release/tools/quickbook/test/callouts.quickbook
      - copied unchanged from r58040, /trunk/tools/quickbook/test/callouts.quickbook
Properties modified: 
   branches/release/tools/quickbook/   (props changed)
Text files modified: 
   branches/release/tools/quickbook/detail/actions.cpp |     1 +                                       
   branches/release/tools/quickbook/doc/quickbook.qbk  |     2 +-                                      
   branches/release/tools/quickbook/test/Jamfile.v2    |     1 +                                       
   3 files changed, 3 insertions(+), 1 deletions(-)

Modified: branches/release/tools/quickbook/detail/actions.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/actions.cpp	(original)
+++ branches/release/tools/quickbook/detail/actions.cpp	2009-12-30 14:11:22 EST (Wed, 30 Dec 2009)
@@ -1212,6 +1212,7 @@
 
                   snippet += "'''<para>'''";
                   snippet += callouts[i];
+                  snippet += "\n";
                   snippet += "'''</para>'''";
                   snippet += "'''</callout>'''";
               }

Modified: branches/release/tools/quickbook/doc/quickbook.qbk
==============================================================================
--- branches/release/tools/quickbook/doc/quickbook.qbk	(original)
+++ branches/release/tools/quickbook/doc/quickbook.qbk	2009-12-30 14:11:22 EST (Wed, 30 Dec 2009)
@@ -1513,8 +1513,8 @@
 [table:id A Simple Table
     [[Heading 1] [Heading 2] [Heading 3]]
     [[R0-C0]     [R0-C1]     [R0-C2]]
+    [[R1-C0]     [R1-C1]     [R1-C2]]
     [[R2-C0]     [R2-C1]     [R2-C2]]
-    [[R3-C0]     [R3-C1]     [R3-C2]]
 ]
 
 The table title is optional. The first row of the table is automatically

Modified: branches/release/tools/quickbook/test/Jamfile.v2
==============================================================================
--- branches/release/tools/quickbook/test/Jamfile.v2	(original)
+++ branches/release/tools/quickbook/test/Jamfile.v2	2009-12-30 14:11:22 EST (Wed, 30 Dec 2009)
@@ -30,6 +30,7 @@
     [ quickbook-test heading ]
     [ quickbook-test table_1_5 ]
     [ quickbook-test image_1_5 ]
+    [ quickbook-test callouts ]
     [ quickbook-fail-test fail-include ]
     [ quickbook-fail-test fail-import ]
     [ quickbook-fail-test fail-template-arguments1 ]