X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fpatches%2Flltjdefs.sty;h=57b3bc8154cee471a42b06b6a0f60050a9f560ed;hb=cd6c052eda6cf9534e1919ce5be10c90ed31b8b5;hp=710c5da3b3213f1da830c2b4196cb47b4c1a24ba;hpb=b5ab697d1aae997f505f3f8f048ee23d352de943;p=luatex-ja%2Fluatexja.git

diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty
index 710c5da..57b3bc8 100644
--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -3,7 +3,11 @@
 % 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2013/04/02 Default font settings for LuaLaTeX-ja]
+\ProvidesPackage{lltjdefs}[2013/06/12 Default font settings of LuaTeX-ja]
+
+\def\ltj@stdmcfont{psft:Ryumin-Right}
+\def\ltj@stdgtfont{psft:GothicBBB-Medium}
+\InputIfFileExists{luatexja.cfg}{}{}
 
 \DeclareKanjiEncodingDefaults{}{}
 \DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10}
@@ -20,9 +24,9 @@
 \kanjiencoding{JY3}
 
 \DeclareKanjiFamily{JY3}{mc}{}
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[0.962216] psft:Ryumin-Light:jfm=ujis}{}
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[0.962216] \ltj@stdmcfont:jfm=ujis}{}
 \DeclareKanjiFamily{JY3}{gt}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[0.962216] psft:GothicBBB-Medium:jfm=ujis}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[0.962216] \ltj@stdgtfont:jfm=ujis}{}
 \DeclareFontShape{JY3}{mc}{bx}{n}{<-> ssub*gt/m/n}{}
 \DeclareFontShape{JY3}{gt}{bx}{n}{<-> ssub*gt/m/n}{}
 
@@ -45,8 +49,8 @@
   "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
 \ltjdefcharrange{4}{%
    "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF, 
-  "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB50-"FE0F, 
-  "FE20-"FE2F, "FE70-"FEFF, "FB00-"FB4F, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
+  "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB00-"FE0F, 
+  "FE20-"FE2F, "FE70-"FEFF, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"10FFFF} 
 \ltjdefcharrange{6}{%
   "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF, 
@@ -58,6 +62,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}
 
 % END OF FILE
 \endinput
@@ -79,8 +84,7 @@ MIDDLE
   % Greek and Coptic, Cyrillic, Greek Extended
 
 \ltjdefcharrange{3}{%
-  "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF, "E000-"F8FF, 
-  "FB00-"FB4F} 
+  "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
   %   66  "2000-"206F num = 140/112 name = General Punctuation
   %   67  "2070-"209F num = 68/48 name = Superscripts and Subscripts
   %   68  "20A0-"20CF num = 5/48 name = Currency Symbols
@@ -99,15 +103,15 @@ MIDDLE
   %   86  "2900-"297F num = 2 name = Supplemental Arrows-B
   %   87  "2980-"29FF num = 4 name = Miscellaneous Mathematical Symbols-B
   %   89  "2B00-"2BFF num = 3 name = Miscellaneous Symbols and Arrows
-  %  142  "E000-"F8FF num = 5/6400 name = Private Use Area
-  %  144  "FB00-"FB4F num = 20/80 name = Alphabetic Presentation Forms
 
 NEGATIVE
 
 \ltjdefcharrange{4}{%
    "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF, 
-  "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB50-"FE0F, 
-  "FE20-"FE2F, "FE70-"FEFF, "10000-"1FFFF} % non-Japanese
+  "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB00-"FE0F, 
+  "FE20-"FE2F, "FE70-"FEFF, "10000-"1FFFF, "E000-"F8FF}
+} % non-Japanese
+
 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"10FFFF} 
   % Surrogates, Tags and Variation Selectors Supplement
   %  208  "F0000-"FFFFF num = 0/65536 name = Supplementary Private Use Area-A