CTAN sync 202202180301

2 files changed, 349 insertions, 78 deletions

diff --git a/language/japanese/japanese-otf/sty/mlutf.sty b/language/japanese/japanese-otf/sty/mlutf.sty
index 70077cb89f..78a6b2353d 100644
--- a/language/japanese/japanese-otf/sty/mlutf.sty
+++ b/language/japanese/japanese-otf/sty/mlutf.sty
@@ -1,23 +1,65 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.27 ttk]
 %force catcode of \" be 12
 \count@\catcode`\"
 \catcode`\"=12
-\DeclareRobustCommand{\UTFK}[1]{\begingroup%
-	\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
-	\kanjifamily{utfk}\uppercase{\set@character="#1}%
-	\endgroup%
-}
-\DeclareRobustCommand{\UTFC}[1]{\begingroup%
-	\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
-	\kanjifamily{utfc}\uppercase{\set@character="#1}%
-	\endgroup%
-}
-\DeclareRobustCommand{\UTFT}[1]{\begingroup%
-	\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
-	\kanjifamily{utft}\uppercase{\set@character="#1}%
-	\endgroup%
-}
+\if@otf@uplatex
+\if@deluxe
+	\DeclareRobustCommand{\UTFK}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}%
+		\ifx\k@family\reserved@a \kanjifamily{utfkg}\else\ifx\k@family\reserved@b
+			\kanjifamily{utfkmg}\else\kanjifamily{utfk}\fi\fi%
+		\uppercase{\set@character@="#1}%
+		\endgroup%
+	}
+	\DeclareRobustCommand{\UTFC}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}%
+		\ifx\k@family\reserved@a \kanjifamily{utfcg}\else\ifx\k@family\reserved@b
+			\kanjifamily{utfcmg}\else\kanjifamily{utfc}\fi\fi%
+		\uppercase{\set@character@="#1}%
+		\endgroup%
+	}
+	\DeclareRobustCommand{\UTFT}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}%
+		\ifx\k@family\reserved@a \kanjifamily{utftg}\else\ifx\k@family\reserved@b
+			\kanjifamily{utftmg}\else\kanjifamily{utft}\fi\fi%
+		\uppercase{\set@character@="#1}%
+		\endgroup%
+	}
+\else
+	\DeclareRobustCommand{\UTFK}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+		\kanjifamily{utfk}\uppercase{\set@character@="#1}%
+		\endgroup%
+	}
+	\DeclareRobustCommand{\UTFC}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+		\kanjifamily{utfc}\uppercase{\set@character@="#1}%
+		\endgroup%
+	}
+	\DeclareRobustCommand{\UTFT}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+		\kanjifamily{utft}\uppercase{\set@character@="#1}%
+		\endgroup%
+	}
+\fi
+\else% for pLaTeX
+	\DeclareRobustCommand{\UTFK}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+		\kanjifamily{utfk}\uppercase{\set@character="#1}%
+		\endgroup%
+	}
+	\DeclareRobustCommand{\UTFC}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+		\kanjifamily{utfc}\uppercase{\set@character="#1}%
+		\endgroup%
+	}
+	\DeclareRobustCommand{\UTFT}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+		\kanjifamily{utft}\uppercase{\set@character="#1}%
+		\endgroup%
+	}
+\fi
 \DeclareRobustCommand{\UTFM}[1]{\begingroup%
 	\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
 	\kanjifamily{utf}\uppercase{\set@character="#1}%
@@ -27,10 +69,10 @@
 %end of changing catcode of \"
 \gdef\Redefine@MLUTF{%
 	\@ifpackageloaded{hyperref}{%
-		\def\hyper@UTFC##1{\ifHy@pdfstring\0x##1\else\csname UTFC \endcsname{##1}\fi}
-		\def\hyper@UTFK##1{\ifHy@pdfstring\0x##1\else\csname UTFK \endcsname{##1}\fi}
-		\def\hyper@UTFT##1{\ifHy@pdfstring\0x##1\else\csname UTFT \endcsname{##1}\fi}
-		\def\hyper@UTFM##1{\ifHy@pdfstring\0x##1\else\csname UTFM \endcsname{##1}\fi}
+		\def\hyper@UTFC##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFC \endcsname{##1}\fi}
+		\def\hyper@UTFK##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFK \endcsname{##1}\fi}
+		\def\hyper@UTFT##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFT \endcsname{##1}\fi}
+		\def\hyper@UTFM##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFM \endcsname{##1}\fi}
 		\def\UTFC{\protect\hyper@UTFC}
 		\def\UTFK{\protect\hyper@UTFK}
 		\def\UTFT{\protect\hyper@UTFT}
@@ -41,18 +83,66 @@
 
 \DeclareKanjiFamily{\otf@JYn}{utfk}{}
 \DeclareKanjiFamily{\otf@JTn}{utfk}{}
-\Declare@FontShape{utfk}{m}{0123456789abcdef}{utfkmr}
-\Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr}
 \DeclareKanjiFamily{\otf@JYn}{utfc}{}
 \DeclareKanjiFamily{\otf@JTn}{utfc}{}
-\Declare@FontShape{utfc}{m}{0123456789abcdef}{utfcmr}
-\Declare@FontShape{utfc}{bx}{0123456789abcdef}{utfcgr}
 \DeclareKanjiFamily{\otf@JYn}{utft}{}
 \DeclareKanjiFamily{\otf@JTn}{utft}{}
-\Declare@FontShape{utft}{m}{0123456789abcdef}{utftmr}
-\Declare@FontShape{utft}{bx}{0123456789abcdef}{utftgr}
+\if@otf@uplatex
+	\Declare@FontShape{utfk}{m}{-}{utfkmr}
+	\Declare@FontShape{utfc}{m}{-}{utfcmr}
+	\Declare@FontShape{utft}{m}{-}{utftmr}
+	\if@deluxe
+		\Declare@FontShape{utfk}{bx}{-}{utfkmb}
+		\DeclareKanjiFamily{\otf@JYn}{utfkg}{}
+		\DeclareKanjiFamily{\otf@JTn}{utfkg}{}
+		\Declare@FontShape{utfkg}{m}{-}{utfkgr}
+		\Declare@FontShape{utfkg}{bx}{-}{utfkgb}
+		\Declare@FontShape{utfkg}{eb}{-}{utfkge}
+		\DeclareKanjiFamily{\otf@JYn}{utfkmg}{}
+		\DeclareKanjiFamily{\otf@JTn}{utfkmg}{}
+		\Declare@FontShape{utfkmg}{m}{-}{utfkmgr}
+		\Declare@FontShape{utfk}{l}{-}{utfkml}
+		\Declare@FontShape{utfc}{bx}{-}{utfcmb}
+		\DeclareKanjiFamily{\otf@JYn}{utfcg}{}
+		\DeclareKanjiFamily{\otf@JTn}{utfcg}{}
+		\Declare@FontShape{utfcg}{m}{-}{utfcgr}
+		\Declare@FontShape{utfcg}{bx}{-}{utfcgb}
+		\Declare@FontShape{utfcg}{eb}{-}{utfcge}
+		\DeclareKanjiFamily{\otf@JYn}{utfcmg}{}
+		\DeclareKanjiFamily{\otf@JTn}{utfcmg}{}
+		\Declare@FontShape{utfcmg}{m}{-}{utfcmgr}
+		\Declare@FontShape{utfc}{l}{-}{utfcml}
+		\Declare@FontShape{utft}{bx}{-}{utftmb}
+		\DeclareKanjiFamily{\otf@JYn}{utftg}{}
+		\DeclareKanjiFamily{\otf@JTn}{utftg}{}
+		\Declare@FontShape{utftg}{m}{-}{utftgr}
+		\Declare@FontShape{utftg}{bx}{-}{utftgb}
+		\Declare@FontShape{utftg}{eb}{-}{utftge}
+		\DeclareKanjiFamily{\otf@JYn}{utftmg}{}
+		\DeclareKanjiFamily{\otf@JTn}{utftmg}{}
+		\Declare@FontShape{utftmg}{m}{-}{utftmgr}
+		\Declare@FontShape{utft}{l}{-}{utftml}
+	\else
+		\if@bold
+			\Declare@FontShape{utfk}{bx}{-}{utfkgb}
+			\Declare@FontShape{utfc}{bx}{-}{utfcgb}
+			\Declare@FontShape{utft}{bx}{-}{utftgb}
+		\else
+			\Declare@FontShape{utfk}{bx}{-}{utfkgr}
+			\Declare@FontShape{utfc}{bx}{-}{utfcgr}
+			\Declare@FontShape{utft}{bx}{-}{utftgr}
+		\fi
+	\fi
+\else
+	\Declare@FontShape{utfk}{m}{0123456789abcdef}{utfkmr}
+	\Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr}
+	\Declare@FontShape{utfc}{m}{0123456789abcdefklmo}{utfcmr}
+	\Declare@FontShape{utfc}{bx}{0123456789abcdefklmo}{utfcgr}
+	\Declare@FontShape{utft}{m}{0123456789abcdefklmnopqrstuvwxz}{utftmr}
+	\Declare@FontShape{utft}{bx}{0123456789abcdefklmnopqrstuvwxz}{utftgr}
+\fi
 \DeclareKanjiFamily{\otf@JYn}{utf}{}
 \DeclareKanjiFamily{\otf@JTn}{utf}{}
-\Declare@FontShape{utf}{m}{0123456789abcdef}{utfmr}
-\Declare@FontShape{utf}{bx}{0123456789abcdef}{utfgr}
+\Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvwxyz}{utfmr}
+\Declare@FontShape{utf}{bx}{0123456789abcdefjklmnopqrstuvwxyz}{utfgr}
 \endinput
diff --git a/language/japanese/japanese-otf/sty/otf.sty b/language/japanese/japanese-otf/sty/otf.sty
index c747f5d6a8..3513407c10 100644
--- a/language/japanese/japanese-otf/sty/otf.sty
+++ b/language/japanese/japanese-otf/sty/otf.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{otf}[2019/04/01 v1.7b8 psitau]
+\ProvidesPackage{otf}[2022/02/17 TeX JP org, v1.7b8 psitau, u0.27 ttk]
 \RequirePackage{keyval}
 %for processing options 
 \newif\if@kana \@kanafalse
@@ -10,6 +10,7 @@
 \newif\if@burasage \@burasagefalse
 \newif\if@newglyph \@newglyphfalse
 \newif\if@otf@uplatex \@otf@uplatexfalse
+\newif\if@otf@autodetect \@otf@autodetectfalse
 \newif\if@otf@scale \@otf@scalefalse
 \newif\if@jsclasses \@jsclassesfalse
 
@@ -22,6 +23,7 @@
 \DeclareOption{multi}{\AtEndOfPackage{\RequirePackage{mlutf}\RequirePackage{mlcid}}}
 \DeclareOption{burasage}{\@burasagetrue}
 \DeclareOption{uplatex}{\@otf@uplatextrue}
+\DeclareOption{autodetect-engine}{\@otf@autodetecttrue}
 \DeclareOption{jis2004}{\@newglyphtrue}
 \DeclareOption*{\otfpkg@setkey}
 \def\otfpkg@setkey{\expandafter\otfpkg@setkey@a\expandafter{\CurrentOption}}
@@ -30,10 +32,40 @@
 
 \def\otf@JYn{\if@otf@uplatex JY2\else JY1\fi}
 \def\otf@JTn{\if@otf@uplatex JT2\else JT1\fi}
+\def\otf@OTorT{\if@otf@uplatex T\else OT\fi}
 \def\otf@pfx@{\if@otf@uplatex up\else \fi}
 \def\brsg@pfx@{\if@burasage brsg\else\fi}
 \def\nlck@sfx@{\if@newglyph n\else\fi}
 \ProcessOptions\relax
+
+% Autodetect engine
+\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000 %upTeX
+	\if@otf@autodetect
+		\PackageInfo{otf}{Autodetected engine: upLaTeX}
+		\@otf@uplatextrue
+	\fi
+	\if@otf@uplatex\else
+		\PackageError{otf}
+			{You are running upLaTeX.\MessageBreak
+			 Please use pLaTeX instead, or add 'uplatex' to\MessageBreak
+			 the package option list}
+			{\@ehc}
+		\@otf@uplatextrue
+	\fi
+\else %pTeX
+	\if@otf@autodetect
+		\PackageInfo{otf}{Autodetected engine: pLaTeX}
+		\@otf@uplatexfalse
+	\fi
+	\if@otf@uplatex
+		\PackageError{otf}
+			{You are running pLaTeX.\MessageBreak
+			 Please use upLaTeX instead, or remove 'uplatex' from\MessageBreak
+			 the package option list}
+			{\@ehc}
+		\@otf@uplatexfalse
+	\fi
+\fi
 %user interface
 %force catcode of \" be 12
 \count@\catcode`\"
@@ -43,7 +75,8 @@
 		\edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}%
 		\ifx\k@family\reserved@a \kanjifamily{utfjg}\else\ifx\k@family\reserved@b
 			\kanjifamily{utfjmg}\else\kanjifamily{utfj}\fi\fi%
-		\uppercase{\set@character="#1}%
+%		\uppercase{\set@character="#1}% (1) pLaTeX, upLaTeXともに\UTF{}に従来のsubfontを使う
+		\uppercase{\if@otf@uplatex\set@character@\else\set@character\fi="#1}% (2) upLaTeXでは\UTF{}に新vfを使う
 		\endgroup%
 	}
 	\DeclareRobustCommand{\CID}[1]{\begingroup%
@@ -56,7 +89,9 @@
 \else
 	\DeclareRobustCommand{\UTF}[1]{\begingroup%
 		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
-		\kanjifamily{utfj}\uppercase{\set@character="#1}%
+		\kanjifamily{utfj}%
+%		\uppercase{\set@character="#1}% (1) pLaTeX, upLaTeXともに\UTF{}に従来のsubfontを使う
+		\uppercase{\if@otf@uplatex\set@character@\else\set@character\fi="#1}% (2) upLaTeXでは\UTF{}に新vfを使う
 		\endgroup%
 	}
 	\DeclareRobustCommand{\CID}[1]{\begingroup%
@@ -66,9 +101,142 @@
 	}
 \fi
 \gdef\Redefine@UTF{\@ifpackageloaded{hyperref}{%
-	\def\hyper@UTF##1{\ifHy@pdfstring\0x##1\else\csname UTF \endcsname{##1}\fi}
+	\def\hyper@UTF##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTF \endcsname{##1}\fi}
 	\def\UTF{\protect\hyper@UTF}}{}
 }
+% support surrogate pair in \hyper@UTF@{} by ZR-san
+\def\otf@end{\otf@end@}
+\def\otf@mark{\otf@mark@}
+\def\otf@triexpandafter{%
+	\expandafter\expandafter\expandafter
+}
+\begingroup \catcode`\|=0
+\gdef\otf@cond#1|fi{%
+	#1\expandafter\@firstoftwo
+	|else \expandafter\@secondoftwo
+	|fi
+}
+\endgroup
+\def\otf@next#1#2#3#4#5{%
+	\@namedef{otf@qh/#1#2}{#3}%
+	\@namedef{otf@hq/#3}{#1#2}%
+	\@namedef{otf@lhq/#4#5}{#1#2}%
+}
+\@for\otf@x:={%
+	00001,01102,02203,03304,10405,11506,12607,13708,%
+	20809,2190A,22A0B,23B0C,30C0D,31D0E,32E0F,33F10}\do{%
+	\expandafter\otf@next\otf@x
+}
+\def\otf@next#1{%
+	\lowercase{\def\otf@y{#1}}%
+	\@namedef{otf@hd/#1}{#1}%
+	\@namedef{otf@hd/\otf@y}{#1}%
+}
+\@tfor\otf@x:=0123456789ABCDEF\do{%
+	\expandafter\otf@next\otf@x
+}
+\def\hyper@UTF@#1{%
+	\expandafter\otf@hy@utf@pre@a#1\relax{}\otf@mark\otf@end
+}
+\def\otf@hy@utf@pre@a{%
+	\expandafter\otf@hy@utf@pre@b\romannumeral-`>%
+}
+\def\otf@hy@utf@pre@b#1#{%
+	\otf@cond \ifx\otf@end#1\otf@end \fi{%
+		\otf@hy@utf@bombout
+	}{%
+		\otf@hy@utf@pre@c#1%
+	}%
+}
+\def\otf@hy@utf@pre@c#1{%
+	\otf@cond \ifx#1\relax \fi{%
+		\otf@hy@utf@pre@end
+	}{%
+		\otf@triexpandafter\otf@hy@utf@pre@d
+		\csname otf@hd/\string#1\endcsname
+	}%
+}
+\def\otf@hy@utf@pre@d#1{%
+	\otf@cond \ifx#1\relax \fi{%
+		\otf@hy@utf@bombout
+	}{%
+		\otf@hy@utf@pre@e#1%
+	}%
+}
+\def\otf@hy@utf@pre@e#1#2\otf@mark#3\otf@end{%
+	\otf@cond \if 0#1\fi{%
+		\otf@cond \ifx\otf@end#3\otf@end \fi{%
+			\otf@hy@utf@pre@f{#2}{#3}%
+		}{%
+			\otf@hy@utf@pre@f{#2}{#3#1}%
+		}%
+	}{%
+		\otf@hy@utf@pre@f{#2}{#3#1}%
+	}%
+}
+\def\otf@hy@utf@pre@f#1#2{%
+	\otf@hy@utf@pre@a#1\otf@mark#2\otf@end
+}
+\def\otf@hy@utf@pre@end#1\otf@mark#2\otf@end{%
+	\otf@cond \ifx\otf@end#1\otf@end \fi{%
+		\otf@hy@utf@sw{#2}%
+	}{%
+		\otf@hy@utf@error
+	}%
+}
+\def\otf@hy@utf@bombout#1\otf@end{%
+	\otf@hy@utf@error
+}
+
+\def\otf@hy@utf@sw#1{%
+	\otf@cond \ifnum"0#1>"10FFFF \fi{%
+		\otf@hy@utf@error
+	}{%
+		\otf@hy@utf@sw@a{#1}%
+	}%
+}
+\def\otf@hy@utf@sw@a#1{%
+	\otf@cond \ifnum"0#1>"FFFF \fi{%
+		\otf@hy@utf@big#1"000000\otf@end
+	}{%
+		\otf@hy@utf@small#1"0000\otf@end
+	}%
+}
+\def\otf@hy@utf@small#1#2#3#4#5#6\otf@end{%
+	\otf@hy@utf@small@a#1#2#3#4#5\otf@end
+}
+\def\otf@hy@utf@small@a#1"#2\otf@end{%
+	\otf@hy@utf@unit{#2#1}%
+}
+\def\otf@hy@utf@big#1#2#3#4#5#6#7#8\otf@end{%
+	\otf@hy@utf@big@a#1#2#3#4#5#6#7\otf@end
+}
+\def\otf@hy@utf@big@a#1"#2\otf@end{%
+	\otf@hy@utf@big@b#2#1\otf@end
+}
+\def\otf@hy@utf@big@b#1#2#3#4{%
+	\otf@triexpandafter\otf@hy@utf@big@c
+	\csname otf@lhq/#1#2\otf@triexpandafter\endcsname
+	\csname otf@hq/#3\otf@triexpandafter\endcsname
+	\csname otf@hq/#4\endcsname
+}
+\def\otf@hy@utf@big@c#1#2#3#4#5#6{%
+	\otf@triexpandafter\otf@hy@utf@big@d
+	\csname otf@qh/2#1\otf@triexpandafter\endcsname
+	\csname otf@qh/#2#3\otf@triexpandafter\endcsname
+	\csname otf@qh/#4#5\otf@triexpandafter\endcsname
+	\csname otf@qh/3#6\endcsname
+}
+\def\otf@hy@utf@big@d#1#2#3#4#5\otf@end{%
+	\otf@hy@utf@unit{D#1#2#3}%
+	\otf@hy@utf@unit{D#4#5}%
+}
+\def\otf@hy@utf@error{%
+	\otf@hy@utf@unit{FFFD}%
+}
+\def\otf@hy@utf@unit#1{%
+	\0x#1%
+}
 \AtBeginDocument{\Redefine@UTF}
 %internal macros
 %macros by iNOUE Koich!
@@ -76,7 +244,9 @@
 \newcommand\put@character{%
 	\@tempcntb=\@tempcnta
 	\divide\@tempcntb by "1000
-	\kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\fi}%
+	\kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\or
+	   \or  \or  \or  \or  \or  \or  \or  \or  \or  \or  \or g\or  \or h\or i\or j\or
+	  k\or l\or m\or n\or o\or p\or q\or r\or s\or t\or u\or v\or w\or x\or y\or z\fi}%
 	\selectfont%
 	\multiply\@tempcntb by "1000
 	\advance\@tempcnta by -\@tempcntb
@@ -86,12 +256,17 @@
 	\advance\@tempcnta by \@tempcntb
 	\if@otf@uplatex
 		\advance\@tempcnta by "113030
-		\char\@tempcnta%
+		\kchar\@tempcnta%
 	\else
 		\advance\@tempcnta by "3030
 		\char\jis\@tempcnta%
 	\fi
 }
+\newcommand\set@character@{\afterassignment\put@character@\@tempcnta}
+\newcommand\put@character@{%
+	\kanjishape{-}\selectfont%
+	\kchar\@tempcnta%
+}
 \catcode`\"=\count@
 %end of changing catcode of \"
 \def\Declare@FontShape#1#2#3#4{%
@@ -113,6 +288,11 @@
 	}{\edef\utf@sc@le{\Cjascale}}
 \fi
 %definitions of alt-normal font family
+\@ifundefined{if@enablejfam}{%
+	\let\if@jfam@used\iffalse
+}{%
+	\let\if@jfam@used\if@enablejfam
+}
 \if@replace
 	\DeclareErrorKanjiFont{\otf@JYn}{hmc}{m}{n}{10}
 	\DeclareKanjiSubstitution{\otf@JYn}{hmc}{m}{n}
@@ -121,35 +301,32 @@
 	\DeclareKanjiFamily{\otf@JTn}{hmc}{}
 	\DeclareKanjiFamily{\otf@JYn}{hgt}{}
 	\DeclareKanjiFamily{\otf@JTn}{hgt}{}
-	\DeclareRelationFont{\otf@JYn}{hmc}{m}{}{OT1}{cmr}{m}{}
-	\DeclareRelationFont{\otf@JTn}{hmc}{m}{}{OT1}{cmr}{m}{}
-	\DeclareRelationFont{\otf@JYn}{hmc}{bx}{}{OT1}{cmr}{bx}{}
-	\DeclareRelationFont{\otf@JTn}{hmc}{bx}{}{OT1}{cmr}{bx}{}
+	\DeclareRelationFont{\otf@JYn}{hmc}{m}{}{\otf@OTorT1}{cmr}{m}{}
+	\DeclareRelationFont{\otf@JTn}{hmc}{m}{}{\otf@OTorT1}{cmr}{m}{}
+	\DeclareRelationFont{\otf@JYn}{hmc}{bx}{}{\otf@OTorT1}{cmr}{bx}{}
+	\DeclareRelationFont{\otf@JTn}{hmc}{bx}{}{\otf@OTorT1}{cmr}{bx}{}
 	\if@deluxe
-		\DeclareRelationFont{\otf@JYn}{hgt}{m}{}{OT1}{cmss}{m}{}
-		\DeclareRelationFont{\otf@JTn}{hgt}{m}{}{OT1}{cmss}{m}{}
-		\DeclareRelationFont{\otf@JYn}{hgt}{bx}{}{OT1}{cmss}{bx}{}
-		\DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{OT1}{cmss}{bx}{}
+		\DeclareRelationFont{\otf@JYn}{hgt}{m}{}{\otf@OTorT1}{cmss}{m}{}
+		\DeclareRelationFont{\otf@JTn}{hgt}{m}{}{\otf@OTorT1}{cmss}{m}{}
+		\DeclareRelationFont{\otf@JYn}{hgt}{bx}{}{\otf@OTorT1}{cmss}{bx}{}
+		\DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{\otf@OTorT1}{cmss}{bx}{}
 	\else
-		\DeclareRelationFont{\otf@JYn}{hgt}{m}{}{OT1}{cmr}{bx}{}
-		\DeclareRelationFont{\otf@JTn}{hgt}{m}{}{OT1}{cmr}{bx}{}
-		\DeclareRelationFont{\otf@JYn}{hgt}{bx}{}{OT1}{cmr}{bx}{}
-		\DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{OT1}{cmr}{bx}{}
+		\DeclareRelationFont{\otf@JYn}{hgt}{m}{}{\otf@OTorT1}{cmr}{bx}{}
+		\DeclareRelationFont{\otf@JTn}{hgt}{m}{}{\otf@OTorT1}{cmr}{bx}{}
+		\DeclareRelationFont{\otf@JYn}{hgt}{bx}{}{\otf@OTorT1}{cmr}{bx}{}
+		\DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{\otf@OTorT1}{cmr}{bx}{}
 	\fi
 	\@ifpackageloaded{jisx0213}{\relax}{\def\mcdefault{hmc}\def\gtdefault{hgt}}
-	\@ifundefined{if@enablejfam}{%if disablejfam option is not available, do nothing.
-	}{%
-		\if@enablejfam
-			\if@compatibility\else
-				\DeclareSymbolFont{mincho}{\otf@JYn}{hmc}{m}{n}
-				\DeclareSymbolFontAlphabet{\mathmc}{mincho}
-				\SetSymbolFont{mincho}{bold}{\otf@JYn}{hmc}{bx}{n}
-				\DeclareMathAlphabet{\mathgt}{\otf@JYn}{hgt}{m}{n}
-				\SetMathAlphabet{\mathgt}{bold}{\otf@JYn}{hgt}{bx}{n}
-				\jfam\symmincho
-			\fi
+	\if@jfam@used
+		\if@compatibility\else
+			\DeclareSymbolFont{mincho}{\otf@JYn}{hmc}{m}{n}
+			\DeclareSymbolFontAlphabet{\mathmc}{mincho}
+			\SetSymbolFont{mincho}{bold}{\otf@JYn}{hmc}{bx}{n}
+			\DeclareMathAlphabet{\mathgt}{\otf@JYn}{hgt}{m}{n}
+			\SetMathAlphabet{\mathgt}{bold}{\otf@JYn}{hgt}{bx}{n}
+			\jfam\symmincho
 		\fi
-	}
+	\fi
 \fi
 \if@kana
 	\DeclareKanjiFamily{\otf@JYn}{ruby}{}
@@ -158,8 +335,8 @@
 	\if@deluxe
 		\DeclareKanjiFamily{\otf@JYn}{rubyg}{}
 		\DeclareKanjiFamily{\otf@JTn}{rubyg}{}
-		\DeclareRelationFont{\otf@JYn}{rubyg}{m}{}{OT1}{cmss}{m}{}
-		\DeclareRelationFont{\otf@JTn}{rubyg}{m}{}{OT1}{cmss}{m}{}
+		\DeclareRelationFont{\otf@JYn}{rubyg}{m}{}{\otf@OTorT1}{cmss}{m}{}
+		\DeclareRelationFont{\otf@JTn}{rubyg}{m}{}{\otf@OTorT1}{cmss}{m}{}
 		\DeclareRobustCommand\rubyfamily{\edef\reserved@a{\gtdefault}%
 			\edef\reserved@b{\mgdefault}%
 			\ifx\k@family\reserved@a \kanjifamily{rubyg}\else\ifx\k@family\reserved@b
@@ -211,13 +388,13 @@
 		\if@bold
 			\DeclareFontShape{\otf@JYn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothb\nlck@sfx@-h}{}
 			\DeclareFontShape{\otf@JTn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothb\nlck@sfx@-v}{}
-			\DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb\nlck@sfx@-h}{}
-			\DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb\nlck@sfx@-v}{}
+			\DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb-h}{}
+			\DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb-v}{}
 		\else
 			\DeclareFontShape{\otf@JYn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothr\nlck@sfx@-h}{}
 			\DeclareFontShape{\otf@JTn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothr\nlck@sfx@-v}{}
-			\DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr\nlck@sfx@-h}{}
-			\DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr\nlck@sfx@-v}{}
+			\DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr-h}{}
+			\DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr-v}{}
 		\fi
 	\else
 		\if@bold
@@ -241,16 +418,16 @@
 	\def\ltdefault{l}
 	\DeclareKanjiFamily{\otf@JYn}{mg}{}
 	\DeclareKanjiFamily{\otf@JTn}{mg}{}
-	\DeclareRelationFont{\otf@JYn}{mg}{m}{}{OT1}{cmss}{m}{}
-	\DeclareRelationFont{\otf@JTn}{mg}{m}{}{OT1}{cmss}{m}{}
+	\DeclareRelationFont{\otf@JYn}{mg}{m}{}{\otf@OTorT1}{cmss}{m}{}
+	\DeclareRelationFont{\otf@JTn}{mg}{m}{}{\otf@OTorT1}{cmss}{m}{}
 	\DeclareMathAlphabet{\mathmg}{\otf@JYn}{mg}{m}{n}
 	\DeclareRobustCommand\mgfamily{\not@math@alphabet\mgfamily\mathmg%
 		\kanjifamily\mgdefault\selectfont}
 	\DeclareTextFontCommand{\textmg}{\mgfamily}
 	\DeclareKanjiFamily{\otf@JYn}{rubymg}{}
 	\DeclareKanjiFamily{\otf@JTn}{rubymg}{}
-	\DeclareRelationFont{\otf@JYn}{rubymg}{m}{}{OT1}{cmss}{m}{}
-	\DeclareRelationFont{\otf@JTn}{rubymg}{m}{}{OT1}{cmss}{m}{}
+	\DeclareRelationFont{\otf@JYn}{rubymg}{m}{}{\otf@OTorT1}{cmss}{m}{}
+	\DeclareRelationFont{\otf@JTn}{rubymg}{m}{}{\otf@OTorT1}{cmss}{m}{}
 	\DeclareRobustCommand\propshape
 		{\not@math@alphabet\propshape\relax
 		\kanjishape\propdefault\selectfont}
@@ -267,6 +444,8 @@
 		\DeclareFontShape{\otf@JTn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubymgothr-v}{}
 		\DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-h}{}
 		\DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-v}{}
+		\DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-h}{}
+		\DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-v}{}
 		\DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-h}{}
 		\DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-v}{}
 	\else
@@ -275,8 +454,8 @@
 		\DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-h}{}
 		\DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-v}{}
 	\fi
-	\DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb-h}{}
-	\DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb-v}{}
+	\DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-h}{}
+	\DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-v}{}
 	\DeclareFontShape{\otf@JYn}{hmc}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw3-h}{}
 	\DeclareFontShape{\otf@JYn}{hmc}{bx}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw6-h}{}
 	\DeclareFontShape{\otf@JYn}{hgt}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phirakakuw3-h}{}
@@ -293,34 +472,36 @@
 \DeclareKanjiFamily{\otf@JTn}{utfj}{}
 \DeclareKanjiFamily{\otf@JYn}{cidj}{}
 \DeclareKanjiFamily{\otf@JTn}{cidj}{}
-\Declare@FontShape{utfj}{m}{0123456789abcdef}{utfjmr\nlck@sfx@}
+\Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvxyz-}{utfjmr\nlck@sfx@}
 \Declare@FontShape{cidj}{m}{012345}{cidjmr}
 %definition of other utf/cid fonts
 \if@deluxe
-	\Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjmb\nlck@sfx@}
+	\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjmb\nlck@sfx@}
 	\Declare@FontShape{cidj}{bx}{012345}{cidjmb}
 	\DeclareKanjiFamily{\otf@JYn}{utfjg}{}
 	\DeclareKanjiFamily{\otf@JTn}{utfjg}{}
 	\DeclareKanjiFamily{\otf@JYn}{cidjg}{}
 	\DeclareKanjiFamily{\otf@JTn}{cidjg}{}
-	\Declare@FontShape{utfjg}{m}{0123456789abcdef}{utfjgr\nlck@sfx@}
+	\Declare@FontShape{utfjg}{m}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgr\nlck@sfx@}
 	\Declare@FontShape{cidjg}{m}{012345}{cidjgr}
-	\Declare@FontShape{utfjg}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@}
+	\Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgb\nlck@sfx@}
 	\Declare@FontShape{cidjg}{bx}{012345}{cidjgb}
+	\Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvxyz-}{utfjge\nlck@sfx@}
+	\Declare@FontShape{cidjg}{eb}{012345}{cidjge}
 	\DeclareKanjiFamily{\otf@JYn}{utfjmg}{}
 	\DeclareKanjiFamily{\otf@JTn}{utfjmg}{}
 	\DeclareKanjiFamily{\otf@JYn}{cidjmg}{}
 	\DeclareKanjiFamily{\otf@JTn}{cidjmg}{}
-	\Declare@FontShape{utfjmg}{m}{0123456789abcdef}{utfjmgr\nlck@sfx@}
+	\Declare@FontShape{utfjmg}{m}{0123456789abcdefjklmnopqrstuvxyz-}{utfjmgr\nlck@sfx@}
 	\Declare@FontShape{cidjmg}{m}{012345}{cidjmgr}
-	\Declare@FontShape{utfj}{l}{0123456789abcdef}{utfjml\nlck@sfx@}
+	\Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvxyz-}{utfjml\nlck@sfx@}
 	\Declare@FontShape{cidj}{l}{012345}{cidjml}
 \else
 	\if@bold
-		\Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@}
+		\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgb\nlck@sfx@}
 		\Declare@FontShape{cidj}{bx}{012345}{cidjgb}
 	\else
-		\Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjgr\nlck@sfx@}
+		\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgr\nlck@sfx@}
 		\Declare@FontShape{cidj}{bx}{012345}{cidjgr}
 	\fi
 \fi