• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: Commit

ソースコードの管理場所


Commit MetaInfo

Revision2a2280783df5a03e1499bd1c7438ec4b9ed2541c (tree)
Time2022-06-25 08:21:22
AuthorHironori Kitagawa <h_kitagawa2001@yaho...>
CommiterHironori Kitagawa

Log Message

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

Change Summary

Incremental Difference

Binary files a/doc/ltjsclasses.pdf and b/doc/ltjsclasses.pdf differ
Binary files a/doc/luatexja-en.pdf and b/doc/luatexja-en.pdf differ
Binary files a/doc/luatexja-ja.pdf and b/doc/luatexja-ja.pdf differ
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
11 % luatexja-preset.sty
2-\ProvidesPackage{luatexja-preset}[2020-09-14 Japanese font presets]
2+\ProvidesPackage{luatexja-preset}[2022-06-19 Japanese font presets]
33
44 \RequirePackage{expl3,l3keys2e}
55 \RequirePackage{luatexja}
@@ -211,7 +211,7 @@
211211 mc = A-OTF-RyuminPr6N-Light.otf, mc-b = A-OTF-FutoMinA101Pr6N-Bold.otf,
212212 gt-d = A-OTF-GothicBBBPr6N-Medium.otf , gt-b = A-OTF-FutoGoB101Pr6N-Bold.otf,
213213 gt-u = A-OTF-GothicBBBPr6N-Medium.otf , gt-eb = A-OTF-MidashiGoPr6N-MB31.otf,
214- mg-m = A-OTF-Jun101Pr6N-Light.otf,
214+ mg-m = A-OTF-ShinMGoPr6N-Light.otf,
215215 __custom = false, __office = false, __noembed = false,
216216 }
217217
@@ -312,6 +312,20 @@
312312 mc-l = Noto~Serif~CJK~JP~Light,
313313 __custom = false, __office = false, __noembed = false,
314314 }
315+\ltjpreset_declare_preset:nx{noto}{
316+ noto-otf,
317+}
318+\ltjpreset_declare_preset:nx{noto-jp}{
319+ mc-m = Noto~Serif~JP~Regular,
320+ mc-b = Noto~Serif~JP~Bold,
321+ gt-d = Noto~Sans~JP~Regular,
322+ gt-b = Noto~Sans~JP~Bold,
323+ gt-u = Noto~Sans~JP~Medium,
324+ gt-eb = Noto~Sans~JP~Black,
325+ mg-m = Noto~Sans~JP~Medium,
326+ mc-l = Noto~Serif~JP~Light,
327+ __custom = false, __office = false, __noembed = false,
328+}
315329
316330 % HaranoAji {Mincho, Gothic}
317331 \ltjpreset_declare_preset:nx{haranoaji}{
--- a/src/ltjsarticle.cls
+++ b/src/ltjsarticle.cls
@@ -1401,7 +1401,7 @@ class has defined the old font commands like\MessageBreak
14011401 \advance\leftskip 3\zw
14021402 \parindent 1\zw
14031403 \noindent
1404- \llap{\@makefnmark\hskip0.3\zw}#1}
1404+ \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
14051405 \let\@inhibitglue=\ltjfakeparbegin
14061406 \def\@item[#1]{%
14071407 \if@noparitem
--- a/src/ltjsbook.cls
+++ b/src/ltjsbook.cls
@@ -1494,7 +1494,7 @@ class has defined the old font commands like\MessageBreak
14941494 \advance\leftskip 3\zw
14951495 \parindent 1\zw
14961496 \noindent
1497- \llap{\@makefnmark\hskip0.3\zw}#1}
1497+ \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
14981498 \let\@inhibitglue=\ltjfakeparbegin
14991499 \def\@item[#1]{%
15001500 \if@noparitem
--- a/src/ltjsclasses.dtx
+++ b/src/ltjsclasses.dtx
@@ -5164,12 +5164,13 @@
51645164 % |\@makefnmark| は脚注の番号を出力する命令です。
51655165 % ここでは脚注が左端から一定距離に来るようにしてあります。
51665166 %
5167+%
51675168 % \begin{macrocode}
51685169 \newcommand\@makefntext[1]{%
51695170 \advance\leftskip 3\zw
51705171 \parindent 1\zw
51715172 \noindent
5172- \llap{\@makefnmark\hskip0.3\zw}#1}
5173+ \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
51735174 % \end{macrocode}
51745175 % \end{macro}
51755176 %
--- a/src/ltjskiyou.cls
+++ b/src/ltjskiyou.cls
@@ -1365,7 +1365,7 @@ class has defined the old font commands like\MessageBreak
13651365 \advance\leftskip 3\zw
13661366 \parindent 1\zw
13671367 \noindent
1368- \llap{\@makefnmark\hskip0.3\zw}#1}
1368+ \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
13691369 \let\@inhibitglue=\ltjfakeparbegin
13701370 \def\@item[#1]{%
13711371 \if@noparitem
--- a/src/ltjspf.cls
+++ b/src/ltjspf.cls
@@ -1259,7 +1259,7 @@ class has defined the old font commands like\MessageBreak
12591259 \advance\leftskip 3\zw
12601260 \parindent 1\zw
12611261 \noindent
1262- \llap{\@makefnmark\hskip0.3\zw}#1}
1262+ \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
12631263 \let\@inhibitglue=\ltjfakeparbegin
12641264 \def\@item[#1]{%
12651265 \if@noparitem
--- a/src/ltjsreport.cls
+++ b/src/ltjsreport.cls
@@ -1487,7 +1487,7 @@ class has defined the old font commands like\MessageBreak
14871487 \advance\leftskip 3\zw
14881488 \parindent 1\zw
14891489 \noindent
1490- \llap{\@makefnmark\hskip0.3\zw}#1}
1490+ \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1}
14911491 \let\@inhibitglue=\ltjfakeparbegin
14921492 \def\@item[#1]{%
14931493 \if@noparitem
--- a/src/luatexja.sty
+++ b/src/luatexja.sty
@@ -27,7 +27,7 @@
2727 \newif\ifltj@disablejfam
2828
2929 %%%% VERSION
30-\def\LuaTeXjaversion{20220411.0}
30+\def\LuaTeXjaversion{20220530.0}
3131
3232 %% Check if LaTeX is used.
3333 \begingroup\expandafter\expandafter\expandafter\endgroup
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -3,7 +3,7 @@
33 %
44
55 \NeedsTeXFormat{LaTeX2e}
6-\ProvidesPackage{lltjcore}[2022-01-17 Patch to LaTeX2e Kernel for LuaTeX-ja]
6+\ProvidesPackage{lltjcore}[2022-05-30 Patch to LaTeX2e Kernel for LuaTeX-ja]
77 \RequirePackage{etoolbox}
88
99 %%% expl3
@@ -235,11 +235,16 @@
235235 \hskip\@tempskipa\color@endgroup\egroup}
236236 \pretocmd{\footnote}{\inhibitglue}{}{}
237237 \pretocmd{\footnotemark}{\inhibitglue}{}{}
238-\patchcmd{\@footnotemark}{\@makefnmark}{%
239- \unless\ifnum\ltjgetparameter{direction}=3 \@makefnmark%
240- \else\hbox to\z@{\hskip-.25\zw\raise.9\zh\@makefnmark\hss}\fi%
241-}{}{}
242-\let\@parboxto\@empty
238+\def\@ltj@process@makefnmark#1{%
239+ \unless\ifnum\ltjgetparameter{direction}=3 #1%
240+ \else\hbox to\z@{\hskip-.25\zw\raise.9\zh#1\hss}\fi%
241+}%
242+\ifdefined\@kernel@process@makefnmark %% 2022-06-01 latex-lab?
243+ \let\ltj@orig@kernel@process@makefnmark=\@kernel@process@makefnmark
244+ \def\@kernel@process@makefnmark#1{\ltj@orig@kernel@process@makefnmark{\@ltj@process@makefnmark#1}}
245+\else
246+ \patchcmd{\@footnotemark}{\@makefnmark}{\@ltj@process@makefnmark\@makefnmark}{}{}
247+\fi
243248 \long\def\@iiiparbox#1#2[#3]#4#5{%
244249 \leavevmode
245250 \@pboxswfalse
Show on old repository browser