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

Subject: [Boost-commit] svn:boost r65591 - in branches/release/tools/quickbook: . doc src test
From: dnljms_at_[hidden]
Date: 2010-09-25 20:01:41

Author: danieljames
Date: 2010-09-25 20:01:35 EDT (Sat, 25 Sep 2010)
New Revision: 65591
URL: http://svn.boost.org/trac/boost/changeset/65591

Log:
Merge quickbook from trunk.
Properties modified: 
   branches/release/tools/quickbook/   (props changed)
Text files modified: 
   branches/release/tools/quickbook/doc/quickbook.qbk         |     1 +                                       
   branches/release/tools/quickbook/src/doc_info_grammar.cpp  |    10 +++++++---                              
   branches/release/tools/quickbook/src/phrase_grammar.hpp    |     3 ++-                                     
   branches/release/tools/quickbook/test/doc-info-1.quickbook |     1 +                                       
   branches/release/tools/quickbook/test/doc-info-2.quickbook |     1 +                                       
   5 files changed, 12 insertions(+), 4 deletions(-)

Modified: branches/release/tools/quickbook/doc/quickbook.qbk
==============================================================================
--- branches/release/tools/quickbook/doc/quickbook.qbk	(original)
+++ branches/release/tools/quickbook/doc/quickbook.qbk	2010-09-25 20:01:35 EDT (Sat, 25 Sep 2010)
@@ -230,6 +230,7 @@
 * In docbook, variable list entries can only have one `listitem`, so if an
   entry has multiple values, merge them into one `listitem`.
 * Support nested code snippets.
+* Support nested blocks in document info comments.
 * Revert xml escaping document info, it broke some documentation files
   (now a 1.6 feature).
 * Further work on quickbook 1.6, still not stable.

Modified: branches/release/tools/quickbook/src/doc_info_grammar.cpp
==============================================================================
--- branches/release/tools/quickbook/src/doc_info_grammar.cpp	(original)
+++ branches/release/tools/quickbook/src/doc_info_grammar.cpp	2010-09-25 20:01:35 EDT (Sat, 25 Sep 2010)
@@ -32,9 +32,9 @@
         cl::rule<Scanner>
                         doc_info, doc_title, doc_version, doc_id, doc_dirname,
                         doc_copyright, doc_purpose, doc_category, doc_authors,
-                        doc_author, comment, space, hard_space, doc_license,
+                        doc_author, space, hard_space, doc_license,
                         doc_last_revision, doc_source_mode, doc_biblioid,
-                        phrase, quickbook_version, char_;
+                        phrase, quickbook_version, char_, comment, dummy_block;
         phrase_grammar common;
         cl::symbols<> doc_types;
 
@@ -190,7 +190,11 @@
             ;
 
         comment =
-            "[/" >> *(cl::anychar_p - ']') >> ']'
+            "[/" >> *(dummy_block | (cl::anychar_p - ']')) >> ']'
+            ;
+
+        dummy_block =
+            '[' >> *(dummy_block | (cl::anychar_p - ']')) >> ']'
             ;
 
         space =

Modified: branches/release/tools/quickbook/src/phrase_grammar.hpp
==============================================================================
--- branches/release/tools/quickbook/src/phrase_grammar.hpp	(original)
+++ branches/release/tools/quickbook/src/phrase_grammar.hpp	2010-09-25 20:01:35 EDT (Sat, 25 Sep 2010)
@@ -363,7 +363,8 @@
             ;
 
         anchor =
-                blank
+                "#"
+            >>  blank
             >>  (*(cl::anychar_p - phrase_end)) [actions.anchor]
             ;
 

Modified: branches/release/tools/quickbook/test/doc-info-1.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/doc-info-1.quickbook	(original)
+++ branches/release/tools/quickbook/test/doc-info-1.quickbook	2010-09-25 20:01:35 EDT (Sat, 25 Sep 2010)
@@ -6,5 +6,6 @@
 [purpose Inline code test: `1 + 2`]
 [category tests]
 [category irrelevance]
+[/ [category commented out] ]
 [biblioid uri http://www.boost.org/tools/quickbook/test/doc-info-1.quickbook]
 ]

Modified: branches/release/tools/quickbook/test/doc-info-2.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/doc-info-2.quickbook	(original)
+++ branches/release/tools/quickbook/test/doc-info-2.quickbook	2010-09-25 20:01:35 EDT (Sat, 25 Sep 2010)
@@ -6,6 +6,7 @@
 [purpose Inline code test: `1 + 2`]
 [category tests]
 [category irrelevance]
+[/ [category commented out] ]
 [biblioid uri http://www.boost.org/tools/quickbook/test/doc-info-2.quickbook]
 [biblioid isbn 0-937383-18-X]
 ]