Subject: [Boost-commit] svn:boost r65419 - in trunk/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2010-09-14 16:45:48
Author: danieljames
Date: 2010-09-14 16:45:47 EDT (Tue, 14 Sep 2010)
New Revision: 65419
URL: http://svn.boost.org/trac/boost/changeset/65419
Log:
Don't match words that start with tip, note etc.
Text files modified:
trunk/tools/quickbook/src/block_grammar.cpp | 10 +++++-----
trunk/tools/quickbook/test/blocks.gold | 3 +++
trunk/tools/quickbook/test/blocks.quickbook | 5 ++++-
3 files changed, 12 insertions(+), 6 deletions(-)
Modified: trunk/tools/quickbook/src/block_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/block_grammar.cpp (original)
+++ trunk/tools/quickbook/src/block_grammar.cpp 2010-09-14 16:45:47 EDT (Tue, 14 Sep 2010)
@@ -222,23 +222,23 @@
;
admonition =
- "warning" >> blank >>
+ "warning" >> hard_space >>
scoped_block(actions)[inside_paragraph]
[actions.warning]
|
- "caution" >> blank >>
+ "caution" >> hard_space >>
scoped_block(actions)[inside_paragraph]
[actions.caution]
|
- "important" >> blank >>
+ "important" >> hard_space >>
scoped_block(actions)[inside_paragraph]
[actions.important]
|
- "note" >> blank >>
+ "note" >> hard_space >>
scoped_block(actions)[inside_paragraph]
[actions.note]
|
- "tip" >> blank >>
+ "tip" >> hard_space >>
scoped_block(actions)[inside_paragraph]
[actions.tip]
;
Modified: trunk/tools/quickbook/test/blocks.gold
==============================================================================
--- trunk/tools/quickbook/test/blocks.gold (original)
+++ trunk/tools/quickbook/test/blocks.gold 2010-09-14 16:45:47 EDT (Tue, 14 Sep 2010)
@@ -83,4 +83,7 @@
</footnote>.
</para>
</blockquote>
+ <para>
+ [tipping point]
+ </para>
</article>
Modified: trunk/tools/quickbook/test/blocks.quickbook
==============================================================================
--- trunk/tools/quickbook/test/blocks.quickbook (original)
+++ trunk/tools/quickbook/test/blocks.quickbook 2010-09-14 16:45:47 EDT (Tue, 14 Sep 2010)
@@ -36,4 +36,7 @@
[: Blockquote containing a footnote[footnote Here it is!].]
-[/ Unfortunately footnotes currently can't contain blocks.]
\ No newline at end of file
+[/ Unfortunately footnotes currently can't contain blocks.]
+
+[/ Quickbook shouldn't think that this is a tip]
+[tipping point]
\ No newline at end of file