jttdefault

diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua
index d4d5e94..59dda28 100644 (file)
--- a/src/ltj-jfmglue.lua
+++ b/src/ltj-jfmglue.lua
@@ -789,7 +789,7 @@ do
       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 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
          local ro = (r~=0) and floor(log(abs(r))/log264+0.0625) or 0
          return round(r/2.^(64*ro)), ro
       end

diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty
index 8e90190..347f66b 100644 (file)
--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -83,14 +83,14 @@
   \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n}
 \fi
 
   \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n}
 \fi
 

-\ifdefined\fontseriesforce
+\ifdefined\@rmfamilyhook

 %%%% LaTeX 2020-02-02
 \edef\bfseries@mc{\bfdefault}
 \edef\bfseries@gt{\bfdefault}
 %%%% 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}
 \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
 
 \newif\if@ltj@match@family

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 298bcc5..f2d78fb 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -568,7 +568,7 @@
   \fi\fi
 }
 
   \fi\fi
 }
 

-\ifdefined\fontseriesforce
+\ifdefined\@rmfamilyhook

 %%%% LaTeX 2020-02-02
 \DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}}
 \DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}}
 %%%% LaTeX 2020-02-02
 \DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}}
 \DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}}


@@ -671,7 +671,7 @@
     \ignorespaces}
 \let\reset@font\normalfont
 
     \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}{}{}
 %%%% LaTeX 2020-02-02
 \let\prepare@family@series@update@kanji=\prepare@family@series@update
 \patchcmd\prepare@family@series@update{\fontfamily}{\romanfamily}{}{}

diff --git a/src/patches/lltjp-fontspec.sty b/src/patches/lltjp-fontspec.sty
index 13e8786..617eeda 100644 (file)
--- a/src/patches/lltjp-fontspec.sty
+++ b/src/patches/lltjp-fontspec.sty
@@ -12,7 +12,6 @@
   \tl_replace_all:cnn { rmfamily~ } { \fontfamily }{ \romanfamily }
   \tl_replace_all:cnn { sffamily~ } { \fontfamily }{ \romanfamily }
   \tl_replace_all:cnn { ttfamily~ } { \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
   \cs_if_exist:NF \@rmfamilyhook {
     \tl_replace_all:cnn { rmfamily~ } { \selectfont } {
       \if@ltj@match@family