X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fpatches%2Flltjp-xunicode.sty;h=da4d1a7888041beb49f3f50d88a7b75d05422ba3;hb=67291f7f1dee7f7ace5c41e9b881eb3ca8b727c3;hp=ee74848f23ccc04f786dc2ef95843445b365209c;hpb=cedece70776db9548f639c0abd73b0e3427bd7c2;p=luatex-ja%2Fluatexja.git

diff --git a/src/patches/lltjp-xunicode.sty b/src/patches/lltjp-xunicode.sty
index ee74848..da4d1a7 100644
--- 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