X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fluatexja-otf.sty;h=d2c469c9fa07eb34ead46f427863f7082a884bba;hb=026e2a65ad58dd692c4c5e65e44c028a5ecfae77;hp=ac7a8838e336a6a9b1899e6e42cbbf0ae5ee8251;hpb=e8c88f11c34a3957a1fff1391109d353566d4a6a;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja-otf.sty b/src/luatexja-otf.sty
index ac7a883..d2c469c 100644
--- a/src/luatexja-otf.sty
+++ b/src/luatexja-otf.sty
@@ -85,11 +85,21 @@
 %! Main part of luatexja-otf
 \RequireLuaModule{luatexja.otf}
 
-\protected\def\CID#1{\ifvmode\leavevmode\fi\directlua{luatexja.otf.cid(#1)}\relax}
+\newcount\ltj@tempcnta
 
-%% \UTF being compatible with the OTF package for pLaTeX
+\protected\def\CID#1{\ifvmode\leavevmode\fi\ltj@tempcnta#1\relax\directlua{luatexja.otf.cid(\the\ltj@tempcnta)}\relax}
+
+%% \UTF compatible with the OTF package for pLaTeX
 \protected\def\UTF#1{\ifvmode\leavevmode\fi\directlua{luatexja.otf.append_jglyph(0x#1)}}
 
+%% Load ajmacros
+\ifltj@in@latex                 %<*LaTeX>
+  \RequirePackage{luatexja-ajmacros}[2011/09/19]
+\else                           %<*!LaTeX>
+  \input luatexja-ajmacros.sty %
+\fi                             %</LaTeX>
+
+
 %%------------------ all done
 \ltj@otf@AtEnd
 \endinput