[Boost-commit] svn:boost r75354 - in branches/quickbook-dev/tools/quickbook: src test

Subject: [Boost-commit] svn:boost r75354 - in branches/quickbook-dev/tools/quickbook: src test
From: dnljms_at_[hidden]
Date: 2011-11-06 17:20:44

Author: danieljames
Date: 2011-11-06 17:20:44 EST (Sun, 06 Nov 2011)
New Revision: 75354
URL: http://svn.boost.org/trac/boost/changeset/75354

Log:
Quickbook: No point in using `hard_space` here.

The difference between `hard_space` and `space` is that `hard_space`
won't have a zero-width match in certain places. But in the `-` part of
a classic spirit rule, zero-width matches don't count so there's
effectively no difference.
Text files modified: 
   branches/quickbook-dev/tools/quickbook/src/phrase_element_grammar.cpp |     2 +-                                      
   branches/quickbook-dev/tools/quickbook/test/link-1_1.gold             |     3 +++                                     
   branches/quickbook-dev/tools/quickbook/test/link-1_1.quickbook        |     2 ++                                      
   3 files changed, 6 insertions(+), 1 deletions(-)

Modified: branches/quickbook-dev/tools/quickbook/src/phrase_element_grammar.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/phrase_element_grammar.cpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/phrase_element_grammar.cpp	2011-11-06 17:20:44 EST (Sun, 06 Nov 2011)
@@ -91,7 +91,7 @@
 
         local.link =
                 space
-            >>  (*(cl::anychar_p - (']' | hard_space)))
+            >>  (*(cl::anychar_p - (']' | space)))
                                                 [actions.values.entry(ph::arg1, ph::arg2)]
             >>  hard_space
             >>  local.inner_phrase

Modified: branches/quickbook-dev/tools/quickbook/test/link-1_1.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/link-1_1.gold	(original)
+++ branches/quickbook-dev/tools/quickbook/test/link-1_1.gold	2011-11-06 17:20:44 EST (Sun, 06 Nov 2011)
@@ -17,6 +17,9 @@
       <conceptname alt="foo">link text</conceptname> <globalname alt="foo">foo</globalname>
       <globalname alt="foo">link text</globalname>
     </para>
+    <para>
+      <link linkend="link">description</link>
+    </para>
   </section>
   <section id="link_tests.side_by_side_links">
     <title>Side-by-side links</title>

Modified: branches/quickbook-dev/tools/quickbook/test/link-1_1.quickbook
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/link-1_1.quickbook	(original)
+++ branches/quickbook-dev/tools/quickbook/test/link-1_1.quickbook	2011-11-06 17:20:44 EST (Sun, 06 Nov 2011)
@@ -25,6 +25,8 @@
 [globalref foo]
 [globalref foo link text]
 
+[link link[/ comment]description]
+
 [endsect]
 
 [section Side-by-side links]