Merge quickbook.

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


[SVN r60665]
This commit is contained in:
Daniel James
2010-03-17 00:18:38 +00:00
parent 28e248c521
commit 962f63fef6
4 changed files with 33 additions and 8 deletions

View File

@@ -634,7 +634,8 @@ from the output.
[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 @@ boostbook standalone
:
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

View File

@@ -275,10 +275,10 @@ namespace quickbook
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]

View File

@@ -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>

View File

@@ -27,4 +27,11 @@
* \u03A6\u03C6 Phi
* \u03A7\u03C7 Chi
* \u03A8\u03C8 Psi
* \u03A9\u03C9 Omega
* \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