diff options
54 files changed, 255 insertions, 217 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 25046e71682..ab88e3cb75e 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/README +++ b/Master/texmf-dist/doc/luatex/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20190708.0 +The LuaTeX-ja Package 20190826.0 -------------------------------- Copyright (c) 2011--2019 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -23,7 +23,7 @@ Installation 0. Please make sure that your TeX distribution is up-to-date. This version of LuaTeX-ja requires - LuaTeX 1.0.0 or later - - luaotfload v2.6 + - luaotfload (v2.98 or later recommended) - adobemapping (Adobe CMap files) - everysel package - etoolbox package @@ -35,14 +35,14 @@ Installation - IPAex fonts (http://ipafont.ipa.go.jp/) Hence this version does not work in TeX Live 2016 (or earlier). -1. If you are using TeX Live 2018 or later, you can install LuaTeX-ja via tlmgr. +1. If you are using TeX Live 2019 or later, you can install LuaTeX-ja via tlmgr. 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20190708.0 in the Git repository by + or tagged as 20190826.0 in the Git repository by <http://git.osdn.jp/view?p=luatex-ja/luatexja.git - ;a=snapshot;h=refs/tags/20190708.0;sf=tgz> + ;a=snapshot;h=refs/tags/20190826.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -87,4 +87,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Mon Jul 8 15:23:01 2019 +0900 +Last commit date: Mon Aug 26 09:29:22 2019 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf Binary files differindex 35711733799..872598852f8 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf Binary files differindex 299c6fb040f..06aa0a88da6 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf Binary files differindex 7a96dccb4bb..ed027605465 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf Binary files differindex 1688589de04..eb9c60bca0e 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx index b2c53a818a5..d65b7165b8b 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -40,11 +40,12 @@ %%%%%%%% fonts \usepackage{luatexja-otf} \usepackage[no-math]{fontspec} -\setmainfont[Ligatures=TeX]{Linux Libertine O} +\setmainfont[Ligatures=TeX,RawFeature=-notdef]{Linux Libertine O} \setmonofont[Scale=MatchLowercase, ItalicFont=lmmono10-italic.otf, - BoldFont=lmmonolt10-bold.otf, BoldItalicFont=lmmonolt10-boldoblique.otf + BoldFont=lmmonolt10-bold.otf, BoldItalicFont=lmmonolt10-boldoblique.otf, + RawFeature=-notdef ]{lmmono10-regular.otf} -\setsansfont[Scale=MatchLowercase,Ligatures=TeX]{Linux Biolinum O} +\setsansfont[Scale=MatchLowercase,Ligatures=TeX,RawFeature=-notdef]{Linux Biolinum O} \usepackage[match]{luatexja-fontspec} \usepackage[kozuka-pr6n]{luatexja-preset} \usepackage{unicode-math} @@ -650,11 +651,11 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}. %<ja>\LuaTeX-jaパッケージの動作には次のパッケージ類が必要である. \begin{itemize} \item \LuaTeX\ 1.0.0 (or later) -\item \Pkg{luaotfload} v2.6 (or later) +\item recent \Pkg{luaotfload} (v2.98 or later recommended) \item \Pkg{adobemapping} (Adobe cmap and pdfmapping files) \item \Pkg{etoolbox}, \Pkg{everysel} (if you want to use \LuaTeX-ja with \LaTeXe) \item \Pkg{ltxcmds}, \Pkg{pdftexcmds}, \Pkg{filehook}, \Pkg{atbegshi} -\item \Pkg{fontspec} v2.5c (or later) +\item \Pkg{fontspec} v2.7c (or later) %<en>\item \emph{IPAex fonts} (\url{http://ipafont.ipa.go.jp/}) %<ja>\item \emph{IPAexフォント(\url{http://ipafont.ipa.go.jp/})} \end{itemize} @@ -813,28 +814,28 @@ For changes from \pTeX, see Subsection~\ref{ssec:chgptex}. %</ja> %<*en> \item \LuaTeX-ja is very slower than \pTeX. - Generally speaking, LuaJIT\TeX\ processes \LuaTeX-ja - about 30\% faster than \LuaTeX, but not always% - \footnote{% - LuaJIT has several limitations such as 1\,GB~(or~2\,GB) memory limitation. - So typesetting a large source by LuaJIT\TeX may cause an ``out of memory'' error, - or failure of loading/saving font cache of \Pkg{luaotfload}. - }. + % Generally speaking, LuaJIT\TeX\ processes \LuaTeX-ja + % about 30\% faster than \LuaTeX, but not always% + % \footnote{% + % LuaJIT has several limitations such as 1\,GB~(or~2\,GB) memory limitation. + % So typesetting a large source by LuaJIT\TeX may cause an ``out of memory'' error, + % or failure of loading/saving font cache of \Pkg{luaotfload}. + % }. %</en> %<*ja> \item \LuaTeX-jaは動作が\pTeX に比べて非常に遅い. コードを調整して徐々に速くしているが,まだ満足できる速度ではない. -LuaJIT\TeX を用いると\LuaTeX のだいたい1.3倍の速度で動くようであるが, -IPA mj明朝などの大きいフォントを用いた場合には\LuaTeX よりも遅くなることもある - \footnote{% - LuaJITは1\,GB(あるいは2\,GB)のメモリ制限など,いくつかの制限事項があることが知られている.そのため, - 大きいソースファイルをLuaJIT\TeX でタイプセットするとLuaの側で``out of memory''エラーが発生してしまう. - 本ドキュメントのように,「各ページごとにLuaで使っているメモリ容量をチェックし, - 必要なら\texttt{collectgarbage("collect")}でガベージコレクタを実行」すると - 状況が多少改善されるかもしれない. - また,LuaJIT\TeX でIPA mj明朝などの「大きい」フォントを利用した場合はフォントキャッシュの保存に失敗し, - 毎回フォントを読み込まなければならず結果的に時間がかかることがある. - }. +% LuaJIT\TeX を用いると\LuaTeX のだいたい1.3倍の速度で動くようであるが, +% IPA mj明朝などの大きいフォントを用いた場合には\LuaTeX よりも遅くなることもある +% \footnote{% +% LuaJITは1\,GB(あるいは2\,GB)のメモリ制限など,いくつかの制限事項があることが知られている.そのため, +% 大きいソースファイルをLuaJIT\TeX でタイプセットするとLuaの側で``out of memory''エラーが発生してしまう. +% 本ドキュメントのように,「各ページごとにLuaで使っているメモリ容量をチェックし, +% 必要なら\texttt{collectgarbage("collect")}でガベージコレクタを実行」すると +% 状況が多少改善されるかもしれない. +% また,LuaJIT\TeX でIPA mj明朝などの「大きい」フォントを利用した場合はフォントキャッシュの保存に失敗し, +% 毎回フォントを読み込まなければならず結果的に時間がかかることがある. +% }. %</ja> \item% @@ -3856,7 +3857,7 @@ default Japanese fonts and JFMs for them: \item[\cs{ltj@stdyokojfm}] %<en>The default JFM for horizontal direction. %<ja>標準で用いる横組用JFM. - \item[\cs{ltj@stdyokojfm}] + \item[\cs{ltj@stdtatejfm}] %<en>The default JFM for vertical direction. %<ja>標準で用いる縦組用JFM. \end{cslist} @@ -4692,7 +4693,7 @@ as follows: %<ja>\paragraph{仮想的な文字} %<en>\paragraph{Imaginary characters} %<*en> -As described before, you can specify several \emph{imaginary characters} in +As described before, you can specify several ``imaginary characters'' in \texttt{chars} field. The most of these characters are regarded as the characters of class 0 in \pTeX. As a result, \LuaTeX-ja can control typesetting finer than \pTeX. @@ -4711,8 +4712,17 @@ The following is the list of imaginary characters: %%<ja>JFMやサイズが異なる2つの\textbf{JAchar}の間の境界として用いられる. \item['boxbdd'] -%<en>The beginning/ending of a hbox, and the beginning of a noindented (i.e., began by \cs{noindent}) paragraph. -%<ja>hboxの先頭と末尾,及びインデントされていない(\cs{noindent} で開始された)段落の先頭を表す. +%<*en> +The beginning/ending of a hbox, and the beginning of a noindented (i.e., began by \cs{noindent}) paragraph. +If a hbox~$b$ begins (resp.~ends) a glue or kern between this ``charater'' and a \textbf{JAchar}, +\textbf{JAglue} won't be inserted before(resp.~after) the hbox~$b$. +\Param{kanjiskip}~and~\Param{xkanjiskip} around a hbox. +%</en> +%<*ja> +hboxの先頭と末尾,及びインデントされていない(\cs{noindent} で開始された)段落の先頭を表す. +この「文字」との間に設定したグルー・カーンがボックス$b$の先頭(もしくは末尾)に来た場合, + そのボックス$b$の直前(もしくは直後)には和文処理グルーは入らない. +%</ja> \item['parbdd'] %<en>The beginning of an (indented) paragraph. @@ -7260,7 +7270,7 @@ for making the difference obvious.} \begin{description} \item[\texttt{lineend=[false,true,extended]}] 行末文字の位置調整の機能を無効化(\texttt{false}),「行分割後に調整」の形で有効化(\texttt{true}), - 「行分割の仮定で考慮」の形で有効化(\texttt{extended})する. + 「行分割の過程で考慮」の形で有効化(\texttt{extended})する. \item[\texttt{priority=[false,true]}] 優先順位付きの行長調整を無効化(\texttt{false}),または有効化(\texttt{true}). \item[\texttt{profile=[false,true]}] diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx index c6f39b74d0c..3112fd1c224 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx @@ -120,6 +120,7 @@ % \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策 % (sync with ltsect.dtx 2018/09/26 v1.1c)} % \changes{v1.8b}{2019/04/02}{新元号対応} +% \changes{v1.8b-ltj-17}{2019/08/12}{disablejfamの``Unused global option(s)''警告を出さないようにした} % \fi % @@ -150,7 +151,7 @@ %<11pt&bk>\ProvidesFile{ltjtbk11.clo} %<12pt&bk>\ProvidesFile{ltjtbk12.clo} %</tate> - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 %<article|report|book> Standard LuaLaTeX-ja class] %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] %<*driver> @@ -605,6 +606,18 @@ %</article|report|book> % \end{macrocode} % +% \subsection{disablejfamオプション} +% \changes{v1.8b-ltj-17}{2019/08/12}{disablejfamの``Unused global option(s)''警告を出さないようにした} +% disablejfamオプションはLua\TeX-ja本体で処理しますが, +% もうLua\TeX-jaは読み込んでいるため,このままでは``Unused global option(s): [disablejfam]''警告が +% 出てしまいます.そのため,「何もしない」disablejfamオプションをクラス内で定義しておきます. +% +% \begin{macrocode} +%<*article|report|book> +\DeclareOption{disablejfam}{} +%</article|report|book> +% \end{macrocode} +% % \subsection{オプションの実行} % オプションの実行、およびサイズクラスのロードを行ないます。 % \begin{macrocode} diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx index b816ad579ce..be67a2f68e7 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> - [2019/04/06 ltjsclasses ] + [2019/08/12 ltjsclasses ] %<*driver> \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{} \documentclass[disablejfam]{ltjsarticle} @@ -600,6 +600,14 @@ % [2018-10-08 LTJ] Lua\TeX-ja本体が\texttt{disablejfam}オプションをサポートしたので, % クラスファイルからは削除します. % +% [2019-08-12 LTJ] ……と思いましたが,``Unused global option(s): [disablejfam]''警告が +% 出てしまいますので,「何もしない」クラスオプションとして形だけ定義します. +% \begin{macrocode} +%<*article|report|book> +\DeclareOption{disablejfam}{} +%</article|report|book> +% \end{macrocode} +% % \paragraph{ドラフト} % % \texttt{draft} でoverfull boxの起きた行末に5ptの罫線を引きます。 diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty index 14a1871ea6c..9c67b70358c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty @@ -4,7 +4,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luatexja-fontspec-25c}[2019/05/14 fontspec support of LuaTeX-ja] -\RequirePackage{l3keys2e,luatexja} +\RequirePackage{l3keys2e} \ExplSyntaxOn %%%%%%%% Change Japanese font family by \rmfamily or not diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty index 3b67fa82609..1472633bb0f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty @@ -4,7 +4,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luatexja-fontspec-26h}[2019/05/14 fontspec support of LuaTeX-ja] -\RequirePackage{l3keys2e,luatexja} +\RequirePackage{l3keys2e} \ExplSyntaxOn %%%%%%%% Change Japanese font family by \rmfamily or not diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty index 5292e1d3fff..88d6b37b58c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty @@ -4,7 +4,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luatexja-fontspec-27c}[2019/05/14 fontspec support of LuaTeX-ja] -\RequirePackage{l3keys2e,luatexja} +\RequirePackage{l3keys2e} \ExplSyntaxOn %%%%%%%% Change Japanese font family by \rmfamily or not diff --git a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua index 2a7e5a69892..ccae212f886 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua @@ -297,7 +297,6 @@ end t[200]=table.fastcopy(t[0]) t[200].chars={'〱', '〲'} t[200].width = 2.0 -t[200].left=-0.5 for i,v in pairs(t) do if type(v)=='table' then if v.glue and v.glue[0] then v.glue[200] = v.glue[0] end diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua index 1ed8ab88bee..4182a603c3c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua @@ -257,7 +257,7 @@ do if lfs.isdir(testpath) then savepath = testpath; break end end - save_cache_luc = function (filename, t, serialized) + local function save_cache_luc(filename, t, serialized) local fullpath = savepath .. '/' .. filename .. luc_suffix local s = serialized or serialize(t, 'return', false) if s then @@ -271,7 +271,7 @@ do end end - save_cache = function (filename, t) + local function save_cache(filename, t) local fullpath = savepath .. '/' .. filename .. '.lua' local s = serialize(t, 'return', false) if s then @@ -285,7 +285,7 @@ do end end - local function load_cache_a (filename, outdate) + local function load_cache_a(filename, outdate) local result for _,v in pairs(path) do local fn = join(v, cache_dir, filename) @@ -302,7 +302,7 @@ do end end - load_cache = function (filename, outdate) + local function load_cache(filename, outdate) local r = load_cache_a(filename .. luc_suffix, outdate) if r then return r @@ -313,6 +313,17 @@ do end end + local function remove_file_if_exist(name) + if os.rename(name,name) then os.remove(name) end + end + local function remove_cache (filename) + local fullpath_wo_ext = savepath .. '/' .. filename .. '.lu' + remove_file_if_exist(fullpath_wo_ext .. 'a') + remove_file_if_exist(fullpath_wo_ext .. 'b') + remove_file_if_exist(fullpath_wo_ext .. 'c') + end + + ltjb.remove_cache = remove_cache ltjb.load_cache = load_cache ltjb.save_cache_luc = save_cache_luc ltjb.save_cache = save_cache diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua index 5b864ff77c1..f94b0284525 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 = '2018/08/11', + date = '2019/07/26', description = 'Insertion process of JFM glues, [x]kanjiskip and others', }) luatexja.jfmglue = luatexja.jfmglue or {} @@ -267,7 +267,7 @@ luatexbase.create_callback("luatexja.jfmglue.whatsit_after", "data", -- calc next Np local calc_np -do +do -- 001 ----------------------------------------------- local traverse = node.direct.traverse local function check_next_ickern(lp) @@ -306,21 +306,40 @@ local function calc_np_pbox(lp, last) return lp end -local ltjw_apply_ashift_math = ltjw.apply_ashift_math -local ltjw_apply_ashift_disc = ltjw.apply_ashift_disc -local min, max = math.min, math.max -local function calc_np_aux_glyph_common(lp, acc_flag) - Np.nuc = lp - Np.first= (Np.first or lp) - if if_lang_ja(lp) then +local calc_np_aux_glyph_common +do -- 002 --------------------------------------- + local min, max = math.min, math.max + local getwhd = node.direct.getwhd + local attr_jchar_class = luatexbase.attributes['ltj@charclass'] + local attr_jchar_code = luatexbase.attributes['ltj@charcode'] + local identifiers = fonts.hashes.identifiers + local function calc_np_notdef(lp) + local ident = identifiers[getfont(lp)] + if not ident.descriptions[getchar(lp)] then + local ln = node_next(lp) + if (ident.shared and ident.shared.features and ident.shared.features.notdef) + and ln and getid(ln)==id_glyph then + set_attr(lp, attr_icflag, PROCESSED) + set_attr(ln, attr_jchar_code, has_attr(lp, attr_jchar_code) or getchar(lp)) + set_attr(ln, attr_jchar_class, has_attr(lp, attr_jchar_class) or 0) + Np.nuc, lp = ln, ln + end + end + return lp + end +function calc_np_aux_glyph_common(lp, acc_flag) + Np.nuc, Np.first = lp, (Np.first or lp) + if if_lang_ja(lp) then -- JAchar Np.id = id_jglyph local m, mc, cls = set_np_xspc_jachar(Np, lp) local npi, npf + local w, h, d = getwhd(lp) + if w==0 and h==0 and d==0 then lp = calc_np_notdef(lp) end lp, head, npi, npf = capsule_glyph(lp, m, mc[cls], head, tex_dir) Np.first = (Np.first~=Np.nuc) and Np.first or npf or npi Np.nuc = npi return true, check_next_ickern(lp); - else + else --ALchar Np.id = id_glyph set_np_xspc_alchar(Np, getchar(lp), lp, 1) -- loop @@ -403,8 +422,11 @@ local function calc_np_aux_glyph_common(lp, acc_flag) return true, lp end end +end -- 002 --------------------------------------- local calc_np_auxtable -do +do -- 002 --------------------------------------- +local ltjw_apply_ashift_math = ltjw.apply_ashift_math +local ltjw_apply_ashift_disc = ltjw.apply_ashift_disc local node_end_of_math = node.direct.end_of_math local dir_tate = luatexja.dir_table.dir_tate local sid_start_link = node.subtype('pdf_start_link') @@ -445,6 +467,10 @@ calc_np_auxtable = { local lq = node_next(lp); head = node_remove(head, lp); node_free(lp); non_ihb_flag = false return false, lq; + elseif getfield(lp, 'user_id')==luatexja.userid_table.JA_AL_BDD then + local lq = node_next(lp); + head = node_remove(head, lp); node_free(lp) + return false, lq; else set_attr(lp, attr_icflag, PROCESSED) luatexbase.call_callback("luatexja.jfmglue.whatsit_getinfo", @@ -513,7 +539,7 @@ calc_np_auxtable = { return false, node_next(lp) end, } -end +end -- 002 --------------------------------------- calc_np_auxtable[id_rule] = calc_np_auxtable.box_like calc_np_auxtable[15] = calc_np_auxtable.box_like @@ -551,7 +577,7 @@ function calc_np(last, lp) end Np=nil end -end +end -- 001 ----------------------------------------------- -- extract informations from Np -- We think that "Np is a Japanese character" if Np.met~=nil, @@ -1255,7 +1281,7 @@ end end do - local IHB = luatexja.userid_table.IHB + local IHB = luatexja.userid_table.IHB local BPAR = luatexja.userid_table.BPAR local BOXB = luatexja.userid_table.BOXB local node_prev = node.direct.getprev diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua index 375527af9e7..82e2808e5a2 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua @@ -809,46 +809,32 @@ local prepare_fl_data do local sort = table.sort prepare_fl_data = function (dest, id) - local t = {} + local ascent = id.shared.rawdata.metadata.ascender + local t_vorigin, t_ind_to_uni = {}, {} for i,v in pairs(id.shared.rawdata.descriptions) do - t[v.index] = i + t_ind_to_uni[v.index] = i + if v.tsb then + local j = v.boundingbox[4] + v.tsb + if j~=ascent then t_vorigin[i]=j end + end end - dest = dest or {}; dest.ind_to_uni = t + dest = dest or {} + dest.ind_to_uni = t_ind_to_uni + dest.vorigin = t_vorigin return dest end end -- do - local cache_ver = 18 - local function prepare_extra_data_base(id) if (not id) or (not id.filename) then return end local bname = id.psname or file.nameonly(id.filename) if not font_extra_basename[bname] then - -- if the cache is present, read it - if not lfs then lfs=require"lfs" end - local newtime = lfs.attributes(id.filename,"modification") - local v = "extra_" .. string.lower(bname) - local dat = ltjb.load_cache( - v, - function (t) return (t.version~=cache_ver) or (t.modtime~=newtime) end - ) - -- if the cache is not found or outdated, save the cache - if dat then - font_extra_basename[bname] = dat[1] or {} - else - local dat = nil - dat = prepare_fl_data(dat, id) - dat = list_rotate_glyphs(dat, id) - font_extra_basename[bname] = dat or {} - ltjb.save_cache( v, - { - modtime = newtime, - version = cache_ver, - dat, - }) - end + ltjb.remove_cache("extra_" .. string.lower(bname)) -- remove cache + local dat = prepare_fl_data(dat, id) + dat = list_rotate_glyphs(dat, id) + font_extra_basename[bname] = dat or {} return bname end end @@ -883,63 +869,6 @@ do end end - ------------------------------------------------------------------------- --- calculate vadvance ------------------------------------------------------------------------- -do - local function acc_feature(table_vadv, table_vorg, subtables, ft, already_vert) - for char_num,v in pairs(ft.shared.rawdata.descriptions) do - if v.slookups then - for sn, sv in pairs(v.slookups) do - if subtables[sn] and type(sv)=='table' then - if sv[4]~=0 then - table_vadv[char_num] - = (table_vadv[char_num] or 0) + sv[4] - end - if sv[2]~=0 and not already_vert then - table_vorg[char_num] - = (table_vorg[char_num] or 0) + sv[2] - end - end - end - end - end - end - -luatexbase.add_to_callback( - "luatexja.define_jfont", - function (fmtable, fnum) - local vadv = {}; fmtable.v_advance = vadv - local vorg = {}; fmtable.v_origin = vorg - local ft = font_getfont(fnum) - local subtables = {} - if ft.specification then - for feat_name,v in pairs(ft.specification.features.normal) do - if v==true and ft.resources then - for _,i in pairs(ft.resources.sequences) do - if i.order[1]== feat_name and i.type == 'gpos_single' and type(i.subtables)=='table' then - for _,st in pairs(i.subtables) do - subtables[st] = true - end - end - end - end - end - acc_feature(vadv, vorg, subtables, ft, - ft.specification.features.normal.vrt2 or ft.specification.features.normal.vert) - for i,v in pairs(vadv) do - vadv[i]=vadv[i]/ft.units_per_em*fmtable.size - end - for i,v in pairs(vorg) do - vorg[i]=vorg[i]/ft.units_per_em*fmtable.size - end - end - return fmtable - end, 'ltj.v_advance', 1 -) -end - ------------------------------------------------------------------------ -- make table of vertical glyphs which does not covered by vert feature -- nor UTR#50 diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua index a80500cfe20..3f37278e545 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-pretreat.lua @@ -43,9 +43,9 @@ local attr_icflag = luatexbase.attributes['ltj@icflag'] local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct local ltjs_orig_char_table = ltjs.orig_char_table local ltjf_replace_altfont = ltjf.replace_altfont -local attr_orig_char = luatexbase.attributes['ltj@origchar'] local STCK = luatexja.userid_table.STCK local DIR = luatexja.userid_table.DIR +local JA_AL_BDD = luatexja.userid_table.JA_AL_BDD local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG local dir_tate = luatexja.dir_table.dir_tate @@ -86,6 +86,9 @@ do { __index = function() return node_next end, }) + local id_boundary = node.id('boundary') + local node_new, insert_before = node.direct.new, node.direct.insert_before + local setsubtype = node.direct.setsubtype or function(n,l) setfield(n,'subtype',l) end local function suppress_hyphenate_ja (h) start_time_measure('ltj_hyphenate') head = to_direct(h) @@ -98,15 +101,26 @@ do do local p = head while p do - local pid = getid(p) + local pid, prev_chartype = getid(p), 0 + -- prev_chartype: 0: not char 1: ALchar 2: JAchar while pid==id_glyph do local pc = getchar(p) if has_attr(p, attr_icflag, 0) and is_ucs_in_japanese_char(p, pc) then + if prev_chartype==1 then + local b = node_new(id_whatsit,sid_user); + setfield(b, 'type', 100); setfield(b, 'user_id', JA_AL_BDD); + insert_before(head, p, b) + end local pf = has_attr(p, attr_curjfnt) pf = (pf and pf>0 and pf) or getfont(p) setfont(p, ltjf_replace_altfont(pf, pc)) setlang(p, lang_ja) - ltjs_orig_char_table[p] = pc + ltjs_orig_char_table[p], prev_chartype = pc, 2 + elseif prev_chartype==2 then + local b = node_new(id_whatsit,sid_user); + setfield(b, 'type', 100); setfield(b, 'user_id', JA_AL_BDD); + insert_before(head, p, b); prev_chartype = 1 + else prev_chartype = 1 end p = node_next(p); pid = getid(p) end diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua index 14c6a240ced..9f13c97c61a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua @@ -14,6 +14,7 @@ local getfont = node.direct.getfont local getlist = node.direct.getlist local getchar = node.direct.getchar local getsubtype = node.direct.getsubtype +local getwidth = node.direct.getwidth or function(n) return getfield(n,'width') end local getdepth = node.direct.getdepth or function(n) return getfield(n,'depth') end local getwhd = node.direct.getwhd or function(n) return getfield(n,'width'), getfield(n,'height'),getfield(n,'depth') end @@ -23,6 +24,7 @@ local setwhd = node.direct.setwhd or function(n,w,h,d) local setchar = node.direct.setchar or function(n,c) setfield(n,'char',c) end local setnext = node.direct.setnext or function(n,c) setfield(n,'next',c) end local setdir = node.direct.setdir or function(n,c) setfield(n,'dir',c) end +local setkern = node.direct.setkern or function(n,c) setfield(n,'kern',c) end local setoffsets = node.direct.setoffsets or function(n,x,y) setfield(n,'xoffset',x); setfield(n,'yoffset',y) end local getoffsets = node.direct.getoffsets or function(n) @@ -56,6 +58,7 @@ local dir_tate = luatexja.dir_table.dir_tate local attr_ykblshift = luatexbase.attributes['ltj@ykblshift'] local attr_tkblshift = luatexbase.attributes['ltj@tkblshift'] local attr_icflag = luatexbase.attributes['ltj@icflag'] +local attr_vert_ori = luatexbase.attributes['ltj@vert@ori'] local ltjf_font_extra_info = ltjf.font_extra_info @@ -81,7 +84,7 @@ luatexbase.create_callback("luatexja.set_width", "data", end) local call_callback = luatexbase.call_callback -local fshift = { down = 0, left = 0} +local fshift = { down = 0, left = 0 } local min, max = math.min, math.max @@ -175,21 +178,19 @@ local function capsule_glyph_tate(p, met, char_data, head, dir) local ascent, descent = met.ascent, met.descent local fwidth, pwidth = char_data.width do - local pf = getfont(p) - local pc = getchar(p) + local pf, pc = getfont(p), getchar(p) local feir = ltjf_font_extra_info[pf] if feir and feir.rotation and met.vert_activated then - if feir.rotation[pc] then + if feir.rotation[pc] and (has_attr(p, attr_vert_ori) or 0)<=0 then return capsule_glyph_tate_rot(p, met, char_data, head, dir, 0.5*(ascent-descent)) end end local ident = fonts.hashes.identifiers[pf] - pwidth = (ident.descriptions and ident.descriptions[pc] + pwidth = (ident.descriptions and ident.descriptions[pc] and ident.descriptions[pc].vheight and ident.descriptions[pc].vheight / ident.units * met.size) - or (ascent+descent) - pwidth = pwidth + (met.v_advance[pc] or 0) - ascent = met.v_origin[pc] and ascent - met.v_origin[pc] or ascent + or (ident.metadata and ident.metadata.defaultvheight) or (ascent+descent) + ascent = feir.vorigin[pc] and (feir.vorigin[pc] / ident.units * met.size) or ascent end fwidth = fwidth or pwidth fshift.down = char_data.down; fshift.left = char_data.left @@ -210,9 +211,9 @@ local function capsule_glyph_tate(p, met, char_data, head, dir) local ws = node_new(id_whatsit, sid_save) local wm = node_new(id_whatsit, sid_matrix) setfield(wm, 'data', '0 1 -1 0') - local pwnh = -round(0.5*getfield(p, 'width')) - local k2 = node_new(id_kern, 1); setfield(k2, 'kern', pwnh) - local k3 = node_new(id_kern, 1); setfield(k3, 'kern', -getfield(p, 'width')-pwnh) + local pwnh = -round(0.5*getwidth(p)) + local k2 = node_new(id_kern, 1); setkern(k2, pwnh) + local k3 = node_new(id_kern, 1); setkern(k3, -getwidth(p)-pwnh) local wr = node_new(id_whatsit, sid_restore) setfield(box, 'head', ws) setnext(ws, wm); setnext(wm, k2); @@ -228,7 +229,7 @@ luatexja.setwidth.capsule_glyph_tate = capsule_glyph_tate local function capsule_glyph_math(p, met, char_data) if not char_data then return nil end - local fwidth, pwidth = char_data.width, getfield(p, 'width') + local fwidth, pwidth = char_data.width, getwidth(p) fwidth = fwidth or pwidth fshift.down = char_data.down; fshift.left = char_data.left fshift = call_callback("luatexja.set_width", fshift, met, char_data) diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls index 884eeb90e29..98945f49c56 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjarticle} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -136,6 +136,7 @@ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} \ltjglobalsetparameter{differentjfm=both} \directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')} +\DeclareOption{disablejfam}{} \ExecuteOptions{a4paper,10pt,oneside,onecolumn,final} \ProcessOptions\relax \input{ltjsize1\@ptsize.clo} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo index 18d59619531..ab672939790 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk10.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo index 8265b54e331..86ddc448394 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk11.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo index ae7da1cb5e8..df2a6c90f9d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk12.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls index 6ad203fcce0..280da3aca8e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjbook} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -146,6 +146,7 @@ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} \ltjglobalsetparameter{differentjfm=both} \directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')} +\DeclareOption{disablejfam}{} \ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright} \ProcessOptions\relax \input{ltjbk1\@ptsize.clo} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls index d87b35efba2..4b46fb51ffa 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjreport} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -144,6 +144,7 @@ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} \ltjglobalsetparameter{differentjfm=both} \directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')} +\DeclareOption{disablejfam}{} \ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany} \ProcessOptions\relax \input{ltjsize1\@ptsize.clo} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls index 7b015de3599..1c4ff19dae4 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsarticle} - [2019/04/06 ltjsclasses ] + [2019/08/12 ltjsclasses ] \def\jsc@clsname{ltjsarticle} \def\Cjascale{0.924715} \RequirePackage{luatexja} @@ -194,6 +194,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% &\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss##\egroup \tabskip\z@skip\cr }} +\DeclareOption{disablejfam}{} \DeclareOption{draft}{\setlength\overfullrule{5pt}} \DeclareOption{final}{\setlength\overfullrule{0pt}} \newif\ifmingoth diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index 162b2364e6b..ffcccbc7f94 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsbook} - [2019/04/06 ltjsclasses ] + [2019/08/12 ltjsclasses ] \def\jsc@clsname{ltjsbook} \def\Cjascale{0.924715} \RequirePackage{luatexja} @@ -199,6 +199,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% &\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss##\egroup \tabskip\z@skip\cr }} +\DeclareOption{disablejfam}{} \DeclareOption{draft}{\setlength\overfullrule{5pt}} \DeclareOption{final}{\setlength\overfullrule{0pt}} \newif\ifmingoth diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo index 0fd6055cc0a..601be87f600 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize10.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo index d2445e45698..fcc0f724de9 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize11.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo index c8e3ca64c24..4e1ad8790cc 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize12.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls index 3bb3ae09e20..2f7805cadfd 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjskiyou} - [2019/04/06 ltjsclasses ] + [2019/08/12 ltjsclasses ] \def\jsc@clsname{ltjskiyou} \def\Cjascale{0.924715} \RequirePackage{luatexja} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls index 3e7b5d2d7d6..72071601764 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjspf} - [2019/04/06 ltjsclasses ] + [2019/08/12 ltjsclasses ] \def\jsc@clsname{ltjspf} \def\Cjascale{0.903375} \RequirePackage{luatexja} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls index f28caebdc95..ae0e0128281 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsreport} - [2019/04/06 ltjsclasses ] + [2019/08/12 ltjsclasses ] \def\jsc@clsname{ltjsreport} \def\Cjascale{0.924715} \RequirePackage{luatexja} @@ -198,6 +198,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% &\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss##\egroup \tabskip\z@skip\cr }} +\DeclareOption{disablejfam}{} \DeclareOption{draft}{\setlength\overfullrule{5pt}} \DeclareOption{final}{\setlength\overfullrule{0pt}} \newif\ifmingoth diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls index 6c8e4fde857..4f542359a27 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtarticle} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -147,6 +147,7 @@ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} \ltjglobalsetparameter{differentjfm=both} \directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')} +\DeclareOption{disablejfam}{} \ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,tate} \ProcessOptions\relax \input{ltjtsize1\@ptsize.clo} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo index 61825f2e1a6..60ee4fac2ad 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk10.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo index 1db86d1fbb8..9b4067ce23c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk11.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo index 72f211645a1..1b3f553d255 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk12.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls index 9815703c00d..328fd0ffc4d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtbook} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -157,6 +157,7 @@ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} \ltjglobalsetparameter{differentjfm=both} \directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')} +\DeclareOption{disablejfam}{} \ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright,tate} \ProcessOptions\relax \input{ltjtbk1\@ptsize.clo} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls index 447ee9e34d4..041e935548f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtreport} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -155,6 +155,7 @@ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} \ltjglobalsetparameter{differentjfm=both} \directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')} +\DeclareOption{disablejfam}{} \ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany,tate} \ProcessOptions\relax \input{ltjtsize1\@ptsize.clo} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo index 6fe390af3d2..1bb6c8b7978 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize10.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo index 02683226ed8..2258dbcdf32 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize11.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo index 5f5d5ecb8fd..645f6ce72fd 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize12.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty index e57739d0c21..ba13695352b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty @@ -137,7 +137,6 @@ \newattribute\ltj@icflag % attribute for italic correction \newattribute\ltj@curjfnt % index for ``current horizontal Japanese font'' \newattribute\ltj@curtfnt % index for ``current vertical Japanese font'' -\newattribute\ltj@origchar % \newattribute\ltj@charclass % \newattribute\ltj@charcode % \newattribute\ltj@autospc % attribute for autospacing @@ -147,12 +146,12 @@ \newattribute\ltj@tablshift % attribute for talbaselineshift \newattribute\ltj@tkblshift % attribute for tjabaselineshift \newattribute\jfam % index for current jfam +\newattribute\ltj@vert@ori % <=0: UAX#50, >0: always upright \newattribute\ltj@dir \newlanguage\ltj@@japanese \ltj@dir\z@ \ltj@icflag\z@ -\ltj@origchar\z@ \ltj@charclass\z@ \ltj@curjfnt\m@ne \ltj@curtfnt\m@ne @@ -477,14 +476,20 @@ %%%%%%%% \ltjalchar<number>, \ltjjachar<number> \let\ltj@@origchar=\char -\protected\def\ltj@alljachar{\relax - \csname ltj@kcat0\endcsname\z@ - \csname ltj@kcat1\endcsname\z@ - \csname ltj@kcat2\endcsname\z@ - \csname ltj@kcat3\endcsname\z@ - \csname ltj@kcat4\endcsname\z@ - \csname ltj@kcat5\endcsname\z@ - \csname ltj@kcat6\endcsname\z@} +\newluafunction\ltj@alljachar@inner +\directlua{ + local t, set_attr = lua.get_functions_table(), tex.setattribute + local get_attr, floor = tex.getattribute, math.floor + local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] + local lang_ja = luatexja.lang_ja + t[\the\ltj@alljachar@inner] = function() + font.current(get_attr(attr_curjfnt)); tex.language=lang_ja; + for i=0,6 do + set_attr(luatexbase.attributes['ltj@kcat' .. floor(i)],0) + end + end +} +\protected\def\ltj@alljachar{\luafunction\ltj@alljachar@inner} \protected\def\ltj@allalchar{\relax \csname ltj@kcat0\endcsname="7FFFFFFF %" \csname ltj@kcat1\endcsname="7FFFFFFF %" diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua index 9756eadd62b..4a4de62b0d1 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua @@ -80,6 +80,7 @@ userid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par', 'luatexja') -- 「段落始め」 userid_table.DIR = luatexbase.newuserwhatsitid('direction', 'luatexja') -- 組方向 userid_table.BOXB = luatexbase.newuserwhatsitid('box_boundary', 'luatexja') -- 「ボックス始め・終わり」 +userid_table.JA_AL_BDD = luatexbase.newuserwhatsitid('ja_al_boundary', 'luatexja') local dir_table = {} luatexja.dir_table = dir_table diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index fffb71b23c5..71f90ca3277 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -41,15 +41,14 @@ \ProcessOptions\relax \fi %</LaTeX> %%%% VERSION -\def\LuaTeXjaversion{20190708.0} +\def\LuaTeXjaversion{20190827.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs %% Load all sub-packages. \ifltj@in@latex %<*LaTeX> %% \RequirePackage{expl3} needed if the version of l3kernel is v6111 - \RequirePackage{luatexja-core} - \RequirePackage{luatexja-compat} + \RequirePackage{luatexja-core,luatexja-compat} \else %<*!LaTeX> \input luatexja-core.sty % \input luatexja-compat.sty % diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 91827a3b7fd..52649e84265 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjdefs}[2019/05/01 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2019/08/21 Default font settings of LuaTeX-ja] \ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi \ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi @@ -17,6 +17,10 @@ \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10} +\kanjifamily{mc} +\kanjiseries{m} +\kanjishape{n} +\fontsize{10}{10} \DeclareYokoKanjiEncoding{JY3}{}{} \DeclareKanjiSubstitution{JY3}{mc}{m}{n} \DeclareTateKanjiEncoding{JT3}{}{} diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty index 6c25efadc42..8068d3326b8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjfont}[2019/01/29 Patch to NFSS2 for LuaTeX-ja] +\ProvidesPackage{lltjfont}[2019/08/21 Patch to NFSS2 for LuaTeX-ja] \def\ltj@chardef@text@cmd#1{% \let\@ifdefinable\@@ifdefinable% @@ -228,6 +228,7 @@ \def\default@series{#3}% \def\default@shape{#4}}% \fi} +\@onlypreamble\DeclareKanjiSubstitution \def\DeclareErrorKanjiFont#1#2#3#4#5{% \xdef\error@kfontshape{% \noexpand\expandafter\noexpand\split@name\noexpand\string @@ -236,12 +237,7 @@ \gdef\default@k@family{#2}% \gdef\default@k@series{#3}% \gdef\default@k@shape{#4}% - \global\let\k@family\default@k@family - \global\let\k@series\default@k@series - \global\let\k@shape\default@k@shape - \gdef\f@size{#5}% - \gdef\f@baselineskip{#5pt}} -\@onlypreamble\DeclareKanjiSubstitution + } \@onlypreamble\DeclareErrorKanjiFont \newif\ifltjselectfont@force@define diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty index 4cc3d0c0171..989fd8ce9d4 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty @@ -5,7 +5,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{lltjp-array}[2018/03/29 Patch to array for LuaTeX-ja] -\RequirePackage{etoolbox,array,luatexja} +\RequirePackage{etoolbox,array} \patchcmd\insert@column{% \ignorespaces\@sharp\unskip diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty index 40f8c1e94e0..6f469fc08ff 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty @@ -4,7 +4,7 @@ \NeedsTeXFormat{LaTeX2e} -\RequirePackage{fontspec,luatexja} +\RequirePackage{fontspec} \ExplSyntaxOn % <= v2.6g uses \l__fontspec_nfss_enc_tl instead of \g__fontspec_nfss_enc_tl diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty index 8b71f591e1f..db2fac84813 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty @@ -1,21 +1,32 @@ % -% lltjp-microtype.sty 2019-03-29 +% lltjp-microtype.sty 2019-08-12 % % (Work in Progress) % \NeedsTeXFormat{LaTeX2e} \RequirePackage{etoolbox} -\RequirePackage{luatexja} \makeatletter \def\MT@register@font{% - \xdef\MT@font@list{\expandonce{\MT@font@list}\MT@font,}% + \xdef\MT@font@list{\expandonce{\MT@font@list\MT@font},}% !!! } \def\MT@register@subst@font{\MT@exp@one@n\MT@in@clist\font@name\MT@font@list \ifMT@inlist@\else - \xdef\MT@font@list{\expandonce{\MT@font@list}\font@name,}% + \xdef\MT@font@list{\expandonce{\MT@font@list\font@name},}% !!! \fi} +\let\ltj@MT@tracking@\MT@tracking@ +\def\MT@tracking@{% + \MT@exp@one@n\MT@in@clist\MT@font\MT@tr@font@list + \ifMT@inlist@\else + \MT@maybe@do{tr}% + \ifMT@do\else + \xdef\MT@tr@font@list{\expandonce{\MT@tr@font@list\MT@font,}}% !!! + \fi + \fi +} +\ifx\MT@tracking\ltj@MT@tracking@\let\MT@tracking\MT@tracking@\fi + %\endinput \begingroup @@ -23,10 +34,11 @@ /MT@map@tlist@n{/\LτJCHAREX}/@makeother /lccode`/τ=`/t /lowercase{% /def/x{/endgroup + /def/MT@charstring{\CHAR"}% /def/MT@is@char##1\CHAR"##2##3##4/relax{% %/message{MIC <##1><##2><##3><##4>}% /ifx/relax##4/relax - /expandafter/MT@is@char@ltja/MT@strip@prefix##1/relax\LτJALCHAR\LτJALCHAR/relax + /expandafter/MT@is@char@ltja/MT@strip@prefix##1>/relax\LτJALCHAR\LτJALCHAR/relax /else /ifx/relax##1/relax /if##3\/relax @@ -40,15 +52,16 @@ /fi /fi }% + /def/MT@ltjs@drop@##1>##2/relax{##1}% /def/MT@is@char@ltja##1\LτJALCHAR##2\LτJALCHAR##3/relax{% + %/typeout{MICLTJA <##1><##2><##3>}% /ifx/relax##1/relax /ifx/relax##2/relax/else - /edef/MT@char@{/number##2}% + /edef/MT@char@{/expandafter/number/MT@ltjs@drop@##2>/relax}% /fi /fi }% }% } /x - \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty index cfd8e527e6f..00602884eab 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-preview.sty @@ -5,7 +5,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{lltjp-preview}[2018/01/20 Patch to preview for LuaTeX-ja] -\RequirePackage{etoolbox,preview,luatexja} +\RequirePackage{etoolbox,preview} \newbox\ltj@preview@box \patchcmd\pr@endbox{% 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 09a2ad96c11..c6bebc36cde 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-siunitx.sty @@ -4,7 +4,7 @@ \NeedsTeXFormat{LaTeX2e} -\RequirePackage{luatexja} +\RequirePackage{siunitx} \makeatletter \ExplSyntaxOn \cs_generate_variant:Nn \tl_if_in:NnT { coT } diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty index 6f7590c2a4d..e7535bd7e11 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty @@ -4,7 +4,7 @@ \NeedsTeXFormat{LaTeX2e} -\RequirePackage{stfloats,luatexja} +\RequirePackage{stfloats} \RequirePackage{etoolbox} \newif\ifltj@stfloats@fnbelowfloat diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty index 31cbef3e737..d0ac424701a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-tascmac.sty @@ -9,7 +9,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{lltjp-tascmac}[2017/12/23 Patch to (t)ascmac for LuaTeX-ja] -\RequirePackage{tascmac,luatexja} +\RequirePackage{tascmac} %% use Type1 font for ascgrp \pdfextension mapline{+ascgrp <ascgrp.pfb} diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty index fa974bbb846..d8c4055d14f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-unicode-math.sty @@ -4,7 +4,7 @@ \NeedsTeXFormat{LaTeX2e} -\RequirePackage{unicode-math,luatexja,etoolbox} +\RequirePackage{unicode-math,etoolbox} \ExplSyntaxOn diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty index e35fe43664f..3d6e49fbaa7 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty @@ -6,7 +6,7 @@ \ProvidesPackage{lltjp-xunicode}[2017/05/05 Patch to xunicode for LuaTeX-ja] \def\XeTeXpicfile{} -\RequirePackage{xunicode,luatexja} +\RequirePackage{xunicode} {\catcode`\"=12 \gdef\check@hexcom@digits@#1#2#3#4#5@!@#6#7#8{% \ifx @#4\relax |