[Boost-commit] svn:boost r60665 - in branches/release/tools/quickbook: . doc test

Subject: [Boost-commit] svn:boost r60665 - in branches/release/tools/quickbook: . doc test
From: daniel_james_at_[hidden]
Date: 2010-03-16 20:18:39

Author: danieljames
Date: 2010-03-16 20:18:38 EDT (Tue, 16 Mar 2010)
New Revision: 60665
URL: http://svn.boost.org/trac/boost/changeset/60665

Log:
Merge quickbook.

 - 32-bit unicode escapes.
 - Escape a couple of equal signs. Fixes #3906.

Properties modified: 
   branches/release/tools/quickbook/   (props changed)
Text files modified: 
   branches/release/tools/quickbook/doc/quickbook.qbk             |     7 ++++---                                 
   branches/release/tools/quickbook/phrase.hpp                    |     8 ++++----                                
   branches/release/tools/quickbook/test/unicode-escape.gold      |    17 +++++++++++++++++                       
   branches/release/tools/quickbook/test/unicode-escape.quickbook |     9 ++++++++-                               
   4 files changed, 33 insertions(+), 8 deletions(-)

Modified: branches/release/tools/quickbook/doc/quickbook.qbk
==============================================================================
--- branches/release/tools/quickbook/doc/quickbook.qbk	(original)
+++ branches/release/tools/quickbook/doc/quickbook.qbk	2010-03-16 20:18:38 EDT (Tue, 16 Mar 2010)
@@ -634,7 +634,8 @@
 [endsect]
 [section Unicode escape]
 
-You can enter any 32-bit unicode character by using `\u` followed by its 4 digit
+You can enter any 16-bit unicode character by using `\u` followed by its 4 digit
+hexadecimal code, or a 32-bit character by using `\U` followed by an 8 digit
 hexadecimal code. eg.
 
 [pre'''
@@ -2134,8 +2135,8 @@
     :
         my_doc
     :
-        <xsl:param>boost.image.src=images/my_project_logo.png
-        <xsl:param>boost.image.alt="\\"My Project\\""
+        <xsl:param>boost.image.src\=images/my_project_logo.png
+        <xsl:param>boost.image.alt\="\\"My Project\\""
         <xsl:param>boost.image.w=100
         <xsl:param>boost.image.h=50
         <xsl:param>nav.layout=none

Modified: branches/release/tools/quickbook/phrase.hpp
==============================================================================
--- branches/release/tools/quickbook/phrase.hpp	(original)
+++ branches/release/tools/quickbook/phrase.hpp	2010-03-16 20:18:38 EDT (Tue, 16 Mar 2010)
@@ -275,10 +275,10 @@
                         str_p("\\n")                    [actions.break_]
                     |   "\\ "                           // ignore an escaped char
                     |   '\\' >> punct_p                 [actions.raw_char]
-                    |   "\\u">> repeat_p(4)
-                        [
-                            chset<>("0-9a-fA-F")
-                        ]                               [actions.escape_unicode]
+                    |   "\\u" >> repeat_p(4) [chset<>("0-9a-fA-F")]
+                                                        [actions.escape_unicode]
+                    |   "\\U" >> repeat_p(8) [chset<>("0-9a-fA-F")]
+                                                        [actions.escape_unicode]
                     |   (
                             ("'''" >> !eol)             [actions.escape_pre]
                         >>  *(anychar_p - "'''")        [actions.raw_char]

Modified: branches/release/tools/quickbook/test/unicode-escape.gold
==============================================================================
--- branches/release/tools/quickbook/test/unicode-escape.gold	(original)
+++ branches/release/tools/quickbook/test/unicode-escape.gold	2010-03-16 20:18:38 EDT (Tue, 16 Mar 2010)
@@ -82,4 +82,21 @@
       &#x3A9;&#x3C9; Omega
     </listitem>
   </itemizedlist>
+  <para>
+    In the unlikely event that you've got a Mahjong font:
+  </para>
+  <itemizedlist>
+    <listitem>
+      &#x1F000; East Wind
+    </listitem>
+    <listitem>
+      &#x1F001; South Wind
+    </listitem>
+    <listitem>
+      &#x1F002; West Wind
+    </listitem>
+    <listitem>
+      &#x1F003; North Wind
+    </listitem>
+  </itemizedlist>
 </article>

Modified: branches/release/tools/quickbook/test/unicode-escape.quickbook
==============================================================================
--- branches/release/tools/quickbook/test/unicode-escape.quickbook	(original)
+++ branches/release/tools/quickbook/test/unicode-escape.quickbook	2010-03-16 20:18:38 EDT (Tue, 16 Mar 2010)
@@ -27,4 +27,11 @@
 * \u03A6\u03C6 Phi
 * \u03A7\u03C7 Chi
 * \u03A8\u03C8 Psi
-* \u03A9\u03C9 Omega
\ No newline at end of file
+* \u03A9\u03C9 Omega
+
+In the unlikely event that you've got a Mahjong font:
+
+* \U0001F000 East Wind
+* \U0001F001 South Wind
+* \U0001F002 West Wind
+* \U0001F003 North Wind
\ No newline at end of file