Add \kchar and \achar, and a patch for xunicode.sty (in luatexja-fontspec.sty).

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index 7b80cff..e11927c 100644 (file)
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -184,11 +184,11 @@
   \advance\ltj@tempcnta by1
 \repeat
 
+
 %%%%%%%% \asluastring
 \def\asluastring#1{'\luaescapestring{\detokenize{#1}}'}
 
 %%%%%%%% Redefine \/
-%\let\ltj@ic=\/ \protected\def\/{{\ltj@icflag=1\ltj@ic}}
 \protected\def\/{\relax\directlua{luatexja.jfont.append_italic()}}
 
 %%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont
@@ -197,6 +197,7 @@
   \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true)}}
 \def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY()}}
 
+%%%%%%%% \zw, \zh
 \def\zw{\directlua{luatexja.jfont.load_zw()}\ltj@zw}
 \def\zh{\directlua{luatexja.jfont.load_zh()}\ltj@zh}
 
@@ -378,7 +379,7 @@
   \ifnum\globaldefs<0\directlua{ltj.isglobal=''}\else\directlua{ltj.isglobal='global'}\fi
   \setkeys[ltj]{japaram}{#1}\ignorespaces}
 
-%%%%%%%% 
+%%%%%%%% \ltjgetparameter
 \def\ltj@@decl@array@param#1{%
   \expandafter\let\csname ltj@@array@param/#1\endcsname=t%
 }
@@ -404,16 +405,31 @@
   \directlua{ltj.ext_get_parameter_binary('#1', \ltj@safe@num{#2})}%
 }
 
+%%%%%%%% \achar<number>, \kchar<number>
+\let\ltj@@origchar=\char
+\protected\def\kchar{\afterassignment\ltj@@kchar\ltj@tempcnta}
+\def\ltj@@kchar{{%
+    \csname ltj@kcat0\endcsname=0
+    \csname ltj@kcat1\endcsname=0
+    \csname ltj@kcat2\endcsname=0
+    \csname ltj@kcat3\endcsname=0
+    \csname ltj@kcat4\endcsname=0
+    \csname ltj@kcat5\endcsname=0
+    \csname ltj@kcat6\endcsname=0
+    \ltj@@origchar\ltj@tempcnta}}
+\protected\def\achar{\afterassignment\ltj@@achar\ltj@tempcnta}
+\def\ltj@@achar{{%
+    \csname ltj@kcat0\endcsname="7FFFFFFF %"
+    \csname ltj@kcat1\endcsname="7FFFFFFF %"
+    \csname ltj@kcat2\endcsname="7FFFFFFF %"
+    \csname ltj@kcat3\endcsname="7FFFFFFF %"
+    \csname ltj@kcat4\endcsname="7FFFFFFF %"
+    \csname ltj@kcat5\endcsname="7FFFFFFF %"
+    \csname ltj@kcat6\endcsname="7FFFFFFF %"
+    \ltj@@origchar\ltj@tempcnta}}
+
 
 
-%\def\ltj@temp{plain}
-%\ifx\fmtname\ltj@temp
-%  \message{plain format: loading luatexja-plain.tex}
-%\fi
-%\input luatexja-plain.tex
-%\catcode`\@=12
-%\endinput
-%! ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑
 
 %%------------------ Load module for the format
 

diff --git a/src/luatexja-fontspec.sty b/src/luatexja-fontspec.sty
index 1c34d5d..c4b8421 100644 (file)
--- a/src/luatexja-fontspec.sty
+++ b/src/luatexja-fontspec.sty
@@ -3,7 +3,79 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2011/09/23 v0.2]
+\ProvidesPackage{luatexja-fontspec}[2011/11/16 v0.3]
+
+\def\UTFencname{EU2}\def\XeTeXpicfile{}
+\RequirePackage{xunicode}
+%% Patch for xunicode.sty
+{\catcode`\"=12
+\gdef\check@hexcom@digits@#1#2#3#4#5@!@#6#7#8{%
+ \ifx @#4\relax
+  \UTFacc@warning@{insufficient hex digits #7 for #6-\string#8}%
+ \else
+  \ifcat \active\noexpand#8%
+   \ifx\add@flag\@ne %
+    \expandafter\def\csname\UTFencname\string#8\endcsname{\achar"#1#2#3#4\relax}%
+    \ifx\unDeFiNed@#8%
+     \ifx\cf@encoding\UTFencname
+      \DeclareTextCommand{#8}{OT1}{\undefined}%
+     \else
+      \DeclareTextCommand{#8}{\cf@encoding}{\undefined}%
+     \fi
+    \else {% macro #8 exists already ...
+      \let\protect\noexpand
+      \edef\UTF@testi{#8}\def\UTF@testii{#8}%
+      \ifx\UTF@testi\UTF@testii\aftergroup\UTF@ignore
+      \else\aftergroup\UTF@doit\fi
+     }%
+     \iffalse
+      % ... but when it isn't robust, make it so
+      \expandafter\let\csname?-\string#8\endcsname#8\relax
+      \edef\next@UTF@{{\cf@encoding}%
+        {\expandafter\noexpand\csname?-\string#8\endcsname}}%
+      \expandafter\DeclareTextCommand\expandafter
+         {\expandafter#8\expandafter}\next@UTF@
+     \fi
+    \fi %
+   \else % \add@flag \z@
+    \expandafter\global\expandafter
+      \let\csname\UTFencname\string#8\endcsname\relax
+   \fi % end of \add@flag switch
+  \else % not active catcode --- shouldn't happen
+  % \typeout{*** did you really mean #8 ? ***}%
+   \ifx\add@flag\@ne %
+    \edef\tmp@name{\expandafter\string\csname\UTFencname\endcsname
+      \expandafter\string\csname#8\endcsname}%
+    \expandafter\def\csname\tmp@name\endcsname{\achar"#1#2#3#4\relax}%
+    \ifx\cf@encoding\UTFencname
+     \expandafter\DeclareTextCommand\expandafter
+       {\csname#8\endcsname}{OT1}{\undefined}%
+    \else
+     \expandafter\DeclareTextCommand\expandafter
+       {\csname#8\endcsname}{\cf@encoding}{\undefined}%
+    \fi
+   \else % \add@flag \z@
+    \expandafter\global\expandafter\let\csname#8\endcsname\relax
+   \fi % end of \add@flag switch
+  \fi % end of \ifcat
+ \fi}
+\gdef\check@hex@digits@#1#2#3#4#5@!@#6#7#8#9{%
+ \ifx @#4\relax
+  \UTFacc@warning@{insufficient hex digits #7 for #6-\string#8#9}%
+ \else
+  \def\UTFchar{\achar"#1#2#3#4\relax}%
+  \expandafter\expandafter\expandafter\declare@utf@composite
+  \expandafter\expandafter\expandafter
+   {\expandafter\csname#6\endcsname}{\UTFchar}{#8}{#9}\relax
+ \fi}
+%\gdef\add@UTF@accent#1#2#3{#2\achar"#1\relax}
+\gdef\add@UTF@accent#1#2#3{\ifx\relax#2\relax\achar"#3\else
+ \ifx\ #2\relax\achar"#3\else
+ \expandafter\ifx\UTF@space#2\relax\achar"#3\else
+ \ifx~#2\achar"#3\else#2\achar"#1\fi\fi\fi\fi\relax}
+\gdef\add@UTF@accents#1#2#3{#2\achar"#1\achar"#3\relax}
+}
+%% End of patch for xunicode.sty "
 
 \RequirePackage{fontspec}
 \RequirePackage{luatexja}
@@ -135,4 +207,23 @@
 
 \cs_set_eq:NN \addjfontfeature \addjfontfeatures
 
+% We reload xunicode package here.
+\ExplSyntaxOff\ReloadXunicode{EU2}
 \endinput
+
+%% 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

diff --git a/test/test09-fontspec.pdf b/test/test09-fontspec.pdf
index 1022623..c83a6f6 100644 (file)
Binary files a/test/test09-fontspec.pdf and b/test/test09-fontspec.pdf differ

diff --git a/test/test09-fontspec.tex b/test/test09-fontspec.tex
index 632ac85..a8a9c05 100644 (file)
--- a/test/test09-fontspec.tex
+++ b/test/test09-fontspec.tex
@@ -56,5 +56,25 @@
 \noindent{\addjfontfeatures{Kerning=On} アノ ← Kerning=On}
 }
 
-
+\subsection{unicode}
+
+設定依存：「\char"201C」「\char"010F」%"
+常に和文：「\kchar"201C」「\kchar"010F」%"
+常に欧文：「\achar"201C」「\achar"010F」%"
+
+{\tracingall\let\char=\achar\textquotedblleft}あ\textquotedblleft あ%
+{\let\char=\kchar\textquotedblleft}あ“あ
+
+\begin{itemize}
+\item hoge
+\begin{itemize}
+\item hoge\textendash\kchar"2013\achar"2013
+\begin{itemize}
+\item hoge
+\begin{itemize}
+\item hoge\textperiodcentered\kchar"00B7\achar"00B7・
+\end{itemize}
+\end{itemize}
+\end{itemize}
+\end{itemize}
 \end{document}