X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja.sty;h=4d239659cb14af8d234f2046e8eadcded1ddeeae;hb=32bd2b072469cd57605b85e4d58cfdb018e0d760;hp=6bdeab53d6c65ec85704b75939f9448010fdfebe;hpb=5bb70ef57e9fd117aea6bd8f76e800fce285d1c7;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja.sty b/src/luatexja.sty
index 6bdeab5..4d23965 100644
--- a/src/luatexja.sty
+++ b/src/luatexja.sty
@@ -1,7 +1,6 @@
 %
 % luatexja.sty
 %
-
 %! 外から読まれるので多少仰々しくなってます
 %% Avoid multiple loading.
 \csname\if11luatexjaLoaded\fi\endcsname
@@ -35,22 +34,22 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja}[2013/05/14 Japanese Typesetting with LuaTeX]
+  \ProvidesPackage{luatexja}[2015/11/03 Japanese Typesetting with Lua(La)TeX]
 \fi                             %</LaTeX>
 
-\ifnum\catcode`æ¼¢=12
-  \input ltj-unicode-ccfix.tex
-\fi
+\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
 
 %% Load all sub-packages.
 \ifltj@in@latex                 %<*LaTeX>
-  \RequirePackage{luatexja-core}  [2013/05/14]
+  %% \RequirePackage{expl3} needed if the version of l3kernel is v6111
+  \RequirePackage{luatexja-core}  [2015/11/03]
   \RequirePackage{luatexja-compat}[2013/05/14]
 \else                           %<*!LaTeX>
   \input luatexja-core.sty %
   \input luatexja-compat.sty %
 \fi                             %</LaTeX>
 
+\directlua{luatexja.base.start_time_measure('RUN')}
 %% all done
 \ltj@AtEnd
 \endinput