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

Subject: [Boost-commit] svn:boost r75259 - in branches/quickbook-dev/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2011-11-02 04:46:09

Author: danieljames
Date: 2011-11-02 04:46:05 EDT (Wed, 02 Nov 2011)
New Revision: 75259
URL: http://svn.boost.org/trac/boost/changeset/75259

Log:
Quickbook: Add 'block' element.
Text files modified: 
   branches/quickbook-dev/tools/quickbook/src/actions.cpp               |     1 +                                       
   branches/quickbook-dev/tools/quickbook/src/block_element_grammar.cpp |     4 ++++                                    
   branches/quickbook-dev/tools/quickbook/src/block_tags.hpp            |     2 +-                                      
   branches/quickbook-dev/tools/quickbook/src/markups.cpp               |     1 +                                       
   branches/quickbook-dev/tools/quickbook/test/elements-1_5.gold        |     6 ++++++                                  
   branches/quickbook-dev/tools/quickbook/test/elements-1_5.quickbook   |     4 ++++                                    
   branches/quickbook-dev/tools/quickbook/test/elements-1_6.gold        |     2 ++                                      
   branches/quickbook-dev/tools/quickbook/test/elements-1_6.quickbook   |     4 ++++                                    
   8 files changed, 23 insertions(+), 1 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-11-02 04:46:05 EDT (Wed, 02 Nov 2011)
@@ -124,6 +124,7 @@
         case block_tags::important:
         case block_tags::note:
         case block_tags::tip:
+        case block_tags::block:
             return block_action(actions,v);
         case block_tags::hr:
             return block_empty_action(actions,v);

Modified: branches/quickbook-dev/tools/quickbook/src/block_element_grammar.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/block_element_grammar.cpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/block_element_grammar.cpp	2011-11-02 04:46:05 EDT (Wed, 02 Nov 2011)
@@ -102,6 +102,10 @@
             ;
 
         elements.add
+            ("block", element_info(element_info::nested_block, &local.inner_phrase, block_tags::block, 106u))
+            ;
+
+        elements.add
             ("pre", element_info(element_info::nested_block, &local.preformatted, block_tags::preformatted))
             ;
 

Modified: branches/quickbook-dev/tools/quickbook/src/block_tags.hpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/block_tags.hpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/block_tags.hpp	2011-11-02 04:46:05 EDT (Wed, 02 Nov 2011)
@@ -18,7 +18,7 @@
         (generic_heading)
         (heading1)(heading2)(heading3)(heading4)(heading5)(heading6)
         (blurb)(blockquote)(preformatted)
-        (warning)(caution)(important)(note)(tip)
+        (warning)(caution)(important)(note)(tip)(block)
         (macro_definition)(template_definition)
         (variable_list)(table)
         (xinclude)(import)(include)

Modified: branches/quickbook-dev/tools/quickbook/src/markups.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/markups.cpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/markups.cpp	2011-11-02 04:46:05 EDT (Wed, 02 Nov 2011)
@@ -34,6 +34,7 @@
                 { block_tags::important, "<important>", "</important>" },
                 { block_tags::note, "<note>", "</note>" },
                 { block_tags::tip, "<tip>", "</tip>" },
+                { block_tags::block, "", "" },
                 { block_tags::ordered_list, "<orderedlist>", "</orderedlist>" },
                 { block_tags::itemized_list, "<itemizedlist>", "</itemizedlist>" },
                 { block_tags::hr, "<para/>", 0 },

Modified: branches/quickbook-dev/tools/quickbook/test/elements-1_5.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/elements-1_5.gold	(original)
+++ branches/quickbook-dev/tools/quickbook/test/elements-1_5.gold	2011-11-02 04:46:05 EDT (Wed, 02 Nov 2011)
@@ -9,4 +9,10 @@
   <para>
     [itemized_list [item1][item2]]
   </para>
+  <para>
+    [block<simplesect><title>A <emphasis role="bold">simplesect</emphasis>!</title>]
+  </para>
+  <para>
+    [block</simplesect>]
+  </para>
 </article>

Modified: branches/quickbook-dev/tools/quickbook/test/elements-1_5.quickbook
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/elements-1_5.quickbook	(original)
+++ branches/quickbook-dev/tools/quickbook/test/elements-1_5.quickbook	2011-11-02 04:46:05 EDT (Wed, 02 Nov 2011)
@@ -7,3 +7,7 @@
 [ordered_list [item1][item2]]
 
 [itemized_list [item1][item2]]
+
+[block'''<simplesect><title>'''A *simplesect*!'''</title>''']
+
+[block'''</simplesect>''']
\ No newline at end of file

Modified: branches/quickbook-dev/tools/quickbook/test/elements-1_6.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/elements-1_6.gold	(original)
+++ branches/quickbook-dev/tools/quickbook/test/elements-1_6.gold	2011-11-02 04:46:05 EDT (Wed, 02 Nov 2011)
@@ -27,4 +27,6 @@
       </para>
     </listitem>
   </itemizedlist>
+  <simplesect><title>A <emphasis role="bold">simplesect</emphasis>!</title></simplesect>
+
 </article>

Modified: branches/quickbook-dev/tools/quickbook/test/elements-1_6.quickbook
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/elements-1_6.quickbook	(original)
+++ branches/quickbook-dev/tools/quickbook/test/elements-1_6.quickbook	2011-11-02 04:46:05 EDT (Wed, 02 Nov 2011)
@@ -7,3 +7,7 @@
 [ordered_list [item1][item2]]
 
 [itemized_list [item1][item2]]
+
+[block'''<simplesect><title>'''A *simplesect*!'''</title>''']
+
+[block'''</simplesect>''']
\ No newline at end of file