ltj-charrange.lua: definition of jcr_cjk and jcr_noncjk was too late.

[luatex-ja/luatexja.git] / src / patches / lltjp-xunicode.sty

diff --git a/src/patches/lltjp-xunicode.sty b/src/patches/lltjp-xunicode.sty
index ee74848..da4d1a7 100644 (file)
--- a/src/patches/lltjp-xunicode.sty
+++ b/src/patches/lltjp-xunicode.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-xunicode}[2012/4/18 Patch to xunicode for LuaLaTeX-ja]
+\ProvidesPackage{lltjp-xunicode}[2013/05/14 Patch to xunicode for LuaTeX-ja]
 
 \def\UTFencname{EU2}\def\XeTeXpicfile{}
 \RequirePackage{xunicode,luatexja}
@@ -76,20 +76,20 @@
 % If unicode-math is already loaded, the following error occurs:
 %    ! Undefined control sequence.
 %    \hbar ->\hslash
-%    ! Missing \endcsname inserted.
-%    <to be read again>
-%                       \Zbar
-% Therefore temporarily set \hbar=\relax and \Zbar=\relax.
+% Therefore temporarily set \hbar=\relax.
 \let\ltj@tmpa\hbar
 \let\hbar\relax
 \let\ltj@tmpb\iftipaonetoken
 \let\iftipaonetoken\relax
-\let\ltj@tmpc\Zbar
-\let\Zbar\relax
 \ReloadXunicode{EU2}
 \makeatletter
 \let\hbar\ltj@tmpa
 \let\iftipaonetoken\ltj@tmpb
 \let\ltj@tmpb\relax % no more an if-token
-\let\Zbar\ltj@tmpc
+
+%% ticket 30501
+{\catcode`\!0\catcode`\\11!catcode`!2 11!catcode`!?11!catcode`!-11
+ !gdef!EU2\nobreakspace{!?-\nobreakspace}%
+}
+
 \endinput