add keys in luatexja-adjust; changed minimum version of LuaTeX to 1.0.0

diff --git a/README b/README
index 5c4c3e3..94e2120 100644 (file)
--- a/README
+++ b/README
@@ -22,7 +22,7 @@ Installation
 
 0. Please make sure that your TeX distribution is up-to-date.
    This version of LuaTeX-ja requires
-    - LuaTeX beta-0.85.0 or later
+    - LuaTeX 1.0.0 or later
     - luaotfload v2.6
     - adobemapping (Adobe CMap files)
     - everysel package
@@ -33,9 +33,9 @@ Installation
     - filehook package
     - stfloats package
     - IPAex fonts (http://ipafont.ipa.go.jp/)
-   Hence this version does not work in TeX Live 2015 (or earlier).
+   Hence this version does not work in TeX Live 2016 (or earlier).
 
-1. If you are using TeX Live 2016 or later, you can install LuaTeX-ja via tlmgr.
+1. If you are using TeX Live 2018 or later, you can install LuaTeX-ja via tlmgr.
 
 2. If you must/want to install manually:
 

diff --git a/src/addons/luatexja-adjust.sty b/src/addons/luatexja-adjust.sty
index 0416a3e..1a80721 100644 (file)
--- a/src/addons/luatexja-adjust.sty
+++ b/src/addons/luatexja-adjust.sty
@@ -64,7 +64,7 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja-adjust}[2017/05/05]
+  \ProvidesPackage{luatexja-adjust}[2018/07/24]
 \fi                             %</LaTeX>
 
 % Load core module if not yet.
@@ -85,21 +85,25 @@
 %%------------------
 
 %! Main part of luatexja-adjust
-\ifnum\luatexversion>90
-  \RequireLuaTeXjaSubmodule{adjust}
-\else
-  \RequireLuaTeXjaSubmodule{adjust_85}
-\fi
-
+\RequireLuaTeXjaSubmodule{adjust}
 
 \newcount\ltjadj@status@le
 \newcount\ltjadj@status@pr
+\let\ltjadj@method@profile\@empty
+\let\ltjadj@method@lineskip\@empty
 \let\ltj@adjust@temp=\relax
 \define@choicekey[ltj]{adjust}{lineend}[\@@temp\ltj@adjust@temp]%
 {false,true,extended}[true]{%
   \ifnum\ltj@adjust@temp=-1 \else\ltjadj@status@le=\ltj@adjust@temp\fi\relax}
 \define@boolkey[ltj]{adjust}{priority}[true]{%
   \ltjadj@status@pr=\ifltj@adjust@priority1\else0\fi\relax}
+\define@key[ltj]{adjust}{profile}[]{%
+  \def\ltjadj@method@profile{#1}\ltjadj@set@lineskip\relax}
+\define@key[ltj]{adjust}{lineskip}[]{%
+  \def\ltjadj@method@lineskip{#1}\ltjadj@set@lineskip\relax}
+\protected\def\ltjadj@set@lineskip{%
+  \directlua{luatexja.lineskip.setting('\ltjadj@method@profile','\ltjadj@method@lineskip')}\relax
+}
 \protected\def\@@ltjenableadjust[#1]{%
    \setkeys[ltj]{adjust}{#1}%
    \directlua{luatexja.adjust.enable_cb(\the\ltjadj@status@le, \the\ltjadj@status@pr)}\ignorespaces

diff --git a/src/ltj-lineskip.lua b/src/ltj-lineskip.lua
index dbbdebe..d4efaf9 100644 (file)
--- a/src/ltj-lineskip.lua
+++ b/src/ltj-lineskip.lua
@@ -5,7 +5,7 @@ luatexja.load_module('base'); local ltjb = luatexja.base
 luatexja.load_module('direction'); local ltjd = luatexja.direction
 luatexja.lineskip = luatexja.lineskip or {}
 
-local to_direct, to_node = node.direct.todirect, node.direct.tonode
+local to_direct = node.direct.todirect
 local ltjl = luatexja.lineskip
 local id_glue = node.id('glue')
 local id_hlist = node.id('hlist')

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index 51adc9b..e57739d 100644 (file)
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -101,10 +101,10 @@
 \expandafter\endinput\fi\relax
 
 %% Check LuaTeX version.
-\ifnum\luatexversion<85
+\ifnum\luatexversion<100
   \@PackageError{luatexja-core}
     {This LuaTeX engine is too old for this package;\MessageBreak
-     at least beta-0.85.0 is needed}
+     at least 1.0.0 is needed}
     {Package loading is aborted now.\MessageBreak}
 \expandafter\endinput\fi\relax