Dnode -> node.direct (WIP)

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

diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty
index af64356..466e9c7 100644 (file)
--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -3,11 +3,13 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2013/06/12 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2016/01/30 Default font settings of LuaTeX-ja]
 
-\def\ltj@stdmcfont{psft:Ryumin-Light}
-\def\ltj@stdgtfont{psft:GothicBBB-Medium}
-\InputIfFileExists{luatexja.cfg}{}{}
+\def\ltj@stdmcfont{IPAExMincho}
+\def\ltj@stdgtfont{IPAExGothic}
+\InputIfFileExists{luatexja.cfg}{}{%
+  \PackageInfo{lltjdefs}{Cannot find file `luatexja.cfg'\@gobble}%
+}
 
 \DeclareKanjiEncodingDefaults{}{}
 \DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10}
@@ -18,7 +20,7 @@
 
 \newcommand\mcdefault{mc}
 \newcommand\gtdefault{gt}
-\newcommand\jttdefault{\gtdefault}
+\newcommand\jttdefault{\mcdefault}
 \newcommand\kanjiencodingdefault{JY3}
 \newcommand\kanjifamilydefault{\mcdefault}
 \newcommand\kanjiseriesdefault{\mddefault}
@@ -52,6 +54,22 @@
 \DeclareSymbolFontAlphabet{\mathmc}{mincho}
 \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n}
 
+\newif\if@ltj@match@family
+\@ltj@match@familyfalse
+\def\verbatim@font{\normalfont\ttfamily\kanjifamily\jttdefault\selectfont}
+\DeclareRobustCommand\rmfamily
+        {\not@math@alphabet\rmfamily\mathrm
+                   \romanfamily\rmdefault
+                   \if@ltj@match@family\kanjifamily\mcdefault\fi\selectfont}
+\DeclareRobustCommand\sffamily
+        {\not@math@alphabet\sffamily\mathsf
+                   \romanfamily\sfdefault
+                   \if@ltj@match@family\kanjifamily\gtdefault\fi\selectfont}
+\DeclareRobustCommand\ttfamily
+        {\not@math@alphabet\ttfamily\mathtt
+                   \romanfamily\ttdefault
+                   \if@ltj@match@family\kanjifamily\jttdefault\fi\selectfont}
+
 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
 \ltjdefcharrange{3}{%
@@ -68,7 +86,7 @@
   "1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F,
   "AC00-"D7FF}
 \ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7}
-\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, +8}}
+\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}