diff options
author | Karl Berry <karl@freefriends.org> | 2022-10-02 20:22:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-10-02 20:22:38 +0000 |
commit | f07221583be9b4c98b5db2cb0008a92de954d799 (patch) | |
tree | 7b37a17d5650238fc1630f195f1bd8638eb8e66b /Master/texmf-dist/source/luatex | |
parent | 577f093e401f937931fdb0b38a6c9680ad542604 (diff) |
luatexja (2oct22)
git-svn-id: svn://tug.org/texlive/trunk@64587 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/luatex')
3 files changed, 122 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx index e2d4dd9a509..f05afe97c1b 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx @@ -139,6 +139,7 @@ % (sync with ltsect.dtx 2020/07/27 v1.1e)} % \changes{v1.8f-ltj-21}{2021-12-22}{余計なコメントの削除.} % \changes{v1.8f-ltj-22}{2022-04-11}{kern featureが有効になっていたのを修正.} +% \changes{v1.8f-ltj-23}{2022-09-12}{|\stockwidth|がカーネルで定義される可能性に対応.} % \fi % % \iffalse @@ -168,7 +169,7 @@ %<11pt&bk>\ProvidesFile{ltjtbk11.clo} %<12pt&bk>\ProvidesFile{ltjtbk12.clo} %</tate> - [2022-04-11 v1.8f-ltj-22 + [2022-09-12 v1.8f-ltj-23 %<article|report|book> Standard LuaLaTeX-ja class] %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] %<*driver> @@ -977,10 +978,13 @@ % [2017-01-17 LTJ] [lt]jsclassesに合わせ、トンボオプションが指定されているとき「だけ」|\stockwidth|、 % |\stockheight|を定義するようにしました。aminophenさん、ありがとうございます。 % +% [2022-09-12 LTJ] \LaTeXe カーネルに|\stockwidth|、|\stockheight|が追加されるようですので、 +% クラスファイル側では未定義のときのみこれらの長さ変数を定義します。h20y6mさん、ありがとうございます。 +% % \begin{macrocode} \iftombow - \newlength{\stockwidth} - \newlength{\stockheight} + \ifdefined\stockwidth\else\newlength{\stockwidth}\fi + \ifdefined\stockheight\else\newlength{\stockheight}\fi \setlength{\stockwidth}{\paperwidth} \setlength{\stockheight}{\paperheight} \advance \stockwidth 2in diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx index e190617c155..a1512103390 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx @@ -44,7 +44,7 @@ %<*driver> \ProvidesFile{ltjsclasses.dtx} %</driver> - [2022/04/11 ltjsclasses ] + [2022/09/12 ltjsclasses ] %<*driver> \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{} \documentclass[disablejfam]{ltjsarticle} @@ -808,13 +808,15 @@ \begingroup\catcode`\%=12\relax \directlua{ local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536 + local floor, cnt_dimen_at = math.floor, luatexbase.registernumber 'dimen@' + local print_scaled, sprint = luatexja.print_scaled, tex.sprint local t = lua.get_functions_table() t[\the\ltjs@@magnify@font@calc] = function() - tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'))) + sprint(-2,floor(0.5+mpt*getdimen(cnt_dimen_at))) end function luatexja.ltjs_unmagnify_fsize(a) - local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536)) - tex.sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s ) + local s = print_scaled(floor(0.5+a/mpt*65536)) + sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s ) end } \endgroup @@ -892,10 +894,13 @@ % [2017-01-11] トンボオプションが指定されているとき「だけ」|\stockwidth|, % |\stockheight|を定義するようにしました。 % +% [2022-09-12 LTJ] \LaTeXe カーネルに|\stockwidth|、|\stockheight|が追加されるようですので、 +% クラスファイル側では未定義のときのみこれらの長さ変数を定義します。h20y6mさん、ありがとうございます。 +% % \begin{macrocode} \iftombow - \newlength{\stockwidth} - \newlength{\stockheight} + \ifdefined\stockwidth\else\newlength{\stockwidth}\fi + \ifdefined\stockheight\else\newlength{\stockheight}\fi \setlength{\stockwidth}{\paperwidth} \setlength{\stockheight}{\paperheight} \advance \stockwidth 2in diff --git a/Master/texmf-dist/source/luatex/luatexja/tool/test_exist_nodelib.tex b/Master/texmf-dist/source/luatex/luatexja/tool/test_exist_nodelib.tex new file mode 100644 index 00000000000..2d9ee7c3aeb --- /dev/null +++ b/Master/texmf-dist/source/luatex/luatexja/tool/test_exist_nodelib.tex @@ -0,0 +1,104 @@ +\catcode`\{=1 \catcode`\}=2 +\directlua{ +kpse.set_program_name('luatex') +print() print("LUATEX: ", tex.luatexversion, _VERSION) + +function test(c) + if not node[c] then print ('not imple: node.' .. c) end +end +test "direct" +test "free" +test "get_attribute" +test "getglue" +test "id" +test "insert_after" +test "is_node" +test "mlist_to_hlist" +test "new" +test "next" +test "set_attribute" +test "slide" +test "subtype" +test "tail" +test "traverse" +test "type" +test "write" + +function test(c) + if not node.direct[c] then print ('not imple: node.direct.' .. c) end +end + +test "copy" +test "copy_list" +test "dimensions" +test "end_of_math" +test "flush_list" +test "free" +test "get_attribute" +test "getattributelist" +test "getbox" +test "getchar" +test "getcomponents" +test "getdata" +test "getdepth" +test "getdir" +test "getfield" +test "getfont" +test "getglue" +test "getheight" +test "getid" +test "getkern" +test "getlang" +test "getlist" +test "getnext" +test "getnucleus" +test "getoffsets" +test "getpenalty" +test "getprev" +test "getshift" +test "getsub" +test "getsubtype" +test "getsup" +test "getwhd" +test "getwidth" +test "has_attribute" +test "hpack" +test "insert_after" +test "insert_before" +test "last_node" +test "new" +test "rangedimensions" +test "remove" +test "set_attribute" +test "setattributelist" +test "setchar" +test "setdata" +test "setdepth" +test "setdir" +test "setfield" +test "setfont" +test "setglue" +test "setheight" +test "setkern" +test "setlang" +test "setlist" +test "setnext" +test "setnucleus" +test "setoffsets" +test "setpenalty" +test "setshift" +test "setsub" +test "setsubtype" +test "setsup" +test "setwhd" +test "setwidth" +test "tail" +test "todirect" +test "tonode" +test "traverse" +test "traverse_id" +test "unset_attribute" +test "vpack" +test "write" +} +\end |