[Boost-commit] svn:boost r70186 - in trunk/tools/quickbook: . src test/doc-info

Subject: [Boost-commit] svn:boost r70186 - in trunk/tools/quickbook: . src test/doc-info
From: dnljms_at_[hidden]
Date: 2011-03-19 10:53:11

Author: danieljames
Date: 2011-03-19 10:53:10 EDT (Sat, 19 Mar 2011)
New Revision: 70186
URL: http://svn.boost.org/trac/boost/changeset/70186

Log:
Quickbook: Tweak doc info for empty attributes.

Maybe these should fail.

Added:
   trunk/tools/quickbook/test/doc-info/copyright-fail2.quickbook
      - copied unchanged from r69179, /branches/quickbook-filenames/tools/quickbook/test/doc-info/copyright-fail2.quickbook
Properties modified: 
   trunk/tools/quickbook/   (props changed)
Text files modified: 
   trunk/tools/quickbook/src/doc_info_grammar.cpp                 |    10 ++++------                              
   trunk/tools/quickbook/test/doc-info/Jamfile.v2                 |     1 +                                       
   trunk/tools/quickbook/test/doc-info/empty-attributes.quickbook |     2 ++                                      
   3 files changed, 7 insertions(+), 6 deletions(-)

Modified: trunk/tools/quickbook/src/doc_info_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/doc_info_grammar.cpp	(original)
+++ trunk/tools/quickbook/src/doc_info_grammar.cpp	2011-03-19 10:53:10 EDT (Sat, 19 Mar 2011)
@@ -167,7 +167,7 @@
                 );
 
         local.doc_copyright =
-            +(  +(  local.doc_copyright_year
+            *(  +(  local.doc_copyright_year
                                             [actions.values.entry(ph::arg1, ph::arg2, doc_info_tags::copyright_year)]
                 >>  space
                 >>  !(  '-'
@@ -203,12 +203,10 @@
             ;
 
         local.doc_authors =
-                local.doc_author
+            *(  local.doc_author
             >>  space
-            >>  *(  !(cl::ch_p(',') >> space)
-                >>  local.doc_author
-                >>  space
-                )
+            >>  !(cl::ch_p(',') >> space)
+            )
             ;
 
         local.attribute_rules[doc_info_attributes::authors] = &local.doc_authors;

Modified: trunk/tools/quickbook/test/doc-info/Jamfile.v2
==============================================================================
--- trunk/tools/quickbook/test/doc-info/Jamfile.v2	(original)
+++ trunk/tools/quickbook/test/doc-info/Jamfile.v2	2011-03-19 10:53:10 EDT (Sat, 19 Mar 2011)
@@ -23,4 +23,5 @@
     [ quickbook-test source-mode-1.6 ]
     [ quickbook-test copyright1 ]
     [ quickbook-fail-test copyright-fail1 ]
+    [ quickbook-fail-test copyright-fail2 ]
     ;

Modified: trunk/tools/quickbook/test/doc-info/empty-attributes.quickbook
==============================================================================
--- trunk/tools/quickbook/test/doc-info/empty-attributes.quickbook	(original)
+++ trunk/tools/quickbook/test/doc-info/empty-attributes.quickbook	2011-03-19 10:53:10 EDT (Sat, 19 Mar 2011)
@@ -2,9 +2,11 @@
 [version]
 [id]
 [dirname]
+[copyright]
 [copyright 2011]
 [purpose]
 [category]
+[authors]
 [authors [,]]
 [license]
 [last-revision]