[Boost-commit] svn:boost r63607 - in trunk/tools/quickbook: . test

Subject: [Boost-commit] svn:boost r63607 - in trunk/tools/quickbook: . test
From: daniel_james_at_[hidden]
Date: 2010-07-04 12:53:26

Author: danieljames
Date: 2010-07-04 12:53:25 EDT (Sun, 04 Jul 2010)
New Revision: 63607
URL: http://svn.boost.org/trac/boost/changeset/63607

Log:
Make author parsing a little stricter.
Added:
   trunk/tools/quickbook/test/doc-info-3.gold   (contents, props changed)
   trunk/tools/quickbook/test/doc-info-3.quickbook   (contents, props changed)
   trunk/tools/quickbook/test/doc-info-4.gold   (contents, props changed)
   trunk/tools/quickbook/test/doc-info-4.quickbook   (contents, props changed)
Text files modified: 
   trunk/tools/quickbook/doc_info.hpp    |    10 +++++++---                              
   trunk/tools/quickbook/test/Jamfile.v2 |     2 ++                                      
   2 files changed, 9 insertions(+), 3 deletions(-)

Modified: trunk/tools/quickbook/doc_info.hpp
==============================================================================
--- trunk/tools/quickbook/doc_info.hpp	(original)
+++ trunk/tools/quickbook/doc_info.hpp	2010-07-04 12:53:25 EDT (Sun, 04 Jul 2010)
@@ -129,9 +129,13 @@
                     ;
 
                 doc_authors =
-                        "authors" >> hard_space
-                    >>  *(  doc_author              [push_back_a(actions.doc_authors, name)]
-                            >> space >> !ch_p(',') >> space
+                        "authors"
+                    >>  hard_space
+                    >>  doc_author                  [push_back_a(actions.doc_authors, name)]
+                    >>  space
+                    >>  *(  !(ch_p(',') >> space)
+                        >>  doc_author              [push_back_a(actions.doc_authors, name)]
+                        >>  space
                         )
                     ;
 

Modified: trunk/tools/quickbook/test/Jamfile.v2
==============================================================================
--- trunk/tools/quickbook/test/Jamfile.v2	(original)
+++ trunk/tools/quickbook/test/Jamfile.v2	2010-07-04 12:53:25 EDT (Sun, 04 Jul 2010)
@@ -37,6 +37,8 @@
     [ quickbook-test cond_phrase ]
     [ quickbook-test doc-info-1 ]
     [ quickbook-test doc-info-2 ]
+    [ quickbook-test doc-info-3 ]
+    [ quickbook-test doc-info-4 ]
     [ quickbook-test callouts ]
     [ quickbook-test simple_markup ]
     [ quickbook-test blocks ]

Added: trunk/tools/quickbook/test/doc-info-3.gold
==============================================================================
--- (empty file)
+++ trunk/tools/quickbook/test/doc-info-3.gold	2010-07-04 12:53:25 EDT (Sun, 04 Jul 2010)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<appendix id="document_information_4" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Document Information 4</title>
+  <appendixinfo>
+    <authorgroup>
+    <author>
+      <firstname>Joe</firstname> <surname>Blow</surname>
+    </author>
+    </authorgroup>
+  </appendixinfo>
+  <para>
+    The body is largely irrelevant.
+  </para>
+</appendix>

Added: trunk/tools/quickbook/test/doc-info-3.quickbook
==============================================================================
--- (empty file)
+++ trunk/tools/quickbook/test/doc-info-3.quickbook	2010-07-04 12:53:25 EDT (Sun, 04 Jul 2010)
@@ -0,0 +1,6 @@
+[appendix Document Information 4
+[quickbook 1.5]
+[authors [Blow, Joe]]
+]
+
+The body is largely irrelevant.
\ No newline at end of file

Added: trunk/tools/quickbook/test/doc-info-4.gold
==============================================================================
--- (empty file)
+++ trunk/tools/quickbook/test/doc-info-4.gold	2010-07-04 12:53:25 EDT (Sun, 04 Jul 2010)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<chapter id="document_information_4" last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+  <title>Document Information 4</title>
+  <chapterinfo>
+    <authorgroup>
+    <author>
+      <firstname>Joe</firstname> <surname>Blow</surname>
+    </author>
+    <author>
+      <firstname>Jane</firstname> <surname>Doe</surname>
+    </author>
+    <author>
+      <firstname>John</firstname> <surname>Coe</surname>
+    </author>
+    </authorgroup>
+  </chapterinfo>
+  <para>
+    The body is largely irrelevant.
+  </para>
+</chapter>

Added: trunk/tools/quickbook/test/doc-info-4.quickbook
==============================================================================
--- (empty file)
+++ trunk/tools/quickbook/test/doc-info-4.quickbook	2010-07-04 12:53:25 EDT (Sun, 04 Jul 2010)
@@ -0,0 +1,6 @@
+[chapter Document Information 4
+[quickbook 1.5]
+[authors [Blow, Joe], [Doe, Jane] [Coe, John]]
+]
+
+The body is largely irrelevant.
\ No newline at end of file