Subject: [Boost-commit] svn:boost r63342 - in trunk/tools/quickbook: . doc test
From: daniel_james_at_[hidden]
Date: 2010-06-26 08:09:58
Author: danieljames
Date: 2010-06-26 08:09:56 EDT (Sat, 26 Jun 2010)
New Revision: 63342
URL: http://svn.boost.org/trac/boost/changeset/63342
Log:
Don't require commas between authors.
Makes the author grammar more consistent with the rest of quickbook.
Text files modified:
trunk/tools/quickbook/doc/quickbook.qbk | 5 +++--
trunk/tools/quickbook/doc_info.hpp | 8 +++-----
trunk/tools/quickbook/test/doc-info-1.gold | 8 ++++++++
trunk/tools/quickbook/test/doc-info-1.quickbook | 1 +
trunk/tools/quickbook/test/doc-info-2.gold | 8 ++++++++
trunk/tools/quickbook/test/doc-info-2.quickbook | 1 +
6 files changed, 24 insertions(+), 7 deletions(-)
Modified: trunk/tools/quickbook/doc/quickbook.qbk
==============================================================================
--- trunk/tools/quickbook/doc/quickbook.qbk (original)
+++ trunk/tools/quickbook/doc/quickbook.qbk 2010-06-26 08:09:56 EDT (Sat, 26 Jun 2010)
@@ -1,7 +1,7 @@
[article Quickbook
[quickbook 1.5]
[version 1.5]
- [authors [de Guzman, Joel], [Niebler, Eric]]
+ [authors [de Guzman, Joel] [Niebler, Eric]]
[copyright 2002 2004 2006 Joel de Guzman, Eric Niebler]
[purpose /WikiWiki/ style documentation tool]
[license
@@ -201,6 +201,7 @@
* If a line starts with a comment, interpret it as a paragraph even if it's
followed by whitespace or a list character.
* Don't treat 4+ consecutive blank lines as multiple paragraph breaks.
+* Don't require commas between authors in docinfo.
[endsect]
@@ -757,7 +758,7 @@
[copyright 2000 2002 2003 Joe Blow, Jane Doe]
[purpose The document's reason for being]
[category The document's category]
- [authors [Blow, Joe], [Doe, Jane]]
+ [authors [Blow, Joe] [Doe, Jane]]
[license The document's license]
[source-mode source-type]
]
Modified: trunk/tools/quickbook/doc_info.hpp
==============================================================================
--- trunk/tools/quickbook/doc_info.hpp (original)
+++ trunk/tools/quickbook/doc_info.hpp 2010-06-26 08:09:56 EDT (Sat, 26 Jun 2010)
@@ -121,8 +121,7 @@
;
doc_author =
- space
- >> '[' >> space
+ '[' >> space
>> (*(anychar_p - ',')) [assign_a(name.second)] // surname
>> ',' >> space
>> (*(anychar_p - ']')) [assign_a(name.first)] // firstname
@@ -131,9 +130,8 @@
doc_authors =
"authors" >> hard_space
- >> doc_author [push_back_a(actions.doc_authors, name)]
- >> *( ','
- >> doc_author [push_back_a(actions.doc_authors, name)]
+ >> *( doc_author [push_back_a(actions.doc_authors, name)]
+ >> space >> !ch_p(',') >> space
)
;
Modified: trunk/tools/quickbook/test/doc-info-1.gold
==============================================================================
--- trunk/tools/quickbook/test/doc-info-1.gold (original)
+++ trunk/tools/quickbook/test/doc-info-1.gold 2010-06-26 08:09:56 EDT (Sat, 26 Jun 2010)
@@ -4,6 +4,14 @@
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Document Information 1</title>
<articleinfo>
+ <authorgroup>
+ <author>
+ <firstname>Joe</firstname> <surname>Blow</surname>
+ </author>
+ <author>
+ <firstname>Jane</firstname> <surname>Doe</surname>
+ </author>
+ </authorgroup>
</articleinfo>
<para>
The body is largely irrelevant.
Modified: trunk/tools/quickbook/test/doc-info-1.quickbook
==============================================================================
--- trunk/tools/quickbook/test/doc-info-1.quickbook (original)
+++ trunk/tools/quickbook/test/doc-info-1.quickbook 2010-06-26 08:09:56 EDT (Sat, 26 Jun 2010)
@@ -1,5 +1,6 @@
[article Document Information 1
[quickbook 1.5]
+[authors [Blow, Joe], [Doe, Jane]]
[source-mode teletype]
[purpose Inline code test: `1 + 2`]
[category tests]
Modified: trunk/tools/quickbook/test/doc-info-2.gold
==============================================================================
--- trunk/tools/quickbook/test/doc-info-2.gold (original)
+++ trunk/tools/quickbook/test/doc-info-2.gold 2010-06-26 08:09:56 EDT (Sat, 26 Jun 2010)
@@ -3,6 +3,14 @@
<library id="document_information_1" name="Document Information 1" dirname="document_information_1"
last-revision="DEBUG MODE Date: 2000/12/20 12:00:00 $" xmlns:xi="http://www.w3.org/2001/XInclude">
<libraryinfo>
+ <authorgroup>
+ <author>
+ <firstname>Joe</firstname> <surname>Blow</surname>
+ </author>
+ <author>
+ <firstname>Jane</firstname> <surname>Doe</surname>
+ </author>
+ </authorgroup>
<librarypurpose>
Inline code test: <code>1 + 2</code>
</librarypurpose>
Modified: trunk/tools/quickbook/test/doc-info-2.quickbook
==============================================================================
--- trunk/tools/quickbook/test/doc-info-2.quickbook (original)
+++ trunk/tools/quickbook/test/doc-info-2.quickbook 2010-06-26 08:09:56 EDT (Sat, 26 Jun 2010)
@@ -1,5 +1,6 @@
[library Document Information 1
[quickbook 1.5]
+[authors [Blow, Joe] [Doe, Jane]]
[source-mode teletype]
[purpose Inline code test: `1 + 2`]
[category tests]