• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: コミット

ソースコードの管理場所


コミットメタ情報

リビジョン28a5b4eccdb8e7e376b70ea0efe7a2f104bd986f (tree)
日時2020-04-07 23:25:51
作者Hironori Kitagawa <h_kitagawa2001@yaho...>
コミッターHironori Kitagawa

ログメッセージ

use \@setmdseriesdefaultshook etc (latex2e/a3064ea) NOT TESTED

変更サマリ

差分

--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -3,7 +3,7 @@
33 %
44
55 \NeedsTeXFormat{LaTeX2e}
6-\ProvidesPackage{lltjfont}[2020-04-04 Patch to NFSS2 for LuaTeX-ja]
6+\ProvidesPackage{lltjfont}[2020-04-07 Patch to NFSS2 for LuaTeX-ja]
77
88 %% patching \DeclareTextComposite
99 \def\ltj@chardef@text@cmd#1{%
@@ -809,30 +809,43 @@
809809 \patchcmd\update@series@target@value@kanji{\f@series}{\k@series}{}{}
810810 \def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}\@elt{jtt}}
811811
812-\expandafter\patchcmd\csname bfseries \endcsname{%
813- \let\bfseries@rm\bfdef@ult
814- \let\bfseries@sf\bfdef@ult
815- \let\bfseries@tt\bfdef@ult
816-}{%
817- \let\bfseries@rm\bfdef@ult
818- \let\bfseries@sf\bfdef@ult
819- \let\bfseries@tt\bfdef@ult
820- \let\bfseries@mc\bfdef@ult
821- \let\bfseries@gt\bfdef@ult
822- \let\bfseries@jtt\bfdef@ult
823-}{}{}
824-\expandafter\patchcmd\csname mdseries \endcsname{%
825- \let\mdseries@rm\mddef@ult
826- \let\mdseries@sf\mddef@ult
827- \let\mdseries@tt\mddef@ult
828-}{%
829- \let\mdseries@rm\mddef@ult
830- \let\mdseries@sf\mddef@ult
831- \let\mdseries@tt\mddef@ult
832- \let\mdseries@mc\mddef@ult
833- \let\mdseries@gt\mddef@ult
834- \let\mdseries@jtt\mddef@ult
835-}{}{}
812+\ifdefined\@setbfseriesdefaultshook % after 2020-04-07
813+ \g@addto@macro\@setbfseriesdefaultshook{%
814+ \let\bfseries@mc\bfdef@ult
815+ \let\bfseries@gt\bfdef@ult
816+ \let\bfseries@jtt\bfdef@ult
817+ }
818+\else % 2020-02-02
819+ \expandafter\patchcmd\csname bfseries \endcsname{%
820+ \let\bfseries@rm\bfdef@ult
821+ \let\bfseries@sf\bfdef@ult
822+ \let\bfseries@tt\bfdef@ult
823+ }{%
824+ \let\bfseries@rm\bfdef@ult
825+ \let\bfseries@sf\bfdef@ult
826+ \let\bfseries@tt\bfdef@ult
827+ }{}{}
828+\fi
829+\ifdefined\@setmdseriesdefaultshook % after 2020-04-07
830+ \g@addto@macro\@setmdseriesdefaultshook{%
831+ \let\mdseries@mc\mddef@ult
832+ \let\mdseries@gt\mddef@ult
833+ \let\mdseries@jtt\mddef@ult
834+ }
835+\else % 2020-02-02
836+ \expandafter\patchcmd\csname mdseries \endcsname{%
837+ \let\mdseries@rm\mddef@ult
838+ \let\mdseries@sf\mddef@ult
839+ \let\mdseries@tt\mddef@ult
840+ }{%
841+ \let\mdseries@rm\mddef@ult
842+ \let\mdseries@sf\mddef@ult
843+ \let\mdseries@tt\mddef@ult
844+ \let\mdseries@mc\mddef@ult
845+ \let\mdseries@gt\mddef@ult
846+ \let\mdseries@jtt\mddef@ult
847+ }{}{}
848+\fi
836849 \expandafter\patchcmd\csname bfseries \endcsname{%
837850 \ifx\f@family\rmdef@ult \fontseries\bfseries@rm
838851 \else\ifx\f@family\sfdef@ult \fontseries\bfseries@sf
@@ -877,12 +890,21 @@
877890 \fi\fi\fi
878891 \selectfont
879892 }{}{}
880-\appto\expand@font@defaults{%
881- \edef\mcdef@ult{\mcdefault}%
882- \edef\gtdef@ult{\gtdefault}%
883- \edef\jttdef@ult{\jttdefault}%
884- \edef\kanjidef@ult{\kanjifamilydefault}%
885-}
893+\ifdefined\@expandfontdefaultshook % 2020-04-07
894+ \g@addto@macro\@expandfontdefaultshook{
895+ \edef\mcdef@ult{\mcdefault}%
896+ \edef\gtdef@ult{\gtdefault}%
897+ \edef\jttdef@ult{\jttdefault}%
898+ \edef\kanjidef@ult{\kanjifamilydefault}%
899+ }
900+\else % 2020-02-02
901+ \appto\expand@font@defaults{%
902+ \edef\mcdef@ult{\mcdefault}%
903+ \edef\gtdef@ult{\gtdefault}%
904+ \edef\jttdef@ult{\jttdefault}%
905+ \edef\kanjidef@ult{\kanjifamilydefault}%
906+ }
907+\fi
886908 \appto\init@series@setup{%
887909 \ifx\kanjidef@ult\mcdef@ult \mcfamily
888910 \else\ifx\kanjidef@ult\gtdef@ult \gtfamily
旧リポジトリブラウザで表示