local abs, log, log264, floor = math.abs, math.log, math.log(2)*64, math.floor
blend_diffmet_inf = function (b, a, bo, ao, rb, ra)
local nb, na = (bo and b*2.0^(64*bo) or 0), (ao and a*2.0^(64*ao) or 0)
- local r = luatexja.jfmglue.diffmet_rule((1-rb)*b+rb*a, (1-ra)*b+ra*a)
+ local r = luatexja.jfmglue.diffmet_rule((1-rb)*nb+rb*na, (1-ra)*nb+ra*na)
local ro = (r~=0) and floor(log(abs(r))/log264+0.0625) or 0
return round(r/2.^(64*ro)), ro
end
\DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n}
\fi
-\ifdefined\fontseriesforce
+\ifdefined\@rmfamilyhook
%%%% LaTeX 2020-02-02
\edef\bfseries@mc{\bfdefault}
\edef\bfseries@gt{\bfdefault}
-\def\bfseries@jtt{\bfseries@gt}
+\def\bfseries@jtt{\bfseries@mc}
\edef\mdseries@mc{\mddefault}
\edef\mdseries@gt{\mddefault}
-\def\mdseries@jtt{\mdseries@gt}
+\def\mdseries@jtt{\mdseries@mc}
\fi
\newif\if@ltj@match@family
\fi\fi
}
-\ifdefined\fontseriesforce
+\ifdefined\@rmfamilyhook
%%%% LaTeX 2020-02-02
\DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}}
\DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}}
\ignorespaces}
\let\reset@font\normalfont
-\ifdefined\fontseriesforce
+\ifdefined\@rmfamilyhook
%%%% LaTeX 2020-02-02
\let\prepare@family@series@update@kanji=\prepare@family@series@update
\patchcmd\prepare@family@series@update{\fontfamily}{\romanfamily}{}{}
\tl_replace_all:cnn { rmfamily~ } { \fontfamily }{ \romanfamily }
\tl_replace_all:cnn { sffamily~ } { \fontfamily }{ \romanfamily }
\tl_replace_all:cnn { ttfamily~ } { \fontfamily }{ \romanfamily }
- \typeout{LATEX~ 2019-10-01!}
\cs_if_exist:NF \@rmfamilyhook {
\tl_replace_all:cnn { rmfamily~ } { \selectfont } {
\if@ltj@match@family