Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r72775 - in branches/release/tools/quickbook: . doc src test
From: dnljms_at_[hidden]
Date: 2011-06-27 10:02:29


Author: danieljames
Date: 2011-06-27 10:02:28 EDT (Mon, 27 Jun 2011)
New Revision: 72775
URL: http://svn.boost.org/trac/boost/changeset/72775

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

Authorized by Beman Dawes.

Properties modified:
   branches/release/tools/quickbook/ (props changed)
   branches/release/tools/quickbook/doc/ (props changed)
   branches/release/tools/quickbook/src/ (props changed)
   branches/release/tools/quickbook/test/ (props changed)
Text files modified:
   branches/release/tools/quickbook/src/main_grammar.cpp | 17 ++---------------
   branches/release/tools/quickbook/test/simple_markup.gold | 9 ++++++---
   branches/release/tools/quickbook/test/simple_markup.quickbook | 2 ++
   3 files changed, 10 insertions(+), 18 deletions(-)

Modified: branches/release/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- branches/release/tools/quickbook/src/main_grammar.cpp (original)
+++ branches/release/tools/quickbook/src/main_grammar.cpp 2011-06-27 10:02:28 EDT (Mon, 27 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: branches/release/tools/quickbook/test/simple_markup.gold
==============================================================================
--- branches/release/tools/quickbook/test/simple_markup.gold (original)
+++ branches/release/tools/quickbook/test/simple_markup.gold 2011-06-27 10:02:28 EDT (Mon, 27 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: branches/release/tools/quickbook/test/simple_markup.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/simple_markup.quickbook (original)
+++ branches/release/tools/quickbook/test/simple_markup.quickbook 2011-06-27 10:02:28 EDT (Mon, 27 Jun 2011)
@@ -37,4 +37,6 @@
 
 These shouldn't be interepted as markup: == // **
 
+=<= =\<= =\\<=
+
 [endsect]


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk