Merge branch 'kitagawa_test' into cjascale

[luatex-ja/luatexja.git] / src / patches / lltjdefs.sty

diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty
index 466e9c7..a592e73 100644 (file)
--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -3,13 +3,15 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2016/01/30 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2017/11/12 Default font settings of LuaTeX-ja]
 
 \def\ltj@stdmcfont{IPAExMincho}
 \def\ltj@stdgtfont{IPAExGothic}
-\InputIfFileExists{luatexja.cfg}{}{%
-  \PackageInfo{lltjdefs}{Cannot find file `luatexja.cfg'\@gobble}%
-}
+\InputIfFileExists{luatexja.cfg}{%
+  \typeout{*************************^^J%
+           * Loading luatexja.cfg.^^J%
+           *************************}%
+}{}
 
 \DeclareKanjiEncodingDefaults{}{}
 \DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10}
@@ -41,6 +43,13 @@
 \DeclareFontShape{JT3}{gt}{bx}{n}{<-> ssub*gt/m/n}{}
 \KanjiEncodingPair{JY3}{JT3}
 
+\DeclareRelationFont{JY3}{gt}{m}{}{TU}{lmr}{bx}{}
+\DeclareRelationFont{JY3}{mc}{m}{}{TU}{lmr}{m}{}
+\DeclareRelationFont{JY3}{mc}{bx}{}{TU}{lmr}{bx}{}
+\DeclareRelationFont{JT3}{gt}{m}{}{TU}{lmr}{bx}{}
+\DeclareRelationFont{JT3}{mc}{m}{}{TU}{lmr}{m}{}
+\DeclareRelationFont{JT3}{mc}{bx}{}{TU}{lmr}{bx}{}
+
 \kanjiencoding{JY3}\selectfont\adjustbaseline
 
 \DeclareTextFontCommand{\textmc}{\mcfamily}
@@ -69,6 +78,11 @@
         {\not@math@alphabet\ttfamily\mathtt
                    \romanfamily\ttdefault
                    \if@ltj@match@family\kanjifamily\jttdefault\fi\selectfont}
+%%% \eminnershape
+\DeclareRobustCommand\em
+        {\@nomath\em \ifdim \fontdimen\@ne\font >\z@
+                       \eminnershape \else \gtfamily \itshape \fi}
+\def\eminnershape{\mcfamily \upshape}
 
 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
@@ -89,7 +103,7 @@
 \ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}}
 
 \directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
-\def\<{\inhibitglue}
+\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue}
 
 % END OF FILE
 \endinput
@@ -131,8 +145,6 @@ MIDDLE
   %   87  "2980-"29FF num = 4 name = Miscellaneous Mathematical Symbols-B
   %   89  "2B00-"2BFF num = 3 name = Miscellaneous Symbols and Arrows
 
-NEGATIVE
-
 \ltjdefcharrange{4}{%
    "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
   "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB00-"FE0F,