Merge branch 'kitagawa_test' of git.sourceforge.jp:/gitroot/luatex-ja/luatexja into...

diff --git a/doc/ltjsclasses.pdf b/doc/ltjsclasses.pdf
index 9993e10..08d50b5 100644 (file)
Binary files a/doc/ltjsclasses.pdf and b/doc/ltjsclasses.pdf differ

diff --git a/doc/luatexja-en.pdf b/doc/luatexja-en.pdf
index 22661b2..06cae0d 100644 (file)
Binary files a/doc/luatexja-en.pdf and b/doc/luatexja-en.pdf differ

diff --git a/doc/luatexja-ja.pdf b/doc/luatexja-ja.pdf
index 1990978..f5a92ac 100644 (file)
Binary files a/doc/luatexja-ja.pdf and b/doc/luatexja-ja.pdf differ

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index 3da21dd..b1d5873 100644 (file)
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2020-09-14 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2022-06-19 Japanese font presets]
 
 \RequirePackage{expl3,l3keys2e}
 \RequirePackage{luatexja}
@@ -211,7 +211,7 @@
     mc =   A-OTF-RyuminPr6N-Light.otf,      mc-b = A-OTF-FutoMinA101Pr6N-Bold.otf,
     gt-d = A-OTF-GothicBBBPr6N-Medium.otf , gt-b = A-OTF-FutoGoB101Pr6N-Bold.otf,
     gt-u = A-OTF-GothicBBBPr6N-Medium.otf , gt-eb = A-OTF-MidashiGoPr6N-MB31.otf,
-    mg-m = A-OTF-Jun101Pr6N-Light.otf,
+    mg-m = A-OTF-ShinMGoPr6N-Light.otf,
     __custom = false, __office = false, __noembed = false,
 }
 
@@ -312,6 +312,20 @@
     mc-l =  Noto~Serif~CJK~JP~Light,
     __custom = false, __office = false, __noembed = false,
 }
+\ltjpreset_declare_preset:nx{noto}{
+    noto-otf,
+}
+\ltjpreset_declare_preset:nx{noto-jp}{
+    mc-m =  Noto~Serif~JP~Regular,
+    mc-b =  Noto~Serif~JP~Bold,
+    gt-d =  Noto~Sans~JP~Regular,
+    gt-b =  Noto~Sans~JP~Bold,
+    gt-u =  Noto~Sans~JP~Medium,
+    gt-eb = Noto~Sans~JP~Black,
+    mg-m =  Noto~Sans~JP~Medium,
+    mc-l =  Noto~Serif~JP~Light,
+    __custom = false, __office = false, __noembed = false,
+}
 
 % HaranoAji {Mincho, Gothic}
 \ltjpreset_declare_preset:nx{haranoaji}{

diff --git a/src/ltjsarticle.cls b/src/ltjsarticle.cls
index 1f19c60..ea6dc8c 100644 (file)
--- a/src/ltjsarticle.cls
+++ b/src/ltjsarticle.cls
@@ -1401,7 +1401,7 @@ class has defined the old font commands like\MessageBreak
   \advance\leftskip 3\zw
   \parindent 1\zw
   \noindent
-  \llap{\@makefnmark\hskip0.3\zw}#1}
+  \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
 \let\@inhibitglue=\ltjfakeparbegin
 \def\@item[#1]{%
   \if@noparitem

diff --git a/src/ltjsbook.cls b/src/ltjsbook.cls
index bbe4025..43bedbc 100644 (file)
--- a/src/ltjsbook.cls
+++ b/src/ltjsbook.cls
@@ -1494,7 +1494,7 @@ class has defined the old font commands like\MessageBreak
   \advance\leftskip 3\zw
   \parindent 1\zw
   \noindent
-  \llap{\@makefnmark\hskip0.3\zw}#1}
+  \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
 \let\@inhibitglue=\ltjfakeparbegin
 \def\@item[#1]{%
   \if@noparitem

diff --git a/src/ltjsclasses.dtx b/src/ltjsclasses.dtx
index 049f938..e190617 100644 (file)
--- a/src/ltjsclasses.dtx
+++ b/src/ltjsclasses.dtx
@@ -5164,12 +5164,13 @@
 % |\@makefnmark| は脚注の番号を出力する命令です。
 % ここでは脚注が左端から一定距離に来るようにしてあります。
 %
+%
 %    \begin{macrocode}
 \newcommand\@makefntext[1]{%
   \advance\leftskip 3\zw
   \parindent 1\zw
   \noindent
-  \llap{\@makefnmark\hskip0.3\zw}#1}
+  \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
 %    \end{macrocode}
 % \end{macro}
 %

diff --git a/src/ltjskiyou.cls b/src/ltjskiyou.cls
index 09d9430..be94fcc 100644 (file)
--- a/src/ltjskiyou.cls
+++ b/src/ltjskiyou.cls
@@ -1365,7 +1365,7 @@ class has defined the old font commands like\MessageBreak
   \advance\leftskip 3\zw
   \parindent 1\zw
   \noindent
-  \llap{\@makefnmark\hskip0.3\zw}#1}
+  \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
 \let\@inhibitglue=\ltjfakeparbegin
 \def\@item[#1]{%
   \if@noparitem

diff --git a/src/ltjspf.cls b/src/ltjspf.cls
index eb4b41e..f4f11d0 100644 (file)
--- a/src/ltjspf.cls
+++ b/src/ltjspf.cls
@@ -1259,7 +1259,7 @@ class has defined the old font commands like\MessageBreak
   \advance\leftskip 3\zw
   \parindent 1\zw
   \noindent
-  \llap{\@makefnmark\hskip0.3\zw}#1}
+  \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
 \let\@inhibitglue=\ltjfakeparbegin
 \def\@item[#1]{%
   \if@noparitem

diff --git a/src/ltjsreport.cls b/src/ltjsreport.cls
index 47e65c6..6f5a71a 100644 (file)
--- a/src/ltjsreport.cls
+++ b/src/ltjsreport.cls
@@ -1487,7 +1487,7 @@ class has defined the old font commands like\MessageBreak
   \advance\leftskip 3\zw
   \parindent 1\zw
   \noindent
-  \llap{\@makefnmark\hskip0.3\zw}#1}
+  \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
 \let\@inhibitglue=\ltjfakeparbegin
 \def\@item[#1]{%
   \if@noparitem

diff --git a/src/luatexja.sty b/src/luatexja.sty
index adc6f22..eae7d50 100644 (file)
--- a/src/luatexja.sty
+++ b/src/luatexja.sty
@@ -27,7 +27,7 @@
 \newif\ifltj@disablejfam
 
 %%%% VERSION
-\def\LuaTeXjaversion{20220411.0}
+\def\LuaTeXjaversion{20220530.0}
 
 %% Check if LaTeX is used.
 \begingroup\expandafter\expandafter\expandafter\endgroup

diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty
index 086771a..af49aef 100644 (file)
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2022-01-17 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2022-05-30 Patch to LaTeX2e Kernel for LuaTeX-ja]
 \RequirePackage{etoolbox}
 
 %%% expl3
@@ -235,11 +235,16 @@
   \hskip\@tempskipa\color@endgroup\egroup}
 \pretocmd{\footnote}{\inhibitglue}{}{}
 \pretocmd{\footnotemark}{\inhibitglue}{}{}
-\patchcmd{\@footnotemark}{\@makefnmark}{%
-  \unless\ifnum\ltjgetparameter{direction}=3 \@makefnmark%
-  \else\hbox to\z@{\hskip-.25\zw\raise.9\zh\@makefnmark\hss}\fi%
-}{}{}
-\let\@parboxto\@empty
+\def\@ltj@process@makefnmark#1{%
+  \unless\ifnum\ltjgetparameter{direction}=3 #1%
+  \else\hbox to\z@{\hskip-.25\zw\raise.9\zh#1\hss}\fi%
+}%
+\ifdefined\@kernel@process@makefnmark %% 2022-06-01 latex-lab?
+  \let\ltj@orig@kernel@process@makefnmark=\@kernel@process@makefnmark
+  \def\@kernel@process@makefnmark#1{\ltj@orig@kernel@process@makefnmark{\@ltj@process@makefnmark#1}}
+\else
+  \patchcmd{\@footnotemark}{\@makefnmark}{\@ltj@process@makefnmark\@makefnmark}{}{}
+\fi
 \long\def\@iiiparbox#1#2[#3]#4#5{%
   \leavevmode
   \@pboxswfalse