[Boost-commit] svn:boost r72393 - in trunk/tools/quickbook: src test

Subject: [Boost-commit] svn:boost r72393 - in trunk/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2011-06-04 12:18:15

Author: danieljames
Date: 2011-06-04 12:18:14 EDT (Sat, 04 Jun 2011)
New Revision: 72393
URL: http://svn.boost.org/trac/boost/changeset/72393

Log:
Quickbook: Don't use double marks for simple markup.
Text files modified: 
   trunk/tools/quickbook/src/main_grammar.cpp         |     8 +++++++-                                
   trunk/tools/quickbook/test/simple_markup.gold      |     6 ++++--                                  
   trunk/tools/quickbook/test/simple_markup.quickbook |     6 ++++--                                  
   3 files changed, 15 insertions(+), 5 deletions(-)

Modified: trunk/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/main_grammar.cpp	(original)
+++ trunk/tools/quickbook/src/main_grammar.cpp	2011-06-04 12:18:14 EDT (Sat, 04 Jun 2011)
@@ -386,7 +386,13 @@
                     [
                         (   cl::eps_p(actions.macro >> local.simple_markup_end)
                         >>  actions.macro       [actions.do_macro]
-                        |   +(~cl::eps_p(local.simple_markup_end) >> local.nested_char)
+                        |   ~cl::eps_p(cl::f_ch_p(local.simple_markup.mark))
+                        >>  +(  ~cl::eps_p
+                                (   lookback [~cl::f_ch_p(local.simple_markup.mark)]
+                                >>  local.simple_markup_end
+                                )
+                            >>  local.nested_char
+                            )
                         )                       [actions.docinfo_value(ph::arg1, ph::arg2)]
                     ]
                 >>  cl::f_ch_p(local.simple_markup.mark)

Modified: trunk/tools/quickbook/test/simple_markup.gold
==============================================================================
--- trunk/tools/quickbook/test/simple_markup.gold	(original)
+++ trunk/tools/quickbook/test/simple_markup.gold	2011-06-04 12:18:14 EDT (Sat, 04 Jun 2011)
@@ -10,8 +10,10 @@
       role="underline">underline</emphasis> <literal>teletype</literal>
     </para>
     <para>
-      <emphasis>/italic/</emphasis> <emphasis role="bold">*bold*</emphasis> <emphasis
-      role="underline">_underline_</emphasis> <literal>=teletype=</literal>
+      //not italic// **not bold** __not underline__ ==not teletype==
+    </para>
+    <para>
+      <emphasis role="underline">odd__ edge case</emphasis>
     </para>
     <para>
       not__underlined__hopefully

Modified: trunk/tools/quickbook/test/simple_markup.quickbook
==============================================================================
--- trunk/tools/quickbook/test/simple_markup.quickbook	(original)
+++ trunk/tools/quickbook/test/simple_markup.quickbook	2011-06-04 12:18:14 EDT (Sat, 04 Jun 2011)
@@ -8,7 +8,9 @@
 
 /italic/ *bold* _underline_ =teletype=
 
-//italic// **bold** __underline__ ==teletype==
+//not italic// **not bold** __not underline__ ==not teletype==
+
+_odd__ edge case_
 
 not__underlined__hopefully
 
@@ -35,4 +37,4 @@
 
 These shouldn't be interepted as markup: == // **
 
-[endsect]
\ No newline at end of file
+[endsect]