summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/addons
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-07-03 20:58:43 +0000
committerKarl Berry <karl@freefriends.org>2022-07-03 20:58:43 +0000
commitd9b548bc058a1e7859398e11aced788196aca531 (patch)
treed43cf228d7c9beed04483fc509c6dcf840c0bba9 /Master/texmf-dist/tex/luatex/luatexja/addons
parent651896284226ba0b294d5d5a627bcdcadcfbc7e9 (diff)
luatexja (3jul22)
git-svn-id: svn://tug.org/texlive/trunk@63801 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-preset.sty18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty26
2 files changed, 35 insertions, 9 deletions
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 3da21dd1556..b1d5873ab61 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
% luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2020-09-14 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2022-06-19 Japanese font presets]
\RequirePackage{expl3,l3keys2e}
\RequirePackage{luatexja}
@@ -211,7 +211,7 @@
mc = A-OTF-RyuminPr6N-Light.otf, mc-b = A-OTF-FutoMinA101Pr6N-Bold.otf,
gt-d = A-OTF-GothicBBBPr6N-Medium.otf , gt-b = A-OTF-FutoGoB101Pr6N-Bold.otf,
gt-u = A-OTF-GothicBBBPr6N-Medium.otf , gt-eb = A-OTF-MidashiGoPr6N-MB31.otf,
- mg-m = A-OTF-Jun101Pr6N-Light.otf,
+ mg-m = A-OTF-ShinMGoPr6N-Light.otf,
__custom = false, __office = false, __noembed = false,
}
@@ -312,6 +312,20 @@
mc-l = Noto~Serif~CJK~JP~Light,
__custom = false, __office = false, __noembed = false,
}
+\ltjpreset_declare_preset:nx{noto}{
+ noto-otf,
+}
+\ltjpreset_declare_preset:nx{noto-jp}{
+ mc-m = Noto~Serif~JP~Regular,
+ mc-b = Noto~Serif~JP~Bold,
+ gt-d = Noto~Sans~JP~Regular,
+ gt-b = Noto~Sans~JP~Bold,
+ gt-u = Noto~Sans~JP~Medium,
+ gt-eb = Noto~Sans~JP~Black,
+ mg-m = Noto~Sans~JP~Medium,
+ mc-l = Noto~Serif~JP~Light,
+ __custom = false, __office = false, __noembed = false,
+}
% HaranoAji {Mincho, Gothic}
\ltjpreset_declare_preset:nx{haranoaji}{
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty
index 8367feb0476..1e50b1f680c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty
@@ -4,7 +4,7 @@
% LaTeX only!
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-ruby}[2021-05-17 v0.52]
+\ProvidesPackage{luatexja-ruby}[2022-07-03 v0.53]
\RequirePackage{luatexja}
%%------------------
@@ -78,6 +78,14 @@
\expandafter\def\csname ltj@@rubyip@tbaseheight\endcsname{#1}%
}
%% これらの値が正のとき,親文字の高さをこの値(\zh 単位)とみなす
+
+\ltj@@rkeydef{yrubydepth} % 縦組以外 (yoko, utod, dtou)
+\ltj@@rkeydef{trubydepth} % 縦組
+\define@key[ltj]{ruby}{rubydepth}{%
+ \expandafter\def\csname ltj@@rubyip@yrubydepth\endcsname{#1}%
+ \expandafter\def\csname ltj@@rubyip@trubydepth\endcsname{#1}%
+}
+
\define@boolkey[ltj]{ruby}{intrude_jfmgk}[true]{}
\define@boolkey[ltj]{ruby}{intrude_xkanjiskip}[true]{}
\define@boolkey[ltj]{ruby}{intrude_kanjiskip}[true]{}
@@ -100,7 +108,7 @@
% Lua ソースに渡す table 生成
\bgroup
\catcode`\_=11
-\gdef\ltj@@ruby@create@table#1{% #1: ルビ全角
+\gdef\ltj@@ruby@create@table#1#2{% #1: ルビ全角幅,#2: ルビ全角高さ
\string{
eps = \ltj@safe@dimen{\ltj@@rubyip@epsilon\zw},
before_jfmgk = 0, after_jfmgk = 0,
@@ -119,6 +127,8 @@
+ 1048576 * \ifltj@ruby@rubysmash1\else0\fi),
baseheight = \ltj@safe@dimen{\ifnum\ltjgetparameter{direction}=3
\ltj@@rubyip@tbaseheight\else\ltj@@rubyip@ybaseheight\fi\zh},
+ rubydepth = \ltj@safe@dimen{\ifnum\ltjgetparameter{direction}=3
+ \ltj@@rubyip@trubydepth\else\ltj@@rubyip@yrubydepth\fi#2},
intrude_jfmgk = \string{
\ifltj@ruby@intrude_jfmgk [luatexja.icflag_table.FROM_JFM]=true,\fi
\ifltj@ruby@intrude_kanjiskip
@@ -181,9 +191,10 @@
\protected\def\ltjruby{\@ifnextchar[\ltj@@ruby{\ltj@@ruby[]}}%]
\AtBeginDocument{%
\ifdefined\ruby\else\let\ruby=\ltjruby\fi
+ \ifdefined\kenten\else\let\kenten=\ltjkenten\fi
\directlua{luatexja.ruby.read_old_break_info()}%
}
-\def\ltj@@ruby[#1]#2#3{{% #1: option #2: 親文字群,#3: ルビ文字列群,共に| 区切り
+\protected\def\ltj@@ruby[#1]#2#3{{% #1: option #2: 親文字群,#3: ルビ文字列群,共に| 区切り
\setkeys[ltj]{ruby}{#1}%
\directlua{luatexja.ruby.ruby_tmplist_r = \string{\string};
luatexja.ruby.ruby_tmplist_p = \string{\string}}%
@@ -191,9 +202,10 @@
% 引数展開,テーブルにセット
\pxrr@decompbar{#2}{\let\ltj@@ruby@mark\ltj@@ruby@sp\pxrr@res}%
\pxrr@decompbar{#3}{\let\ltj@@ruby@mark\ltj@@ruby@sr\pxrr@res}%
- {\fontsize{\ltj@@rubyip@size\dimen0}\z@\selectfont\ltj@@rubyip@fontcmd\global\dimen1=\zw}%
+ {\fontsize{\ltj@@rubyip@size\dimen0}\z@\selectfont\ltj@@rubyip@fontcmd
+ \global\dimen1=\zw\global\dimen2=\zh}%
\directlua{%
- luatexja.ruby.texiface(\ltj@@ruby@create@table{\dimen1},
+ luatexja.ruby.texiface(\ltj@@ruby@create@table{\dimen1}{\dimen2},
luatexja.ruby.ruby_tmplist_r, luatexja.ruby.ruby_tmplist_p)}%
}}
@@ -207,7 +219,6 @@
}
\protected\def\ltjkenten{\@ifnextchar[\ltj@@kenten{\ltj@@kenten[]}}%]
-\let\kenten=\ltjkenten
\def\ltj@@kenten[#1]#2{{%
\setkeys[ltj]{ruby}{#1, stretchruby=101}%
\@tfor\ltj@@kenten@temp:=#2\do{\ltj@@ruby[]{\ltj@@kenten@temp}{\ltj@@rubyip@kenten}}%
@@ -244,11 +255,12 @@
\ltjsetparameter{rubypreintrusion={-1,1}}
\setkeys[ltj]{ruby}{
- pre=-1, post=-1, mode=1,
+ pre=-1, post=-1, mode=1,
stretchruby={1}{2}{1}, stretch = {1}{2}{1},
stretchbol={0}{1}{1}, stretcheol={1}{1}{0},
maxmargin=0.5, size=0.5, intergap=0, rubysmash=false,
kenten=\textbullet, fontcmd=\relax, ybaseheight=0.88, tbaseheight=0.5,
+ yrubydepth=0.12, trubydepth=0.5,
intrude_jfmgk, intrude_kanjiskip, intrude_xkanjiskip,
epsilon=0.0001,
}