diff options
author | Karl Berry <karl@freefriends.org> | 2013-07-12 23:26:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-07-12 23:26:02 +0000 |
commit | 50834d5bc5540f43c363b17c18a9809b5a827a47 (patch) | |
tree | d15996fcb49041557c50bf78b1a2dfd21c47e5a9 /Master/texmf-dist/tex/luatex/luatexja | |
parent | 944cd493cc09852c6d84e0519760c97750efb2aa (diff) |
luatexja 20130711.0 (12jul13)
git-svn-id: svn://tug.org/texlive/trunk@31183 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-zhfonts.sty | 77 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/jfm-CCT.lua | 84 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-cctbreg.sty | 301 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua | 20 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty | 5 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty | 36 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.tex (renamed from Master/texmf-dist/tex/luatex/luatexja/patches/ltj-unicode-ccfix.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjarticle.cls) | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk10.clo) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk11.clo) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk12.clo) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbook.cls) | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjltxdoc.cls) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjreport.cls) | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsarticle.cls) | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsbook.cls) | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize10.clo) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize11.clo) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize12.clo) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjskiyou.cls) | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls (renamed from Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjspf.cls) | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty | 26 |
27 files changed, 290 insertions, 405 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty index 13a2520b15e..c368215ffec 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty @@ -152,6 +152,9 @@ \cs_set_eq:NN \addjfontfeature \addjfontfeatures +%%% CJKShape=JIS2004 +\fontspec_define_feature_option:nnnnn{CJKShape}{JIS2004}{20}{5}{+jp04} + \ExplSyntaxOff %%%%%%%% Now we completely ignore kanjifont definition file. @@ -224,4 +227,5 @@ \fi \fi} + \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty index ad0a21b886f..d3b32e0419a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty @@ -1,5 +1,5 @@ % luatexja-preset.sty -\ProvidesPackage{luatexja-preset}[2013/05/14 Japanese font presets] +\ProvidesPackage{luatexja-preset}[2013/05/25 Japanese font presets] %% Sync with PXchfon 0.6a \RequirePackage{expl3} @@ -38,8 +38,8 @@ % 漢字字形 \tl_new:N \l_ltjpreset_kanji_shape_tl -\DeclareOption{90jis}{ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +jp90 }} % 90jis -\DeclareOption{jis2004}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +jp04 }} % jis2004 +\DeclareOption{90jis}{ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }} % 90jis +\DeclareOption{jis2004}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }} % jis2004 % font preset \bool_new:N \l_ltjpreset_office_bool % MS Office の HG 系フォントを使っているか @@ -232,9 +232,9 @@ %% KozMinPr6N の場合はjp04 feature がないので,nlck にする \clist_if_in:NnT \l_ltjpreset_font_list { KozMinPr6N-Regular.otf } { - \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04} + \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 } \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { - \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +nlck } + \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=NLC } } } @@ -271,7 +271,7 @@ %% HG 系フォント + JIS2004/90JIS のときはフォント名を置換 \bool_if:NT \l_ltjpreset_office_bool { - \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04} + \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 } \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme04.ttc } \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge04.ttc } @@ -280,7 +280,7 @@ \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_n_uni: % HG ゴシックM のときはそうはいかないので 1 ウェイト時のゴシック体を使う } - \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp90} + \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 } \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme.ttc } \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge.ttc } @@ -306,11 +306,13 @@ \int_compare:nTF { \l_ltjpreset_deluxe_int == 2 } { \newjfontfamily \mgfamily [ \tl_use:N \l_ltjpreset_add_features_tl - \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed } + \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, + \tl_use:N \l_ltjpreset_add_features_tl ] { \ltjpreset_font_mg: } \newjfontfamily \gtebfamily [ \tl_use:N \l_ltjpreset_add_features_tl - \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed } + \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, + \tl_use:N \l_ltjpreset_add_features_tl ] { \ltjpreset_font_gt_eb: } \bool_if:NT \l_ltjpreset_bold_bool { \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_bx: @@ -328,15 +330,17 @@ %%%% 実際の fontspec の呼びだし -\defaultjfontfeatures{ Kerning=Off, \tl_use:N \l_ltjpreset_add_features_tl } +\defaultjfontfeatures{ Kerning=Off } \setmainjfont [ BoldFont = \ltjpreset_font_mc_bx: - \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed } + \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, + \tl_use:N \l_ltjpreset_add_features_tl ] { \ltjpreset_font_mc_m: } \setsansjfont [ BoldFont = \ltjpreset_font_gt_bx: - \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed } + \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, + \tl_use:N \l_ltjpreset_add_features_tl ] { \ltjpreset_font_gt_m: } \ExplSyntaxOff diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-zhfonts.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-zhfonts.sty new file mode 100644 index 00000000000..fd5f7741cda --- /dev/null +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-zhfonts.sty @@ -0,0 +1,77 @@ +% luatexja-zhfonts.sty +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{luatexja-zhfonts}[2013/05/20 Setting for Chinese fonts] +\RequirePackage{luatexja-fontspec} + +% SinoType 华文字体 +\DeclareOption{SinoType}{ +\setmainjfont[BoldFont=STZhongsong]{STSong} +\setsansjfont[BoldFont=STXihei]{STXihei} +\newjfontface\kai{STKaiti} +\newjfontface\fang{STFangsong} +} + +% ZhongYi 中易字体 +\DeclareOption{ZhongYi}{ +\setmainjfont[BoldFont=SimHei]{SimSun} +\setsansjfont[BoldFont=SimHei]{SimHei} +\newjfontface\kai{KaiTi} +\newjfontface\fang{FangSong} +} + +% Adobe Adobe字体 +\DeclareOption{Adobe}{ +\setmainjfont[BoldFont=AdobeHeitiStd-Regular]{AdobeSongStd-Light} +\setsansjfont[BoldFont=AdobeHeitiStd-Regular]{AdobeHeitiStd-Regular} +\newjfontface\kai{AdobeKaitiStd-Regular} +\newjfontface\fang{AdobeFangsongStd-Regular} +} + +% Founder 方正字体 +\DeclareOption{Founder}{ +\setmainjfont[BoldFont=FZXiaoBiaoSong-B05]{FZShuSong-Z01} +\setsansjfont[BoldFont=FZHei-B01]{FZHei-B01} +\newjfontface\kai{FZKai-Z03} +\newjfontface\fang{FZFangSong-Z02} +} + +% HanYi-J 汉仪字体-文房字宝-简体 +% HanYi-F 汉仪字体-文房字宝-繁体 +% 书宋一简 HYA9GJM.ttf +% 中宋简 HYA3GJM.ttf +% 中黑简 HYB1GJM.ttf +% 粗黑简 HYB9GJM.ttf +% 楷体简 HYC1GJM.ttf +% 仿宋简 HYD1GJM.ttf +\DeclareOption{HanYi-J}{ +\setmainjfont[BoldFont=HYA9GJM.ttf]{HYA3GJM.ttf} +\setsansjfont[BoldFont=HYB9GJM.ttf]{HYB1GJM.ttf} +\newjfontface\kai{HYC1GJM.ttf} +\newjfontface\fang{HYD1GJM.ttf} +} + +\DeclareOption{HanYi-F}{ +\setmainjfont[BoldFont=HYA9GFM.ttf]{HYA3GFM.ttf} +\setsansjfont[BoldFont=HYB9GFM.ttf]{HYB1GFM.ttf} +\newjfontface\kai{HYC1GFM.ttf} +\newjfontface\fang{HYD1GFM.ttf} +} + +% cwTeX TrueType (in Debian/Ubuntu) +\DeclareOption{cwttf}{ +\setmainjfont[BoldFont=cwTeXHeiBold]{cwTeXMing} +\setsansjfont[BoldFont=cwTeXHeiBold]{cwTeXHeiBold} +\newjfontface\kai{cwTeXKai} +\newjfontface\fang{cwTeXFangSong} +} + +% Fandol fonts http://fandol-doc.googlecode.com/files/fandol-fonts.7z +\DeclareOption{Fandol}{ +\setmainjfont[BoldFont=FandolSong-Bold]{FandolSong-Regular} +\setsansjfont[BoldFont=FandolHei-Bold]{FandolHei-Regular} +\newjfontface\kai{FandolKai-Regular} +\newjfontface\fang{FandolFang-Regular} +} + +\ProcessOptions\relax +\endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/jfm-CCT.lua b/Master/texmf-dist/tex/luatex/luatexja/jfm-CCT.lua new file mode 100644 index 00000000000..c41f6da311d --- /dev/null +++ b/Master/texmf-dist/tex/luatex/luatexja/jfm-CCT.lua @@ -0,0 +1,84 @@ +luatexja.jfont.define_jfm { + dir = 'yoko', + zw = 1.0, zh = 1.0, + + [0] = { + align = 'left', left = 0.0, down = 0.0, + width = 1.0, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [1] = { 0.25 , 0.0, 0.0 }, + [3] = { 0.125, 0.0, 0.125 } + } + }, + + [1] = { -- fw. opening punctuations + chars = { + 0x2018, 0x201C, 0x3008, 0x300A, 0x300C, 0x300E, 0x3010, 0x3014, 0x3016, + 0x3018, 0x301D, 0xFF08, 0xFF3B, 0xFF5B, 0xFF5F + }, + align = 'right', left = 0.0, down = 0.0, + width = 0.5, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [3] = { 0.25, 0.0, 0.25 } + } + }, + + [2] = { -- fw. closing/colon punctuations + chars = { + 0x2019, 0x201D, 0x3001, 0x3009, 0x300B, 0x300D, 0x300F, 0x3011, 0x3015, + 0x3017, 0x3019, 0x301F, 0xFF09, 0xFF0C, 0xFF3D, 0xFF5D, 0xFF60, + 0xFF1A, 0xFF1B + }, + align = 'left', left = 0.0, down = 0.0, + width = 0.5, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [0] = { 0.25 , 0.0, 0.0 }, + [3] = { 0.125, 0.0, 0.0 }, + [5] = { 0.25 , 0.0, 0.25 } + } + }, + + [3] = { -- fw. middle dot punctuations + chars = {0x30FB, 0x00B7}, + align = 'middle', left = 0.0, down = 0.0, + width = 0.5, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [0] = { 0.125, 0.0, 0.125 }, + [1] = { 0.125, 0.0, 0.125 }, + [2] = { 0.125, 0.0, 0.125 }, + [3] = { 0.5 , 0.0, 0.5 }, + [4] = { 0.25, 0.0, 0.25 }, + [5] = { 0.25, 0.0, 0.25 }, + } + }, + + [4] = { -- fw. stop punctuations + chars = {0x3002, 0xFF01, 0xFF0E, 0xFF1F}, + align = 'left', left = 0.0, down = 0.0, + width = 0.5, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [0] = { 0.5, 0.0, 0.0 }, + [1] = { 0.5, 0.0, 0.0 }, + [3] = { 0.5, 0.0, 0.0 }, + [5] = { 0.5, 0.0, 0.0 } + } + }, + + [5] = { -- fw. dash punctuations + chars = { 0x2015, 0x2025, 0x2026, 0x2014, 0x301C, 0xFF5E }, + align = 'middle', left = 0.0, down = 0.0, + width = 1.0, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [1] = { 0.5 , 0.0, 0.5 }, + [3] = { 0.25, 0.0, 0.25 } + }, + kern = { + [5] = -0.1 + } + }, + + [6] = { -- box end + chars = {'boxbdd'}, + }, + +} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-cctbreg.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-cctbreg.sty deleted file mode 100644 index 0a739a8a43c..00000000000 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-cctbreg.sty +++ /dev/null @@ -1,301 +0,0 @@ -% -% ltj-cctbreg.sty -% - -%! luatexbase と luatex パッケージのカテゴリコードテーブルの割当に -%! 関する衝突を回避する. -%! この衝突に関して「外部のパッチ」で解決しようとするのは, あまり -%! 筋が良くなく, できるなら避けたいが, 今のままだと LuaTeX-ja を -%! LaTeX + fontspec で用いた時に確実に影響が出る. また衝突を残した -%! ままだとカテゴリコードテーブルが実質的に使えない訳で, これも -%! 残念なことである. -%! 「近いうちに両パッケージの中で解決される」ことを期待しつつ, -%! 「衝突がない」という前提で開発を行いたいので, 暫定的処置として, -%! このモジュールを用意する. - -%! これは外から読まれない -%% Avoid multiple loading. -\csname luatexjacctbregLoaded\endcsname -\edef\ltj@cctbreg@AtEnd{% -\endlinechar=\the\endlinechar -\relax} -\endlinechar=-1 % -\def\luatexjacctbregLoaded{\endinput} - -\ifltj@in@latex %<*LaTeX> - \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{ltj-cctbreg}[2013/05/14] -\fi %</LaTeX> - -% LS = Size of storage reserved for luatex-pkg. -\chardef\ltj@cctb@lower@stor@size=16384 - -% LL = (upper bound of cctb index used by luatexbase.sty and luatex.sty) - 1 -\chardef\ltj@cctb@limit=32766 - -%------------------- - -\newcount\ltj@@cctb@failure - -\ltj@@cctb@failure=0 -\def\ltj@@cctb@check@failure{ - \ifnum\ltj@@cctb@failure>0 % - \@PackageWarningNoLine{ltj-cctbreg} - {Cannot apply the patch (\the\ltj@@cctb@failure)} - \ltj@cctbreg@AtEnd - \expandafter\endinput\fi\relax -} - -\chardef\ltj@@cctb@lower@stor@max= - \numexpr\ltj@cctb@lower@stor@size-1\relax -\chardef\ltj@@cctb@lower@stor@safemax= - \numexpr\ltj@cctb@lower@stor@size-8\relax - -\chardef\ltj@@tempcctb@a=\ltj@cctb@lower@stor@size -\chardef\ltj@@tempcctb@b=\numexpr\ltj@cctb@lower@stor@size+1\relax -\def\ltj@@copy@cctb#1#2{% - % Note: The current cctb number is supposed to be zero. - \luatexcatcodetable#1\relax - \luatexsavecatcodetable#2\relax - \luatexcatcodetable0\relax -} - -%------------------- - -% The luatexbase-cctb package stores its preset settings to -% registers 1--6, and new user allocations go to number 7, 8, .... - -\ifdefined\lltxb@catcodetable@alloc - \ifnum\lltxb@catcodetable@alloc>\ltj@@cctb@lower@stor@safemax - % Failure: luatexbase-cctb alloc pointer is too high! - \ltj@@cctb@failure=2 % - \fi -\else - % Failure: luatexbase-cctb not loaded! - \ltj@@cctb@failure=1 % -\fi - -\begingroup -\endlinechar=13 -\gdef\ltj@@cctb@org@def#1{% - \ifnum\lltxb@catcodetable@alloc<65535\relax - \global\advance\lltxb@catcodetable@alloc\tw@ - \allocationnumber\lltxb@catcodetable@alloc - \global\chardef#1\allocationnumber - \luatexinitcatcodetable\allocationnumber - \begingroup\escapechar\m@ne - \luatexbase@directlua{luatexbase.catcodetabledef_from_tex( - '\luatexluaescapestring{\string#1}', '\number\allocationnumber')}% - \endgroup - \wlog{\string#1=\string\luatexcatcodetable\the\allocationnumber}% - \else - \errmessage{No room for a new \string\luatexcatcodetable}% - \fi} -\endgroup - -\unless\ifx\ltj@@cctb@org@def\newluatexcatcodetable - % Failure: luatexbase-cctb is not of expected version! -%%% \bebo <- the meaning of this control sequence? - \ltj@@cctb@failure=3 % -\fi - -\ifdefined\LuT@AllocAttribute - \ifnum\LuT@AllocAttribute>\ltj@@cctb@lower@stor@safemax - % Failure: luatex-pkg alloc pointer is too high! - \ltj@@cctb@failure=4 % - \fi -\fi -\ifdefined\CatcodeTableStack - \ifnum\CatcodeTableStack>\ltj@@cctb@lower@stor@safemax - % Failure: luatex-pkg cctb-stack pointer is too high! - \ltj@@cctb@failure=5 % - \fi -\fi - -\ltj@@cctb@check@failure - -\ltx@firstofone{ - \newluatexcatcodetable\cctb@seven - \catcode12345=14 % - \luatexsavecatcodetable\cctb@seven - \catcode12345=12 % -} - -%% Save the register 7 (to a temporary register) -\unless\ifnum\lltxb@catcodetable@alloc<7 % - \ltj@@copy@cctb{7}{\ltj@@tempcctb@a} -\fi - -%------------------- - -\begingroup -\endlinechar=13 -\gdef\newluatexcatcodetable#1{% - \ifnum\lltxb@catcodetable@alloc<\ltj@cctb@limit\relax - \global\advance\lltxb@catcodetable@alloc\tw@ - \allocationnumber\lltxb@catcodetable@alloc - \global\chardef#1\allocationnumber - \luatexinitcatcodetable\allocationnumber - \begingroup\escapechar\m@ne - \luatexbase@directlua{luatexbase.catcodetabledef_from_tex( - '\luatexluaescapestring{\string#1}', '\number\allocationnumber')}% - \endgroup - \wlog{\string#1=\string\luatexcatcodetable\the\allocationnumber}% - \else - \errmessage{No room for a new \string\luatexcatcodetable}% - \fi} -\endgroup - -%------------------- - -% The luatex package stores its preset settings to registers 1, 3, 5, 7 -% and new user allocations go to odd number 9, 11, 13, etc.; registers -% with even number are reserved for the "category code table stack". - -% I relocate all the future allocation by luatexbase-cctb to the "higher" -% area (number >= \ltj@cctb@lower@stor@size), which is simply done by -% moving the allocation pointer. And all the preset settings of -% luatexbase-cctb (those of luatex-pkg is a subset) are prepared again. -% The colliding user allocation cannot be helped, but in the fortunate -% case where luatex-pkg is not yet loaded or its allocating function -% is never invoked, the only endangered user allocation is register 7 -% of luatexbase-cctb, which is rescued by simply reassining the table, -% since the all presets are migrated to the higher area. - -\unless\ifdefined\LuT@AllocAttribute - \ifltj@in@latex - \RequirePackage{luatex}[2010/03/01] - \else - \input luatex.sty\relax - \fi -\fi - -\edef\ltj@@tempa{\meaning\LuT@AllocAttribute} -\edef\ltj@@tempb{\meaning\lltxb@catcodetable@alloc} -\ifx\ltj@@tempa\ltj@@tempb - % Failure: luatexbase-cctb and luatex-pkg seem to be synchronized! - \ltj@@cctb@failure=6 % -\fi -\ltj@@cctb@check@failure - -\unless\ifnum 7= - \ifdefined\CatcodeTableLaTeX \CatcodeTableLaTeX - \else 0 \fi - % Failure: luatex-pkg is not of expected version!! - \ltj@@cctb@failure=100 % -\fi - -\def\ltj@@cctb@org@def#1{ - \ifnum\LuT@AllocCatcodeTable<1114110 % - \global\advance\LuT@AllocCatcodeTable by\tw@ - \allocationnumber=\LuT@AllocCatcodeTable - \global\chardef#1=\allocationnumber - \wlog{ - \string#1=\string\catcodetable\the\allocationnumber - } - \else - \errmessage{No room for a new \string\catcodetable} - \fi -} -\unless\ifx\ltj@@cctb@org@def\newcatcodetable - % Failure: luatex-pkg is not of expected version!! - \ltj@@cctb@failure=100 % -\fi - -\def\ltj@@cctb@org@def{% - \ifnum\CatcodeTableStack<65534\relax - \global\advance\CatcodeTableStack\tw@ - \else - \errmessage{CatcodeTableStack overflow}% - \fi} -\unless\ifx\ltj@@cctb@org@def\IncCatcodeTableStack - % Failure: luatex-pkg is not of expected version!! - \ltj@@cctb@failure=100 % -\fi -\ltj@@cctb@check@failure - -%% Restore the register 7 which is overwritten by luatex-pkg. -\unless\ifnum\lltxb@catcodetable@alloc<7 % - \ltj@@copy@cctb{\ltj@@tempcctb@a}{7} -\fi - -%% Move the pointer of luatexbase-cctb to higher area. -\lltxb@catcodetable@alloc=\ltj@cctb@lower@stor@size - -%% Restrict the allocation by luatex-pkg to lower area. -\chardef\ltj@@cctb@lower@stor@check= - \numexpr\ltj@cctb@lower@stor@size-2\relax -\def\newcatcodetable#1{ - \ifnum\LuT@AllocCatcodeTable<\ltj@@cctb@lower@stor@check - \global\advance\LuT@AllocCatcodeTable by\tw@ - \allocationnumber=\LuT@AllocCatcodeTable - \global\chardef#1=\allocationnumber - \wlog{ - \string#1=\string\catcodetable\the\allocationnumber - } - \else - \errmessage{No room for a new \string\catcodetable} - \fi -} -\def\IncCatcodeTableStack{% - \ifnum\CatcodeTableStack<\ltj@@cctb@lower@stor@check - \global\advance\CatcodeTableStack by\tw@ - \else - \@PackageError{luatex}{% - Catcode table stack overflow% - }\@ehd - \fi -} - -%------------------- Re-create the presets - -\newluatexcatcodetable\CatcodeTableIniTeX -\newluatexcatcodetable\CatcodeTableString -\setluatexcatcodetable\CatcodeTableString{% - \luatexcatcodetable\CatcodeTableIniTeX - \catcode0 12 % nul - \catcode13 12 % carriage return - \catcode37 12 % percent - \SetCatcodeRange{65}{90}{12}% A-Z - \SetCatcodeRange{97}{122}{12}% a-z - \catcode92 12 % backslash - \catcode127 12 } -\newluatexcatcodetable\CatcodeTableOther -\setluatexcatcodetable\CatcodeTableOther{% - \luatexcatcodetable\CatcodeTableString - \catcode32 12 } -\newluatexcatcodetable\CatcodeTableLaTeX -\setluatexcatcodetable\CatcodeTableLaTeX{% - \luatexcatcodetable\CatcodeTableIniTeX - \SetCatcodeRange{0}{31}{15}% - \catcode9 10 % tab - \catcode12 13 % form feed - \catcode13 5 % carriage return - \catcode35 6 % hash - \catcode36 3 % dollar - \catcode38 4 % ampersand - \catcode94 7 % circumflex - \catcode95 8 % underscore - \catcode123 1 % brace left - \catcode125 2 % brace right - \catcode126 13 % tilde - \catcode127 15 } -\newluatexcatcodetable\CatcodeTableLaTeXAtLetter -\setluatexcatcodetable\CatcodeTableLaTeXAtLetter{% - \luatexcatcodetable\CatcodeTableLaTeX - \catcode64=11 } -\newluatexcatcodetable\CatcodeTableExpl -\setluatexcatcodetable\CatcodeTableExpl{% - \luatexcatcodetable\CatcodeTableLaTeX - \catcode126 10 % tilde is a space char - \catcode32 9 % space is ignored - \catcode9 9 % tab also ignored - \catcode95 11 % underscore letter - \catcode58 11 % colon letter - } -\luatexbase@directlua{luatexbase.catcodetable_do_shortcuts()} - -%%------------------ all done -\ltj@cctbreg@AtEnd -\endinput -%% EOF diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua index f97f966039b..f90047247c0 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua @@ -4,22 +4,26 @@ luatexja.load_module('charrange'); local ltjc = luatexja.charrange -local utf = unicode.utf8 +require("unicode") +local utflen = unicode.utf8.len +local utfbyte = unicode.utf8.byte local node_new = node.new +local node_free = node.free local id_glyph = node.id('glyph') local getcatcode = tex.getcatcode local ltjc_is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char +local FFFFF = string.char(0xF3,0xBF,0xBF,0xBF) --- the following function is modified from jafontspec.lua (by K. Maeda). --- Instead of "%", we use U+FFFFF for suppressing spaces. local function add_comment(buffer) - local i = utf.len(buffer) - while (i>0) and (getcatcode(utf.byte(buffer, i))==1 - or getcatcode(utf.byte(buffer, i))==2) do + local i = utflen(buffer) + while (i>0) and (getcatcode(utfbyte(buffer, i))==1 + or getcatcode(utfbyte(buffer, i))==2) do i=i-1 end if i>0 then - local c = utf.byte(buffer, i) + local c = utfbyte(buffer, i) if c>0x80 then local ct = getcatcode(c) local te = tex.endlinechar @@ -30,9 +34,9 @@ local function add_comment(buffer) local p = node_new(id_glyph) p.char = c if ltjc_is_ucs_in_japanese_char(p) then - buffer = buffer .. string.char(0xF3,0xBF,0xBF,0xBF) -- U+FFFFF + buffer = buffer .. FFFFF -- U+FFFFF end - node.free(p) + node_free(p) end end end @@ -42,4 +46,4 @@ end luatexbase.add_to_callback('process_input_buffer', add_comment,'ltj.process_input_buffer') ---EOF
\ No newline at end of file +--EOF diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty index d8d60dfa42b..fe0e69bf318 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty @@ -39,9 +39,8 @@ %%% default parameters \directlua{ - luatexja.stack.charprop_stack_table[0] - = dofile(assert(kpse.find_file('ltj-kinsoku.lua', 'tex'), - "File `ltj-kinsoku.lua' not found")) + local s = kpse.find_file('ltj-kinsoku.lua', 'tex') + luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {} } \ltjsetparameter{kanjiskip=0pt plus 0.4pt minus 0.4pt, diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua index faef663d239..cdcd7e21175 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua @@ -70,7 +70,7 @@ end local function cid(key) if key==0 then return append_jglyph(char) end - local curjfnt = fonts.ids[tex.attribute[attr_curjfnt]] + local curjfnt = fonts.hashes.identifiers[tex.attribute[attr_curjfnt]] if not curjfnt.cidinfo or curjfnt.cidinfo.ordering ~= "Japan1" and curjfnt.cidinfo.ordering ~= "GB1" and @@ -135,9 +135,9 @@ luatexbase.add_to_callback('pre_linebreak_filter', -- これらの文字指定は,和文フォント定義ごとに,それぞれのフォントの -- CID <-> グリフ 対応状況による変換テーブルが用意される. --- フォント読み込み時に,CID +-- 和文フォント読み込み時に,CID -> unicode 対応をとっておく. local function cid_to_char(fmtable, fn) - local fi = fonts.ids[fn] + local fi = fonts.hashes.identifiers[fn] if fi.cidinfo and fi.cidinfo.ordering == "Japan1" then fmtable.cid_char_type = {} for i, v in pairs(fmtable.chars) do diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty index 27f860c4128..d372c55281d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty @@ -13,7 +13,8 @@ \ifltj@in@latex %<*LaTeX> \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{ltj-plain}[2013/05/14] + \PackageWarning{ltj-plain}{Don't load this package directly; load luatexja.sty instead.} + \ProvidesPackage{ltj-plain}[2013/06/12] \fi %</LaTeX> %%------------------ @@ -22,21 +23,32 @@ %! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ % LuaTeX-ja macros against plain TeX -\jfont\tenmin=psft:Ryumin-Light:jfm=ujis at 9.62216pt -\jfont\sevenmin=psft:Ryumin-Light:jfm=ujis at 6.73551pt -\jfont\fivemin=psft:Ryumin-Light:jfm=ujis at 4.81108pt -\jfont\tengt=psft:GothicBBB-Medium:jfm=ujis at 9.62216pt -\jfont\sevengt=psft:GothicBBB-Medium:jfm=ujis at 6.73551pt -\jfont\fivegt=psft:GothicBBB-Medium:jfm=ujis at 4.81108pt +\def\ltj@stdmcfont{psft:Ryumin-Right} +\def\ltj@stdgtfont{psft:GothicBBB-Medium} +\newread\ltj@@cfgread +\openin\ltj@@cfgread{luatexja.cfg}% +\ifeof\ltj@@cfgread + \message{Cannot find file `luatexja.cfg'.}% +\else + \closein\ltj@@cfgread + \input luatexja.cfg +\fi +\let\ltj@@cfgread\relax\advance\count16by-1\relax + +\jfont\tenmin=\ltj@stdmcfont:jfm=ujis at 9.62216pt +\jfont\sevenmin=\ltj@stdmcfont:jfm=ujis at 6.73551pt +\jfont\fivemin=\ltj@stdmcfont:jfm=ujis at 4.81108pt +\jfont\tengt=\ltj@stdgtfont:jfm=ujis at 9.62216pt +\jfont\sevengt=\ltj@stdgtfont:jfm=ujis at 6.73551pt +\jfont\fivegt=\ltj@stdgtfont:jfm=ujis at 4.81108pt \let\mc=\tenmin \let\gt=\tengt \mc \directlua{ - luatexja.stack.charprop_stack_table[0] - = dofile(assert(kpse.find_file('ltj-kinsoku.lua', 'tex'), - "File `ltj-kinsoku.lua' not found")) + local s = kpse.find_file('ltj-kinsoku.lua', 'tex') + luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {} } \ltjsetparameter{kanjiskip=0pt plus 0.4pt minus 0.4pt, @@ -52,8 +64,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, diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua index f7553d0ceb0..e08cbf1b85a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua @@ -319,7 +319,7 @@ local function mk_rml(name, size, id) fontdata.name = specification.name .. size .. var; cachedata.name = fontdata.name fontdata.fullname = specification.name .. var; cachedata.fullname = fontdata.fullname fontdata.psname = specification.name; cachedata.psname = fontdata.psname - fonts.ids[id] = cachedata + fonts.hashes.identifiers[id] = cachedata return fontdata end diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/ltj-unicode-ccfix.tex b/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.tex index 08b27a11262..08b27a11262 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/ltj-unicode-ccfix.tex +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-unicode-ccfix.tex diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls index 15ba4b8ffcf..a0d58f18229 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjarticle} - [2012/05/08 v1.6-ltj + [2013/06/06 v1.6-ltj-2 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -151,10 +151,10 @@ \directlua{luatexbase.add_to_callback('luatexja.load_jfm', function (ji, jn) ji.chars['parbdd'] = 0; return ji end, 'ltj.jclasses_load_jfm', 1)} -{\jfont\g=psft:Ryumin-Light:jfm=min } % loading jfm-min.lua +{\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax -\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] psft:Ryumin-Light:jfm=min}{} -\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] psft:GothicBBB-Medium:jfm=min;jfmvar=goth}{} +\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{} +\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} \ltjglobalsetparameter{differentjfm=both} \directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')} \if@stysize diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo index 0adafbb6d6e..34dcafa04b5 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk10.clo} - [2012/05/08 v1.6-ltj + [2013/06/06 v1.6-ltj-2 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo index f09395b16d4..e91e26e21da 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk11.clo} - [2012/05/08 v1.6-ltj + [2013/06/06 v1.6-ltj-2 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo index 76d7c6325af..8ea4e74d645 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk12.clo} - [2012/05/08 v1.6-ltj + [2013/06/06 v1.6-ltj-2 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls index fb853bb2a5e..3253e73aa7c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjbook} - [2012/05/08 v1.6-ltj + [2013/06/06 v1.6-ltj-2 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -159,10 +159,10 @@ \directlua{luatexbase.add_to_callback('luatexja.load_jfm', function (ji, jn) ji.chars['parbdd'] = 0; return ji end, 'ltj.jclasses_load_jfm', 1)} -{\jfont\g=psft:Ryumin-Light:jfm=min } % loading jfm-min.lua +{\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax -\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] psft:Ryumin-Light:jfm=min}{} -\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] psft:GothicBBB-Medium:jfm=min;jfmvar=goth}{} +\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{} +\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} \ltjglobalsetparameter{differentjfm=both} \directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')} \if@stysize diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjltxdoc.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls index c8d122bcbff..c8d122bcbff 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjltxdoc.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjltxdoc.cls diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls index 34f33536c04..6eebd7c12d4 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjreport} - [2012/05/08 v1.6-ltj + [2013/06/06 v1.6-ltj-2 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -157,10 +157,10 @@ \directlua{luatexbase.add_to_callback('luatexja.load_jfm', function (ji, jn) ji.chars['parbdd'] = 0; return ji end, 'ltj.jclasses_load_jfm', 1)} -{\jfont\g=psft:Ryumin-Light:jfm=min } % loading jfm-min.lua +{\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax -\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] psft:Ryumin-Light:jfm=min}{} -\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] psft:GothicBBB-Medium:jfm=min;jfmvar=goth}{} +\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{} +\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{} \ltjglobalsetparameter{differentjfm=both} \directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')} \if@stysize diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls index a3843503027..d1042ce9e49 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsarticle} - [2012/05/08 ] + [2013/06/06 ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -285,15 +285,15 @@ \setlength{\pdfpageheight}{\@tempdimb} \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=min}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=min}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=min}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=min}{} \else \ifptexjis - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=jis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=jis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=jis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=jis}{} \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=ujis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=ujis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=ujis}{} \fi \fi \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index d8e77e7422f..44e8b29ca20 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsbook} - [2012/05/08 ] + [2013/06/06 ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -292,15 +292,15 @@ \setlength{\pdfpageheight}{\@tempdimb} \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=min}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=min}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=min}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=min}{} \else \ifptexjis - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=jis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=jis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=jis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=jis}{} \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=ujis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=ujis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=ujis}{} \fi \fi \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo index 61b6cadb821..1aead6f7eab 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize10.clo} - [2012/05/08 v1.6-ltj + [2013/06/06 v1.6-ltj-2 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo index 6f9aa5c8e81..a31c7cd9191 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize11.clo} - [2012/05/08 v1.6-ltj + [2013/06/06 v1.6-ltj-2 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo index 2221af555d4..16d1a5b6fe1 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo @@ -39,7 +39,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize12.clo} - [2012/05/08 v1.6-ltj + [2013/06/06 v1.6-ltj-2 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls index 4c751425a02..31a4386e860 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjskiyou.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjskiyou} - [2012/05/08 ] + [2013/06/06 ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -287,15 +287,15 @@ \setlength{\pdfpageheight}{\@tempdimb} \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=min}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=min}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=min}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=min}{} \else \ifptexjis - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=jis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=jis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=jis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=jis}{} \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=ujis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=ujis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=ujis}{} \fi \fi \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls index a7d0439b83e..facc1d40b15 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjspf.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjspf} - [2012/05/08 ] + [2013/06/06 ] \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -285,15 +285,15 @@ \setlength{\pdfpageheight}{\@tempdimb} \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] psft:Ryumin-Light:jfm=min}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] psft:GothicBBB-Medium:jfm=min}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] \ltj@stdmcfont:jfm=min}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] \ltj@stdgtfont:jfm=min}{} \else \ifptexjis - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] psft:Ryumin-Light:jfm=jis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] psft:GothicBBB-Medium:jfm=jis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] \ltj@stdmcfont:jfm=jis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] \ltj@stdgtfont:jfm=jis}{} \else - \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] psft:Ryumin-Light:jfm=ujis}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] psft:GothicBBB-Medium:jfm=ujis}{} + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] \ltj@stdmcfont:jfm=ujis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] \ltj@stdgtfont:jfm=ujis}{} \fi \fi \DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty index 617c7dc4705..d4487af2d7f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty @@ -131,8 +131,8 @@ %%%%%%%% Attributes for Japanese typesetting. \newluatexattribute\ltj@icflag % attribute for italic correction \newluatexattribute\ltj@curjfnt % index for ``current Japanese font'' -\newluatexattribute\ltj@origchar % -\newluatexattribute\ltj@charclass % +\newluatexattribute\ltj@origchar % +\newluatexattribute\ltj@charclass % \newluatexattribute\ltj@autospc % attribute for autospacing \newluatexattribute\ltj@autoxspc % attribute for autoxspacing \newluatexattribute\ltj@yablshift % attribute for \yabaselineshift @@ -174,10 +174,8 @@ %%%%%%%% Load all sub-packages. \ifltj@in@latex %<*LaTeX> - \RequirePackage{ltj-cctbreg}[2013/05/14] \RequirePackage{ltj-base} [2013/05/14] \else %<*!LaTeX> - \input ltj-cctbreg.sty % \input ltj-base.sty % \fi %</LaTeX> @@ -206,7 +204,7 @@ \def\ltj@@ihb{\relax\directlua{luatexja.jfmglue.create_inhibitglue_node()}} %%%%%%%% \yoko, \tate, \ifydir, \iftdir -%% At this moment, tategaki mode is not implemented; +%% At this moment, tategaki mode is not implemented; %% there is only yokogaki mode now. \let\yoko\relax \let\tate\relax @@ -269,7 +267,7 @@ {\string#2 is not a control sequence that represents \MessageBreak a Japanese font}{}% \else - \directlua{luatexja.stack.set_stack_font(luatexja.isglobal, + \directlua{luatexja.stack.set_stack_font(luatexja.isglobal, luatexja.stack_table_index.#3, \ltj@safe@num@or{nil}{#1}, \the\ltj@curjfnt)}% \fi @@ -280,11 +278,11 @@ % yalbaselineshift = <dimen> % yjabaselineshift = <dimen> \define@key[ltj]{japaram}{yalbaselineshift}{% - \directlua{tex.setattribute(luatexja.isglobal, + \directlua{tex.setattribute(luatexja.isglobal, luatexbase.attributes['ltj@yablshift'], \ltj@safe@dimen@or\ltj@defdimen{#1})}} \define@key[ltj]{japaram}{yjabaselineshift}{% - \directlua{tex.setattribute(luatexja.isglobal, + \directlua{tex.setattribute(luatexja.isglobal, luatexbase.attributes['ltj@ykblshift'], \ltj@safe@dimen@or\ltj@defdimen{#1})}} diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 0be801dd4fd..57b3bc8154c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -3,7 +3,11 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjdefs}[2013/05/14 Default font settings of LuaTeX-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 |