X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja.sty;h=4a163bcfe1d80a163488367995c1c2e903073ba2;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=6bdeab53d6c65ec85704b75939f9448010fdfebe;hpb=41b03ea6a8c8f1254aca62ff30b8abe53786ac7c;p=luatex-ja%2Fluatexja.git

diff --git a/src/luatexja.sty b/src/luatexja.sty
index 6bdeab5..4a163bc 100644
--- a/src/luatexja.sty
+++ b/src/luatexja.sty
@@ -1,7 +1,6 @@
 %
 % luatexja.sty
 %
-
 %! 外から読まれるので多少仰々しくなってます
 %% Avoid multiple loading.
 \csname\if11luatexjaLoaded\fi\endcsname
@@ -25,6 +24,7 @@
 \edef\ltj@AtEnd{\x
   \noexpand\let\noexpand\ltj@AtEnd\relax}
 \def\luatexjaLoaded{\endinput}
+\newif\ifltj@disablejfam
 
 %% Check if LaTeX is used.
 \begingroup\expandafter\expandafter\expandafter\endgroup
@@ -35,22 +35,26 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja}[2013/05/14 Japanese Typesetting with LuaTeX]
+  \ProvidesPackage{luatexja}[2019/04/08 Japanese Typesetting with Lua(La)TeX]
+  \DeclareOption{disablejfam}{\ltj@disablejfamtrue}
+  \DeclareOption*{}
+  \ProcessOptions\relax
 \fi                             %</LaTeX>
+%%%% VERSION
+\def\LuaTeXjaversion{20190708.0}
 
-\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{luatexja-compat}[2013/05/14]
+  %% \RequirePackage{expl3} needed if the version of l3kernel is v6111
+  \RequirePackage{luatexja-core,luatexja-compat}
 \else                           %<*!LaTeX>
   \input luatexja-core.sty %
   \input luatexja-compat.sty %
 \fi                             %</LaTeX>
 
+\directlua{luatexja.base.start_time_measure('RUN')}
 %% all done
 \ltj@AtEnd
 \endinput