From f1e79c3669f68804c471699badc56a4a33a23246 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 8 Aug 2022 03:05:28 +0000 Subject: CTAN sync 202208080305 --- macros/luatex/generic/luatexja/README | 8 ++-- macros/luatex/generic/luatexja/doc/luatexja-en.pdf | Bin 717582 -> 717626 bytes macros/luatex/generic/luatexja/doc/luatexja-ja.pdf | Bin 1149384 -> 1149406 bytes macros/luatex/generic/luatexja/doc/luatexja.dtx | 16 ++++---- macros/luatex/generic/luatexja/src/ltj-adjust.lua | 6 +-- macros/luatex/generic/luatexja/src/ltj-base.sty | 2 +- macros/luatex/generic/luatexja/src/ltj-compat.lua | 4 +- .../luatex/generic/luatexja/src/ltj-direction.lua | 45 +++++++-------------- macros/luatex/generic/luatexja/src/ltj-jfmglue.lua | 12 +++--- macros/luatex/generic/luatexja/src/ltj-jfont.lua | 5 +-- .../luatex/generic/luatexja/src/ltj-lineskip.lua | 13 +++--- macros/luatex/generic/luatexja/src/luatexja.lua | 3 ++ macros/luatex/generic/luatexja/src/luatexja.sty | 2 +- 13 files changed, 52 insertions(+), 64 deletions(-) (limited to 'macros/luatex/generic') diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README index a769b41a75..d37dc3db67 100644 --- a/macros/luatex/generic/luatexja/README +++ b/macros/luatex/generic/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20220703.0 +The LuaTeX-ja Package 20220807.0 -------------------------------- Copyright (c) 2011--2022 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -42,9 +42,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20220703.0 in the Git repository by + or tagged as 20220807.0 in the Git repository by + ;a=snapshot;h=refs/tags/20220807.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -93,4 +93,4 @@ Notes This file and ltj-kinsoku.lua are not used anymore. (Do not remove ltj-kinsoku.tex.) -Last commit date: Sun Jul 3 11:15:41 2022 +0900 +Last commit date: Sun Aug 7 12:20:08 2022 +0900 diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf index 7ad9b0ebc5..5ee7e4047d 100644 Binary files a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf and b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf differ diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf index 8f1095869c..2ed0625eb1 100644 Binary files a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf and b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf differ diff --git a/macros/luatex/generic/luatexja/doc/luatexja.dtx b/macros/luatex/generic/luatexja/doc/luatexja.dtx index 7c167d96f6..58f2cc15bd 100644 --- a/macros/luatex/generic/luatexja/doc/luatexja.dtx +++ b/macros/luatex/generic/luatexja/doc/luatexja.dtx @@ -3019,8 +3019,8 @@ the direction inside the box and that outside the box differ. % \put(4,7.2){\line(0,1){1.8}} \put(11,7.2){\line(0,1){1.8}} - \put(8,8){\vector(-1,0){0.5}\vector(1,0){3}} - \put(7,8){\vector(-1,0){3}\vector(1,0){0.5}} + \put(8,8){\vector(-1,0){0.5}}\put(8,8){\vector(1,0){3}} + \put(7,8){\vector(-1,0){3}}\put(7,8){\vector(1,0){0.5}} \put(9.25,8.2){\makebox(0,0)[b]{$H_{\mathrm{T}}$}} \put(5.75,8.2){\makebox(0,0)[b]{$D_{\mathrm{T}}$}} % @@ -3044,7 +3044,7 @@ the direction inside the box and that outside the box differ. % \put(4,7.2){\line(0,1){1.8}} \put(11,7.2){\line(0,1){1.8}} - \put(7.5,8){\vector(-1,0){3.5}\vector(1,0){3.5}} + \put(7.5,8){\vector(-1,0){3.5}}\put(7.5,8){\vector(1,0){3.5}} \put(13,8){\vector(-1,0){2}} \put(7.5,8.2){\makebox(0,0)[b]{$H_{\mathrm{D}}$}} \put(12,8.2){\makebox(0,0)[b]{$D_{\mathrm{D}}$}} @@ -3063,7 +3063,7 @@ the direction inside the box and that outside the box differ. \put(11.2,0){\line(1,0){3.8}} % \put(2,7){\line(1,0){1.8}} - \put(3,3.5){\vector(0,1){3.5}\vector(0,-1){3.5}} + \put(3,3.5){\vector(0,1){3.5}}\put(3,3.5){\vector(0,-1){3.5}} \put(2.8,3.5){\makebox(0,0)[r]{$H_{\mathrm{Y}}$}} \put(3,-2){\vector(0,1){2}} \put(2.8,-1){\makebox(0,0)[r]{$D_{\mathrm{Y}}$}} @@ -3094,8 +3094,8 @@ the direction inside the box and that outside the box differ. % \put(4,7.2){\line(0,1){1.8}} \put(11,7.2){\line(0,1){1.8}} - \put(6.5,8){\vector(-1,0){2.5}\vector(1,0){2.5}} - \put(10,8){\vector(-1,0){1}\vector(1,0){1}} + \put(6.5,8){\vector(-1,0){2.5}}\put(6.5,8){\vector(1,0){2.5}} + \put(10,8){\vector(-1,0){1}}\put(10,8){\vector(1,0){1}} \put(10,8.2){\makebox(0,0)[b]{$H_{\mathrm{T}}$}} \put(6.5,8.2){\makebox(0,0)[b]{$D_{\mathrm{T}}$}} % @@ -3119,8 +3119,8 @@ the direction inside the box and that outside the box differ. % \put(4,7.2){\line(0,1){1.8}} \put(11,7.2){\line(0,1){1.8}} - \put(5,8){\vector(-1,0){1}\vector(1,0){1}} - \put(8.5,8){\vector(-1,0){2.5}\vector(1,0){2.5}} + \put(5,8){\vector(-1,0){1}}\put(5,8){\vector(1,0){1}} + \put(8.5,8){\vector(-1,0){2.5}}\put(8.5,8){\vector(1,0){2.5}} \put(5,8.2){\makebox(0,0)[b]{$H_{\mathrm{D}}$}} \put(8.5,8.2){\makebox(0,0)[b]{$D_{\mathrm{D}}$}} % diff --git a/macros/luatex/generic/luatexja/src/ltj-adjust.lua b/macros/luatex/generic/luatexja/src/ltj-adjust.lua index 71584d8b5c..053b63ab1a 100644 --- a/macros/luatex/generic/luatexja/src/ltj-adjust.lua +++ b/macros/luatex/generic/luatexja/src/ltj-adjust.lua @@ -514,7 +514,7 @@ do end function ltjl.p_profile(before, after, mirrored, bw) local range, tls - = init_range(), luatexja.adjust.profile_hgap_factor*tex.lineskip.width + = init_range(), luatexja.adjust.profile_hgap_factor*tex.get('lineskip', false) profile_inner(before, range, 3, true, tls) profile_inner(after, range, 4, mirrored, tls) range = range:flatten() @@ -544,9 +544,9 @@ do end if dist < tex.lineskiplimit then local f = max(1, bw*ltja.step_factor) - copy_glue(g, tex.baselineskip, 1, normal - f * floor((dist-tex.lineskip.width)/f)) + copy_glue(g, 'baselineskip', 1, normal - f * floor((dist-tex.get('lineskip', false))/f)) else - copy_glue(g, tex.baselineskip, 2, normal) + copy_glue(g, 'baselineskip', 2, normal) end end end diff --git a/macros/luatex/generic/luatexja/src/ltj-base.sty b/macros/luatex/generic/luatexja/src/ltj-base.sty index 2ce01d71b1..d46b54a1fa 100644 --- a/macros/luatex/generic/luatexja/src/ltj-base.sty +++ b/macros/luatex/generic/luatexja/src/ltj-base.sty @@ -103,7 +103,7 @@ %% \ltj@gobble@glue %! 次に続くグルー値を(2 回展開で)読み捨てる. \def\ltj@gobble@glue{ - \directlua{token.scan_glue()} + \directlua{node.free(token.scan_glue())} } %% \ltj@gobble@dimen diff --git a/macros/luatex/generic/luatexja/src/ltj-compat.lua b/macros/luatex/generic/luatexja/src/ltj-compat.lua index d660915a31..dfb19ee2d0 100644 --- a/macros/luatex/generic/luatexja/src/ltj-compat.lua +++ b/macros/luatex/generic/luatexja/src/ltj-compat.lua @@ -25,12 +25,12 @@ local function to_kansuji(num) num = -num; tex.write '-' end local s = "" - while num~=0 do + repeat s = utfchar( ltjs.get_stack_table(luatexja.stack_table_index.KSJ + num%10, '', tex.getcount 'ltj@@stack')) .. s num=math.floor(num/10) - end + until num==0 tex.write(s) end diff --git a/macros/luatex/generic/luatexja/src/ltj-direction.lua b/macros/luatex/generic/luatexja/src/ltj-direction.lua index db320509d1..565190be2d 100644 --- a/macros/luatex/generic/luatexja/src/ltj-direction.lua +++ b/macros/luatex/generic/luatexja/src/ltj-direction.lua @@ -92,11 +92,12 @@ end local get_dir_count, get_adjust_dir_count do + local node_attr = node.has_attribute local function get_dir_count_inner(h) if h then if h.id==id_whatsit and h.subtype==sid_user and h.user_id==DIR then - return ((node.has_attribute(h, attr_icflag) or 0) -65536000 then - local bw = tex.baselineskip.width + local bw = texget('baselineskip', false) local normal = bw - prev - getfield(new_b, mirrored and 'depth' or 'height') local lmin, adj = nil, 0 local tail = to_direct(tex.nest[tex.nest.ptr].tail) diff --git a/macros/luatex/generic/luatexja/src/luatexja.lua b/macros/luatex/generic/luatexja/src/luatexja.lua index f7957a116d..8da4251882 100644 --- a/macros/luatex/generic/luatexja/src/luatexja.lua +++ b/macros/luatex/generic/luatexja/src/luatexja.lua @@ -583,6 +583,9 @@ local function debug_show_node_X(p,print_fn, limit, inner_depth) debug_show_node_X(q, print_fn, limit, inner_depth) end end + elseif pt == 'attribute' then + s = base .. ' [' .. p.number .. '] = ' .. p.value + print_fn(s) else print_fn(base) end diff --git a/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty index aa3d1f5463..5eab1c4e35 100644 --- a/macros/luatex/generic/luatexja/src/luatexja.sty +++ b/macros/luatex/generic/luatexja/src/luatexja.sty @@ -27,7 +27,7 @@ \newif\ifltj@disablejfam %%%% VERSION -\def\LuaTeXjaversion{20220703.0} +\def\LuaTeXjaversion{20220807.0} %% Check if LaTeX is used. \begingroup\expandafter\expandafter\expandafter\endgroup -- cgit v1.2.3