Merge branch 'master' into kitagawa_test

[luatex-ja/luatexja.git] / src / luatexja.sty

diff --git a/src/luatexja.sty b/src/luatexja.sty
index 46b7e87..2e55d5c 100644 (file)
--- 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}[2011/04/01 v0.1]
+  \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}[2011/04/01]
-  \RequirePackage{luatexja-compat}[2011/04/01]
+  %% \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