X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fpatches%2Flltjdefs.sty;h=466e9c7666b5921f7e04b1d86317d9050d374cf5;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=a76a24ca731b1dfb46ffeb44bd42dd045bd4ba27;hpb=bee8063ebf717af89d29cb13849ac07d0f0156df;p=luatex-ja%2Fluatexja.git diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty index a76a24c..466e9c7 100644 --- a/src/patches/lltjdefs.sty +++ b/src/patches/lltjdefs.sty @@ -1,33 +1,48 @@ % % lltjdefs.sty -% +% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjdefs}[2011/11/22 Default font settings for LuaLaTeX-ja] +\ProvidesPackage{lltjdefs}[2016/01/30 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}% +} \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10} \DeclareYokoKanjiEncoding{JY3}{}{} \DeclareKanjiSubstitution{JY3}{mc}{m}{n} -%JT3 +\DeclareTateKanjiEncoding{JT3}{}{} +\DeclareKanjiSubstitution{JT3}{mc}{m}{n} \newcommand\mcdefault{mc} \newcommand\gtdefault{gt} +\newcommand\jttdefault{\mcdefault} \newcommand\kanjiencodingdefault{JY3} \newcommand\kanjifamilydefault{\mcdefault} \newcommand\kanjiseriesdefault{\mddefault} \newcommand\kanjishapedefault{\updefault} -\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}{} -%fontencoding{JT3}\selectfont -\fontencoding{JY3}\selectfont +\DeclareKanjiFamily{JT3}{mc}{} +\DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[0.962216] \ltj@stdmcfont:jfm=ujisv}{} +\DeclareKanjiFamily{JT3}{gt}{} +\DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[0.962216] \ltj@stdgtfont:jfm=ujisv}{} +\DeclareFontShape{JT3}{mc}{bx}{n}{<-> ssub*gt/m/n}{} +\DeclareFontShape{JT3}{gt}{bx}{n}{<-> ssub*gt/m/n}{} +\KanjiEncodingPair{JY3}{JT3} + +\kanjiencoding{JY3}\selectfont\adjustbaseline + \DeclareTextFontCommand{\textmc}{\mcfamily} \DeclareTextFontCommand{\textgt}{\gtfamily} \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{} @@ -39,25 +54,42 @@ \DeclareSymbolFontAlphabet{\mathmc}{mincho} \DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n} -\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} -\ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF} +\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}{% - "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF, "E000-"F8FF} + "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} % non-Japanese -\ltjdefcharrange{5}{"D800-"DFFF, "E0000-"10FFFF} + "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF, + "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-"E00FF, "E01F0-"10FFFF} \ltjdefcharrange{6}{% - "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF, - "4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF} + "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF, + "4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF, "E0100-"E01EF} \ltjdefcharrange{7}{ - "1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F, + "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} % END OF FILE \endinput @@ -66,7 +98,7 @@ MIDDLE -\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} +\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} % 2 "80-"FF num = 471/128 name = Latin-1 Supplement % 3 "100-"17F num = 484/128 name = Latin Extended-A % 4 "180-"24F num = 87/208 name = Latin Extended-B @@ -75,12 +107,11 @@ MIDDLE % 7 "300-"36F num = 98/112 name = Combining Diacritical Marks % 64 "1E00-"1EFF num = 16/256 name = Latin Extended Additional -\ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF} +\ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF} % 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,17 +130,17 @@ 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 -\ltjdefcharrange{5}{"D800-"DFFF, "E0000-"10FFFF} - % Surrogates, Tags and Variation Selectors Supplement + "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF, + "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-"E00FF, "E01F0-"10FFFF} + % Surrogates, Tags % 208 "F0000-"FFFFF num = 0/65536 name = Supplementary Private Use Area-A % 209 "100000-"10FFFF num = 0/65536 name = Supplementary Private Use Area-B @@ -117,8 +148,8 @@ POSITIVE % Japanese \ltjdefcharrange{6}{% - "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF, - "4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF} + "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF, + "4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF, "E0100-"E01EF} % 77 "2460-"24FF num = 150/160 name = Enclosed Alphanumerics % 98 "2E80-"2EFF num = 21 name = CJK Radicals Supplement % 101 "3000-"303F num = 144 name = CJK Symbols and Punctuation @@ -135,9 +166,10 @@ POSITIVE % 149 "FE30-"FE4F num = 8/32 name = CJK Compatibility Forms % 150 "FE50-"FE6F num = 0/32 name = Small Form Variants % SIP +% "E0000-"E01EF Variation Selectors Supplement \ltjdefcharrange{7}{ - "1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F, + "1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F, "AC00-"D7FF} % 35 "1100-"11FF num = 1 name = Hangul Jamo % 99 "2F00-"2FDF num = 0/224 name = Kangxi Radicals