fix "Command `\colon' already defined" error when fontspec is loaded without no-math...

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

diff --git a/src/patches/lltjp-xunicode.sty b/src/patches/lltjp-xunicode.sty
index 4b201d6..bff08c3 100644 (file)
--- a/src/patches/lltjp-xunicode.sty
+++ b/src/patches/lltjp-xunicode.sty
@@ -3,9 +3,9 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-xunicode}[2011/11/22 Patch to xunicode for LuaLaTeX-ja]
+\ProvidesPackage{lltjp-xunicode}[2013/05/14 Patch to xunicode for LuaTeX-ja]
 
-\def\UTFencname{EU2}\def\XeTeXpicfile{}
+\def\XeTeXpicfile{}
 \RequirePackage{xunicode,luatexja}
 {\catcode`\"=12
 \gdef\check@hexcom@digits@#1#2#3#4#5@!@#6#7#8{%
@@ -75,28 +75,25 @@
 }
 % If unicode-math is already loaded, the following error occurs:
 %    ! Undefined control sequence.
-%    \hbar ->\hslash 
+%    \hbar ->\hslash
 % Therefore temporarily set \hbar=\relax.
 \let\ltj@tmpa\hbar
 \let\hbar\relax
-\ReloadXunicode{EU2}
+
+\let\ltj@tmpb\iftipaonetoken
+\let\iftipaonetoken\relax
+\typeout{UTFencname: \UTFencname}
+\let\ltj@temp=\@temp
+\edef\@temp{\noexpand\ReloadXunicode{\UTFencname}}\@temp
 \makeatletter
+\let\@temp=\ltj@temp\let\ltj@temp\relax
 \let\hbar\ltj@tmpa
-\endinput
+\let\iftipaonetoken\ltj@tmpb
+\let\ltj@tmpb\relax % no more an if-token
 
-%% the following patch is needed to xunicode.sty:
-%% 
---- /opt/texlive/2011/texmf-dist/tex/xelatex/xunicode/xunicode.sty     2011-09-12 08:31:47.000000000 +0900
-+++ xunicode.sty       2011-11-16 22:06:17.061413113 +0900
-@@ -1475,7 +1475,11 @@
- 
- \newtoks\tipasavetokens
- \newtoks\tipachecktokens
-+
-+\fi
- \newif\iftipaonetoken
-+\expandafter\ifx\csname ReloadXunicode\endcsname\relax
-+
- \def\tipalasttoken{!@! do nothing with this !@!}
- \def\tipacatchonechar#1{\begingroup
-  \def\textipa##1{##1}% prevent recursion
+%% ticket 30501
+{\catcode`\!0\catcode`\\11!catcode`!2 11!catcode`!?11!catcode`!-11
+ !expandafter!gdef!csname!UTFencname \nobreakspace!endcsname{!?-\nobreakspace}%
+}
+
+\endinput