diff options
Diffstat (limited to 'Master/texmf-dist')
41 files changed, 323 insertions, 1263 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 9998677f899..41528dbd955 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 20200802.0 +The LuaTeX-ja Package 20200808.0 -------------------------------- Copyright (c) 2011--2020 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -45,9 +45,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20200802.0 in the Git repository by + or tagged as 20200808.0 in the Git repository by <http://git.osdn.jp/view?p=luatex-ja/luatexja.git - ;a=snapshot;h=refs/tags/20200802.0;sf=tgz> + ;a=snapshot;h=refs/tags/20200808.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -55,16 +55,13 @@ Installation src/ltjltxdoc.ins src/ltjsclasses.ins - c. Process src/ltj-kinsoku_make.tex by (plain) LuaTeX to generate ltj-kinsoku.lua, - which stores default "kinsoku" parameters. - - d. Put src/ into your TEXMF tree. + c. Put src/ into your TEXMF tree. An example location is TEXMF/tex/luatex/luatexja. If you are updating from old version, you MUST remove it before extracting the new version of LuaTeX-ja. - e. You may need to update the filename database, by mktexlsr (or by another program). + d. You may need to update the filename database, by mktexlsr (or by another program). Basic Usage @@ -93,6 +90,10 @@ Notes No .{dtx,ins} pair generates .sty files of LuaTeX-ja package. -* src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. +* src/*.{ins.dtx} are not needed in regular use. + +* ltj-kinsoku_make.tex is removed in version 20200808.0. + This file and ltj-kinsoku.lua are not used anymore. + (Do not remove ltj-kinsoku.tex.) -Last commit date: Sun Aug 2 19:53:42 2020 +0900 +Last commit date: Sat Aug 8 18:25:40 2020 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf Binary files differindex 92ac414f9f6..20c4edb88f8 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf +++ b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf diff --git a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex index 1b2aa5ed596..28be8dad3cc 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex +++ b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex @@ -1,6 +1,6 @@ %#! lualatex -\documentclass[a4paper,10pt]{ltjsarticle} -\usepackage[textwidth=45\zw, lines=45, footskip=2\zh, verbose]{geometry} +\documentclass[a4paper,10ptj]{ltjsarticle} +\usepackage[textwidth=42\zw, lines=42, footskip=2\zh, verbose]{geometry} \usepackage{listings,amsmath,booktabs,lltjext,bxghost} \usepackage{unicode-math} \setmathfont{Latin Modern Math} @@ -48,10 +48,10 @@ \section{利用方法} \Pkg{lltjp-geometry}パッケージは，\LuaTeX-jaに標準で含まれている． 本パッケージの動作には\href{http://www.ctan.org/pkg/ifluatex}{\Pkg{ifluatex}}, -\href{http://www.ctan.org/pkg/filehook}{\Pkg{filehook}}パッケージが必要である． +\href{https://www.ctan.org/pkg/etoolbox}{\Pkg{etoolbox}}パッケージが必要である． +また，\LaTeXe~2020\nobreakdash-02\nobreakdash-02以前では\href{http://www.ctan.org/pkg/filehook}{\Pkg{filehook}}パッケージも必要である． -\LuaTeX-jaでは，\Pkg{geometry}パッケージ読み込み時に -自動的に\Pkg{lltjp-geometry}パッケージが読み込まれる． +\LuaTeX-jaでは，自動的に\Pkg{lltjp-geometry}パッケージが読み込まれる． 縦組クラスか否かの自動判定（\ref{ssec:auto}節）を上書きしたい場合は， \begin{lstlisting} % \PassOptionsToPackage{force}{lltjp-geometry} % 強制的に有効 @@ -60,7 +60,7 @@ \usepackage[...]{geometry} \end{lstlisting} のように\emph{\Pkg{luatexja}の読み込み前}に\cs{PassOptionsToPackage}で -本パッケージに渡すオプションを指定する（\cs{usepackage\{lltjp-geometry\}}\>は使えない）． +本パッケージに渡すオプションを指定する（\cs{usepackage\{lltjp-geometry\}}\>を行っても意味がない）． \pTeX 系列では，\Pkg{tarticle}, \Pkg{tbook}, \Pkg{treport}といった \emph{縦組クラスを使う場合}に， @@ -68,7 +68,7 @@ \usepackage[...]{lltjp-geometry} \usepackage[...]{geometry} \end{lstlisting} -と，\Pkg{geometry}パッケージの前に読み込む． +と，\Pkg{geometry}パッケージの\emph{前}に読み込む． \subsection{縦組クラスか否かの判定} \label{ssec:auto} @@ -76,10 +76,12 @@ \Pkg{geometry}パッケージ読み込み直後にパッチを当てる： \begin{enumerate} \item \Pkg{geometry}パッケージを読み込む際に，現在の組方向が縦組になっている． - \item \cs{AtBeginDocument}により指定される，\cs{begin\{document\}}\>時に実行される内容に - \cs{tate}（というトークン）が含まれている． + \item \cs{AtBeginDocument}により + \footnote{\LaTeXe~2020-10-01以降ではそれと同義な\>\cs{AddToHook\{begindocument\}}\>も含む．}指定される， + \cs{begin\{document\}}\>時に実行される内容に\cs{tate}（というトークン）が含まれている． \item 本パッケージを読み込む際に\texttt{force}オプションが指定されている． \end{enumerate} + \LuaTeX-jaで縦組クラスを利用する場合は主に1.の， \pTeX 系列で縦組クラスを利用する場合は主に2.の状況となる \footnote{% diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf Binary files differindex 46209980cc2..4184764810a 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 e7b415f52bd..b9edb1d5623 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 dbe97a5116f..ba86234554d 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 72227e28e73..69360223021 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 18ca18cdae5..34674985525 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -651,15 +651,16 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}. \item \Pkg{adobemapping} (Adobe cmap and pdfmapping files) \item \LaTeX\ 2020-02-02 patch level 5 or later %<en> (if you want to use \LuaTeX-ja with \LaTeXe) -%<ja> （\LaTeX 下で\LuaTeX-jaを使う場合） +%<ja> （\LaTeXe 下で\LuaTeX-jaを使う場合） \item \href{https://github.com/josephwright/etoolbox/}{\Pkg{etoolbox}}, \Pkg{everysel} %<en> (if you want to use \LuaTeX-ja with \LaTeXe) -%<ja> （\LaTeX 下で\LuaTeX-jaを使う場合） -\item \Pkg{ltxcmds}, \Pkg{pdftexcmds}, \Pkg{filehook}, \Pkg{atbegshi} +%<ja> （\LaTeXe 下で\LuaTeX-jaを使う場合） +\item \Pkg{ltxcmds}, \Pkg{pdftexcmds} +\item \Pkg{filehook}, \Pkg{atbegshi} +%<en> (not needed if you want to use \LuaTeX-ja with \LaTeXe~2020-10-01 or later) +%<ja> （\LaTeXe 2020-10-01以降で\LuaTeX-jaを使う場合はどちらも不要） \item \href{https://github.com/wspr/fontspec/}{\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/})} %<*en> \item \emph{Harano Aji fonts} (\url{https://github.com/trueroad/HaranoAjiFonts})\\ More specifically, HaranoAjiMincho-Regular~and~HaranoAjiGothic-Medium. @@ -678,9 +679,10 @@ the following distributions: \begin{itemize} \item \href{https://www.tug.org/texlive/}{\TeX~Live} (in \texttt{texmf-dist/tex/luatex/luatexja}) \item \href{http://w32tex.org/}{W32\TeX}\ (in \texttt{luatexja.tar.xz}) - \item MiK\TeX\ (in \texttt{luatexja.tar.lzma}); see the next subsection + \item MiK\TeX\ (in \texttt{luatexja.tar.xz}) \end{itemize} -Harano Aji fonts are available in \TeX~Live and MiK\TeX. +Harano Aji fonts are also available in these distributions +(\texttt{haranoaji} in \TeX~Live and MiK\TeX, and \texttt{luatexja.tar.xz} in W32\TeX). %</en> %<*ja> 現在，\LuaTeX-jaはCTAN (\texttt{macros/luatex/generic/luatexja})に収録されている他， @@ -690,7 +692,8 @@ Harano Aji fonts are available in \TeX~Live and MiK\TeX. \item \TeX~Live (\texttt{texmf-dist/tex/luatex/luatexja}) \item W32\TeX\ (\texttt{luatexja.tar.xz}) \end{itemize} -\TeX~Live, MiK\TeX は原ノ味フォントも収録している． +これらのディストリビューションは原ノ味フォントも収録している +（\TeX~Live, MiK\TeX では\texttt{haranoaji}，W32\TeX では\texttt{luatexja.tar.xz}）. %</ja> %<*en> @@ -766,13 +769,10 @@ But only the contents in \texttt{src/} are needed to work \LuaTeX-ja. %<*en> \item If you downloaded this package from CTAN, you have to run following commands - to generate classes - and \texttt{ltj-kinsoku.lua} (the file which stores default ``\textit{kinsoku}'' parameters): + to generate classes: %</en> %<*ja> -\item もしCTANから本パッケージを取得したのであれば，日本語用クラスファイルや -標準の禁則処理用パラメータを -格納した \texttt{ltj-kinsoku.lua} を生成するために， +\item もしCTANから本パッケージを取得したのであれば，日本語用クラスファイルを生成するために， 以下を実行する必要がある： %</ja> \begin{lstlisting} @@ -780,19 +780,7 @@ $ cd src $ lualatex ltjclasses.ins $ lualatex ltjsclasses.ins $ lualatex ltjltxdoc.ins -$ luatex ltj-kinsoku_make.tex \end{lstlisting} -%<*en> -\emph{Do not forget processing \texttt{ltj-kinsoku\_make.tex}}. -\texttt{*.\{dtx,ins\}} and \texttt{ltj-kinsoku\_make.tex} used here are not needed in regular use. -%</en> -%<*ja> -\emph{最後の \texttt{ltj-kinsoku\_make.tex} の実行を忘れないように注意}． -ここで使用した \texttt{*.\{dtx,ins\}} と \texttt{ltj-kinsoku\_make.tex} は -通常の使用にあたっては必要ない． -%</ja> - - %<*en> \item Copy all the contents of \texttt{src/} into one of your \texttt{TEXMF} tree. @@ -1149,7 +1137,7 @@ By default, the following fonts are used for these two families. フォントを変更する命令）の前で実行することにより使うことができる． \pLaTeX では標準の欧文フォントはOT1エンコーディングのComputer Modern Roman (\texttt{cmr})% - であったが，2017年以降の\LuaLaTeX ではTUエンコーディングのlatin Modern Roman (\texttt{lmr})% + であったが，2017年以降の\LuaLaTeX ではTUエンコーディングのLatin Modern Roman (\texttt{lmr})% に変更されている．そのため，前段落で述べた「従属欧文」も，Latin Modern Romanに設定している． %</ja> @@ -1694,7 +1682,8 @@ as an external package \Pkg{luatexja-otf}. %</ja> \begin{LTXexample}[width=0.4\textwidth] -森\UTF{9DD7}外と内田百\UTF{9592}とが\UTF{9AD9}島屋に\\ +森\UTF{9DD7}外と\CID{13966}田百\UTF{9592}とが +\UTF{9AD9}島屋に\\ \CID{7652}飾区の\CID{13706}野家， \CID{1481}城市，葛西駅，\\ 高崎と\CID{8705}\UTF{FA11}，濱と\ajMayuHama\\ @@ -1827,7 +1816,7 @@ determined from the following data: %<en>\item Blocks in Unicode~12.0.0. %<ja>\item Unicode~12.0のブロック． %<en>\item The \texttt{Adobe-Japan1-UCS2} mapping between a CID Adobe-Japan1- and Unicode. -%<ja>\item Adobe-Japan1-7のCIDとUnicodeの間の対応表\texttt{Adobe-Japan1-UCS2}7． +%<ja>\item Adobe-Japan1-7のCIDとUnicodeの間の対応表\texttt{Adobe-Japan1-UCS2}． %<en>\item The \Pkg{PXbase} bundle for \upTeX\ by Takayuki Yato. %<ja>\item 八登崇之氏による\upTeX 用の\Pkg{PXbase}バンドル． \end{itemize} @@ -2019,12 +2008,12 @@ these eight ranges belongs to the character range~217. で構成されている．したがって，ブロックのリストを示す 代わりに，範囲の定義そのものを示す． %</ja> -\begin{lstlisting} +\begin{lstlisting}[escapechar=\!] \ltjdefcharrange{4}{% "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF, "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF, "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF, - "1F300-"1FFFF, ... (characters in "2000-"206F which are not in range 9) + "1F300-"1FFFF, ... !\rmfamily (and characters in \texttt{U+2000}--\texttt{U+206F} which are not in range 9)! } % non-Japanese \end{lstlisting} %<en>\item[Range~5${}^{\text{A}}$] Surrogates and Supplementary Private Use Areas. @@ -11105,6 +11094,15 @@ Adobe-CNS1-*<j-cid-auto-adobe-cns1.\{lua.gz,luc\}&UniCNS-UTF32-*&Adobe-CNS1-UC \end{table} %<*ja> +\item[ltj-kinsoku\_default.\{lua.gz,luc\}] +禁則処理，\Param{kansujichar}などの標準設定が格納されたファイルである． +%</ja> +%<*en> +\item[ltj-kinsoku.luc] +The bytecode cache which default \textit{kinsoku} parameters are stored. +%</en> + +%<*ja> \item[ltj-jisx0208.luc] \LuaTeX-ja配布中の\texttt{ltj-jisx0208.lua}をバイトコード化したものである． これはJIS~X~0208とUnicodeとの変換テーブルであり， diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx index dd156b3393d..a868bcb58eb 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx @@ -133,6 +133,7 @@ % 新設の|ptexmin|オプション指定時にのみ行うようにした。 % 句読点を「、」「。」に統一。} % \changes{v1.8e-ltj-19}{2020/07/27}{|everyshi|パッケージへのパッチを別パッケージへ分離。} +% \changes{v1.8e-ltj-20}{2020/08/03}{\LaTeX~2020-10-01への対応．} % \fi % % \iffalse @@ -4706,8 +4707,12 @@ % \section{各種パッケージへの対応} % もともと縦組での利用を想定されていないいくつかのパッケージについて、 % 補正するためのコードを記述しておきます。 -% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます） -% の機能を用いています。 +%% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます） +%% の機能を用いています。 +% +% [2020-08-03 LTJ] \LaTeX\~2020-10-01に対応するため、Lua\TeX-jaの提供する命令 +% （|filehook|パッケージの命令の別名か、新\LaTeX のフック機構を利用して同様の内容を書いたもの） +% に置き換えました。 % % \subsection{\texttt{ftnright}パッケージ} % 脚注番号の書式が|ftnright|パッケージによって勝手に書き換えられるので、 @@ -4715,8 +4720,8 @@ % \changes{v1.7d}{2017/02/19}{コード追加} % \begin{macrocode} %<*article|report|book> -\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} +\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} %</article|report|book> % \end{macrocode} % diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty index 9e1421b130c..d19db9ab61a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty @@ -738,7 +738,6 @@ \lineskip\z@skip\baselineskip\z@skip\@preamble} \def\endarray{\crcr\egroup\egroup\@end@alignbox\@arrayright} } - \@ifpackageloaded{array}{% \let\tabular=\ltj@lltjext@orig@tabular \let\array=\ltj@lltjext@orig@array @@ -746,8 +745,7 @@ }{% \let\ltj@lltjext@orig@tabular\relax \let\ltj@lltjext@orig@array\relax - \RequirePackage{filehook,etoolbox} - \AtEndOfPackageFile{array}{\ltj@lltjext@patch@array} + \ltj@ExecuteAfterPackage{array}{\ltj@lltjext@patch@array} } %%%%%%%%%%%%%%%% LuaTeX-ja original diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty index 605797f3a37..622b3877233 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-base.sty @@ -13,7 +13,7 @@ \ifltj@in@latex %<*LaTeX> \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{ltj-base}[2020-07-27] + \ProvidesPackage{ltj-base}[2020-08-04] \fi %</LaTeX> %%------------------ Tiny helpers @@ -96,13 +96,6 @@ %! plain であるか. \ltj@csletcs{ifltj@in@plain}{iffalse} -%% \ltj@require@package{<package>}{<date>} -%! サブパッケージを読み込む. LaTeX では \RequirePackage、それ以外では -%! \input を使う. <date> は必須だが空でもよい. -\def\ltj@require@package#1#2{ - \RequirePackage{#1}[#2] -} - %% \ltj@print{<message>} %! 端末への出力. \let\ltj@print\typeout @@ -116,11 +109,6 @@ \ltj@csletcs{ifltj@in@plain}{iffalse} \fi -%% \ltj@require@package{<package>}{<date>} -\def\ltj@require@package#1#2{ - \input #1.sty\relax -} - %% \ltj@print{<message>} \def\ltj@print#1{ \immediate\write16{#1} @@ -299,6 +287,7 @@ %% from Sonja Maus, ``Looking Ahead for a <box>'', %% TUGBoat, 11, No. 4, 1990. \newbox\ltj@afbox +\directlua{luatexja.afbox_number=\the\ltj@afbox} \protected\def\ltj@afterbox#1{% \def\ltj@afb@xarg{#1}% \afterassignment\ltj@afb@x diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua index 523397d804c..4c6c3b6bd7a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua @@ -900,8 +900,7 @@ do local sd = to_direct(s) local box_dir = get_box_dir(sd, dir_yoko) if box_dir%dir_math_mod ~= list_dir then - setbox( - 'ltj@afbox', + setbox('ltj@afbox', to_node(copy_list(make_dir_whatsit(sd, sd, list_dir, 'box_move'))) -- copy_list しないとリストの整合性が崩れる……？ ) @@ -1059,8 +1058,7 @@ do local finalize_inner local function finalize_dir_node(db,new_dir) local b = getlist(db) - if getid(b)==id_whatsit and getsubtype(b)==sid_user - and getfield(b, 'user_id')==DIR then + while b and ((getid(b)~=id_hlist) and (getid(b)~=id_vlist)) do local ob = b; b = node_remove(b,b); setfield(db, 'head', b); node_free(ob) end @@ -1115,19 +1113,21 @@ do end end end - local getbox = tex.getbox + local getbox, shipout = tex.getbox, tex.shipout local setbox, copy = node.direct.setbox, node.direct.copy - local lua_mem_kb = 0 - function luatexja.direction.finalize() - local a = to_direct(tex.getbox("AtBeginShipoutBox")) + local afbox + function luatexja.direction.shipout() + start_time_measure 'box_primitive_hook' + if (not afbox) and luatexja.afbox_number then afbox = luatexja.afbox_number end + local a = to_direct(getbox 'ltj@afbox') local a_dir = get_box_dir(a, dir_yoko) if a_dir~=dir_yoko then local b = create_dir_node(a, a_dir, dir_yoko, false) setfield(b, 'head', a); a = b end - setfield(shipout_temp, 'head', a) - finalize_inner(shipout_temp) - setbox('global', "AtBeginShipoutBox", copy(getlist(shipout_temp))) - setfield(shipout_temp, 'head',nil) + setfield(shipout_temp, 'head', a); finalize_inner(shipout_temp) + setbox(afbox, copy(getlist(shipout_temp))); setfield(shipout_temp, 'head',nil) + shipout(afbox) + stop_time_measure 'box_primitive_hook' end end diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua deleted file mode 100644 index 1f277c90fa3..00000000000 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua +++ /dev/null @@ -1,1035 +0,0 @@ -return { - [0]=500, - { - ["shrink"]=26214, - ["shrink_order"]=0, - ["stretch"]=26214, - ["stretch_order"]=0, - ["width"]=0, - }, - { - ["shrink"]=65536, - ["shrink_order"]=0, - ["stretch"]=65536, - ["stretch_order"]=0, - ["width"]=157649, - }, - [256]=51, - [512]=52, - [768]=53, - [1024]=12295, - [1025]=19968, - [1026]=20108, - [1027]=19977, - [1028]=22235, - [1029]=20116, - [1030]=20845, - [1031]=19971, - [1032]=20843, - [1033]=20061, - [2097185]=10000, - [2097186]=10000, - [2097189]=500, - [2097190]=500, - [2097191]=10000, - [2097193]=10000, - [2097194]=500, - [2097195]=500, - [2097196]=10000, - [2097197]=10000, - [2097198]=10000, - [2097199]=500, - [2097210]=10000, - [2097211]=10000, - [2097215]=10000, - [2097245]=10000, - [2097322]=10000, - [2097330]=10000, - [2097331]=10000, - [2097332]=10000, - [2097335]=10000, - [2097337]=10000, - [2097338]=10000, - [2097339]=10000, - [2097872]=10000, - [2105369]=10000, - [2105373]=10000, - [2105381]=250, - [2105382]=250, - [2105404]=10000, - [2105415]=10000, - [2105416]=10000, - [2105417]=10000, - [2105634]=10000, - [2105874]=200, - [2107782]=10000, - [2109441]=10000, - [2109442]=10000, - [2109445]=10000, - [2109449]=10000, - [2109451]=10000, - [2109453]=10000, - [2109455]=10000, - [2109457]=10000, - [2109461]=10000, - [2109463]=10000, - [2109465]=10000, - [2109471]=10000, - [2109491]=10000, - [2109492]=10000, - [2109493]=10000, - [2109499]=10000, - [2109505]=150, - [2109507]=150, - [2109509]=150, - [2109511]=150, - [2109513]=150, - [2109539]=150, - [2109571]=150, - [2109573]=150, - [2109575]=150, - [2109582]=150, - [2109589]=150, - [2109590]=150, - [2109595]=10000, - [2109596]=10000, - [2109597]=10000, - [2109598]=10000, - [2109601]=150, - [2109603]=150, - [2109605]=150, - [2109607]=150, - [2109609]=150, - [2109635]=150, - [2109667]=150, - [2109669]=150, - [2109671]=150, - [2109678]=150, - [2109685]=150, - [2109686]=150, - [2109691]=10000, - [2109692]=10000, - [2109693]=10000, - [2109694]=10000, - [2109936]=150, - [2109937]=150, - [2109938]=150, - [2109939]=150, - [2109940]=150, - [2109941]=150, - [2109942]=150, - [2109943]=150, - [2109944]=150, - [2109945]=150, - [2109946]=150, - [2109947]=150, - [2109948]=150, - [2109949]=150, - [2109950]=150, - [2109951]=150, - [2162433]=10000, - [2162437]=200, - [2162438]=200, - [2162441]=10000, - [2162443]=200, - [2162444]=10000, - [2162445]=200, - [2162446]=10000, - [2162458]=10000, - [2162459]=10000, - [2162461]=200, - [2162463]=10000, - [2162493]=10000, - [2162525]=10000, - [2162528]=10000, - [2162529]=10000, - [2162531]=10000, - [2162532]=10000, - [2162590]=10000, - [2162591]=10000, - [4194339]=500, - [4194340]=500, - [4194344]=10000, - [4194395]=10000, - [4194400]=10000, - [4194465]=10000, - [4194475]=10000, - [4194495]=10000, - [4202520]=10000, - [4202524]=10000, - [4202668]=10000, - [4204933]=10000, - [4206600]=10000, - [4206602]=10000, - [4206604]=10000, - [4206606]=10000, - [4206608]=10000, - [4206612]=10000, - [4206614]=10000, - [4206616]=10000, - [4206621]=10000, - [4259587]=200, - [4259588]=200, - [4259592]=10000, - [4259643]=10000, - [4259648]=10000, - [4259675]=10000, - [4259679]=10000, - [4259682]=10000, - [6299648]=1, - [6299649]=1, - [6299650]=1, - [6299651]=1, - [6299652]=1, - [6299653]=1, - [6299654]=1, - [6299655]=1, - [6299656]=1, - [6299657]=1, - [6299658]=1, - [6299659]=1, - [6299660]=1, - [6299661]=1, - [6299662]=1, - [6299663]=1, - [6299664]=1, - [6299665]=1, - [6299666]=1, - [6299667]=1, - [6299668]=1, - [6299669]=1, - [6299670]=1, - [6299671]=1, - [6299672]=1, - [6299673]=1, - [6299674]=1, - [6299675]=1, - [6299676]=1, - [6299677]=1, - [6299678]=1, - [6299679]=1, - [6299680]=1, - [6299681]=1, - [6299682]=1, - [6299683]=1, - [6299684]=1, - [6299685]=1, - [6299686]=1, - [6299687]=1, - [6299688]=1, - [6299689]=1, - [6299690]=1, - [6299691]=1, - [6299692]=1, - [6299693]=1, - [6299694]=1, - [6299695]=1, - [6299696]=1, - [6299697]=1, - [6299698]=1, - [6299699]=1, - [6299700]=1, - [6299701]=1, - [6299702]=1, - [6299703]=1, - [6299704]=1, - [6299705]=1, - [6299706]=1, - [6299707]=1, - [6299708]=1, - [6299709]=1, - [6299710]=1, - [6299711]=1, - [6299712]=1, - [6299713]=1, - [6299714]=1, - [6299715]=1, - [6299716]=1, - [6299717]=1, - [6299718]=1, - [6299719]=1, - [6299720]=1, - [6299721]=1, - [6299722]=1, - [6299723]=1, - [6299724]=1, - [6299725]=1, - [6299726]=1, - [6299727]=1, - [6299728]=1, - [6299729]=1, - [6299730]=1, - [6299731]=1, - [6299732]=1, - [6299733]=1, - [6299734]=1, - [6299735]=1, - [6299736]=1, - [6299737]=1, - [6299738]=1, - [6299739]=1, - [6299740]=1, - [6299741]=1, - [6299742]=1, - [6299743]=1, - [6299744]=1, - [6299745]=1, - [6299746]=1, - [6299747]=1, - [6299748]=1, - [6299749]=1, - [6299750]=1, - [6299751]=1, - [6299752]=1, - [6299753]=1, - [6299754]=1, - [6299755]=1, - [6299756]=1, - [6299757]=1, - [6299758]=1, - [6299759]=1, - [6303744]=1, - [6303745]=1, - [6303746]=1, - [6303747]=1, - [6303748]=1, - [6303749]=1, - [6303750]=1, - [6303751]=1, - [6303752]=1, - [6303753]=1, - [6303754]=1, - [6303755]=1, - [6303756]=1, - [6303757]=1, - [6303758]=1, - [6303759]=1, - [6303760]=1, - [6303761]=1, - [6303762]=1, - [6303763]=1, - [6303764]=1, - [6303765]=1, - [6303766]=1, - [6303767]=1, - [6303768]=1, - [6303769]=1, - [6303770]=1, - [6303771]=1, - [6303772]=1, - [6303773]=1, - [6303774]=1, - [6303775]=1, - [6303776]=1, - [6303777]=1, - [6303778]=1, - [6303779]=1, - [6303780]=1, - [6303781]=1, - [6303782]=1, - [6303783]=1, - [6303784]=1, - [6303785]=1, - [6303786]=1, - [6303787]=1, - [6303788]=1, - [6303789]=1, - [6303790]=1, - [6303791]=1, - [6303792]=1, - [6303793]=1, - [6303794]=1, - [6303795]=1, - [6303796]=1, - [6303797]=1, - [6303798]=1, - [6303799]=1, - [6303800]=1, - [6303801]=1, - [6303802]=1, - [6303803]=1, - [6303804]=1, - [6303805]=1, - [6303806]=1, - [6303807]=1, - [6356736]=1, - [6356737]=1, - [6356738]=1, - [6356739]=1, - [6356740]=1, - [6356741]=1, - [6356742]=1, - [6356743]=1, - [6356744]=1, - [6356745]=1, - [6356746]=1, - [6356747]=1, - [6356748]=1, - [6356749]=1, - [6356750]=1, - [6356751]=1, - [6356752]=1, - [6356753]=1, - [6356754]=1, - [6356755]=1, - [6356756]=1, - [6356757]=1, - [6356758]=1, - [6356759]=1, - [6356760]=1, - [6356761]=1, - [6356762]=1, - [6356763]=1, - [6356764]=1, - [6356765]=1, - [6356766]=1, - [6356767]=1, - [6356768]=1, - [6356769]=1, - [6356770]=1, - [6356771]=1, - [6356772]=1, - [6356773]=1, - [6356774]=1, - [6356775]=1, - [6356776]=1, - [6356777]=1, - [6356778]=1, - [6356779]=1, - [6356780]=1, - [6356781]=1, - [6356782]=1, - [6356783]=1, - [6356784]=1, - [6356785]=1, - [6356786]=1, - [6356787]=1, - [6356788]=1, - [6356789]=1, - [6356790]=1, - [6356791]=1, - [6356792]=1, - [6356793]=1, - [6356794]=1, - [6356795]=1, - [6356796]=1, - [6356797]=1, - [6356798]=1, - [6356799]=1, - [6356800]=1, - [6356801]=1, - [6356802]=1, - [6356803]=1, - [6356804]=1, - [6356805]=1, - [6356806]=1, - [6356807]=1, - [6356808]=1, - [6356809]=1, - [6356810]=1, - [6356811]=1, - [6356812]=1, - [6356813]=1, - [6356814]=1, - [6356815]=1, - [6356816]=1, - [6356817]=1, - [6356818]=1, - [6356819]=1, - [6356820]=1, - [6356821]=1, - [6356822]=1, - [6356823]=1, - [6356824]=1, - [6356825]=1, - [6356826]=1, - [6356827]=1, - [6356828]=1, - [6356829]=1, - [6356830]=1, - [6356831]=1, - [6356832]=1, - [6356833]=1, - [6356834]=1, - [6356835]=1, - [6356836]=1, - [6356837]=1, - [6356838]=1, - [6356839]=1, - [6356840]=1, - [6356841]=1, - [6356842]=1, - [6356843]=1, - [6356844]=1, - [6356845]=1, - [6356846]=1, - [6356847]=1, - [6356848]=1, - [6356849]=1, - [6356850]=1, - [6356851]=1, - [6356852]=1, - [6356853]=1, - [6356854]=1, - [6356855]=1, - [6356856]=1, - [6356857]=1, - [6356858]=1, - [6356859]=1, - [6356860]=1, - [6356861]=1, - [6356862]=1, - [6356863]=1, - [6356864]=1, - [6356865]=1, - [6356866]=1, - [6356867]=1, - [6356868]=1, - [6356869]=1, - [6356870]=1, - [6356871]=1, - [6356872]=1, - [6356873]=1, - [6356874]=1, - [6356875]=1, - [6356876]=1, - [6356877]=1, - [6356878]=1, - [6356879]=1, - [6356880]=1, - [6356881]=1, - [6356882]=1, - [6356883]=1, - [6356884]=1, - [6356885]=1, - [6356886]=1, - [6356887]=1, - [6356888]=1, - [6356889]=1, - [6356890]=1, - [6356891]=1, - [6356892]=1, - [6356893]=1, - [6356894]=1, - [6356895]=1, - [6356896]=1, - [6356897]=1, - [6356898]=1, - [6356899]=1, - [6356900]=1, - [6356901]=1, - [6356902]=1, - [6356903]=1, - [6356904]=1, - [6356905]=1, - [6356906]=1, - [6356907]=1, - [6356908]=1, - [6356909]=1, - [6356910]=1, - [6356911]=1, - [6356912]=1, - [6356913]=1, - [6356914]=1, - [6356915]=1, - [6356916]=1, - [6356917]=1, - [6356918]=1, - [6356919]=1, - [6356920]=1, - [6356921]=1, - [6356922]=1, - [6356923]=1, - [6356924]=1, - [6356925]=1, - [6356926]=1, - [6356927]=1, - [6356928]=1, - [6356929]=1, - [6356930]=1, - [6356931]=1, - [6356932]=1, - [6356933]=1, - [6356934]=1, - [6356935]=1, - [6356936]=1, - [6356937]=1, - [6356938]=1, - [6356939]=1, - [6356940]=1, - [6356941]=1, - [6356942]=1, - [6356943]=1, - [6356944]=1, - [6356945]=1, - [6356946]=1, - [6356947]=1, - [6356948]=1, - [6356949]=1, - [6356950]=1, - [6356951]=1, - [6356952]=1, - [6356953]=1, - [6356954]=1, - [6356955]=1, - [6356956]=1, - [6356957]=1, - [6356958]=1, - [6356959]=1, - [6356960]=1, - [6356961]=1, - [6356962]=1, - [6356963]=1, - [6356964]=1, - [6356965]=1, - [6356966]=1, - [6356967]=1, - [6356968]=1, - [6356969]=1, - [6356970]=1, - [6356971]=1, - [6356972]=1, - [6356973]=1, - [6356974]=1, - [6356975]=1, - [8388608]=0, - [8388609]=0, - [8388610]=0, - [8388611]=0, - [8388612]=0, - [8388613]=0, - [8388614]=0, - [8388615]=0, - [8388616]=0, - [8388617]=0, - [8388618]=0, - [8388619]=0, - [8388620]=0, - [8388621]=0, - [8388622]=0, - [8388623]=0, - [8388624]=0, - [8388625]=0, - [8388626]=0, - [8388627]=0, - [8388628]=0, - [8388629]=0, - [8388630]=0, - [8388631]=0, - [8388632]=0, - [8388633]=0, - [8388634]=0, - [8388635]=0, - [8388636]=0, - [8388637]=0, - [8388638]=0, - [8388639]=0, - [8388640]=0, - [8388641]=0, - [8388642]=0, - [8388643]=0, - [8388644]=0, - [8388645]=0, - [8388646]=0, - [8388647]=2, - [8388648]=1, - [8388649]=2, - [8388650]=0, - [8388651]=0, - [8388652]=2, - [8388653]=0, - [8388654]=2, - [8388655]=0, - [8388656]=3, - [8388657]=3, - [8388658]=3, - [8388659]=3, - [8388660]=3, - [8388661]=3, - [8388662]=3, - [8388663]=3, - [8388664]=3, - [8388665]=3, - [8388666]=0, - [8388667]=2, - [8388668]=0, - [8388669]=0, - [8388670]=0, - [8388671]=0, - [8388672]=0, - [8388673]=3, - [8388674]=3, - [8388675]=3, - [8388676]=3, - [8388677]=3, - [8388678]=3, - [8388679]=3, - [8388680]=3, - [8388681]=3, - [8388682]=3, - [8388683]=3, - [8388684]=3, - [8388685]=3, - [8388686]=3, - [8388687]=3, - [8388688]=3, - [8388689]=3, - [8388690]=3, - [8388691]=3, - [8388692]=3, - [8388693]=3, - [8388694]=3, - [8388695]=3, - [8388696]=3, - [8388697]=3, - [8388698]=3, - [8388699]=1, - [8388700]=0, - [8388701]=2, - [8388702]=0, - [8388703]=0, - [8388704]=1, - [8388705]=3, - [8388706]=3, - [8388707]=3, - [8388708]=3, - [8388709]=3, - [8388710]=3, - [8388711]=3, - [8388712]=3, - [8388713]=3, - [8388714]=3, - [8388715]=3, - [8388716]=3, - [8388717]=3, - [8388718]=3, - [8388719]=3, - [8388720]=3, - [8388721]=3, - [8388722]=3, - [8388723]=3, - [8388724]=3, - [8388725]=3, - [8388726]=3, - [8388727]=3, - [8388728]=3, - [8388729]=3, - [8388730]=3, - [8388731]=0, - [8388732]=0, - [8388733]=0, - [8388734]=0, - [8388735]=0, - [8388736]=3, - [8388737]=3, - [8388738]=3, - [8388739]=3, - [8388740]=3, - [8388741]=3, - [8388742]=3, - [8388743]=3, - [8388744]=3, - [8388745]=3, - [8388746]=3, - [8388747]=3, - [8388748]=3, - [8388749]=3, - [8388750]=3, - [8388751]=3, - [8388752]=3, - [8388753]=3, - [8388754]=3, - [8388755]=3, - [8388756]=3, - [8388757]=3, - [8388758]=3, - [8388759]=3, - [8388760]=3, - [8388761]=3, - [8388762]=3, - [8388763]=3, - [8388764]=3, - [8388765]=3, - [8388766]=3, - [8388767]=3, - [8388768]=3, - [8388769]=1, - [8388770]=3, - [8388771]=3, - [8388772]=3, - [8388773]=0, - [8388774]=3, - [8388775]=3, - [8388776]=3, - [8388777]=3, - [8388778]=2, - [8388779]=1, - [8388780]=3, - [8388781]=3, - [8388782]=3, - [8388783]=3, - [8388784]=2, - [8388785]=3, - [8388786]=2, - [8388787]=2, - [8388788]=3, - [8388789]=3, - [8388790]=3, - [8388791]=3, - [8388792]=3, - [8388793]=2, - [8388794]=2, - [8388795]=2, - [8388796]=3, - [8388797]=3, - [8388798]=3, - [8388799]=1, - [8388800]=3, - [8388801]=3, - [8388802]=3, - [8388803]=3, - [8388804]=3, - [8388805]=3, - [8388806]=3, - [8388807]=3, - [8388808]=3, - [8388809]=3, - [8388810]=3, - [8388811]=3, - [8388812]=3, - [8388813]=3, - [8388814]=3, - [8388815]=3, - [8388816]=3, - [8388817]=3, - [8388818]=3, - [8388819]=3, - [8388820]=3, - [8388821]=3, - [8388822]=3, - [8388823]=3, - [8388824]=3, - [8388825]=3, - [8388826]=3, - [8388827]=3, - [8388828]=3, - [8388829]=3, - [8388830]=3, - [8388831]=3, - [8388832]=3, - [8388833]=3, - [8388834]=3, - [8388835]=3, - [8388836]=3, - [8388837]=3, - [8388838]=3, - [8388839]=3, - [8388840]=3, - [8388841]=3, - [8388842]=3, - [8388843]=3, - [8388844]=3, - [8388845]=3, - [8388846]=3, - [8388847]=3, - [8388848]=3, - [8388849]=3, - [8388850]=3, - [8388851]=3, - [8388852]=3, - [8388853]=3, - [8388854]=3, - [8388855]=3, - [8388856]=3, - [8388857]=3, - [8388858]=3, - [8388859]=3, - [8388860]=3, - [8388861]=3, - [8388862]=3, - [8388863]=3, - [8396820]=0, - [8396821]=0, - [8396824]=1, - [8396825]=2, - [8396828]=1, - [8396829]=2, - [8396838]=0, - [8396850]=2, - [8396851]=2, - [8396860]=2, - [8396871]=2, - [8396872]=2, - [8396873]=2, - [8396972]=1, - [8397090]=2, - [8398080]=0, - [8398081]=0, - [8398082]=0, - [8398083]=0, - [8398084]=0, - [8398085]=0, - [8398086]=0, - [8398087]=0, - [8398088]=0, - [8398089]=0, - [8398090]=0, - [8398091]=0, - [8398092]=0, - [8398093]=0, - [8398094]=0, - [8398095]=0, - [8398096]=0, - [8398097]=0, - [8398098]=0, - [8398099]=0, - [8398100]=0, - [8398101]=0, - [8398102]=0, - [8398103]=0, - [8398104]=0, - [8398105]=0, - [8398106]=0, - [8398107]=0, - [8398108]=0, - [8398109]=0, - [8398110]=0, - [8398111]=0, - [8398112]=0, - [8398113]=0, - [8398114]=0, - [8398115]=0, - [8398116]=0, - [8398117]=0, - [8398118]=0, - [8398119]=0, - [8398120]=0, - [8398121]=0, - [8398122]=0, - [8398123]=0, - [8398124]=0, - [8398125]=0, - [8398126]=0, - [8398127]=0, - [8398128]=0, - [8398129]=0, - [8398130]=0, - [8398131]=0, - [8398132]=0, - [8398133]=0, - [8398134]=0, - [8398135]=0, - [8398136]=0, - [8398137]=0, - [8398138]=0, - [8398139]=0, - [8398140]=0, - [8398141]=0, - [8398142]=0, - [8398143]=0, - [8398144]=0, - [8398145]=0, - [8398146]=0, - [8398147]=0, - [8398148]=0, - [8398149]=0, - [8398150]=0, - [8398151]=0, - [8398152]=0, - [8398153]=0, - [8398154]=0, - [8398155]=0, - [8398156]=0, - [8398157]=0, - [8398158]=0, - [8398159]=0, - [8398160]=0, - [8398161]=0, - [8398162]=0, - [8398163]=0, - [8398164]=0, - [8398165]=0, - [8398166]=0, - [8398167]=0, - [8398168]=0, - [8398169]=0, - [8398170]=0, - [8398171]=0, - [8398172]=0, - [8398173]=0, - [8398174]=0, - [8398175]=0, - [8398176]=0, - [8398177]=0, - [8398178]=0, - [8398179]=0, - [8398180]=0, - [8398181]=0, - [8398182]=0, - [8398183]=0, - [8398184]=0, - [8398185]=0, - [8398186]=0, - [8398187]=0, - [8398188]=0, - [8398189]=0, - [8398190]=0, - [8398191]=0, - [8398192]=0, - [8398193]=0, - [8398194]=0, - [8398195]=0, - [8398196]=0, - [8398197]=0, - [8398198]=0, - [8398199]=0, - [8398200]=0, - [8398201]=0, - [8398202]=0, - [8398203]=0, - [8398204]=0, - [8398205]=0, - [8398206]=0, - [8398207]=0, - [8399237]=1, - [8399238]=2, - [8400897]=2, - [8400898]=2, - [8400904]=1, - [8400905]=2, - [8400906]=1, - [8400907]=2, - [8400908]=1, - [8400909]=2, - [8400910]=1, - [8400911]=2, - [8400912]=1, - [8400913]=2, - [8400916]=1, - [8400917]=2, - [8400918]=1, - [8400919]=2, - [8400920]=1, - [8400921]=2, - [8400924]=0, - [8400925]=1, - [8400927]=2, - [8453896]=1, - [8453897]=2, - [8453900]=2, - [8453902]=2, - [8453915]=2, - [8453919]=2, - [8453947]=1, - [8453949]=2, - [8453979]=1, - [8453981]=2, - [8453982]=0, - [8453983]=1, - [8453984]=2, - [8453985]=2, - [8453986]=1, - [8453987]=2, - [8453988]=2, - [8454117]=0, -} diff --git a/Master/texmf-dist/source/luatex/luatexja/ltj-kinsoku_make.tex b/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.tex index 5d25ff0f11f..d5b9c183b75 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltj-kinsoku_make.tex +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.tex @@ -1,27 +1,22 @@ -%#!luatex ltj-kinsoku_make.tex -%\tracingall -\input luatexja.sty - -\catcode`\@=11 \ltj@tempcnta="0%" \loop\ifnum\ltj@tempcnta<"100%" \ltjsetparameter{alxspmode={\ltj@tempcnta,0}}% \advance\ltj@tempcnta by1 \repeat -\ltj@tempcnta=`\0%" -\loop\ifnum\ltj@tempcnta<`\:%" +\ltj@tempcnta=`0%" +\loop\ifnum\ltj@tempcnta<`:%" \ltjsetparameter{alxspmode={\ltj@tempcnta,3}}% \advance\ltj@tempcnta by1 \repeat -\ltj@tempcnta=`\A%" -\loop\ifnum\ltj@tempcnta<`\[%" +\ltj@tempcnta=`A%" +\loop\ifnum\ltj@tempcnta<`[%" \ltjsetparameter{alxspmode={\ltj@tempcnta,3}}% \advance\ltj@tempcnta by1 \repeat -\ltj@tempcnta=`\a%" +\ltj@tempcnta=`a%" \loop\ifnum\ltj@tempcnta<`\{%" \ltjsetparameter{alxspmode={\ltj@tempcnta,3}}% \advance\ltj@tempcnta by1 @@ -446,11 +441,28 @@ \ltjsetparameter{jaxspmode={`｢,preonly}} \ltjsetparameter{jaxspmode={`｣,postonly}} -\catcode`\_=12 -\directlua{ - s = table.copy(luatexja.stack.charprop_stack_table[0]) - s.kanjiskip = nil; s.xkanjiskip = nil - table.tofile('ltj-kinsoku.lua', s, 'return', false, true, false) +\ltjsetparameter{% + kanjiskip=\z@ plus .4pt minus .5pt, + xkanjiskip=2.40554pt plus 1pt minus 1pt, + yalbaselineshift=\z@, yjabaselineshift=\z@, + jcharwidowpenalty=500 } -\bye +% default setting of kansujichar (luatexja-compat) +\define@key[ltj]{japaram}{kansujichar}{\ltj@@set@stack{KSJ}{0}{0x7FFFFFFF}#1 } + +\ltjsetparameter{kansujichar={0,`〇}} +\ltjsetparameter{kansujichar={1,`一}} +\ltjsetparameter{kansujichar={2,`二}} +\ltjsetparameter{kansujichar={3,`三}} +\ltjsetparameter{kansujichar={4,`四}} +\ltjsetparameter{kansujichar={5,`五}} +\ltjsetparameter{kansujichar={6,`六}} +\ltjsetparameter{kansujichar={7,`七}} +\ltjsetparameter{kansujichar={8,`八}} +\ltjsetparameter{kansujichar={9,`九}} + +\directlua{% + local s = table.copy(luatexja.stack.charprop_stack_table[0]) + luatexja.base.save_cache('ltj-kinsoku_default', {s, version=1}) +} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty index ca774fe8cdc..55fd5d4ebd7 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty @@ -12,7 +12,7 @@ \def\luatexjalatexLoaded{\endinput} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ltj-latex}[2020-05-17 LaTeX support of LuaTeX-ja] +\ProvidesPackage{ltj-latex}[2020-08-08 LaTeX support of LuaTeX-ja] % cleanup at end of the document %\let\ltj@@orig@end=\@@end @@ -27,45 +27,49 @@ \usepackage{lltjcore} %%% patching commands -\RequirePackage{filehook} - -\def\ltj@pkgpatch@im#1{% - \@ifnextchar[{\ltj@pkgpatch@im@{#1}}{\ltj@pkgpatch@im@{#1}[lltjp-#1]}}%] -\def\ltj@pkgpatch@im@#1[#2]{% - \AtEndOfPackageFile*{#1}{% - \@ifpackageloaded{#2}{}{% - \@namedef{ver@#2.\@pkgextension}{0000/00/00}%dummy - \if\catcode`@=11\let\ltj@temp\relax\else - \edef\ltj@temp{\noexpand\catcode`@=\the\catcode`@\relax}\makeatletter - \fi - \@@input{#2.\@pkgextension}\ltj@temp - }% +\newif\ifltj@ltfilehook@avail +\@ifl@t@r\fmtversion{2020-10-01}{% + \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltfilehook@availtrue\fi + \else\ltj@ltfilehook@availtrue\fi +}{} +\ifltj@ltfilehook@avail + \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}} + \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}} + \def\ltj@ExecuteAfterPackage{\@ifstar\@@ltj@ExecuteAfterPackage@star\@@ltj@ExecuteAfterPackage} + \def\@@ltj@ExecuteAfterPackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}% + } + \def\ltj@ExecuteBeforePackage{\@ifstar\@@ltj@ExecuteBeforePackage@star\@@ltj@ExecuteBeforePackage} + \def\@@ltj@ExecuteBeforePackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}% + } +\else + \RequirePackage{filehook} + \let\ltj@ExecuteAfterPackage=\AtEndOfPackageFile + \let\ltj@ExecuteBeforePackage=\AtBeginOfPackageFile +\fi +\def\ltj@pkgpatch@im#1{\@ifnextchar[{\ltj@pkgpatch@im@{#1}}{\ltj@pkgpatch@im@{#1}[lltjp-#1]}}%] +\def\ltj@pkgpatch@im@#1[#2]{\ltj@ExecuteAfterPackage*{#1}{\ltj@pkgpatch@im@@{#2}}} +\def\ltj@pkgpatch@im@@#1{% + \@ifpackageloaded{#1}{}{% + \if\catcode`@=11\let\ltj@temp\relax\else + \edef\ltj@temp{\noexpand\catcode`@=\the\catcode`@\relax}\makeatletter + \fi + \@@input{#1.\@pkgextension}\ltj@temp }% } -\def\ltj@pkgpatch#1{% - \@ifnextchar[{\ltj@pkgpatch@@{#1}}{\ltj@pkgpatch@@{#1}[lltjp-#1]}}%] -\def\ltj@pkgpatch@@#1[#2]{% - \gpreto\@begindocumenthook{% - \@ifpackageloaded{#1}{% - \@ifpackageloaded{#2}{}{\RequirePackage{#2}}% - }{}% +\def\ltj@pkgpatch#1{\@ifnextchar[{\ltj@pkgpatch@{#1}}{\ltj@pkgpatch@{#1}[lltjp-#1]}}%] +\ifltj@ltfilehook@avail + \def\ltj@pkgpatch@@{\AddToHook{env/document/before}[luatexja.autopatch]} +\else + \def\ltj@pkgpatch@@{\gpreto\@begindocumenthook} +\fi +\def\ltj@pkgpatch@#1[#2]{% + \ltj@pkgpatch@@{% + \@ifpackageloaded{#1}{\@ifpackageloaded{#2}{}{\RequirePackage{#2}}}{}% }% } - -%%% default parameters -\directlua{ - local s = kpse.find_file('ltj-kinsoku.lua', 'tex') - luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {} -} - -\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt, - xkanjiskip=.25\zw plus 1pt minus 1pt, - autospacing, autoxspacing, jacharrange={-1}, - yalbaselineshift=\z@, yjabaselineshift=\z@, - jcharwidowpenalty=500, differentjfm=paverage -} - \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax %%% patch for packages @@ -83,7 +87,8 @@ \ltj@pkgpatch@im{unicode-math} \ltj@pkgpatch@im{siunitx} \ltj@pkgpatch@im{microtype} -\ltj@pkgpatch@im{everyshi} + +\ifltj@ltshipout@avail\else\ltj@pkgpatch@im{everyshi}\fi \RequirePackage{lltjp-geometry} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty index 16e71e10607..58baa9ff9db 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty @@ -57,16 +57,8 @@ \def\gt{\tengt\tentgt} \mc -\directlua{ - local s = kpse.find_file('ltj-kinsoku.lua', 'tex') - luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {} -} - -\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .4pt, - xkanjiskip=.25\zw plus 1pt minus 1pt, - autospacing, autoxspacing, jacharrange={-1}, - yalbaselineshift=\z@, yjabaselineshift=\z@, - jcharwidowpenalty=500, differentjfm=paverage, +\ltjsetparameter{% + autospacing, autoxspacing, differentjfm=paverage, jatextfont={0, \tenmin}, jascriptfont={0, \sevenmin}, jascriptscriptfont={0, \fivemin}, } diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls index 5cc447f5d64..8896cf2434a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls @@ -850,8 +850,10 @@ \else \@mparswitchfalse \fi -\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} +%% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます） +%% の機能を用いています。 +\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjarticle.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo index f4dbe032dc8..b472e605451 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo @@ -298,6 +298,8 @@ \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 748bd751879..00b28f12e09 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo @@ -298,6 +298,8 @@ \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 9e70985ccd5..a83237bd4f5 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo @@ -298,6 +298,8 @@ \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 21390be6a03..034dfa24125 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls @@ -954,8 +954,10 @@ \else \@mparswitchfalse \fi -\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} +%% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます） +%% の機能を用いています。 +\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjbook.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls index 109758df807..a750187447d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls @@ -951,8 +951,10 @@ \else \@mparswitchfalse \fi -\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} +%% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます） +%% の機能を用いています。 +\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjreport.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo index 549d1e0daf1..977249647a8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo @@ -303,6 +303,8 @@ \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 ef22a16c7a4..55f511ff28e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo @@ -303,6 +303,8 @@ \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 e532731aebe..0051f9362ec 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo @@ -303,6 +303,8 @@ \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/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls index 960a4832776..4c3280d6f55 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls @@ -851,8 +851,10 @@ \fi \normalmarginpar \@mparswitchfalse -\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} +%% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます） +%% の機能を用いています。 +\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtarticle.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo index d1b2d818b47..ffe8cccd8d6 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo @@ -306,6 +306,8 @@ \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 ff40594149c..22bbc7131fe 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo @@ -306,6 +306,8 @@ \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 f07832ee7cd..323e0763707 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo @@ -306,6 +306,8 @@ \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 386d2c2342b..728965bc015 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls @@ -955,8 +955,10 @@ \fi \normalmarginpar \@mparswitchfalse -\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} +%% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます） +%% の機能を用いています。 +\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtbook.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls index cd111927050..cfffc94d006 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls @@ -952,8 +952,10 @@ \fi \normalmarginpar \@mparswitchfalse -\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} -\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} +%% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます） +%% の機能を用いています。 +\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtreport.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo index e07c73f0e7e..c2cd76f6584 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo @@ -306,6 +306,8 @@ \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 8396638d316..8e84e44c321 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo @@ -306,6 +306,8 @@ \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 db3bbc4c209..e6dc52ed08d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo @@ -306,6 +306,8 @@ \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-compat.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-compat.sty index f55bf511142..2d6d0539795 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-compat.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-compat.sty @@ -65,7 +65,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-compat}[2018/03/29 Compatibility with pTeX] + \ProvidesPackage{luatexja-compat}[2020-08-08 Compatibility with pTeX] \fi %</LaTeX> % Load core module if not yet. @@ -99,26 +99,10 @@ \def\sjis{\ltj@code@conv{sjis}} \def\ucs{\ltj@code@conv{ucs}} -\def\ltj@code@conv#1{% - \directlua{luatexja.compat.from_#1(token.scan_int())}% -} - -\def\kansuji{% - \directlua{luatexja.compat.to_kansuji(token.scan_int())}% -} +\def\ltj@code@conv#1{\directlua{luatexja.compat.from_#1(token.scan_int())}} +\def\kansuji{\directlua{luatexja.compat.to_kansuji(token.scan_int())}} \define@key[ltj]{japaram}{kansujichar}{\ltj@@set@stack{KSJ}{0}{0x7FFFFFFF}#1 } - -\ltjsetparameter{kansujichar={0,`〇}} -\ltjsetparameter{kansujichar={1,`一}} -\ltjsetparameter{kansujichar={2,`二}} -\ltjsetparameter{kansujichar={3,`三}} -\ltjsetparameter{kansujichar={4,`四}} -\ltjsetparameter{kansujichar={5,`五}} -\ltjsetparameter{kansujichar={6,`六}} -\ltjsetparameter{kansujichar={7,`七}} -\ltjsetparameter{kansujichar={8,`八}} -\ltjsetparameter{kansujichar={9,`九}} \ltj@@decl@array@param{kansujichar} \ifltj@in@latex diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty index 4acc74cb327..fee1a78a2f0 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty @@ -65,7 +65,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-core}[2020-07-27 Core of LuaTeX-ja] + \ProvidesPackage{luatexja-core}[2020-08-08 Core of LuaTeX-ja] \fi %</LaTeX> %% Load prerequisite packages. @@ -80,7 +80,6 @@ \RequirePackage{xkeyval} [2012/10/14] % v2.6b \RequirePackage{etoolbox} \RequirePackage{lltjp-atbegshi} - \AtBeginShipoutInit \IfFileExists{everyhook.sty}{\RequirePackage{everyhook}\ltj@everyhook@availtrue}{} \else %<*!LaTeX> \input luatexbase.sty @@ -88,8 +87,6 @@ \input ltxcmds.sty \input pdftexcmds.sty \input xkeyval - \input lltjp-atbegshi.sty - \AtBeginShipoutInit \fi %</LaTeX> \endlinechar=-1 % @@ -619,7 +616,7 @@ %%%% \hbox, \vbox, \vtop \setbox\z@\hbox{% - \primitive\everymath{} + \primitive\everymath{}% $\directlua{% This value depends on the version of LuaTeX. luatexja.stack.mmode = -tex.nest[tex.nest.ptr].mode }$% @@ -655,8 +652,6 @@ \protected\def\ltj@@reset@badness{\luafunction\ltj@@reset@badness@inner} -\AtBeginShipout{\directlua{luatexja.direction.finalize()}} - %%%% \raise, \lower, \moveleft, \moveright \newluafunction\ltj@@lua@raisebox@inner \directlua{ @@ -686,6 +681,7 @@ %%%%\vsplit \let\ltj@@orig@vsplit=\vsplit \protected\def\vsplit{\directlua{luatexja.direction.vsplit()}} + %%%% \vcenter \let\ltj@@orig@vcenter=\vcenter \protected\def\vcenter{\ltj@afterbox\ltj@@vcenter\vbox} @@ -693,6 +689,21 @@ \ltj@@lua@raisebox\ltj@@orig@vcenter{\box\ltj@afbox}% } +%%%% \shipout +\newluafunction\ltj@@lua@shipout@inner +\directlua{ + local t = lua.get_functions_table() + t[\the\ltj@@lua@shipout@inner]=luatexja.direction.shipout +} +\protected\luadef\ltj@@lua@shipout\ltj@@lua@shipout@inner +\protected\def\ltj@shipout{\ltj@afterbox\ltj@@lua@shipout} +\ifprimitive\shipout\let\shipout\ltj@shipout\fi +\ifcsname tex_shipout:D\endcsname + \expandafter\let\csname tex_shipout:D\endcsname\ltj@shipout +\fi +\ifdefined\AtBeginShipoutOriginalShipout + \let\AtBeginShipoutOriginalShipout\ltj@shipout +\fi %%%% \unhbox and \unvbox \newluafunction\ltj@@lua@unboxcheckdir@inner \directlua{ @@ -745,6 +756,7 @@ %%------------------ Load module for the format +\directlua{luatexja.load_kinsoku()} \ifltj@in@latex %<*LaTeX> \RequirePackage{ltj-latex} \else\ifltj@in@plain %<*plain> diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua index 988f51955e4..074d0502768 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua @@ -347,6 +347,22 @@ do end end +do + local cache_ver = 1 -- must be same as ltj-kinsoku.tex + local cache_outdate_fn = function (t) return t.version~=cache_ver end + local t = ltjs.charprop_stack_table + function luatexja.load_kinsoku() + for i,_ in pairs(t) do t[i]=nil end + local kinsoku = ltjb.load_cache('ltj-kinsoku_default',cache_outdate_fn) + if kinsoku and kinsoku[1] then + t[0] = kinsoku[1] + else + t[0] = {}; tex.print(cat_lp, '\\input ltj-kinsoku.tex\\relax') + end + luatexja.load_kinsoku=nil + end +end + -- debug do @@ -372,8 +388,7 @@ local function debug_show_node_X(p,print_fn, limit, inner_depth) local k = prefix local s local pt, pic = node_type(p.id), (has_attr(p, attr_icflag) or 0) % icflag_table.PROCESSED_BEGIN_FLAG - local base = prefix .. string.format('%X', pic) - .. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' ' + local base = prefix .. string.format('%X', pic) .. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' ' if pt == 'glyph' then s = base .. ' ' .. (p.char<0xF0000 and utfchar(p.char) or '') @@ -505,6 +520,9 @@ local function debug_show_node_X(p,print_fn, limit, inner_depth) for i=1,#p.data do print_fn(s .. ' [' .. i .. '] = ' .. tostring(p.data[i].csname)) end + elseif p.subtype==16 then + s = s .. ' mode=' .. p.mode .. ', literal="' .. p.data .. '"' + print_fn(s) else print_fn(s) end diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index d51b575f762..0f16a8c1901 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -35,13 +35,13 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja}[2020-08-02 Japanese Typesetting with Lua(La)TeX] + \ProvidesPackage{luatexja}[2020-08-08 Japanese Typesetting with Lua(La)TeX] \DeclareOption{disablejfam}{\ltj@disablejfamtrue} \DeclareOption*{} \ProcessOptions\relax \fi %</LaTeX> %%%% VERSION -\def\LuaTeXjaversion{20200802.0} +\def\LuaTeXjaversion{20200808.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index e0dba375471..76a3147036b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -3,12 +3,10 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjdefs}[2020/03/16 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2020-08-08 Default font settings of LuaTeX-ja] \ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{file:HaranoAjiMincho-Regular.otf}\fi \ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{file:HaranoAjiGothic-Medium.otf}\fi -%\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi -%\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi \ifdefined\ltj@stdyokojfm\else\def\ltj@stdyokojfm{ujis}\fi \ifdefined\ltj@stdtatejfm\else\def\ltj@stdtatejfm{ujisv}\fi \InputIfFileExists{luatexja.cfg}{% @@ -34,11 +32,9 @@ \newcommand\kanjiencodingdefault{JY3} \newcommand\kanjifamilydefault{\mcdefault} \newcommand\kanjiseriesdefault{\mddefault} -\ifdefined\@rmfamilyhook - %% LaTeX 2020-02-02 +\ifdefined\@rmfamilyhook%% LaTeX 2020-02-02 \newcommand\kanjishapedefault{\shapedefault} -\else - %% LaTeX 2019-10-01 +\else %% LaTeX 2019-10-01 \newcommand\kanjishapedefault{\updefault} \fi @@ -78,8 +74,7 @@ \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{} \unless\ifltj@disablejfam - \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n} - \jfam\symmincho + \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n}\jfam\symmincho \SetSymbolFont{mincho}{bold}{JY3}{gt}{m}{n} \DeclareSymbolFontAlphabet{\mathmc}{mincho} \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} @@ -132,6 +127,8 @@ \expandafter\patchcmd\csname em \endcsname{\itshape}{\gtfamily\itshape}{}{} \def\eminnershape{\mcfamily \upshape} +\ltjsetparameter{autospacing, autoxspacing, differentjfm=paverage} + \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF} \ltjdefcharrange{3}{% diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-atbegshi.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-atbegshi.sty index ecdfd48c225..85120238744 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-atbegshi.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-atbegshi.sty @@ -2,23 +2,40 @@ % lltjp-atbegshi.sty % -\ifdefined\NeedsTeXFormat - \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{lltjp-atbegshi}[2020-07-30 Patch to atbegshi for LuaTeX-ja] - \RequirePackage{atbegshi} -\else - \input atbegshi.sty -\fi +\newif\ifltj@ltshipout@avail +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{lltjp-atbegshi}[2020-08-08 Patching \string\shipout\space hooks for LuaTeX-ja] +\@ifl@t@r\fmtversion{2020-10-01}{% + \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltshipout@availtrue\fi + \else\ltj@ltshipout@availtrue\fi +}{} +\ifltj@ltshipout@avail\else\RequirePackage{atbegshi}\fi + +% concept: execute all hooks inside yoko direction \vbox -%-------------------------------------- -% following codes are almost copied from -% pxatbegshi.sty 2019/09/07 v0.5 (in platex-tools bundle, by H. Yamashita). +\ifltj@ltshipout@avail +%<*ltshipout>----------------------------------- +% +\RequirePackage{expl3} +\ExplSyntaxOn\makeatletter +\box_new:N \l__platex_shipout_dummy_box +\pretocmd {\__shipout_execute_cont:} + {\tex_setbox:D \l__platex_shipout_dummy_box \tex_vbox:D \c_group_begin_token \yoko } {} {} +\apptocmd {\__shipout_execute_cont:} {\c_group_end_token} {} {} +\ExplSyntaxOff +%</ltshipout>----------------------------------- + +\else +\AtBeginShipoutInit +%<*atbegshi>------------------------------------- +% patching atbegshi.sty +%%% following codes are almost copied from +%%% pxatbegshi.sty 2019/09/07 v0.5 (in platex-tools bundle, by H. Yamashita). %% internal macros are locally effective \begingroup -%--------------------------------------- helpers - +% helpers %% unique tokens \def\pxabgs@mark{\pxabgs@mark@} \def\pxabgs@fin{\pxabgs@fin@} @@ -27,29 +44,25 @@ \def\pxabgs@patch@cmd#1#2#3{% \ifx#1\relax\else \def\pxabgs@next##1#2##2\pxabgs@mark##3\pxabgs@fin{% - \ifx\pxabgs@mark##3\pxabgs@mark - \let#1\relax + \ifx\pxabgs@mark##3\pxabgs@mark\let#1\relax \else - \def\pxabgs@fragment{##2}% - \def#1{##1#3##2}% + \def\pxabgs@fragment{##2}\def#1{##1#3##2}% \fi}% \expandafter\pxabgs@next#1\pxabgs@mark#2\pxabgs@mark\pxabgs@fin \fi } -%--------------------------------------- - -% concept: execute all hooks inside yoko direction \vbox - % prepare -\let\pxabgs@AtBegShi@Output\AtBegShi@Output +\ifdefined\AtBegShi@Output + \let\pxabgs@AtBegShi@Output\AtBegShi@Output +\else\let\pxabgs@AtBegShi@Output\relax\fi % try first patch \pxabgs@patch@cmd\pxabgs@AtBegShi@Output {\let\AtBegShi@OrgProtect\protect}% {\setbox8\vbox\bgroup\yoko\let\AtBegShi@OrgProtect\protect} \pxabgs@patch@cmd\pxabgs@AtBegShi@Output - {\AtBeginShipoutOriginalShipout\box\AtBeginShipoutBox}% - {\AtBeginShipoutOriginalShipout\box\AtBeginShipoutBox\egroup} + {\AtBeginShipoutOriginalShipout\box\AtBeginShipoutBox}% + {\AtBeginShipoutOriginalShipout\box\AtBeginShipoutBox\egroup} \pxabgs@patch@cmd\pxabgs@AtBegShi@Output {% \begingroup @@ -75,5 +88,6 @@ \endgroup %% internal macros are no longer effective - +%</atbegshi>------------------------------------- +\fi \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty index 9b8f1fc7a12..eba249fa5e6 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-geometry}[2020/02/25 Patch to geometry for LuaTeX-ja with vertical writing mode] +\ProvidesPackage{lltjp-geometry}[2020-08-05 Patch to geometry for LuaTeX-ja with vertical writing mode] \RequirePackage{expl3} \ifdefined\if@ltj@@geometry@tate\expandafter\endinput\fi \newif\if@ltj@@geometry@tate @@ -29,33 +29,65 @@ } \fi -\RequirePackage{filehook} +%============================================ +\unless\ifdefined\ltj@ExecuteAfterPackage +\expandafter\newif\csname ifltj@ltfilehook@avail\endcsname +\@ifl@t@r\fmtversion{2020-10-01}{% + \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltfilehook@availtrue\fi + \else\ltj@ltfilehook@availtrue\fi +}{} +\ifltj@ltfilehook@avail + \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}} + \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}} + \def\ltj@ExecuteAfterPackage{\@ifstar\@@ltj@ExecuteAfterPackage@star\@@ltj@ExecuteAfterPackage} + \def\@@ltj@ExecuteAfterPackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}% + } + \def\ltj@ExecuteBeforePackage{\@ifstar\@@ltj@ExecuteBeforePackage@star\@@ltj@ExecuteBeforePackage} + \def\@@ltj@ExecuteBeforePackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}% + } +\else + \RequirePackage{filehook} + \let\ltj@ExecuteAfterPackage=\AtEndOfPackageFile + \let\ltj@ExecuteBeforePackage=\AtBeginOfPackageFile +\fi +\fi +%============================================ + \RequirePackage{etoolbox} \newif\ifGm@ltj@layoutswitch \let\orig@PackageWarningNoLine=\PackageWarningNoLine % define ifGm@swap@papersize if it is undefined \expandafter\newif\csname ifGm@swap@papersize\endcsname -\AtBeginOfPackageFile{geometry}{% +\ExplSyntaxOn +\ltj@ExecuteBeforePackage{geometry}{% \edef\Gm@ltj@topskip{\the\topskip} \edef\Gm@ltj@headsep{\the\headsep} \edef\Gm@ltj@footskip{\the\footskip} +\bool_set_false:N \l_tmpa_bool \ifluatex - \ifnum\ltjgetparameter{direction}=3 \@ltj@@geometry@tatetrue\fi + \ifnum\ltjgetparameter{direction}=3 \bool_set_true:N \l_tmpa_bool \fi \else - \@gobble\iftrue\csname iftdir\endcsname\@ltj@@geometry@tatetrue\fi + \@gobble\iftrue\csname iftdir\endcsname \bool_set_true:N \l_tmpa_bool \fi \fi -\csname tl_if_in:NnT\endcsname\@begindocumenthook{\tate}{\@ltj@@geometry@tatetrue} -\if@ltj@@geometry@tate +\ifltj@ltfilehook@avail + \prop_map_inline:Nn \g__hook_begindocument_code_prop + { \tl_if_in:nnT {#2} {\tate} {\bool_set_true:N \l_tmpa_bool} } +\else + \tl_if_in:NnT \@begindocumenthook {\tate} {\bool_set_true:N \l_tmpa_bool} +\fi +\bool_if:NT \l_tmpa_bool { \if@ltj@@geometry@forceoff \@ltj@@geometry@tatefalse \else \let\PackageWarningNoLine\@gobbletwo% 警告抑止 \fi -\fi } - -\AtEndOfPackageFile{geometry}{% +} +\ExplSyntaxOff +\ltj@ExecuteAfterPackage{geometry}{% \let\PackageWarningNoLine=\orig@PackageWarningNoLine \if@ltj@@geometry@tate \let\PackageWarningNoLine=\orig@PackageWarningNoLine |