summaryrefslogtreecommitdiff
path: root/macros/luatex/generic
diff options
context:
space:
mode:
Diffstat (limited to 'macros/luatex/generic')
-rw-r--r--macros/luatex/generic/luatexja/COPYING2
-rw-r--r--macros/luatex/generic/luatexja/README8
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-en.pdfbin700002 -> 702899 bytes
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-ja.pdfbin1144831 -> 1147690 bytes
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja.dtx18
-rw-r--r--macros/luatex/generic/luatexja/src/addons/luatexja-ajmacros.sty18
-rw-r--r--macros/luatex/generic/luatexja/src/ltjclasses.dtx48
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja.sty2
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjcore.sty8
9 files changed, 51 insertions, 53 deletions
diff --git a/macros/luatex/generic/luatexja/COPYING b/macros/luatex/generic/luatexja/COPYING
index b82ffc50fe..9799d0ab20 100644
--- a/macros/luatex/generic/luatexja/COPYING
+++ b/macros/luatex/generic/luatexja/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2011--2024 The LuaTeX-ja project, All rights reserved.
+Copyright (c) 2011--2025 The LuaTeX-ja project, All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README
index b70a6c36fb..fb8ca19008 100644
--- a/macros/luatex/generic/luatexja/README
+++ b/macros/luatex/generic/luatexja/README
@@ -1,6 +1,6 @@
-The LuaTeX-ja Package 20241014.0
+The LuaTeX-ja Package 20250208.0
--------------------------------
-Copyright (c) 2011--2024 The LuaTeX-ja project
+Copyright (c) 2011--2025 The LuaTeX-ja project
License: modified BSD (see COPYING)
LuaTeX-ja is a macro package for typesetting Japanese documents with LuaTeX.
@@ -42,7 +42,7 @@ Installation
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20241014.0 in the Git repository by
+ or tagged as 20250208.0 in the Git repository by
<https://github.com/luatexja/luatexja/archive/refs/tags/$VER.zip>
b. Extract the archive and process following three files by LuaLaTeX
@@ -92,4 +92,4 @@ Notes
This file and ltj-kinsoku.lua are not used anymore.
(Do not remove ltj-kinsoku.tex.)
-Last commit date: Mon Oct 14 10:29:57 2024 +0900
+Last commit date: Sat Feb 8 21:26:17 2025 +0900
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
index 4a64b591fa..91e7a1eda1 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
Binary files differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
index 981d4ddf93..608eb31bde 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
Binary files differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja.dtx b/macros/luatex/generic/luatexja/doc/luatexja.dtx
index 5b46c260fc..cefd739386 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja.dtx
+++ b/macros/luatex/generic/luatexja/doc/luatexja.dtx
@@ -1920,7 +1920,7 @@ these eight ranges belongs to the character range~217.
\label{tab:rng9}
\centering\footnotesize
\def\ch#1{%
- {\fboxsep0pt\fcolorbox{cyan}{white}%
+ {\fboxsep0pt\fcolorbox{b_cyan}{white}%
{\normalsize\KOZM\UTF{20#1}}}\ (\texttt{U+20#1})} %"
% 13: JIS X0213, AJ, Adobe-Japan-1 only
\begin{tabular}{ll>{\color{white}}lll>{\color{white}}l}
@@ -2530,7 +2530,7 @@ For the detail, see \autoref{tab:kcat}.
\begin{table}[t]
\small
-\caption{\cs{kcatcode} in \upTeX}
+\caption{\cs{kcatcode} in \upTeX~u1.30}
\label{tab:kcat}
%<en>\medskip
@@ -2649,7 +2649,7 @@ to allow these characters in the control word.
%<en>\medskip
\label{tab:kcat-diff}
\def\D#1#2#3#4{%
- {\fboxsep0pt\fcolorbox{cyan}{white}%
+ {\fboxsep0pt\fcolorbox{b_cyan}{white}%
{\large\char"#1#2#3#4}}\ (\texttt{U+#1#2#3#4})} %"
\leavevmode\hbox to 0pt{\hss\begin{tabular}[t]{cccccc}
\toprule
@@ -2708,7 +2708,7 @@ to allow these characters in the control word.
%<*en>
\subsection{Non-kanji characters in a control word}
{\def\D#1{%
- {\fboxsep0pt\fcolorbox{cyan}{white}{#1}}}%
+ {\fboxsep0pt\fcolorbox{b_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.
@@ -4071,7 +4071,7 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont
\end{figure}
\begin{table}[t]
\def\D#1#2#3#4{%
- {\fboxsep0pt\fcolorbox{cyan}{white}%
+ {\fboxsep0pt\fcolorbox{b_cyan}{white}%
{\large\lower-\cdp\hbox{\tate\ltjjachar"#1#2#3#4}}}\ (\texttt{U+#1#2#3#4})%"
}
\caption{\texttt{jpotf}が指定された際に行われる追加の縦組形への置換}
@@ -7551,7 +7551,7 @@ JFMの\texttt{chars}テーブルのエントリとして \verb+'AJ1-xxx'+ の形
\def\outbox#1{{\Large%
\ltjsetparameter{kanjiskip=0pt plus .2\zw minus .2\zw}%
\setbox\gridbox=\hbox to 20\zw{\sq\sq\sq\sq\sb\sq\sq\sq\sq\sb\sq\sq\sq\sq\sb\sq\sq\sq\sq\sb}%
- \hbox{\textcolor{cyan}{\copy\gridbox}\hskip-20\zw%
+ \hbox{\textcolor{b_cyan}{\copy\gridbox}\hskip-20\zw%
\vbox{\hsize=20\zw\noindent\leftskip0pt\rightskip0pt\parfillskip0pt#1}\vrule}%
}}
@@ -9896,7 +9896,8 @@ process it}, if and only if the following three conditions are satisfied:
\item The category code of \cs{ltjlineendcomment} itself is 14~(\textit{comment}).
\item The input line matches the following ``regular expression'':
\[
- (\text{any char})^*(\textbf{JAchar})
+ (\text{any char})^*
+ \Bigl(\textbf{JAchar}\cap\bigl(\{\text{catcode}=11\}\cup\{\text{catcode}=12\}\bigr)\Bigr)
\bigl(\{\text{catcode}=1\}\cup\{\text{catcode}=2\}\bigr)^*
\]
\end{enumerate}
@@ -9957,7 +9958,8 @@ emits a space.
\item \cs{ltjlineendcomment}のカテゴリーコードが14~(\textit{comment})である.
\item 入力行は次の「正規表現」にマッチしている:
\[
- (\text{any char})^*(\textbf{JAchar})
+ (\text{any char})^*
+ \Bigl(\textbf{JAchar}\cap\bigl(\{\text{catcode}=11\}\cup\{\text{catcode}=12\}\bigr)\Bigr)
\bigl(\{\text{catcode}=1\}\cup\{\text{catcode}=2\}\bigr)^*
\]
\end{enumerate}
diff --git a/macros/luatex/generic/luatexja/src/addons/luatexja-ajmacros.sty b/macros/luatex/generic/luatexja/src/addons/luatexja-ajmacros.sty
index 10c2cd8fde..5692dc3b45 100644
--- a/macros/luatex/generic/luatexja/src/addons/luatexja-ajmacros.sty
+++ b/macros/luatex/generic/luatexja/src/addons/luatexja-ajmacros.sty
@@ -68,7 +68,7 @@
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-ajmacros}[2020-10-09]
+ \ProvidesPackage{luatexja-ajmacros}[2025-02-05]
\fi %</LaTeX>
%%------------------
@@ -651,24 +651,24 @@
\@tempdimb.94\@tempdimb
\@tempskipa.94\@tempskipa
\fontsize{\@tempdimb}{\@tempskipa}\selectfont\aj訓点レ}}
-\gdef\aj訓点一レ{\mbox{\tate\kern-.24zw\aj訓点一\kern-.65zw\raise.15zw\hbox{\aj@smallReten}}}
-\gdef\aj訓点上レ{\mbox{\tate\aj訓点上\kern-.3zw\raise.15zw\hbox{\aj@smallReten}}}
-\gdef\aj訓点甲レ{\mbox{\tate\aj訓点甲\kern-.25zw\raise.15zw\hbox{\aj@smallReten}}}
-\gdef\aj訓点天レ{\mbox{\tate\aj訓点天\kern-.4zw\raise.1zw\hbox{\aj@smallReten}}}
+\gdef\aj訓点一レ{\mbox{\tate\kern-.24\zw\aj訓点一\kern-.65\zw\raise.15\zw\hbox{\aj@smallReten}}}
+\gdef\aj訓点上レ{\mbox{\tate\aj訓点上\kern-.3\zw\raise.15\zw\hbox{\aj@smallReten}}}
+\gdef\aj訓点甲レ{\mbox{\tate\aj訓点甲\kern-.25\zw\raise.15\zw\hbox{\aj@smallReten}}}
+\gdef\aj訓点天レ{\mbox{\tate\aj訓点天\kern-.4\zw\raise.1\zw\hbox{\aj@smallReten}}}
\def\@ajongofudef#1{\ifx\@nil#1%
\else\expandafter\xdef\csname aj訓点#1|\endcsname
{\noexpand\mbox{\yoko\expandafter\noexpand\csname aj訓点#1\endcsname
- \hbox to\z@{\hss\expandafter\noexpand\csname aj訓点|\endcsname\kern-.5zw}}}%
+ \hbox to\z@{\hss\expandafter\noexpand\csname aj訓点|\endcsname\kern-.5\zw}}}%
\expandafter\@ajongofudef\fi}
\@ajongofudef 二三四中下乙丙丁地人\@nil
-\expandafter\gdef\csname aj訓点 |\endcsname{\mbox{\yoko{ }\hbox to\z@{\hss\csname aj訓点|\endcsname\kern-.5zw}}}
+\expandafter\gdef\csname aj訓点 |\endcsname{\mbox{\yoko{ }\hbox to\z@{\hss\csname aj訓点|\endcsname\kern-.5\zw}}}
\def\@ajkungofudef#1{\ifx\@nil#1%
\else\expandafter\xdef\csname aj訓点|#1\endcsname
- {\noexpand\mbox{\yoko\hbox to\z@{\hss\expandafter\noexpand\csname aj訓点|\endcsname\kern-.5zw}%
+ {\noexpand\mbox{\yoko\hbox to\z@{\hss\expandafter\noexpand\csname aj訓点|\endcsname\kern-.5\zw}%
\expandafter\noexpand\csname aj訓点#1\endcsname}}%
\expandafter\@ajkungofudef\fi}
\@ajkungofudef 二三四中下乙丙丁地人\@nil
-\expandafter\gdef\csname aj訓点| \endcsname{\mbox{\yoko\hbox to\z@{\hss\csname aj訓点|\endcsname\kern-.5zw}{ }}}
+\expandafter\gdef\csname aj訓点| \endcsname{\mbox{\yoko\hbox to\z@{\hss\csname aj訓点|\endcsname\kern-.5\zw}{ }}}
%
\gdef\ajKunten#1{\csname aj訓点#1\endcsname}
%
diff --git a/macros/luatex/generic/luatexja/src/ltjclasses.dtx b/macros/luatex/generic/luatexja/src/ltjclasses.dtx
index f05afe97c1..7f6000dbb9 100644
--- a/macros/luatex/generic/luatexja/src/ltjclasses.dtx
+++ b/macros/luatex/generic/luatexja/src/ltjclasses.dtx
@@ -140,6 +140,7 @@
% \changes{v1.8f-ltj-21}{2021-12-22}{余計なコメントの削除.}
% \changes{v1.8f-ltj-22}{2022-04-11}{kern featureが有効になっていたのを修正.}
% \changes{v1.8f-ltj-23}{2022-09-12}{|\stockwidth|がカーネルで定義される可能性に対応.}
+% \changes{v1.8f-ltj-24}{2024-12-13}{TOCファイルに\cs{rensuji}を書き出すことをやめた}
% \fi
%
% \iffalse
@@ -169,7 +170,7 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%</tate>
- [2022-09-12 v1.8f-ltj-23
+ [2024-12-13 v1.8f-ltj-24
%<article|report|book> Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
@@ -4130,6 +4131,7 @@
% \changes{v1.3}{2001/10/04}{第5引数の書体を\cs{rmfamily}から\cs{normalfont}に変更}
% \changes{v1.7a}{2016/11/16}{Added \cs{nobreak} for
% latex/2343 (sync with ltsect.dtx v1.0z)}
+% \changes{v1.8f-ltj-24}{2024-12-13}{TOCファイルに\cs{rensuji}を書き出すことをやめた}
% \begin{macrocode}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
@@ -4143,36 +4145,18 @@
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
- \hb@xt@\@pnumwidth{\hss\normalfont \normalcolor #5}%
+%<yoko> \hb@xt@\@pnumwidth{\hss\normalfont \normalcolor #5}%
+%<tate> \hb@xt@\@pnumwidth{\hss\normalfont \normalcolor\rensuji{#5}}%
\par}%
\fi}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\addcontentsline}
-% 縦組の場合にページ番号を|\rensuji|で囲むように変更します。
-%
-% このマクロは\file{ltsect.dtx}で定義されています。
-% ^^A 命令 |\addcontentsline| と |\addtocontents| を組み合わせ
-% \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策
-% (sync with ltsect.dtx 2018/09/26 v1.1c)}
-% \changes{v1.8f}{2020/09/30}{add a fourth argument for better
-% hyperref compability
-% (sync with ltsect.dtx 2020/07/27 v1.1e)}
-% \begin{macrocode}
-\providecommand*\protected@file@percent{}
-\def\addcontentsline#1#2#3{%
- \protected@write\@auxout
- {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-%<tate> \@temptokena{\rensuji{\thepage}}%
-%<yoko> \@temptokena{\thepage}%
- }{\string\@writefile{#1}%
- {\protect\contentsline{#2}{#3}{\the\@temptokena}{}%
- \protected@file@percent}}%
-}
-% \end{macrocode}
-% \end{macro}
-%
+% [2024-12-13 LTJ] 従来は\cs{addcontentsline}命令を再定義し、ページ番号が入る\cs{contentsline}の第3引数を
+% 縦組時には\cs{rensuji}でくくっていました。これでは|hyperref|パッケージと干渉してしまうので、
+% \cs{rensuji}は\cs{l@chapter}など実際の出力命令のほうに押し込めることにし、
+% \cs{addcontentsline}の再定義は削除します。
+% \changes{v1.8f-ltj-24}{2024-12-13}{TOCファイルに\cs{rensuji}を書き出すことをやめた}
%
% \subsubsection{本文目次}
%
@@ -4200,6 +4184,7 @@
%
% \begin{macro}{\l@part}
% partレベルの目次です。
+% \changes{v1.8f-ltj-24}{2024-12-13}{TOCファイルに\cs{rensuji}を書き出すことをやめた}
% \begin{macrocode}
\newcommand*{\l@part}[2]{%
\ifnum \c@tocdepth >-2\relax
@@ -4212,7 +4197,8 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4\zw}%
#1\hfil\nobreak
- \hb@xt@\@pnumwidth{\hss#2}}\par
+%<yoko> \hb@xt@\@pnumwidth{\hss#2}}\par
+%<tate> \hb@xt@\@pnumwidth{\hss\rensuji{#2}}}\par
\nobreak
%<article> \if@compatibility
\global\@nobreaktrue
@@ -4225,6 +4211,7 @@
%
% \begin{macro}{\l@chapter}
% chapterレベルの目次です。
+% \changes{v1.8f-ltj-24}{2024-12-13}{TOCファイルに\cs{rensuji}を書き出すことをやめた}
% \begin{macrocode}
%<*report|book>
\newcommand*{\l@chapter}[2]{%
@@ -4236,7 +4223,8 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4\zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
+%<yoko> #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
+%<tate> #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss\rensuji{#2}}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -4246,6 +4234,7 @@
%
% \begin{macro}{\l@section}
% sectionレベルの目次です。
+% \changes{v1.8f-ltj-24}{2024-12-13}{TOCファイルに\cs{rensuji}を書き出すことをやめた}
% \begin{macrocode}
%<*article>
\newcommand*{\l@section}[2]{%
@@ -4257,7 +4246,8 @@
\leavevmode\bfseries
\setlength\@lnumwidth{1.5em}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
+%<yoko> #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
+%<tate> #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss\rensuji{#2}}\par
\endgroup
\fi}
%</article>
diff --git a/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty
index 8b05af3cc9..413b58f85c 100644
--- a/macros/luatex/generic/luatexja/src/luatexja.sty
+++ b/macros/luatex/generic/luatexja/src/luatexja.sty
@@ -27,7 +27,7 @@
\newif\ifltj@disablejfam
%%%% VERSION
-\def\LuaTeXjaversion{20241014.0}
+\def\LuaTeXjaversion{20250208.0}
%% Check if LaTeX is used.
\begingroup\expandafter\expandafter\expandafter\endgroup
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjcore.sty b/macros/luatex/generic/luatexja/src/patches/lltjcore.sty
index 121a45ba0b..99b61c4a5d 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjcore.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjcore.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2023-02-26 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2025-01-12 Patch to LaTeX2e Kernel for LuaTeX-ja]
\RequirePackage{etoolbox}
%%% expl3
@@ -353,4 +353,10 @@
\def\ltj@unhbox@curfield{\ltjfakeboxbdd\unhbox\@curfield\ltjfakeboxbdd}
%\patchcmd\@contfield{\unhbox\@curfield}{\ltj@unhbox@curfield}{}{}
\patchcmd\@addfield{\unhbox\@curfield}{\ltj@unhbox@curfield}{}{}
+
+%\def\m@th{\mathsurround\z@\ltj@yablshift0 }
+\def\mathsm@sh#1#2{%
+ \setbox\z@\hbox{\ltj@yablshift0$\m@th#1{#2}$}%
+ {}\finsm@sh}
+
\endinput