From 18fc5a795946eeb8ae9cf525063efea3e37a5602 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 24 Oct 2021 21:01:14 +0000 Subject: luatexja (24oct21) git-svn-id: svn://tug.org/texlive/trunk@60862 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 8 +- .../texmf-dist/doc/luatex/luatexja/ltjclasses.pdf | Bin 400691 -> 400068 bytes .../texmf-dist/doc/luatex/luatexja/ltjltxdoc.pdf | Bin 69366 -> 69217 bytes .../texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf | Bin 457434 -> 456779 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 694840 -> 694135 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 1126393 -> 1125361 bytes .../doc/luatex/luatexja/luatexja-ruby.pdf | Bin 381296 -> 381090 bytes Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 99 ++++++--------------- .../source/luatex/luatexja/ltjltxdoc.dtx | 3 +- .../tex/luatex/luatexja/addons/luatexja-adjust.sty | 2 +- .../tex/luatex/luatexja/addons/luatexja-otf.sty | 2 +- .../tex/luatex/luatexja/addons/luatexja-ruby.sty | 2 +- .../texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua | 2 +- .../texmf-dist/tex/luatex/luatexja/ltj-latex.sty | 30 +++++-- .../texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls | 2 +- Master/texmf-dist/tex/luatex/luatexja/luatexja.sty | 13 ++- .../tex/luatex/luatexja/patches/lltjdefs.sty | 2 +- .../tex/luatex/luatexja/patches/lltjp-array.sty | 2 +- .../tex/luatex/luatexja/patches/lltjp-atbegshi.sty | 2 +- .../tex/luatex/luatexja/patches/lltjp-geometry.sty | 30 +++++-- .../tex/luatex/luatexja/patches/lltjp-xunicode.sty | 2 +- 21 files changed, 97 insertions(+), 104 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index f708f32afa3..6ecb431970c 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 20210918.0 +The LuaTeX-ja Package 20211024.0 -------------------------------- Copyright (c) 2011--2021 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -42,9 +42,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20210918.0 in the Git repository by + or tagged as 20211024.0 in the Git repository by + ;a=snapshot;h=refs/tags/20211024.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -93,4 +93,4 @@ Notes This file and ltj-kinsoku.lua are not used anymore. (Do not remove ltj-kinsoku.tex.) -Last commit date: Sat Sep 18 21:01:24 2021 +0900 +Last commit date: Sun Oct 24 13:28:03 2021 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf index bbae89d4e13..a199f6baefb 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf and b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjltxdoc.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjltxdoc.pdf index ebbd0df0c69..37de2535542 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/ltjltxdoc.pdf and b/Master/texmf-dist/doc/luatex/luatexja/ltjltxdoc.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf index f599de92214..2c2a923de9b 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf and b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf index 146c837511f..6f4ce08e8a6 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf index 299097de2d0..cc188cb9d0d 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf index e3cea8d7384..2dce1034fc3 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx index 4b1dd88c841..46106f09304 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -2657,69 +2657,23 @@ is controlled by the lowermost bit of the \Param{kcatcode} parameter. % %<*en> -Default setting of \cs{catcode} of Unicode characters are located in -\begin{description} - \item[plain \LuaTeX] \texttt{luatex-unicode-letters.tex}, which is based on \texttt{unicode-letters.tex} -(for \XeTeX). - \item[\LuaLaTeX] now included in \LaTeX\ kernel as~\texttt{unicode-letters.def}. -\end{description} -However, the default setting of \cs{catcode} differs -between \XeTeX\ and \LuaTeX, by the following reasons: -\begin{itemize} - \item (plain format) \texttt{luatex-unicode-letters.tex} is based on old \texttt{unicode-letters.tex}. - \item The latter half of \texttt{unicode-letters.tex}~and~\texttt{unicode-letters.def} -sets\cs{catcode} of several characters to 11, via setting \cs{XeTeXcharclass}. -However, this latter half does not exist (plain case), or not executed (\LaTeX~case) in \LuaTeX. -\end{itemize} -In other words, -\begin{description} -\item[plain \LuaTeX] -Kanji nor kana characters cannot be used in -a control word, in the default setting of plain \LuaTeX. -\item[\LuaLaTeX] -In recent (2015-10-01 or later) \LuaLaTeX, Kanji and kana characters in a control word is supported (these catcode are 11), -but not fullwidth alphanumerics and several other characters. -\end{description} - -This would be inconvenient for \pTeX~users to shifting to \LuaTeX-ja, -since several control words containing Kanji or other fullwidth characters, such as -\cs{西暦}~or~\cs{1年目西暦} are used in \pTeX. -Hence, \LuaTeX-ja have a counterpart of \texttt{unicode-letters.tex} -for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} +Default setting of \cs{catcode} of Unicode characters with \LuaTeX\ is slightly inconvenient +for \pTeX~users to shifting to \LuaTeX-ja, +because several fullwidth characters which can be used in a control word with \pTeX, +such as ``\texttt{1}''~(FULLWIDTH DIGIT ONE), cannnot be used in a control word with \LuaTeX. +Hence, \LuaTeX-ja changes the \cs{catcode} of some characters% +---whose line breaking class is ``ID''~(Ideographic) in UAX~\#14---, +to allow these characters in the control word. % %<*ja> -ネイティブにUnicode全部の文字を扱える\XeTeX や\LuaTeX では, -文字が制御綴内で使用できるかは通常の欧文文字と同じく\cs{catcode}% -で指定することとなる.plain \XeTeX における\cs{catcode}の初期設定は% -\texttt{unicode-letters.tex}中に記述されており,plain \LuaTeX ではそれを -元にした\texttt{luatex-unicode-letters.tex}を用いている. -\LaTeX では\cs{catcode}の設定はカーネルに\texttt{unicode-letters.def}として統合され. -このファイルを\XeLaTeX, \LuaLaTeX の両方が用いている. +最近の(2015-10-01以降の)\LuaLaTeX では漢字や仮名を制御綴内に +使用することが可能であるが,全角英数字は使用できない. +これでは\pTeX で使用できた\cs{1年目西暦}\footnote{科研費\LaTeX で使用されているそうです.}などが使えないため, +\LuaTeX-jaへの移行で手間が生じることになる. -だが,\XeTeX における\cs{catcode}の初期設定と -\LuaTeX におけるそれは一致していない: -\begin{itemize} - \item \texttt{luatex-unicode-letters.tex} の元になった - \texttt{unicode-letters.tex}が古い - \item \texttt{unicode-letters.tex} 後半部や\texttt{unicode-letters.def}後半部では -\cs{XeTeXcharclass}の設定を行なっており, -それによって漢字や仮名,および全角英数字の\cs{catcode}が11に設定されている. -しかし,\texttt{luatex-unicode-letters.tex}ではこの「後半部」が -まるごと省略されており,また\LuaLaTeX でも\texttt{unicode-letters.def}後半部は実行されな - い. -\end{itemize} -言い換えると, -\begin{description} - \item[plain \LuaTeX] 漢字や仮名を制御綴内に -使用することはできない. - \item[\LuaLaTeX] 最近の(2015-10-01以降の) -\LuaLaTeX では漢字や仮名を制御綴内に -使用することが可能になったが,全角英数字は相変わらず使用できない, -\end{description} -これでは\pTeX で使用できた\cs{1年目西暦}\footnote{科研費\LaTeX で使用されているそうです.}などが使えないこととなり, -\LuaTeX-jaへの移行で手間が生じる.そのため,\LuaTeX-jaでは -\texttt{unicode-letters.tex}の後半部にあたる内容を自前でパッチし, -結果として\emph{\XeTeX における初期設定と同じになるようにしている.} +そのため,\LuaTeX-jaでは全角英数字など一部の文字 +\footnote{正確には,Unicodeの行分割アルゴリズム(UAX~\#14)で``ID''~(Ideographic)と指定されている文字.}の +\cs{catcode}を11に変更し,これらの文字を制御綴中で使用可能にしている. % \begin{table} @@ -2731,7 +2685,7 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} \def\D#1#2#3#4{% {\fboxsep0pt\fcolorbox{cyan}{white}% {\large\char"#1#2#3#4}}\ (\texttt{U+#1#2#3#4})} %" -\leavevmode\hbox to 0pt{\hss\begin{tabular}{cccccc} +\leavevmode\hbox to 0pt{\hss\begin{tabular}[t]{cccccc} \toprule %&\textbf{row}&\textbf{col.}&\textbf{\pTeX}&\textbf{\upTeX}&\textbf{\LuaTeX-ja}\\ %&\emph{区}&\emph{点}&\emph{\pTeX}&\emph{\upTeX}&\emph{\LuaTeX-ja}\\ @@ -2744,25 +2698,26 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} \D FF3E&1&16&N&N&Y\\ \D FFE3&1&17&N&N&Y\\ \D FF3F&1&18&N&N&Y\\ -%\D 30FD&1&19&N&Y&Y\\ -%\D 30FE&1&20&N&Y&Y\\ -%\D 309D&1&21&N&Y&Y\\ -%\D 309E&1&22&N&Y&Y\\ +\D 30FD&1&19&N&Y&Y\\ +\D 30FE&1&20&N&Y&Y\\ +\D 309D&1&21&N&Y&Y\\ +\D 309E&1&22&N&Y&Y\\ \D 3003&1&23&N&N&Y\\ \D 4EDD&1&24&N&Y&Y\\ \D 3005&1&25&N&N&Y\\ \D 3006&1&26&N&N&Y\\ \D 3007&1&27&N&N&Y\\ \D 30FC&1&28&N&Y&Y\\ -\D FF0F&1&31&N&N&Y\\ -\D FF3C&1&32&N&N&Y\\ \bottomrule \end{tabular}\qquad -\begin{tabular}{cccccc} +\begin{tabular}[t]{cccccc} \toprule %&\textbf{row}&\textbf{col.}&\textbf{\pTeX}&\textbf{\upTeX}&\textbf{\LuaTeX-ja}\\ %&\emph{区}&\emph{点}&\emph{\pTeX}&\emph{\upTeX}&\emph{\LuaTeX-ja}\\ \midrule +\D FF0F&1&31&N&N&Y\\ +\D FF3C&1&32&N&N&Y\\ +\D FF5E&1&33&N&N&Y\\ \D FF5C&1&35&N&N&Y\\ \D FF0B&1&60&N&N&Y\\ \D FF1D&1&65&N&N&Y\\ @@ -2786,11 +2741,13 @@ for \LuaTeX, \emph{to match the \cs{catcode} setting with that of \XeTeX.} %<*en> \subsection{Non-kanji characters in a control word} +{\def\D#1{% + {\fboxsep0pt\fcolorbox{cyan}{white}{#1}}}% Because the engine differ, so non-kanji JIS~X~0208 characters which can be used in a control word differ in \pTeX, in \upTeX,~and~in \LuaTeX-ja. \autoref{tab:kcat-diff} shows the difference. -Except for four characters ``・'',~``゛'', ``゜'',~``゠'', -\LuaTeX-ja admits more characters in a control word than \upTeX. +Except for three characters \D{・},~\D{゛},~and~`\D{゜}, +\LuaTeX-ja admits more characters in a control word than \upTeX.} Difference becomes larger, if we consider non-kanji JIS~X~0213 characters. @@ -2802,7 +2759,7 @@ For the detail, see \url{https://github.com/h-kitagawa/kct}. エンジンが異なるので,\pTeX, \upTeX, \LuaTeX-ja において制御綴中に使用可能なJIS~X~0208の文字は異なる. 異なっているところだけを載せると,\autoref{tab:kcat-diff}のようになる. -「・」「゛」「゜」「゠」を除けば,\LuaTeX-jaでは\upTeX より多くの文字が +「・」「゛」「゜」を除けば,\LuaTeX-jaでは\upTeX より多くの文字が 制御綴に使用可能になっている. JIS~X~0213の範囲に広げると,差異はさらに大きくなる. diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx index 9d4bf2114a8..5e7424ba0e6 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx @@ -25,12 +25,13 @@ % \changes{v1.0c}{2016/07/25}{docパッケージが上書きする\cs{verb}を再々定義} % \changes{v1.0d}{2017/09/24}{\cs{vadjust\{\}}を追加} % \changes{v1.0d-ltj-3}{2018/01/01}{\cs{Cjascale}を追加} +% \changes{v1.0d-ltj-4}{2021-10-24}{HaranoAji fonts} % \fi % % \iffalse % %\NeedsTeXFormat{LaTeX2e} -%\ProvidesClass{ltjltxdoc}[2018/01/01 v1.0d-ltj-3 Standard LuaLaTeX-ja file] +%\ProvidesClass{ltjltxdoc}[2021-10-24 v1.0d-ltj-4 Standard LuaLaTeX-ja file] %<*driver> \documentclass{ltjltxdoc} \GetFileInfo{ltjltxdoc.cls} diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty index c4cc54c2f9e..56361794645 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty @@ -64,7 +64,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-adjust}[2018/07/24] + \ProvidesPackage{luatexja-adjust}[2019-01-06] \fi % % Load core module if not yet. diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty index e8cb01e4bba..6ac200b7e60 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty @@ -64,7 +64,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-otf}[2019/09/26] + \ProvidesPackage{luatexja-otf}[2019-09-26] \fi % % Load core module if not yet. diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty index c8f933ec925..8367feb0476 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty @@ -4,7 +4,7 @@ % LaTeX only! \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-ruby}[2021-05-04 v0.52] +\ProvidesPackage{luatexja-ruby}[2021-05-17 v0.52] \RequirePackage{luatexja} %%------------------ diff --git a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua index 62becb25a35..2bfe670b9e5 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua @@ -136,7 +136,7 @@ local t = { } }, - [5] = { -- -- 二分(二重)ダッシュ + [105] = { -- -- 二分(二重)ダッシュ chars = { '゠', '–' }, align = 'middle', left = 0.0, down = 0.0, width = 0.50, height = 0.50, depth = 0.50, italic=0.0, diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty index 7e4ec507c6f..4e89ecee61e 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}[2021-05-17 LaTeX support of LuaTeX-ja] +\ProvidesPackage{ltj-latex}[2021-10-24 LaTeX support of LuaTeX-ja] \endlinechar=13 @@ -60,15 +60,29 @@ %%% patching commands \ifltj@ltfilehook@avail - \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}} - \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}} + %% \ltj@ExecuteBeforePackage and \ltj@ExecuteAfterPackage + %% no-starred version: do nothing if the is loaded + %% starred version: do right away if the is loaded \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}}% + \@ifl@t@r\fmtversion{2021-11-15}{% 2021-11-15 + \def\@@ltj@ExecuteAfterPackage@star#1{\AddToHook{package/#1/after}} + \def\@@ltj@ExecuteBeforePackage@star#1{\AddToHook{package/#1/before}} + \long\def\@@ltj@ExecuteAfterPackage#1#2{% + \@ifpackageloaded{#1}{}{\AddToHook{package/#1/after}{#2}}% + } + \long\def\@@ltj@ExecuteBeforePackage#1#2{% + \@ifpackageloaded{#1}{}{\AddToHook{package/#1/before}{#2}}% + } + }{ + \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}} + \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}} + \long\def\@@ltj@ExecuteAfterPackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}% + } + \long\def\@@ltj@ExecuteBeforePackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}% + } } \else \RequirePackage{filehook} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls index d7a76c58c39..84872803d97 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls @@ -23,7 +23,7 @@ %% File: ltjltxdoc.dtx \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{ltjltxdoc}[2018/01/01 v1.0d-ltj-3 Standard LuaLaTeX-ja file] +\ProvidesClass{ltjltxdoc}[2021-10-24 v1.0d-ltj-4 Standard LuaLaTeX-ja file] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{ltxdoc}} \ProcessOptions \LoadClass{ltxdoc} diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index 77a955741ac..5c86aa9b787 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -26,6 +26,9 @@ \def\luatexjaLoaded{\endinput} \newif\ifltj@disablejfam +%%%% VERSION +\def\LuaTeXjaversion{20211024.0} + %% Check if LaTeX is used. \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax %<*!LaTeX> @@ -35,13 +38,17 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja}[2021-06-07 Japanese Typesetting with Lua(La)TeX] + \makeatletter + \def\ltj@@temp#1#2#3#4#5#6#7#8#9\@nil{% + \edef\ltj@@do{\noexpand\ProvidesPackage + {luatexja}[#1#2#3#4-#5#6-#7#8 Japanese Typesetting with Lua(La)TeX]% + }\ltj@@do\let\ltj@@do\undefined\let\ltj@@temp\undefined + } + \expandafter\ltj@@temp\LuaTeXjaversion\@nil \DeclareOption{disablejfam}{\ltj@disablejfamtrue} \DeclareOption*{} \ProcessOptions\relax \fi % -%%%% VERSION -\def\LuaTeXjaversion{20210918.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 8bf6bac9f3d..b76a3957a00 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}[2021-01-24 Default font settings of LuaTeX-ja] +\ProvidesPackage{lltjdefs}[2021-04-29 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 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 989fd8ce9d4..9575dc3c049 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-array.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-array}[2018/03/29 Patch to array for LuaTeX-ja] +\ProvidesPackage{lltjp-array}[2019-07-18 Patch to array for LuaTeX-ja] \RequirePackage{etoolbox,array} 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 27680205f64..c766ec46858 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-atbegshi.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-atbegshi.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-atbegshi}[2021-03-14 Patching \string\shipout\space hooks for LuaTeX-ja] +\ProvidesPackage{lltjp-atbegshi}[2021-04-29 Patching \string\shipout\space hooks for LuaTeX-ja] % concept: execute all hooks inside yoko direction \vbox 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 0be092eaaa3..67b0f5de7f7 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-12-29 Patch to geometry for LuaTeX-ja with vertical writing mode] +\ProvidesPackage{lltjp-geometry}[2021-10-24 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 @@ -40,15 +40,29 @@ }% }{} \ifltj@ltfilehook@avail - \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}} - \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}} + %% \ltj@ExecuteBeforePackage and \ltj@ExecuteAfterPackage + %% no-starred version: do nothing if the is loaded + %% starred version: do right away if the is loaded \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}}% + \@ifl@t@r\fmtversion{2021-11-15}{% 2021-11-15 + \def\@@ltj@ExecuteAfterPackage@star#1{\AddToHook{package/#1/after}} + \def\@@ltj@ExecuteBeforePackage@star#1{\AddToHook{package/#1/before}} + \long\def\@@ltj@ExecuteAfterPackage#1#2{% + \@ifpackageloaded{#1}{}{\AddToHook{package/#1/after}{#2}}% + } + \long\def\@@ltj@ExecuteBeforePackage#1#2{% + \@ifpackageloaded{#1}{}{\AddToHook{package/#1/before}{#2}}% + } + }{ + \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}} + \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}} + \long\def\@@ltj@ExecuteAfterPackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}% + } + \long\def\@@ltj@ExecuteBeforePackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}% + } } \else \RequirePackage{filehook} 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 3d6e49fbaa7..470534d6283 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-xunicode}[2017/05/05 Patch to xunicode for LuaTeX-ja] +\ProvidesPackage{lltjp-xunicode}[2019-07-18 Patch to xunicode for LuaTeX-ja] \def\XeTeXpicfile{} \RequirePackage{xunicode} -- cgit v1.2.3