From d9b548bc058a1e7859398e11aced788196aca531 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 3 Jul 2022 20:58:43 +0000 Subject: luatexja (3jul22) git-svn-id: svn://tug.org/texlive/trunk@63801 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/luatex/luatexja/addons/luatexja-preset.sty | 18 +++++++++++++-- .../tex/luatex/luatexja/addons/luatexja-ruby.sty | 26 ++++++++++++++++------ Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua | 3 ++- Master/texmf-dist/tex/luatex/luatexja/luatexja.sty | 2 +- 4 files changed, 38 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/luatex') 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, } diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua index 320b7307f05..7fa7ea927e7 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.ruby', - date = '2022-02-03', + date = '2022-06-25', description = 'Ruby annotation', }) luatexja.ruby = {} @@ -398,6 +398,7 @@ local function new_ruby_box(r, p, tmp_tbl, no_begin, no_end) setfield(a, 'depth', 0); setfield(k, 'kern', tmp_tbl.intergap) insert_after(r, r, a); insert_after(r, a, k); insert_after(r, k, p); setfield(p, 'next', nil) + if tmp_tbl.rubydepth >= 0 then setfield(r, 'depth', tmp_tbl.rubydepth) end if tmp_tbl.baseheight >= 0 then setfield(p, 'height', tmp_tbl.baseheight) end a = node.direct.vpack(r); setfield(a, 'shift', 0) set_attr(a, attr_ruby, post_intrusion) diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index eae7d5040b8..aa3d1f54632 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -27,7 +27,7 @@ \newif\ifltj@disablejfam %%%% VERSION -\def\LuaTeXjaversion{20220530.0} +\def\LuaTeXjaversion{20220703.0} %% Check if LaTeX is used. \begingroup\expandafter\expandafter\expandafter\endgroup -- cgit v1.2.3