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

Subject: [Boost-commit] svn:boost r72695 - in trunk/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2011-06-20 14:52:04

Author: danieljames
Date: 2011-06-20 14:52:03 EDT (Mon, 20 Jun 2011)
New Revision: 72695
URL: http://svn.boost.org/trac/boost/changeset/72695

Log:
Quickbook: remove escape character support from simple markup.

It breaks the regex documentation. Will probably implement this for quickbook
1.6.

Text files modified: 
   trunk/tools/quickbook/src/main_grammar.cpp         |    17 ++---------------                       
   trunk/tools/quickbook/test/simple_markup.gold      |     9 ++++++---                               
   trunk/tools/quickbook/test/simple_markup.quickbook |     2 ++                                      
   3 files changed, 10 insertions(+), 18 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-20 14:52:03 EDT (Mon, 20 Jun 2011)
@@ -89,7 +89,7 @@
                         top_level, blocks, paragraph_separator,
                         code, code_line, blank_line, hr,
                         list, list_item,
-                        nested_char, escape,
+                        escape,
                         inline_code,
                         template_,
                         code_block, macro,
@@ -391,7 +391,7 @@
                                 (   lookback [~cl::f_ch_p(local.simple_markup.mark)]
                                 >>  local.simple_markup_end
                                 )
-                            >>  local.nested_char
+                            >>  cl::anychar_p   [actions.plain_char]
                             )
                         )                       [actions.to_value]
                     ]
@@ -454,19 +454,6 @@
             ]
             ;
 
-        local.nested_char =
-                cl::str_p("\\n")                [actions.break_]
-            |   "\\ "                           // ignore an escaped space
-            |   '\\' >> cl::punct_p             [actions.raw_char]
-            |   "\\u" >> cl::repeat_p(4)
-                    [cl::chset<>("0-9a-fA-F")]
-                                                [actions.escape_unicode]
-            |   "\\U" >> cl::repeat_p(8)
-                    [cl::chset<>("0-9a-fA-F")]
-                                                [actions.escape_unicode]
-            |   cl::anychar_p                   [actions.plain_char]
-            ;
-
         local.escape =
                 cl::str_p("\\n")                [actions.break_]
             |   cl::str_p("\\ ")                // ignore an escaped space

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-20 14:52:03 EDT (Mon, 20 Jun 2011)
@@ -34,7 +34,7 @@
       _Should not underline escaped markup_. _or this escaped_ markup form.
     </para>
     <para>
-      <literal>Matti Meik&#xE4;l&#xE4;inen</literal>
+      <literal>Matti Meik\u00E4l\u00E4inen</literal>
     </para>
     <para>
       <literal>replaced</literal>
@@ -43,13 +43,16 @@
       <emphasis role="underline">replaced</emphasis>
     </para>
     <para>
-      <literal>_macro_</literal>
+      <literal>_mac\ ro_</literal>
     </para>
     <para>
-      /not italic/
+      <emphasis>not italic\</emphasis>
     </para>
     <para>
       These shouldn't be interepted as markup: == // **
     </para>
+    <para>
+      <literal>&lt;</literal> <literal>\&lt;</literal> <literal>\\&lt;</literal>
+    </para>
   </section>
 </article>

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-20 14:52:03 EDT (Mon, 20 Jun 2011)
@@ -37,4 +37,6 @@
 
 These shouldn't be interepted as markup: == // **
 
+=<= =\<= =\\<=
+
 [endsect]