[Boost-commit] svn:boost r69308 - in branches/quickbook-filenames/tools/quickbook: src test

Subject: [Boost-commit] svn:boost r69308 - in branches/quickbook-filenames/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2011-02-26 13:31:19

Author: danieljames
Date: 2011-02-26 13:31:17 EST (Sat, 26 Feb 2011)
New Revision: 69308
URL: http://svn.boost.org/trac/boost/changeset/69308

Log:
Don't include escaped boostbook or code in simple markup.
Text files modified: 
   branches/quickbook-filenames/tools/quickbook/src/main_grammar.cpp         |     2 +-                                      
   branches/quickbook-filenames/tools/quickbook/test/simple_markup.gold      |     3 +++                                     
   branches/quickbook-filenames/tools/quickbook/test/simple_markup.quickbook |     3 +++                                     
   3 files changed, 7 insertions(+), 1 deletions(-)

Modified: branches/quickbook-filenames/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/src/main_grammar.cpp	(original)
+++ branches/quickbook-filenames/tools/quickbook/src/main_grammar.cpp	2011-02-26 13:31:17 EST (Sat, 26 Feb 2011)
@@ -420,7 +420,7 @@
             |   local.simple_teletype
             ;
 
-        local.simple_phrase_end = '[' | phrase_end;
+        local.simple_phrase_end = cl::ch_p('[') | "'''" | '`' | phrase_end;
 
         simple_markup(local.simple_bold,
             '*', actions.simple_bold, local.simple_phrase_end);

Modified: branches/quickbook-filenames/tools/quickbook/test/simple_markup.gold
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/test/simple_markup.gold	(original)
+++ branches/quickbook-filenames/tools/quickbook/test/simple_markup.gold	2011-02-26 13:31:17 EST (Sat, 26 Feb 2011)
@@ -28,5 +28,8 @@
     <para>
       not_underlined_
     </para>
+    <para>
+      _Should not underline escaped markup_. _or this escaped_ markup form.
+    </para>
   </section>
 </article>

Modified: branches/quickbook-filenames/tools/quickbook/test/simple_markup.quickbook
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/test/simple_markup.quickbook	(original)
+++ branches/quickbook-filenames/tools/quickbook/test/simple_markup.quickbook	2011-02-26 13:31:17 EST (Sat, 26 Feb 2011)
@@ -18,4 +18,7 @@
 
 not_underlined_
 
+_Should not underline '''escaped''' markup_.
+_or this '''escaped_ markup''' form.
+
 [endsect]
\ No newline at end of file