summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/addons
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-08-25 20:56:18 +0000
committerKarl Berry <karl@freefriends.org>2018-08-25 20:56:18 +0000
commit21a58c30431c4e45b1b0bc9f94f4e696bab9a217 (patch)
tree6f66df0c8d0bc0893a4dc129d740b7a709ab61d3 /Master/texmf-dist/tex/luatex/luatexja/addons
parent07d445bda7b2504536050450a2f1cc433ed3899e (diff)
luatexja (25aug18)
git-svn-id: svn://tug.org/texlive/trunk@48483 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty25
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty2
2 files changed, 18 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty
index 0416a3ebd77..57d9835caf5 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/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,26 +85,31 @@
%%------------------
%! Main part of luatexja-adjust
-\ifnum\luatexversion>90
- \RequireLuaTeXjaSubmodule{adjust}
-\else
- \RequireLuaTeXjaSubmodule{adjust_85}
-\fi
-
+\RequireLuaTeXjaSubmodule{adjust}
\newcount\ltjadj@status@le
+\newcount\ltjadj@status@lp
\newcount\ltjadj@status@pr
+\newcount\ltjadj@status@ls
\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@boolkey[ltj]{adjust}{profile}[true]{%
+ \ltjadj@status@lp=\ifltj@adjust@profile1\else0\fi\relax}
+\define@boolkey[ltj]{adjust}{linestep}[true]{%
+ \ltjadj@status@ls=\ifltj@adjust@linestep1\else0\fi\relax}
+
\protected\def\@@ltjenableadjust[#1]{%
\setkeys[ltj]{adjust}{#1}%
- \directlua{luatexja.adjust.enable_cb(\the\ltjadj@status@le, \the\ltjadj@status@pr)}\ignorespaces
+ \directlua{luatexja.adjust.enable_cb(
+ \the\ltjadj@status@le, \the\ltjadj@status@pr,
+ \the\ltjadj@status@lp, \the\ltjadj@status@ls)}\ignorespaces
}
-\protected\def\ltjdisableadjust{\ltjenableadjust[lineend=false,priority=false]}
+\protected\def\ltjdisableadjust{%
+ \ltjenableadjust[lineend=false,priority=false,profile=false,linestep=false]}
\protected\def\ltjenableadjust{%
\ltx@ifnextchar[{\@@ltjenableadjust}{\@@ltjenableadjust[lineend,priority]}}%]
@@ -127,6 +132,8 @@
stretch_priority={kanjiskip=-35, xkanjiskip=-25, others=50},
shrink_priority={kanjiskip=-35, xkanjiskip=-25, others=50},
}
+\define@key[ltj]{japaram}{linestep_factor}{%
+ \directlua{local d = #1; luatexja.adjust.step_factor=math.abs(d)}\relax}
%%------------------ all done
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
index b2eabb12fb4..4e577aad5ea 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -88,7 +88,9 @@
% 漢字字形
\tl_new:N \l_ltjpreset_kanji_shape_tl
\ltjpreset_declare_option:nn{90jis}{ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }} % 90jis
+\ltjpreset_declare_option:nn{jis90}{ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }} % 90jis
\ltjpreset_declare_option:nn{jis2004}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }} % jis2004
+\ltjpreset_declare_option:nn{2004jis}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }} % jis2004
% font preset
\prop_new:N \g_ltjpreset_font_prop