• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: コミット

ソースコードの管理場所


コミットメタ情報

リビジョンa978d06a452db8d773e039ed49dd2b57666e7f60 (tree)
日時2020-01-27 12:24:54
作者Hironori Kitagawa <h_kitagawa2001@yaho...>
コミッターHironori Kitagawa

ログメッセージ

jttdefault

変更サマリ

差分

--- a/src/ltj-jfmglue.lua
+++ b/src/ltj-jfmglue.lua
@@ -789,7 +789,7 @@ do
789789 local abs, log, log264, floor = math.abs, math.log, math.log(2)*64, math.floor
790790 blend_diffmet_inf = function (b, a, bo, ao, rb, ra)
791791 local nb, na = (bo and b*2.0^(64*bo) or 0), (ao and a*2.0^(64*ao) or 0)
792- local r = luatexja.jfmglue.diffmet_rule((1-rb)*b+rb*a, (1-ra)*b+ra*a)
792+ local r = luatexja.jfmglue.diffmet_rule((1-rb)*nb+rb*na, (1-ra)*nb+ra*na)
793793 local ro = (r~=0) and floor(log(abs(r))/log264+0.0625) or 0
794794 return round(r/2.^(64*ro)), ro
795795 end
--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -83,14 +83,14 @@
8383 \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n}
8484 \fi
8585
86-\ifdefined\fontseriesforce
86+\ifdefined\@rmfamilyhook
8787 %%%% LaTeX 2020-02-02
8888 \edef\bfseries@mc{\bfdefault}
8989 \edef\bfseries@gt{\bfdefault}
90-\def\bfseries@jtt{\bfseries@gt}
90+\def\bfseries@jtt{\bfseries@mc}
9191 \edef\mdseries@mc{\mddefault}
9292 \edef\mdseries@gt{\mddefault}
93-\def\mdseries@jtt{\mdseries@gt}
93+\def\mdseries@jtt{\mdseries@mc}
9494 \fi
9595
9696 \newif\if@ltj@match@family
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -568,7 +568,7 @@
568568 \fi\fi
569569 }
570570
571-\ifdefined\fontseriesforce
571+\ifdefined\@rmfamilyhook
572572 %%%% LaTeX 2020-02-02
573573 \DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}}
574574 \DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}}
@@ -671,7 +671,7 @@
671671 \ignorespaces}
672672 \let\reset@font\normalfont
673673
674-\ifdefined\fontseriesforce
674+\ifdefined\@rmfamilyhook
675675 %%%% LaTeX 2020-02-02
676676 \let\prepare@family@series@update@kanji=\prepare@family@series@update
677677 \patchcmd\prepare@family@series@update{\fontfamily}{\romanfamily}{}{}
--- a/src/patches/lltjp-fontspec.sty
+++ b/src/patches/lltjp-fontspec.sty
@@ -12,7 +12,6 @@
1212 \tl_replace_all:cnn { rmfamily~ } { \fontfamily }{ \romanfamily }
1313 \tl_replace_all:cnn { sffamily~ } { \fontfamily }{ \romanfamily }
1414 \tl_replace_all:cnn { ttfamily~ } { \fontfamily }{ \romanfamily }
15- \typeout{LATEX~ 2019-10-01!}
1615 \cs_if_exist:NF \@rmfamilyhook {
1716 \tl_replace_all:cnn { rmfamily~ } { \selectfont } {
1817 \if@ltj@match@family
旧リポジトリブラウザで表示