diff options
Diffstat (limited to 'Master/texmf-dist/tex')
31 files changed, 105 insertions, 88 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 56361794645..d325df7dc6c 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}[2019-01-06] + \ProvidesPackage{luatexja-adjust}[2022-01-03] \fi %</LaTeX> % Load core module if not yet. @@ -109,7 +109,7 @@ \the\ltjadj@status@lp, \the\ltjadj@status@ls)}\ignorespaces } \protected\def\ltjdisableadjust{% - \ltjenableadjust[lineend=false,priority=false,profile=false,linestep=false]} + \ltjenableadjust[lineend=false,priority=false,profile=false,linestep=false]}% \protected\def\ltjenableadjust{% \ltx@ifnextchar[{\@@ltjenableadjust}{\@@ltjenableadjust[lineend,priority]}}%] diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua index 56effa3c57a..76a1a68ec48 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua @@ -434,7 +434,7 @@ do luatexja.lineskip.setting( status_lp>0 and 'profile' or 'dummy', status_ls>0 and 'step' or 'dummy' - ) + ) end local function disable_cb() -- only for compatibility enable_cs(0,0,0,0) diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua index e1623199e4f..7f39b9b8d76 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua @@ -14,6 +14,43 @@ local id_glyph = node.id 'glyph' local getcatcode, getcount = tex.getcatcode, tex.getcount local ltjc_is_japanese_char_curlist = ltjc.is_japanese_char_curlist +local substituter +do + local uchar = utf.char + local cd, cp = uchar(0x3099), uchar(0x309A) + substituter = (utf.substituter or utf.subtituter) -- typo in lualibs? + { + ['ウ'..cd] = 'ヴ', ['う'..cd] = uchar(0x30F4), + ['か'..cd] = 'が', ['カ'..cd] = 'ガ', + ['き'..cd] = 'ぎ', ['キ'..cd] = 'ギ', + ['く'..cd] = 'ぐ', ['ク'..cd] = 'グ', + ['け'..cd] = 'げ', ['ケ'..cd] = 'ゲ', + ['こ'..cd] = 'ご', ['コ'..cd] = 'ゴ', + -- + ['さ'..cd] = 'ざ', ['サ'..cd] = 'ザ', + ['し'..cd] = 'じ', ['シ'..cd] = 'ジ', + ['す'..cd] = 'ず', ['ス'..cd] = 'ズ', + ['せ'..cd] = 'ぜ', ['セ'..cd] = 'ゼ', + ['そ'..cd] = 'ぞ', ['ソ'..cd] = 'ゾ', + -- + ['た'..cd] = 'だ', ['タ'..cd] = 'ダ', + ['ち'..cd] = 'ぢ', ['チ'..cd] = 'ヂ', + ['つ'..cd] = 'づ', ['ツ'..cd] = 'ヅ', + ['て'..cd] = 'で', ['テ'..cd] = 'デ', + ['と'..cd] = 'ど', ['ト'..cd] = 'ド', + -- + ['は'..cd] = 'ば', ['ハ'..cd] = 'バ', ['は'..cp] = 'ぱ', ['ハ'..cp] = 'パ', + ['ひ'..cd] = 'び', ['ヒ'..cd] = 'ビ', ['ひ'..cp] = 'ぴ', ['ヒ'..cp] = 'ピ', + ['ふ'..cd] = 'ぶ', ['フ'..cd] = 'ブ', ['ふ'..cp] = 'ぷ', ['フ'..cp] = 'プ', + ['へ'..cd] = 'べ', ['ヘ'..cd] = 'ベ', ['へ'..cp] = 'ぺ', ['ヘ'..cp] = 'ペ', + ['ほ'..cd] = 'ぼ', ['ホ'..cd] = 'ボ', ['ほ'..cp] = 'ぽ', ['ホ'..cp] = 'ポ', + -- + ['ゝ'..cd] = 'ゞ', ['ヽ'..cd] = 'ヾ', + ['ワ'..cd] = uchar(0x30F7), ['ヰ'..cd] = uchar(0x30F8), + ['ヱ'..cd] = uchar(0x30F9), ['ヲ'..cd] = uchar(0x30FA), + } +end + --- the following function is modified from jafontspec.lua (by K. Maeda). --- Instead of "%", we use U+FFFFF for suppressing spaces. --DEBUG require"socket" @@ -21,7 +58,7 @@ local time_line = 0 local start_time_measure, stop_time_measure = ltjb.start_time_measure, ltjb.stop_time_measure local function add_comment(buffer) - start_time_measure 'inputbuf' + start_time_measure 'inputbuf'; buffer = substituter(buffer) local i = utflen(buffer) local c = utfbyte(buffer, i) while (i>0) and (getcatcode(c)==1 or getcatcode(c)==2) do diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua index 9ce78160705..a2bede6442e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfmglue', - date = '2021-09-18', + date = '2022-01-02', description = 'Insertion process of JFM glues, [x]kanjiskip and others', }) luatexja.jfmglue = luatexja.jfmglue or {} @@ -975,24 +975,20 @@ end -- NA, NB: alchar or math local function get_NA_skip() local pm = Np.met - local g, _, kn, kp, kh = new_jfm_glue( - pm.char_type, - fast_find_char_class( - (Nq.id == id_math and -1 or (Nq.xspc>=2 and 'alchar' or 'nox_alchar')), pm), - Np.class) - local k = ((Nq.xspc>=2) and (Np.xspc%2==1) and combine_spc 'auto_xspc') - and get_xkanjiskip_low(false, pm, kn, kp, kh) + local qclass = fast_find_char_class( + (Nq.id == id_math and -1 or (Nq.xspc>=2 and 'alchar' or 'nox_alchar')), pm) + local g, _, kn, kp, kh = new_jfm_glue(pm.char_type, qclass, Np.class) + local k = g and (Nq.xspc>=2) and (Np.xspc%2==1) and combine_spc 'auto_xspc' + and get_kanjiskip_low(true, pm, kn, kp, kh) return g, k end local function get_NB_skip() local qm = Nq.met - local g, _, kn, kp, kh = new_jfm_glue( - qm.char_type, Nq.class, - fast_find_char_class( - (Np.id == id_math and -1 or (Np.xspc%2==1 and 'alchar' or 'nox_alchar')), qm) - ) - local k = ((Nq.xspc>=2) and (Np.xspc%2==1) and combine_spc 'auto_xspc') - and get_xkanjiskip_low(false, qm, kn, kp, kh) + local pclass = fast_find_char_class( + (Np.id == id_math and -1 or (Np.xspc%2==1 and 'alchar' or 'nox_alchar')), qm) + local g, _, kn, kp, kh = new_jfm_glue(qm.char_type, Nq.class, pclass) + local k = g and (Nq.xspc>=2) and (Np.xspc%2==1) and combine_spc 'auto_xspc' + and get_kanjiskip_low(true, qm, kn, kp, kh) return g, k end @@ -1037,8 +1033,7 @@ local function handle_np_jachar(mode) if not g then g = get_kanjiskip() end handle_penalty_normal(0, Np.pre, g); real_insert(g); real_insert(k) elseif Nq.pre then - local g, k - if non_ihb_flag then g, k = get_NA_skip() end -- N_A->X + local g, k; if non_ihb_flag then g, k = get_NA_skip() end -- N_A->X if not g then g = get_xkanjiskip(Np) end handle_penalty_normal((qid==id_hlist and 0 or Nq.post), Np.pre, g); real_insert(g); real_insert(k) @@ -1059,8 +1054,10 @@ end -- jachar .. (anything) local function handle_nq_jachar() if Np.pre then - local g = non_ihb_flag and get_NB_skip() or get_xkanjiskip(Nq) -- N_B->X - handle_penalty_normal(Nq.post, (Np.id==id_hlist and 0 or Np.pre), g); real_insert(g) + local g, k; if non_ihb_flag then g, k = get_NB_skip()end -- N_B->X + if not g then g = get_xkanjiskip(Nq) end + handle_penalty_normal(Nq.post, (Np.id==id_hlist and 0 or Np.pre), g); + real_insert(g); real_insert(k) else local g =non_ihb_flag and (get_OB_skip()) -- O_B if Np.id==id_glue then handle_penalty_normal(Nq.post, 0, g) diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua index b097809883e..4c19e33cb29 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfont', - date = '2021-09-18', + date = '2021-11-06', description = 'Loader for Japanese fonts', }) @@ -889,12 +889,16 @@ do end end - local function prepare_extra_data_font(id, res) + local function prepare_extra_data_font(id, res, name) if type(res)=='table' and (res.psname or res.filename) then - local bname = res.psname or nameonly(res.filename) - local t = font_extra_basename[bname] - if not t then bname = prepare_extra_data_base(res) end - font_extra_info[id] = bname and (t or font_extra_basename[bname]) or dummytable + if (res.embedding=='no') and (type(name)=='string') and (name:sub(1,5)=='psft:') then + font_extra_info[id] = res.resources.ltj_extra + else + local bname = res.psname or nameonly(res.filename) + local t = font_extra_basename[bname] + if not t then bname = prepare_extra_data_base(res) end + font_extra_info[id] = bname and (t or font_extra_basename[bname]) or dummytable + end end end luatexbase.add_to_callback( @@ -907,7 +911,7 @@ do luatexbase.add_to_callback( 'luatexja.define_font', function (res, name, size, id) - prepare_extra_data_font(id, res) + prepare_extra_data_font(id, res, name) end, 'ltj.prepare_extra_data', 1) diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua index 499d3eda4a9..49f2018e4dc 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua @@ -5,7 +5,7 @@ luatexja.load_module('base'); local ltjb = luatexja.base local cidfont_data = {} local cache_chars = {} -local cache_ver = 10 +local cache_ver = 11 local identifiers = fonts.hashes.identifiers local cid_reg, cid_order, cid_supp, cid_name @@ -157,6 +157,7 @@ do tth[pricode], cidmo[i], pricode = { index = i }, pricode, pricode+1; end + ttu[i] = cidmo[i] ttu[cid_order .. '.' .. i] = cidmo[i] end @@ -231,7 +232,7 @@ do cidf_vert_processor = { function (head, fnum) local fontdata = font_getfont(fnum) - if head and luatexja.jfont.font_metric_table[fnum].vert_activated then + if head and luatexja.jfont.font_metric_table[fnum] and luatexja.jfont.font_metric_table[fnum].vert_activated then local vt = fontdata.ltj_vert_table local nh = is_node(head) and to_direct(head) or head for n in traverse_id(id_glyph, head) do @@ -245,6 +246,9 @@ do } end +local dummy_vht, dummy_vorg = {}, {} +setmetatable(dummy_vht, {__index = function () return 1 end } ) +setmetatable(dummy_vorg, {__index = function () return 0.88 end } ) local function cid_cache_outdated(t) return t.version~=cache_ver end local function read_cid_font() local dat = ltjb.load_cache("ltj-cid-auto-" .. string.lower(cid_name), @@ -260,6 +264,9 @@ local function read_cid_font() end if cidfont_data[cid_name] then cidfont_data[cid_name].shared.processes = cidf_vert_processor + cidfont_data[cid_name].resources.ltj_extra + = { ind_to_uni = cidfont_data[cid_name].resources.unicodes, + vheight = dummy_vht, vorigin = dummy_vorg } for i,v in pairs(cidfont_data[cid_name].characters) do if not v.width then v.width = 655360 end v.height, v.depth = 576716.8, 78643.2 -- optimized for jfm-ujis.lua diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls index 03f9eec4a22..82d19556c9f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjarticle} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -850,8 +850,6 @@ \else \@mparswitchfalse \fi -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} \ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo index 9381f79349a..9b25775e93f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk10.clo} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% @@ -298,8 +298,6 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \endinput %% %% End of file `ltjbk10.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo index 592a73dbb35..18022a68efe 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk11.clo} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% @@ -298,8 +298,6 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \endinput %% %% End of file `ltjbk11.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo index 37bd3caad89..884b2d93379 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk12.clo} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% @@ -298,8 +298,6 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \endinput %% %% End of file `ltjbk12.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls index b94927909e2..171da90b671 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjbook} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -954,8 +954,6 @@ \else \@mparswitchfalse \fi -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} \ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls index bd80b44c319..95a1d1b4223 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjreport} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -951,8 +951,6 @@ \else \@mparswitchfalse \fi -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} \ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls index bef8aac8512..97f82233891 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls @@ -1384,6 +1384,7 @@ class has defined the old font commands like\MessageBreak \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index 94bdb8223dd..9374b91557e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls @@ -1477,6 +1477,7 @@ class has defined the old font commands like\MessageBreak \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo index a51ce468f39..aa97c2db03f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize10.clo} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% @@ -303,8 +303,6 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \endinput %% %% End of file `ltjsize10.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo index 964fa2a55e0..12f87a8135e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize11.clo} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% @@ -303,8 +303,6 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \endinput %% %% End of file `ltjsize11.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo index 3f791c9f389..bed0b18d2d7 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize12.clo} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% @@ -303,8 +303,6 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \endinput %% %% End of file `ltjsize12.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls index 621167c2c07..7349a6075f3 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls @@ -1348,6 +1348,7 @@ class has defined the old font commands like\MessageBreak \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls index 237c9f86c6a..b6a1794837e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls @@ -1242,6 +1242,7 @@ class has defined the old font commands like\MessageBreak \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls index d9ee6d23465..4b7d0da9faa 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls @@ -1470,6 +1470,7 @@ class has defined the old font commands like\MessageBreak \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls index 73a67486d28..26009f79f20 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtarticle} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -851,8 +851,6 @@ \fi \normalmarginpar \@mparswitchfalse -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} \ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo index 4f3f9f20baf..b1b3364005c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk10.clo} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% @@ -306,8 +306,6 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \endinput %% %% End of file `ltjtbk10.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo index 43d5e5106c7..f2b034c22bc 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk11.clo} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% @@ -306,8 +306,6 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \endinput %% %% End of file `ltjtbk11.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo index d251a35c8df..fdb2e740136 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk12.clo} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% @@ -306,8 +306,6 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \endinput %% %% End of file `ltjtbk12.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls index 5c81f3da125..04ed5b52609 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtbook} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -955,8 +955,6 @@ \fi \normalmarginpar \@mparswitchfalse -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} \ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls index 1284acb9c7e..6e4d79c7463 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtreport} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -952,8 +952,6 @@ \fi \normalmarginpar \@mparswitchfalse -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} \ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo index 05f7dc832a4..339446ea671 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize10.clo} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% @@ -306,8 +306,6 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \endinput %% %% End of file `ltjtsize10.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo index fff725c7fde..9440ddf8cce 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize11.clo} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% @@ -306,8 +306,6 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \endinput %% %% End of file `ltjtsize11.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo index 49561974c69..5224aa93d13 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize12.clo} - [2020-09-30 v1.8f-ltj-20 + [2021-12-22 v1.8f-ltj-21 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% @@ -306,8 +306,6 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) -%% の機能を用いています。 \endinput %% %% End of file `ltjtsize12.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index 5c86aa9b787..48db2624ecd 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{20211024.0} +\def\LuaTeXjaversion{20220103.0} %% Check if LaTeX is used. \begingroup\expandafter\expandafter\expandafter\endgroup diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty index db444aecb78..fcc8922fea4 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty @@ -1,5 +1,5 @@ % -% lltjp-siunitx.sty 2021-04-19 +% lltjp-siunitx.sty 2021-10-31 % \NeedsTeXFormat{LaTeX2e} @@ -31,6 +31,9 @@ \__siunitx_print_text_replace:n {#1} } } +\cs_set_eq:NN \ltj_orig__siunitx_table_collect_begin:w \__siunitx_table_collect_begin:w +\cs_set_protected:Npn \__siunitx_table_collect_begin:w #1 \relax + { \ltj_orig__siunitx_table_collect_begin:w } }% siunitx v3.00 end {% siunitx v2.xx \cs_generate_variant:Nn \tl_if_in:NnT { coT } |