\DeclareErrorKanjiFont (as in platex/a9fa3a9, and ltfssbas.dtx 2019/07/09

diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty
index 91827a3..52649e8 100644 (file)
--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
 %
 
 \NeedsTeXFormat{LaTeX2e}

-\ProvidesPackage{lltjdefs}[2019/05/01 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2019/08/21 Default font settings of LuaTeX-ja]

 
 \ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi
 \ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi
 
 \ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi
 \ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi


@@ -17,6 +17,10 @@
 
 \DeclareKanjiEncodingDefaults{}{}
 \DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10}
 
 \DeclareKanjiEncodingDefaults{}{}
 \DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10}

+\kanjifamily{mc}
+\kanjiseries{m}
+\kanjishape{n}
+\fontsize{10}{10}

 \DeclareYokoKanjiEncoding{JY3}{}{}
 \DeclareKanjiSubstitution{JY3}{mc}{m}{n}
 \DeclareTateKanjiEncoding{JT3}{}{}
 \DeclareYokoKanjiEncoding{JY3}{}{}
 \DeclareKanjiSubstitution{JY3}{mc}{m}{n}
 \DeclareTateKanjiEncoding{JT3}{}{}

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 6c25efa..8068d33 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
 %
 
 \NeedsTeXFormat{LaTeX2e}

-\ProvidesPackage{lltjfont}[2019/01/29 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2019/08/21 Patch to NFSS2 for LuaTeX-ja]

 
 \def\ltj@chardef@text@cmd#1{%
   \let\@ifdefinable\@@ifdefinable%
 
 \def\ltj@chardef@text@cmd#1{%
   \let\@ifdefinable\@@ifdefinable%


@@ -228,6 +228,7 @@
                            \def\default@series{#3}%
                            \def\default@shape{#4}}%
   \fi}
                            \def\default@series{#3}%
                            \def\default@shape{#4}}%
   \fi}

+\@onlypreamble\DeclareKanjiSubstitution

 \def\DeclareErrorKanjiFont#1#2#3#4#5{%
    \xdef\error@kfontshape{%
       \noexpand\expandafter\noexpand\split@name\noexpand\string
 \def\DeclareErrorKanjiFont#1#2#3#4#5{%
    \xdef\error@kfontshape{%
       \noexpand\expandafter\noexpand\split@name\noexpand\string


@@ -236,12 +237,7 @@
    \gdef\default@k@family{#2}%
    \gdef\default@k@series{#3}%
    \gdef\default@k@shape{#4}%
    \gdef\default@k@family{#2}%
    \gdef\default@k@series{#3}%
    \gdef\default@k@shape{#4}%

-   \global\let\k@family\default@k@family
-   \global\let\k@series\default@k@series
-   \global\let\k@shape\default@k@shape
-   \gdef\f@size{#5}%
-   \gdef\f@baselineskip{#5pt}}
-\@onlypreamble\DeclareKanjiSubstitution
+   }

 \@onlypreamble\DeclareErrorKanjiFont
 
 \newif\ifltjselectfont@force@define
 \@onlypreamble\DeclareErrorKanjiFont
 
 \newif\ifltjselectfont@force@define