luatexja (23jun12)

git-svn-id: svn://tug.org/texlive/trunk@27037 c570f23f-e606-0410-a88d-b1316a301751

22 files changed, 802 insertions, 265 deletions

diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty
index 0cd516ccfac..a4aa8339acc 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty
@@ -4,9 +4,7 @@
 % Original:
 % \ProvidesPackage{ajmacros}[2005/12/25 13:52 iNOUE Koich! <inoue@ma.ns.musashi-tech.ac.jp>]
 %
-% Note 1: \aj半角 is renamed \ajHankaku
-% Note 2: Comment out \ajQuote
-%
+
 
 %% Avoid multiple loading.
 \csname\if11luatexjaajmacrosLoaded\fi\endcsname
@@ -70,7 +68,7 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja-ajmacros}[2011/09/19 v0.1]
+  \ProvidesPackage{luatexja-ajmacros}[2012/05/08 v0.1a]
 \fi                             %</LaTeX>
 
 %%------------------
@@ -82,6 +80,7 @@
 \ifltj@in@latex\else
   \def\@tw{\char"2}
   \def\@ifstar#1#2#3{\ifx*#3\expandafter#1\else#2{#3}\fi}
+  \long\def\@gobble#1{}
 \fi
 
 {%
@@ -326,21 +325,21 @@
 %2/3 9376 12892 9696 13212
 %
 %
-\def\@ajHankakudef#1{\ifx\@nil#1\else
-	\expandafter\xdef\csname ajHankaku@#1\endcsname{\noexpand\CID
+\def\@aj半角def#1{\ifx\@nil#1\else
+	\expandafter\xdef\csname aj半角@#1\endcsname{\noexpand\CID
 		{\noexpand\ifydir\number\@tempcnta\noexpand\else\number\@tempcntb\noexpand\fi}}%
 	\advance\@tempcnta\@ne\advance\@tempcntb\@ne
-	\expandafter\@ajHankakudef\fi}
+	\expandafter\@aj半角def\fi}
 \@tempcnta326
 \@tempcntb9084
-\@ajHankakudef 　。「」、・ヲァィゥェォャュョッーアイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワン゛゜｀ヰヱヮヵヶヴガギグゲゴザジズゼゾダヂヅデドバパビピブプベペボポ\@nil
+\@aj半角def 　。「」、・ヲァィゥェォャュョッーアイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワン゛゜｀ヰヱヮヵヶヴガギグゲゴザジズゼゾダヂヅデドバパビピブプベペボポ\@nil
 \@tempcnta516
-\@ajHankakudef をぁぃぅぇぉゃゅょっあいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわんゐゑゎがぎぐげござじずぜぞだぢづでどばぱびぴぶぷべぺぼぽ\@nil
-\gdef\ajHankaku#1{\aj@Hankaku#1\@nil}
-\gdef\aj@Hankaku#1{\ifx\@nil#1\else
-	\expandafter\ifx\csname ajHankaku@#1\endcsname\relax
-	   #1\else\csname ajHankaku@#1\endcsname\fi
-   \expandafter\aj@Hankaku\fi}
+\@aj半角def をぁぃぅぇぉゃゅょっあいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわんゐゑゎがぎぐげござじずぜぞだぢづでどばぱびぴぶぷべぺぼぽ\@nil
+\gdef\aj半角#1{\aj@半角#1\@nil}
+\gdef\aj@半角#1{\ifx\@nil#1\else
+	\expandafter\ifx\csname aj半角@#1\endcsname\relax
+	   #1\else\csname aj半角@#1\endcsname\fi
+   \expandafter\aj@半角\fi}
 %
 %
 \def\@ajligdef#1#2{\expandafter\xdef\csname ajLig\@ajmojifam#1\endcsname{\noexpand\CID{#2}}}
@@ -798,38 +797,41 @@
 	\leaders\hbox{\CID{\@tempcnta}}\ifhmode\hskip\else\vskip\fi#1}}
 %
 %
-%% \toks0{}\toks1{}\toks2{}\toks3{}
-%% \def\ajQuotedef#1 #2 #3 #4 {\ifx*#1\else
-%% 	\toks0\expandafter{\the\toks0 \or#1}%
-%% 	\toks1\expandafter{\the\toks1 \or#2}%
-%% 	\toks2\expandafter{\the\toks2 \or#3}%
-%% 	\toks3\expandafter{\the\toks3 \or#4}%
-%% 	\expandafter\ajQuotedef\fi}
-%% \ajQuotedef
-%% 670 671 12173 12174
-%% 672 673 7956 7957
-%% 674 675 7899 7900
-%% 676 677 7901 7902
-%% 678 679 7903 7904
-%% 680 681 7905 7906
-%% 682 683 7907 7908
-%% 684 685 7909 7910
-%% 686 687 7911 7912
-%% 688 689 7913 7914
-%% 690 691 7915 7916
-%% 7608 7609 7956 7957
-%% 12125 12126 12135 12136
-%% 12127 12128 12137 12138
-%% 12129 12130 12139 12140
-%% 12131 12132 12141 12142
-%% 12171 12172 12173 12174
-%% 16197 16198 16329 16330
-%% * * * *
-%% \xdef\ajQuote#1#2{\noexpand\CID{\noexpand\ifydir\noexpand\ifcase#1\the\toks0
-%% 	\noexpand\fi\noexpand\else\noexpand\ifcase#1\the\toks2
-%% 	\noexpand\fi\noexpand\fi}#2\inhibitglue\noexpand\CID{\noexpand\ifydir\noexpand\ifcase#1\the\toks1
-%% 	\noexpand\fi\noexpand\else\noexpand\ifcase#1\the\toks3
-%% 	\noexpand\fi\noexpand\fi}}
+\endlinechar=13
+\toks0{}\toks1{}\toks2{}\toks3{}
+\def\ajQuotedef#1 #2 #3 #4 {\ifx*#1\else
+	\toks0\expandafter{\the\toks0 \or#1}%
+	\toks1\expandafter{\the\toks1 \or#2}%
+	\toks2\expandafter{\the\toks2 \or#3}%
+	\toks3\expandafter{\the\toks3 \or#4}%
+	\expandafter\ajQuotedef\fi}
+\ajQuotedef
+670 671 12173 12174
+672 673 7956 7957
+674 675 7899 7900
+676 677 7901 7902
+678 679 7903 7904
+680 681 7905 7906
+682 683 7907 7908
+684 685 7909 7910
+686 687 7911 7912
+688 689 7913 7914
+690 691 7915 7916
+7608 7609 7956 7957
+12125 12126 12135 12136
+12127 12128 12137 12138
+12129 12130 12139 12140
+12131 12132 12141 12142
+12171 12172 12173 12174
+16197 16198 16329 16330
+* * * *
+\def\@removetop#1{\toks#1\expandafter\expandafter\expandafter{\expandafter\@gobble\the\toks#1}}
+\@removetop0\@removetop1\@removetop2\@removetop3
+\xdef\ajQuote#1#2{\noexpand\CID{\noexpand\ifydir\noexpand\ifcase#1 \the\toks0
+	\noexpand\fi\noexpand\else\noexpand\ifcase#1 \the\toks2
+	\noexpand\fi\noexpand\fi}#2\inhibitglue\noexpand\CID{\noexpand\ifydir\noexpand\ifcase#1 \the\toks1
+	\noexpand\fi\noexpand\else\noexpand\ifcase#1 \the\toks3
+	\noexpand\fi\noexpand\fi}}
 }
 \ifltj@in@latex\else
   \ajRedefine@KundokuMacros
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty
index 048f6d25fa3..290f6b17aa0 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty
@@ -64,15 +64,15 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja-otf}[2012/4/20 v0.2]
+  \ProvidesPackage{luatexja-otf}[2012/04/20 v0.2]
 \fi                             %</LaTeX>
 
 % Load core module if not yet.
 \ifx\luatexjacoreLoaded\@undefined
   \ifltj@in@latex                 %<*LaTeX>
-    \RequirePackage{luatexja-core}[2012/04/20]
+    \RequirePackage{luatexja}[2012/04/20]
   \else                           %<*!LaTeX>
-    \input luatexja-core.sty %
+    \input luatexja.sty %
   \fi                             %</LaTeX>
 \fi
 
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
new file mode 100644
index 00000000000..d4fd53bbfc9
--- /dev/null
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -0,0 +1,278 @@
+% luatexja-preset.sty
+\ProvidesPackage{luatexja-preset}
+  [2012/05/18 v0.0]
+
+\RequirePackage{expl3}
+\RequirePackage{luatexja-fontspec}
+\ExplSyntaxOn
+
+%%%% message
+
+
+\bool_new:N \l_ltjpreset_bold_bool % bold
+\bool_set_false:N \l_ltjpreset_bold_bool
+\DeclareOption{bold}  {\bool_set_true:N \l_ltjpreset_bold_bool}
+\DeclareOption{nobold}{\bool_set_false:N \l_ltjpreset_bold_bool}
+
+\bool_new:N \l_ltjpreset_expert_bool % expert
+\bool_set_false:N \l_ltjpreset_expert_bool
+\DeclareOption{expert}  {\bool_set_true:N \l_ltjpreset_expert_bool}
+\DeclareOption{noexpert}{\bool_set_false:N \l_ltjpreset_expert_bool}
+
+\int_new:N \l_ltjpreset_deluxe_int % expert
+\int_set:Nn \l_ltjpreset_deluxe_int { 0 }
+\DeclareOption{deluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 2 }} % 7 fonts
+\DeclareOption{nodeluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 0 }} % 2 fonts
+
+% scale
+{ \fontsize{1024}{1024}\selectfont
+  \fp_set_from_dim:Nn \l_ltjpreset_scale_fp \zw
+  \fp_gdiv:Nn \l_ltjpreset_scale_fp {1024}
+}
+\msg_new:nnn { luatexja-preset }{ scale }{
+  日本語フォントは~\fp_use:N \l_ltjpreset_scale_fp~倍にスケーリングされます．
+}
+\msg_warning:nn { luatexja-preset }{ scale }
+
+% JFM
+\cs_set:Npn \ltjpreset_use_jfm: {ujis}  % 使用する JFM
+%%% \DeclareOption{min}{\cs_set:Npn  \ltjpreset_use_jfm: {min}} % min
+%%% ↑jfm-min.lua が横組み・縦組み専用仮名に追いついていないので使用禁止
+\DeclareOption{jis}{\cs_set:Npn  \ltjpreset_use_jfm: {jis}}     % jis
+\DeclareOption{ujis}{\cs_set:Npn  \ltjpreset_use_jfm: {ujis}}   % ujis
+
+% 漢字字形
+\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
+
+% font preset
+\bool_new:N \l_ltjpreset_office_bool  % MS Office の HG 系フォントを使っているか
+\bool_new:N \l_ltjpreset_noembed_bool % 非埋込か
+\clist_new:N \l_ltjpreset_font_list
+
+\cs_new:Npn \ltjpreset_set_uni:nn #1#2 {
+  \ltjpreset_set_multi:n { #1, #1, #2, #2, #2, #2, #1 }
+}
+\cs_new:Npn \ltjpreset_set_multi:n #1 {
+  \clist_set:Nn \l_ltjpreset_font_list { #1 }
+  \bool_set_false:N \l_ltjpreset_office_bool
+  \bool_set_false:N \l_ltjpreset_noembed_bool
+}
+\cs_new:Npn \ltjpreset_set_office:nn #1 #2{
+  \ltjpreset_set_multi:n {
+    #1, HGMinchoE ,           % mc/m, mc/bx
+    HGGothicM , HGGothicE ,   % gt/m, gt/bx (multiweight))
+    #2 , HGSoeiKakugothicUB , % gt/m (uni), gt/eb
+    HGMaruGothicMPRO          % mg/m
+  }
+  \bool_set_true:N \l_ltjpreset_office_bool
+}
+
+% kozuka
+\DeclareOption{kozuka4}{
+  \ltjpreset_set_multi:n {
+    KozMinPro-Regular.otf , KozMinPro-Bold.otf, % mc/m, mc/bx
+    KozGoPro-Regular.otf  , KozGoPro-Bold.otf,  % gt/m, gt/bx (multiweight))
+    KozGoPro-Medium.otf   , KozGoPro-Heavy.otf, % gt/m (uni), gt/eb
+    KozGoPro-Heavy.otf                          % mg/m
+  }
+}
+\DeclareOption{kozuka6}{
+  \ltjpreset_set_multi:n {
+    KozMinProVI-Regular.otf , KozMinProVI-Bold.otf, % mc/m, mc/bx
+    KozGoProVI-Regular.otf  , KozGoProVI-Bold.otf,  % gt/m, gt/bx (multiweight))
+    KozGoProVI-Medium.otf   , KozGoProVI-Heavy.otf, % gt/m (uni), gt/eb
+    KozGoProVI-Heavy.otf                            % mg/m
+  }
+}
+\DeclareOption{kozuka6n}{
+  \ltjpreset_set_multi:n {
+    KozMinPr6N-Regular.otf , KozMinPr6N-Bold.otf, % mc/m, mc/bx
+    KozGoPr6N-Regular.otf  , KozGoPr6N-Bold.otf,  % gt/m, gt/bx (multiweight))
+    KozGoPr6N-Medium.otf   , KozGoPr6N-Heavy.otf, % gt/m (uni), gt/eb
+    KozGoPr6N-Heavy.otf                           % mg/m
+  }
+}
+
+% hiragino
+\DeclareOption{hiragino}{
+  \ltjpreset_set_multi:n {
+    HiraMinPro-W3.otf      , HiraMinPro-W6.otf,   % mc/m, mc/bx
+    HiraKakuPro-W3.otf     , HiraKakuPro-W6.otf,  % gt/m, gt/bx (multiweight))
+    HiraKakuPro-W3.otf     , HiraKakuStd-W8.otf,  % gt/m (uni), gt/eb
+    HiraMaruPro-W4.otf                            % mg/m
+  }
+}
+\DeclareOption{hiraginon}{
+  \ltjpreset_set_multi:n {
+    HiraMinProN-W3.otf      , HiraMinProN-W6.otf,   % mc/m, mc/bx
+    HiraKakuProN-W3.otf     , HiraKakuProN-W6.otf,  % gt/m, gt/bx (multiweight))
+    HiraKakuProN-W3.otf     , HiraKakuStdN-W8.otf,  % gt/m (uni), gt/eb
+    HiraMaruProN-W4.otf                             % mg/m
+  }
+}
+
+% morisawa?
+\DeclareOption{morisawa4}{
+  \ltjpreset_set_multi:n {
+    A-OTF-RyuminPro-Light.otf , A-OTF-FutoMinA101Pro-Bold.otf ,    % mc/m, mc/bx
+    A-OTF-GothicBBBPro-Medium.otf , A-OTF-FutoGoB101Pro-Bold.otf , % gt/m, gt/bx (multiweight))
+    A-OTF-GothicBBBPro-Medium.otf , A-OTF-MidashiGoPro-MB31.otf ,  % gt/m (uni), gt/eb
+    A-OTF-Jun101Pro-Light.otf % mg/m
+  }
+}
+\DeclareOption{morisawa6n}{
+  \ltjpreset_set_multi:n {
+    A-OTF-RyuminPr6N-Light.otf , A-OTF-FutoMinA101Pr6N-Bold.otf ,    % mc/m, mc/bx
+    A-OTF-GothicBBBPr6N-Medium.otf , A-OTF-FutoGoB101Pr6N-Bold.otf , % gt/m, gt/bx (multiweight))
+    A-OTF-GothicBBBPr6N-Medium.otf , A-OTF-MidashiGoPr6N-MB31.otf ,  % gt/m (uni), gt/eb
+    A-OTF-Jun101Pr6N-Light.otf                                       % mg/m
+  }
+}
+
+
+% ipa, ipaex, ms
+\DeclareOption{ipa}{
+  \ltjpreset_set_uni:nn { IPAMincho } { IPAGothic }
+}
+\DeclareOption{ipaex}{
+  \ltjpreset_set_uni:nn { IPAExMincho } { IPAExGothic }
+}
+\DeclareOption{ms}{
+  \ltjpreset_set_uni:nn { MS-Mincho } { MS-Gothic }
+}
+
+% {ipa,ipaex,ms}-dx % Office 付属フォントを利用
+\DeclareOption{ipaex-dx}{
+  \ltjpreset_set_office:nn { IPAExMincho } { IPAExGothic }
+}
+\DeclareOption{ipa-dx}{
+  \ltjpreset_set_office:nn { IPAMincho } { IPAGothic }
+}
+\DeclareOption{ms-dx}{
+  \ltjpreset_set_office:nn { MS-Mincho } { MS-Gothic }
+}
+
+
+% 非埋込
+\DeclareOption{noembed}{
+  \ltjpreset_set_uni:nn { Ryumin-Light } { GothicBBB-Medium }
+  \bool_set_true:N \l_ltjpreset_noembed_bool
+}
+
+\ExecuteOptions{noembed}
+\ProcessOptions*
+
+%% KozMinPr6N の場合はjp04 feature がないので，nlck にする
+\clist_if_in:NnT \l_ltjpreset_font_list { KozMinPr6N-Regular.otf } {
+  \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04}
+  \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
+    \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +nlck }
+  }
+}
+
+%%%%%%%% main routine
+
+%%%%  リストからの展開
+% mc/m
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_mc_m: { \tl_use:N \l_tmpa_tl }
+
+% mc/bx
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_mc_bx: { \tl_use:N \l_tmpa_tl }
+
+% gt/m
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_gt_m: { \tl_use:N \l_tmpa_tl }
+
+% gt/bx
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_gt_bx: { \tl_use:N \l_tmpa_tl }
+
+% gt/m-uni
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_gt_n_uni: { \tl_use:N \l_tmpa_tl }
+
+% gt/eb
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_gt_eb: { \tl_use:N \l_tmpa_tl }
+
+% mg/m
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_mg: { \tl_use:N \l_tmpa_tl }
+
+%% HG 系フォント + JIS2004/90JIS のときはフォント名を置換
+\bool_if:NT \l_ltjpreset_office_bool {
+  \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04}
+  \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 }
+    \cs_set:Nx \ltjpreset_font_gt_eb: { hgrsgu04.ttc }
+    \cs_set:Nx \ltjpreset_font_mg:    { hgrsmp04.ttf }
+    \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_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 }
+    \cs_set:Nx \ltjpreset_font_gt_eb: { hgrsgu.ttc }
+    \cs_set:Nx \ltjpreset_font_mg:    { hgrsmp.ttf }
+  }
+}
+
+%%%% expert 用設定
+\tl_new:N \l_ltjpreset_add_features_tl
+
+\tl_set:Nx \l_ltjpreset_add_features_tl {
+  Scale = \fp_use:N \l_ltjpreset_scale_fp ,
+  \tl_use:N \l_ltjpreset_kanji_shape_tl, 
+  JFM   = \ltjpreset_use_jfm:
+}
+
+\bool_if:NT \l_ltjpreset_expert_bool {
+  \cs_set:Npn \rubyfamily { \addfontfeatures { Style = Ruby} }
+  \tl_put_left:Nn \l_ltjpreset_add_features_tl { Style = HorizontalKana, }
+}
+
+%%%% （丸）ゴシック体の設定: bold option もここで
+\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 }
+    ] { \ltjpreset_font_mg: }
+  \newjfontfamily \gtebfamily [
+      \tl_use:N \l_ltjpreset_add_features_tl
+      \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }
+    ] { \ltjpreset_font_gt_eb: }
+  \bool_if:NT \l_ltjpreset_bold_bool {
+    \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_bx:
+  }
+}{
+  \bool_if:NTF \l_ltjpreset_bold_bool {
+    \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_bx:
+  }{
+    \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_n_uni:
+  }
+  \cs_set_eq:NN \ltjpreset_font_gt_bx: \ltjpreset_font_gt_m:
+  \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_m:
+}
+
+
+%%%% 実際の fontspec の呼びだし
+
+\defaultjfontfeatures{ Kerning=Off, \tl_use:N \l_ltjpreset_add_features_tl }
+
+\setmainjfont [ 
+  BoldFont = \ltjpreset_font_mc_bx:
+  \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }
+] { \ltjpreset_font_mc_m: }
+\setsansjfont [ 
+  BoldFont = \ltjpreset_font_gt_bx: 
+  \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }
+] { \ltjpreset_font_gt_m: }
+
+\ExplSyntaxOff
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-cns1.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-cns1.lua
index 15ce22b5bf5..17348160476 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-cns1.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-cns1.lua
@@ -6,126 +6,167 @@ return {
  characters={
   [32]={
    index=1,
+   width=164495.36,
   },
   [33]={
    index=2,
+   width=227409.92,
   },
   [34]={
    index=3,
+   width=265420.8,
   },
   [35]={
    index=4,
+   width=484311.04,
   },
   [36]={
    index=5,
+   width=330301.44,
   },
   [37]={
    index=6,
+   width=496762.88,
   },
   [38]={
    index=7,
+   width=540672,
   },
   [39]={
    index=8,
+   width=184156.16,
   },
   [40]={
    index=9,
+   width=192020.48,
   },
   [41]={
    index=10,
+   width=192675.84,
   },
   [42]={
    index=11,
+   width=323747.84,
   },
   [43]={
    index=12,
+   width=406323.2,
   },
   [44]={
    index=13,
+   width=164495.36,
   },
   [45]={
    index=14,
+   width=244449.28,
   },
   [46]={
    index=15,
+   width=165150.72,
   },
   [47]={
    index=16,
+   width=202506.24,
   },
   [48]={
    index=17,
+   width=329646.08,
   },
   [49]={
    index=18,
+   width=329646.08,
   },
   [50]={
    index=19,
+   width=329646.08,
   },
   [51]={
    index=20,
+   width=329646.08,
   },
   [52]={
    index=21,
+   width=330301.44,
   },
   [53]={
    index=22,
+   width=329646.08,
   },
   [54]={
    index=23,
+   width=328990.72,
   },
   [55]={
    index=24,
+   width=329646.08,
   },
   [56]={
    index=25,
+   width=329646.08,
   },
   [57]={
    index=26,
+   width=330301.44,
   },
   [58]={
    index=27,
+   width=164495.36,
   },
   [59]={
    index=28,
+   width=164495.36,
   },
   [60]={
    index=29,
+   width=406978.56,
   },
   [61]={
    index=30,
+   width=406978.56,
   },
   [62]={
    index=31,
+   width=406978.56,
   },
   [63]={
    index=32,
+   width=265420.8,
   },
   [64]={
    index=33,
+   width=682885.12,
   },
   [65]={
    index=34,
+   width=490864.64,
   },
   [66]={
    index=35,
+   width=441057.28,
   },
   [67]={
    index=36,
+   width=444989.44,
   },
   [68]={
    index=37,
+   width=444989.44,
   },
   [69]={
    index=38,
+   width=448921.6,
   },
   [70]={
    index=39,
+   width=439746.56,
   },
   [71]={
    index=40,
+   width=483655.68,
   },
   [72]={
    index=41,
+   width=482344.96,
   },
   [73]={
    index=42,
@@ -133,72 +174,95 @@ return {
   },
   [74]={
    index=43,
+   width=323747.84,
   },
   [75]={
    index=44,
+   width=477757.44,
   },
   [76]={
    index=45,
+   width=456130.56,
   },
   [77]={
    index=46,
+   width=590479.36,
   },
   [78]={
    index=47,
+   width=471859.2,
   },
   [79]={
    index=48,
+   width=491520,
   },
   [80]={
    index=49,
+   width=441712.64,
   },
   [81]={
    index=50,
+   width=488898.56,
   },
   [82]={
    index=51,
+   width=440401.92,
   },
   [83]={
    index=52,
+   width=410910.72,
   },
   [84]={
    index=53,
+   width=503971.84,
   },
   [85]={
    index=54,
+   width=463339.52,
   },
   [86]={
    index=55,
+   width=509214.72,
   },
   [87]={
    index=56,
+   width=581304.32,
   },
   [88]={
    index=57,
+   width=464650.24,
   },
   [89]={
    index=58,
+   width=469237.76,
   },
   [90]={
    index=59,
+   width=403701.76,
   },
   [91]={
    index=60,
+   width=182845.44,
   },
   [92]={
    index=61,
+   width=202506.24,
   },
   [93]={
    index=62,
+   width=181534.72,
   },
   [94]={
    index=63,
+   width=230686.72,
   },
   [95]={
    index=64,
+   width=376832,
   },
   [96]={
    index=65,
+   width=192675.84,
   },
   [97]={
    index=66,
@@ -206,90 +270,119 @@ return {
   },
   [98]={
    index=67,
+   width=334888.96,
   },
   [99]={
    index=68,
+   width=328990.72,
   },
   [100]={
    index=69,
+   width=359792.64,
   },
   [101]={
    index=70,
+   width=323747.84,
   },
   [102]={
    index=71,
+   width=233308.16,
   },
   [103]={
    index=72,
+   width=338165.76,
   },
   [104]={
    index=73,
+   width=360448,
   },
   [105]={
    index=74,
+   width=210370.56,
   },
   [106]={
    index=75,
+   width=210370.56,
   },
   [107]={
    index=76,
+   width=334233.6,
   },
   [108]={
    index=77,
+   width=207749.12,
   },
   [109]={
    index=78,
+   width=483655.68,
   },
   [110]={
    index=79,
+   width=349306.88,
   },
   [111]={
    index=80,
+   width=350617.6,
   },
   [112]={
    index=81,
+   width=357171.2,
   },
   [113]={
    index=82,
+   width=349306.88,
   },
   [114]={
    index=83,
+   width=246415.36,
   },
   [115]={
    index=84,
+   width=290324.48,
   },
   [116]={
    index=85,
+   width=236584.96,
   },
   [117]={
    index=86,
+   width=346685.44,
   },
   [118]={
    index=87,
+   width=344719.36,
   },
   [119]={
    index=88,
+   width=486277.12,
   },
   [120]={
    index=89,
+   width=349962.24,
   },
   [121]={
    index=90,
+   width=377487.36,
   },
   [122]={
    index=91,
+   width=287703.04,
   },
   [123]={
    index=92,
+   width=292945.92,
   },
   [124]={
    index=93,
+   width=171704.32,
   },
   [125]={
    index=94,
+   width=292290.56,
   },
   [126]={
    index=95,
+   width=309329.92,
   },
   [162]={
    index=262,
@@ -58890,26 +58983,6 @@ return {
         dflt=true,
        },
       },
-      pwid={
-       cyrl={
-        dflt=true,
-       },
-       dflt={
-        dflt=true,
-       },
-       grek={
-        dflt=true,
-       },
-       hani={
-        dflt=true,
-       },
-       kana={
-        dflt=true,
-       },
-       latn={
-        dflt=true,
-       },
-      },
       trep={
        ["*"]={
         ["*"]=true,
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-gb1.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-gb1.lua
index ee00b5e5171..acd44991969 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-gb1.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-gb1.lua
@@ -6,183 +6,243 @@ return {
  characters={
   [32]={
    index=1,
+   width=135659.52,
   },
   [33]={
    index=2,
+   width=176947.2,
   },
   [34]={
    index=3,
+   width=224133.12,
   },
   [35]={
    index=4,
+   width=306053.12,
   },
   [36]={
    index=5,
+   width=302776.32,
   },
   [37]={
    index=6,
+   width=522321.92,
   },
   [38]={
    index=7,
+   width=465305.6,
   },
   [39]={
    index=8,
+   width=156631.04,
   },
   [40]={
    index=9,
+   width=245104.64,
   },
   [41]={
    index=10,
+   width=245104.64,
   },
   [42]={
    index=11,
+   width=277217.28,
   },
   [43]={
    index=12,
+   width=396492.8,
   },
   [44]={
    index=13,
+   width=155975.68,
   },
   [45]={
    index=14,
+   width=245760,
   },
   [46]={
    index=15,
+   width=155975.68,
   },
   [47]={
    index=16,
+   width=218890.24,
   },
   [48]={
    index=17,
+   width=302776.32,
   },
   [49]={
    index=18,
+   width=302776.32,
   },
   [50]={
    index=19,
+   width=302776.32,
   },
   [51]={
    index=20,
+   width=302776.32,
   },
   [52]={
    index=21,
+   width=302776.32,
   },
   [53]={
    index=22,
+   width=302776.32,
   },
   [54]={
    index=23,
+   width=302776.32,
   },
   [55]={
    index=24,
+   width=302776.32,
   },
   [56]={
    index=25,
+   width=302776.32,
   },
   [57]={
    index=26,
+   width=302776.32,
   },
   [58]={
    index=27,
+   width=155975.68,
   },
   [59]={
    index=28,
+   width=155975.68,
   },
   [60]={
    index=29,
+   width=396492.8,
   },
   [61]={
    index=30,
+   width=396492.8,
   },
   [62]={
    index=31,
+   width=396492.8,
   },
   [63]={
    index=32,
+   width=225443.84,
   },
   [64]={
    index=33,
+   width=490209.28,
   },
   [65]={
    index=34,
+   width=448266.24,
   },
   [66]={
    index=35,
+   width=367001.6,
   },
   [67]={
    index=36,
+   width=455475.2,
   },
   [68]={
    index=37,
+   width=484311.04,
   },
   [69]={
    index=38,
+   width=368967.68,
   },
   [70]={
    index=39,
+   width=334888.96,
   },
   [71]={
    index=40,
+   width=477757.44,
   },
   [72]={
    index=41,
+   width=519700.48,
   },
   [73]={
    index=42,
+   width=208404.48,
   },
   [74]={
    index=43,
+   width=204472.32,
   },
   [75]={
    index=44,
+   width=436469.76,
   },
   [76]={
    index=45,
+   width=344719.36,
   },
   [77]={
    index=46,
+   width=587202.56,
   },
   [78]={
    index=47,
+   width=496762.88,
   },
   [79]={
    index=48,
+   width=505937.92,
   },
   [80]={
    index=49,
+   width=356515.84,
   },
   [81]={
    index=50,
+   width=505937.92,
   },
   [82]={
    index=51,
+   width=411566.08,
   },
   [83]={
    index=52,
+   width=304742.4,
   },
   [84]={
    index=53,
+   width=397803.52,
   },
   [85]={
    index=54,
+   width=493486.08,
   },
   [86]={
    index=55,
+   width=465960.96,
   },
   [87]={
    index=56,
+   width=637009.92,
   },
   [88]={
    index=57,
+   width=424017.92,
   },
   [89]={
    index=58,
+   width=406323.2,
   },
   [90]={
    index=59,
+   width=397803.52,
   },
   [91]={
    index=60,
+   width=245104.64,
   },
   [92]={
    index=61,
@@ -190,9 +250,11 @@ return {
   },
   [93]={
    index=62,
+   width=245104.64,
   },
   [94]={
    index=63,
+   width=397148.16,
   },
   [95]={
    index=64,
@@ -200,96 +262,127 @@ return {
   },
   [96]={
    index=65,
+   width=156631.04,
   },
   [97]={
    index=66,
+   width=273285.12,
   },
   [98]={
    index=67,
+   width=329646.08,
   },
   [99]={
    index=68,
+   width=279838.72,
   },
   [100]={
    index=69,
+   width=346685.44,
   },
   [101]={
    index=70,
+   width=271974.4,
   },
   [102]={
    index=71,
+   width=173015.04,
   },
   [103]={
    index=72,
+   width=290979.84,
   },
   [104]={
    index=73,
+   width=339476.48,
   },
   [105]={
    index=74,
+   width=157941.76,
   },
   [106]={
    index=75,
+   width=150732.8,
   },
   [107]={
    index=76,
+   width=324403.2,
   },
   [108]={
    index=77,
+   width=149422.08,
   },
   [109]={
    index=78,
+   width=519700.48,
   },
   [110]={
    index=79,
+   width=345374.72,
   },
   [111]={
    index=80,
+   width=343408.64,
   },
   [112]={
    index=81,
+   width=343408.64,
   },
   [113]={
    index=82,
+   width=330301.44,
   },
   [114]={
    index=83,
+   width=221511.68,
   },
   [115]={
    index=84,
+   width=220200.96,
   },
   [116]={
    index=85,
+   width=181534.72,
   },
   [117]={
    index=86,
+   width=338821.12,
   },
   [118]={
    index=87,
+   width=294912,
   },
   [119]={
    index=88,
+   width=427294.72,
   },
   [120]={
    index=89,
+   width=305397.76,
   },
   [121]={
    index=90,
+   width=296222.72,
   },
   [122]={
    index=91,
+   width=266731.52,
   },
   [123]={
    index=92,
+   width=242483.2,
   },
   [124]={
    index=93,
+   width=169082.88,
   },
   [125]={
    index=94,
+   width=242483.2,
   },
   [126]={
    index=95,
+   width=396492.8,
   },
   [164]={
    index=167,
@@ -92788,26 +92881,6 @@ return {
         dflt=true,
        },
       },
-      pwid={
-       cyrl={
-        dflt=true,
-       },
-       dflt={
-        dflt=true,
-       },
-       grek={
-        dflt=true,
-       },
-       hani={
-        dflt=true,
-       },
-       kana={
-        dflt=true,
-       },
-       latn={
-        dflt=true,
-       },
-      },
       trad={
        cyrl={
         dflt=true,
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-japan1.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-japan1.lua
index 2d461945360..f39c9e26a9f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-japan1.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-japan1.lua
@@ -6,192 +6,255 @@ return {
  characters={
   [32]={
    index=1,
+   width=182190.08,
   },
   [33]={
    index=2,
+   width=195952.64,
   },
   [34]={
    index=3,
+   width=231342.08,
   },
   [35]={
    index=4,
+   width=402391.04,
   },
   [36]={
    index=5,
+   width=402391.04,
   },
   [37]={
    index=6,
+   width=472514.56,
   },
   [38]={
    index=7,
+   width=481689.6,
   },
   [39]={
    index=8,
+   width=141557.76,
   },
   [40]={
    index=9,
+   width=211681.28,
   },
   [41]={
    index=10,
+   width=211681.28,
   },
   [42]={
    index=11,
+   width=294256.64,
   },
   [43]={
    index=12,
+   width=346685.44,
   },
   [44]={
    index=13,
+   width=143523.84,
   },
   [45]={
    index=14,
+   width=200540.16,
   },
   [46]={
    index=15,
+   width=143523.84,
   },
   [47]={
    index=16,
+   width=296878.08,
   },
   [48]={
    index=17,
+   width=402391.04,
   },
   [49]={
    index=18,
+   width=402391.04,
   },
   [50]={
    index=19,
+   width=402391.04,
   },
   [51]={
    index=20,
+   width=402391.04,
   },
   [52]={
    index=21,
+   width=402391.04,
   },
   [53]={
    index=22,
+   width=402391.04,
   },
   [54]={
    index=23,
+   width=402391.04,
   },
   [55]={
    index=24,
+   width=402391.04,
   },
   [56]={
    index=25,
+   width=402391.04,
   },
   [57]={
    index=26,
+   width=402391.04,
   },
   [58]={
    index=27,
+   width=143523.84,
   },
   [59]={
    index=28,
+   width=143523.84,
   },
   [60]={
    index=29,
+   width=346685.44,
   },
   [61]={
    index=30,
+   width=346685.44,
   },
   [62]={
    index=31,
+   width=346685.44,
   },
   [63]={
    index=32,
+   width=318504.96,
   },
   [64]={
    index=33,
+   width=487587.84,
   },
   [65]={
    index=34,
+   width=423362.56,
   },
   [66]={
    index=35,
+   width=395837.44,
   },
   [67]={
    index=36,
+   width=404357.12,
   },
   [68]={
    index=37,
+   width=446300.16,
   },
   [69]={
    index=38,
+   width=371589.12,
   },
   [70]={
    index=39,
+   width=351928.32,
   },
   [71]={
    index=40,
+   width=424017.92,
   },
   [72]={
    index=41,
+   width=483655.68,
   },
   [73]={
    index=42,
+   width=209715.2,
   },
   [74]={
    index=43,
+   width=283770.88,
   },
   [75]={
    index=44,
+   width=417464.32,
   },
   [76]={
    index=45,
+   width=370933.76,
   },
   [77]={
    index=46,
+   width=592445.44,
   },
   [78]={
    index=47,
+   width=465305.6,
   },
   [79]={
    index=48,
+   width=469237.76,
   },
   [80]={
    index=49,
+   width=396492.8,
   },
   [81]={
    index=50,
+   width=469237.76,
   },
   [82]={
    index=51,
+   width=408289.28,
   },
   [83]={
    index=52,
+   width=338821.12,
   },
   [84]={
    index=53,
+   width=393871.36,
   },
   [85]={
    index=54,
+   width=452198.4,
   },
   [86]={
    index=55,
+   width=437780.48,
   },
   [87]={
    index=56,
+   width=648806.4,
   },
   [88]={
    index=57,
+   width=446300.16,
   },
   [89]={
    index=58,
+   width=415498.24,
   },
   [90]={
    index=59,
+   width=378798.08,
   },
   [91]={
    index=60,
+   width=207093.76,
   },
   [92]={
    index=97,
+   width=296878.08,
   },
   [93]={
    index=62,
+   width=207093.76,
   },
   [94]={
    index=63,
+   width=346685.44,
   },
   [95]={
    index=64,
@@ -199,96 +262,127 @@ return {
   },
   [96]={
    index=65,
+   width=253624.32,
   },
   [97]={
    index=66,
+   width=333578.24,
   },
   [98]={
    index=67,
+   width=370933.76,
   },
   [99]={
    index=68,
+   width=313262.08,
   },
   [100]={
    index=69,
+   width=370278.4,
   },
   [101]={
    index=70,
+   width=329646.08,
   },
   [102]={
    index=71,
+   width=220856.32,
   },
   [103]={
    index=72,
+   width=359792.64,
   },
   [104]={
    index=73,
+   width=380108.8,
   },
   [105]={
    index=74,
+   width=180224,
   },
   [106]={
    index=75,
+   width=174325.76,
   },
   [107]={
    index=76,
+   width=356515.84,
   },
   [108]={
    index=77,
+   width=180879.36,
   },
   [109]={
    index=78,
+   width=559677.44,
   },
   [110]={
    index=79,
+   width=379453.44,
   },
   [111]={
    index=80,
+   width=360448,
   },
   [112]={
    index=81,
+   width=378798.08,
   },
   [113]={
    index=82,
+   width=370933.76,
   },
   [114]={
    index=83,
+   width=268697.6,
   },
   [115]={
    index=84,
+   width=290979.84,
   },
   [116]={
    index=85,
+   width=222822.4,
   },
   [117]={
    index=86,
+   width=376832,
   },
   [118]={
    index=87,
+   width=335544.32,
   },
   [119]={
    index=88,
+   width=498073.6,
   },
   [120]={
    index=89,
+   width=329646.08,
   },
   [121]={
    index=90,
+   width=346685.44,
   },
   [122]={
    index=91,
+   width=296878.08,
   },
   [123]={
    index=92,
+   width=213647.36,
   },
   [124]={
    index=99,
+   width=249036.8,
   },
   [125]={
    index=94,
+   width=213647.36,
   },
   [126]={
    index=100,
+   width=346685.44,
   },
   [161]={
    index=101,
@@ -77806,46 +77900,6 @@ return {
         dflt=true,
        },
       },
-      pkna={
-       cyrl={
-        dflt=true,
-       },
-       dflt={
-        dflt=true,
-       },
-       grek={
-        dflt=true,
-       },
-       hani={
-        dflt=true,
-       },
-       kana={
-        dflt=true,
-       },
-       latn={
-        dflt=true,
-       },
-      },
-      pwid={
-       cyrl={
-        dflt=true,
-       },
-       dflt={
-        dflt=true,
-       },
-       grek={
-        dflt=true,
-       },
-       hani={
-        dflt=true,
-       },
-       kana={
-        dflt=true,
-       },
-       latn={
-        dflt=true,
-       },
-      },
       qwid={
        cyrl={
         dflt=true,
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-korea1.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-korea1.lua
index 213c52daccc..115a2727a06 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-korea1.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-korea1.lua
@@ -10,21 +10,27 @@ return {
   },
   [33]={
    index=2,
+   width=272629.76,
   },
   [34]={
    index=3,
+   width=272629.76,
   },
   [35]={
    index=4,
+   width=545914.88,
   },
   [36]={
    index=5,
+   width=409600,
   },
   [37]={
    index=6,
+   width=600309.76,
   },
   [38]={
    index=7,
+   width=545914.88,
   },
   [39]={
    index=8,
@@ -44,48 +50,63 @@ return {
   },
   [43]={
    index=12,
+   width=545914.88,
   },
   [44]={
    index=13,
+   width=190709.76,
   },
   [45]={
    index=14,
+   width=545914.88,
   },
   [46]={
    index=15,
+   width=190709.76,
   },
   [47]={
    index=16,
+   width=245760,
   },
   [48]={
    index=17,
+   width=409600,
   },
   [49]={
    index=18,
+   width=409600,
   },
   [50]={
    index=19,
+   width=409600,
   },
   [51]={
    index=20,
+   width=409600,
   },
   [52]={
    index=21,
+   width=409600,
   },
   [53]={
    index=22,
+   width=409600,
   },
   [54]={
    index=23,
+   width=409600,
   },
   [55]={
    index=24,
+   width=409600,
   },
   [56]={
    index=25,
+   width=409600,
   },
   [57]={
    index=26,
+   width=409600,
   },
   [58]={
    index=27,
@@ -97,12 +118,15 @@ return {
   },
   [60]={
    index=29,
+   width=545914.88,
   },
   [61]={
    index=30,
+   width=545914.88,
   },
   [62]={
    index=31,
+   width=600309.76,
   },
   [63]={
    index=32,
@@ -113,30 +137,39 @@ return {
   },
   [65]={
    index=34,
+   width=518389.76,
   },
   [66]={
    index=35,
+   width=463994.88,
   },
   [67]={
    index=36,
+   width=463994.88,
   },
   [68]={
    index=37,
+   width=491520,
   },
   [69]={
    index=38,
+   width=463994.88,
   },
   [70]={
    index=39,
+   width=436469.76,
   },
   [71]={
    index=40,
+   width=491520,
   },
   [72]={
    index=41,
+   width=518389.76,
   },
   [73]={
    index=42,
+   width=245760,
   },
   [74]={
    index=43,
@@ -144,51 +177,66 @@ return {
   },
   [75]={
    index=44,
+   width=518389.76,
   },
   [76]={
    index=45,
+   width=436469.76,
   },
   [77]={
    index=46,
+   width=600309.76,
   },
   [78]={
    index=47,
+   width=518389.76,
   },
   [79]={
    index=48,
+   width=491520,
   },
   [80]={
    index=49,
+   width=436469.76,
   },
   [81]={
    index=50,
+   width=491520,
   },
   [82]={
    index=51,
+   width=463994.88,
   },
   [83]={
    index=52,
+   width=436469.76,
   },
   [84]={
    index=53,
+   width=518389.76,
   },
   [85]={
    index=54,
+   width=518389.76,
   },
   [86]={
    index=55,
+   width=491520,
   },
   [87]={
    index=56,
   },
   [88]={
    index=57,
+   width=463994.88,
   },
   [89]={
    index=58,
+   width=463994.88,
   },
   [90]={
    index=59,
+   width=436469.76,
   },
   [91]={
    index=60,
@@ -196,6 +244,7 @@ return {
   },
   [92]={
    index=61,
+   width=245760,
   },
   [93]={
    index=62,
@@ -215,30 +264,39 @@ return {
   },
   [97]={
    index=66,
+   width=354549.76,
   },
   [98]={
    index=67,
+   width=382074.88,
   },
   [99]={
    index=68,
+   width=354549.76,
   },
   [100]={
    index=69,
+   width=382074.88,
   },
   [101]={
    index=70,
+   width=382074.88,
   },
   [102]={
    index=71,
+   width=245760,
   },
   [103]={
    index=72,
+   width=382074.88,
   },
   [104]={
    index=73,
+   width=382074.88,
   },
   [105]={
    index=74,
+   width=190709.76,
   },
   [106]={
    index=75,
@@ -246,48 +304,63 @@ return {
   },
   [107]={
    index=76,
+   width=382074.88,
   },
   [108]={
    index=77,
+   width=190709.76,
   },
   [109]={
    index=78,
+   width=573440,
   },
   [110]={
    index=79,
+   width=382074.88,
   },
   [111]={
    index=80,
+   width=382074.88,
   },
   [112]={
    index=81,
+   width=382074.88,
   },
   [113]={
    index=82,
+   width=382074.88,
   },
   [114]={
    index=83,
+   width=300154.88,
   },
   [115]={
    index=84,
+   width=354549.76,
   },
   [116]={
    index=85,
+   width=245760,
   },
   [117]={
    index=86,
+   width=382074.88,
   },
   [118]={
    index=87,
+   width=382074.88,
   },
   [119]={
    index=88,
+   width=545914.88,
   },
   [120]={
    index=89,
+   width=409600,
   },
   [121]={
    index=90,
+   width=409600,
   },
   [122]={
    index=91,
@@ -295,15 +368,19 @@ return {
   },
   [123]={
    index=92,
+   width=382074.88,
   },
   [124]={
    index=93,
+   width=382074.88,
   },
   [125]={
    index=94,
+   width=382074.88,
   },
   [126]={
    index=95,
+   width=491520,
   },
   [161]={
    index=208,
@@ -56497,7 +56574,7 @@ return {
   space=218234.88,
   space_shrink=72744.96,
   space_stretch=109117.44,
-  x_height=0,
+  x_height=313262.08,
  },
  psname="",
  script="dflt",
@@ -56661,29 +56738,6 @@ return {
         dflt=true,
        },
       },
-      pwid={
-       cyrl={
-        dflt=true,
-       },
-       dflt={
-        dflt=true,
-       },
-       grek={
-        dflt=true,
-       },
-       hang={
-        dflt=true,
-       },
-       hani={
-        dflt=true,
-       },
-       kana={
-        dflt=true,
-       },
-       latn={
-        dflt=true,
-       },
-      },
       sinf={
        cyrl={
         dflt=true,
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
index 512e4d12162..6032b5067bf 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
@@ -14,22 +14,25 @@ luatexja.load_module('charrange'); local ltjc = luatexja.charrange
 
 local node_new = node.new
 local id_glyph = node.id('glyph')
+local getcatcode = tex.getcatcode
 
 --- the following function is modified from jafontspec.lua (by K. Maeda).
 --- Instead of "%", we use U+FFFFF for suppressing spaces.
 function add_comment(buffer)
    local i = utf.len(buffer)
-   while (i>0) and (tex.getcatcode(utf.byte(buffer, i))==1 
-		 or tex.getcatcode(utf.byte(buffer, i))==2) do
+   while (i>0) and (getcatcode(utf.byte(buffer, i))==1 
+		 or getcatcode(utf.byte(buffer, i))==2) do
       i=i-1
    end
    if i>0 then
       local c = utf.byte(buffer, i)
-      local ct = tex.getcatcode(c)
-      local ctl = tex.getcatcode(13) -- endline character
-      local ctc = tex.getcatcode(0xFFFFF) -- new comment character
-      if ((ct==11) or (ct==12)) and (ctl==5) and (ctc==14) then
-	 local p =  node_new(id_glyph)
+      local ct = getcatcode(c)
+      local te = tex.endlinechar
+      local ctl = (te ~= -1) and (getcatcode(te)==5) and (getcatcode(0xFFFFF)==14)
+      -- Is the catcode of endline character is 5 (end-of-line)?
+      -- Is the catcode of U+FFFFF (new comment char) is 14 (comment)?
+      if ((ct==11) or (ct==12)) and ctl then
+	 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
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjarticle.cls
index c10fe562471..15ba4b8ffcf 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjarticle.cls
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjarticle}
-  [2011/10/03 v1.6-ltj
+  [2012/05/08 v1.6-ltj
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -758,13 +758,13 @@
   \kern 2.6\p@}
 \newcommand\@makefntext[1]{\parindent 1em
   \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
-\newif\ifSeireki \Seirekifalse
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦false
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{{%
   \iftdir
-    \ifSeireki
+    \if西暦
       \kansuji\number\year 年
       \kansuji\number\month 月
       \kansuji\number\day 日
@@ -774,7 +774,7 @@
       \kansuji\number\day 日
     \fi
   \else
-    \ifSeireki
+    \if西暦
       \number\year~年
       \number\month~月
       \number\day~日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk10.clo
index d20e999a1a5..0adafbb6d6e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk10.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk10.clo}
-  [2011/10/03 v1.6-ltj
+  [2012/05/08 v1.6-ltj
   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/ltjclasses/ltjbk11.clo
index 36d87a7ac7e..f09395b16d4 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk11.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk11.clo}
-  [2011/10/03 v1.6-ltj
+  [2012/05/08 v1.6-ltj
   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/ltjclasses/ltjbk12.clo
index 96f9c828026..76d7c6325af 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk12.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk12.clo}
-  [2011/10/03 v1.6-ltj
+  [2012/05/08 v1.6-ltj
   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/ltjclasses/ltjbook.cls
index 6f72cc77779..fb853bb2a5e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbook.cls
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjbook}
-  [2011/10/03 v1.6-ltj
+  [2012/05/08 v1.6-ltj
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -847,13 +847,13 @@
 \@addtoreset{footnote}{chapter}
 \newcommand\@makefntext[1]{\parindent 1em
   \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
-\newif\ifSeireki \Seirekifalse
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦false
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{{%
   \iftdir
-    \ifSeireki
+    \if西暦
       \kansuji\number\year 年
       \kansuji\number\month 月
       \kansuji\number\day 日
@@ -863,7 +863,7 @@
       \kansuji\number\day 日
     \fi
   \else
-    \ifSeireki
+    \if西暦
       \number\year~年
       \number\month~月
       \number\day~日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjreport.cls
index b35ebef4697..34f33536c04 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjreport.cls
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjreport}
-  [2011/10/03 v1.6-ltj
+  [2012/05/08 v1.6-ltj
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -844,13 +844,13 @@
 \@addtoreset{footnote}{chapter}
 \newcommand\@makefntext[1]{\parindent 1em
   \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
-\newif\ifSeireki \Seirekifalse
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦false
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{{%
   \iftdir
-    \ifSeireki
+    \if西暦
       \kansuji\number\year 年
       \kansuji\number\month 月
       \kansuji\number\day 日
@@ -860,7 +860,7 @@
       \kansuji\number\day 日
     \fi
   \else
-    \ifSeireki
+    \if西暦
       \number\year~年
       \number\month~月
       \number\day~日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize10.clo
index 1f0e475f666..61b6cadb821 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize10.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize10.clo}
-  [2011/10/03 v1.6-ltj
+  [2012/05/08 v1.6-ltj
   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/ltjclasses/ltjsize11.clo
index 69b2a194860..6f9aa5c8e81 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize11.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize11.clo}
-  [2011/10/03 v1.6-ltj
+  [2012/05/08 v1.6-ltj
   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/ltjclasses/ltjsize12.clo
index 0271a91de85..2221af555d4 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize12.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize12.clo}
-  [2011/10/03 v1.6-ltj
+  [2012/05/08 v1.6-ltj
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsarticle.cls
index 9475d20df67..a3843503027 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsarticle.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsarticle}
-  [2012/04/24]
+  [2012/05/08 ]
 \RequirePackage{luatexja}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -1361,12 +1361,12 @@
     \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
     \inhibitglue \ignorespaces
   \fi}
-\def\Shou#1{\hbox{$\m@th$%
+\def\小#1{\hbox{$\m@th$%
   \csname S@\f@size\endcsname
   \fontsize\sf@size\z@
   \math@fontsfalse\selectfont
   #1}}
-\def\UeShou#1{{\sbox\z@ T\vbox to\ht0{\Shou{#1}\vss}}}
+\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}}
 \def\cmrTeX{%
   \ifdim \fontdimen\@ne\font >\z@
     T\kern-.25em\lower.5ex\hbox{E}\kern-.125emX\@
@@ -1375,12 +1375,12 @@
   \fi}
 \def\cmrLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.32em\UeShou{A}\kern-.22em\cmrTeX
+    L\kern-.32em\上小{A}\kern-.22em\cmrTeX
   \else
-    L\kern-.36em\UeShou{A}\kern-.15em\cmrTeX
+    L\kern-.36em\上小{A}\kern-.15em\cmrTeX
   \fi}
 \def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@}
-\def\sfLaTeX{L\kern-.25em\UeShou{A}\kern-.08em\sfTeX}
+\def\sfLaTeX{L\kern-.25em\上小{A}\kern-.08em\sfTeX}
 \def\ptmTeX{%
   \ifdim \fontdimen\@ne\font >\z@
     T\kern-.12em\lower.37ex\hbox{E}\kern-.02emX\@
@@ -1389,9 +1389,9 @@
   \fi}
 \def\ptmLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.2em\UeShou{A}\kern-.1em\ptmTeX
+    L\kern-.2em\上小{A}\kern-.1em\ptmTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.1em\ptmTeX
+    L\kern-.3em\上小{A}\kern-.1em\ptmTeX
   \fi}
 \def\pncTeX{%
   \ifdim \fontdimen\@ne\font >\z@
@@ -1401,9 +1401,9 @@
   \fi}
 \def\pncLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+    L\kern-.3em\上小{A}\kern-.1em\pncTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+    L\kern-.3em\上小{A}\kern-.1em\pncTeX
   \fi}
 \def\pplTeX{%
   \ifdim \fontdimen\@ne\font >\z@
@@ -1413,9 +1413,9 @@
   \fi}
 \def\pplLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.27em\UeShou{A}\kern-.12em\pplTeX
+    L\kern-.27em\上小{A}\kern-.12em\pplTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.15em\pplTeX
+    L\kern-.3em\上小{A}\kern-.15em\pplTeX
   \fi}
 \def\ugmTeX{%
   \ifdim \fontdimen\@ne\font >\z@
@@ -1425,9 +1425,9 @@
   \fi}
 \def\ugmLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.2em\UeShou{A}\kern-.13em\ugmTeX
+    L\kern-.2em\上小{A}\kern-.13em\ugmTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.13em\ugmTeX
+    L\kern-.3em\上小{A}\kern-.13em\ugmTeX
   \fi}
 \DeclareRobustCommand{\TeX}{%
   \def\@tempa{cmr}%
@@ -1487,10 +1487,10 @@
 \def\pLaTeX{p\LaTeX}
 \def\pLaTeXe{p\LaTeXe}
 \def\AmSTeX{\protect\AmS-\protect\TeX{}}
-\DeclareRobustCommand{\BibTeX}{B\kern-.05em\Shou{I\kern-.025em B}%
+\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}%
   \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
 \DeclareRobustCommand{\SliTeX}{%
-  S\kern-.06emL\kern-.18em\UeShou{I}\kern -.03em\TeX}
+  S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX}
 \newcommand{\prepartname}{\if@english Part~\else 第\fi}
 \newcommand{\postpartname}{\if@english\else 部\fi}
 \newcommand{\presectionname}{}%  第
@@ -1505,9 +1505,9 @@
 \newcommand{\tablename}{\if@english Table.~\else 表\fi}
 \newcommand{\appendixname}{\if@english Appendix~\else 付録\fi}
 \newcommand{\abstractname}{\if@english Abstract\else 概要\fi}
-\newif\ifSeireki \Seirekitrue
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦true
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{%
   \if@english
@@ -1516,7 +1516,7 @@
       July\or August\or September\or October\or November\or December\fi
       \space\number\day, \number\year
   \else
-    \ifSeireki
+    \if西暦
       \number\year 年
       \number\month 月
       \number\day 日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsbook.cls
index 9fb9bb5d90c..d8e77e7422f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsbook.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsbook}
-  [2012/04/24]
+  [2012/05/08 ]
 \RequirePackage{luatexja}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -1436,12 +1436,12 @@
     \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
     \inhibitglue \ignorespaces
   \fi}
-\def\Shou#1{\hbox{$\m@th$%
+\def\小#1{\hbox{$\m@th$%
   \csname S@\f@size\endcsname
   \fontsize\sf@size\z@
   \math@fontsfalse\selectfont
   #1}}
-\def\UeShou#1{{\sbox\z@ T\vbox to\ht0{\Shou{#1}\vss}}}
+\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}}
 \def\cmrTeX{%
   \ifdim \fontdimen\@ne\font >\z@
     T\kern-.25em\lower.5ex\hbox{E}\kern-.125emX\@
@@ -1450,12 +1450,12 @@
   \fi}
 \def\cmrLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.32em\UeShou{A}\kern-.22em\cmrTeX
+    L\kern-.32em\上小{A}\kern-.22em\cmrTeX
   \else
-    L\kern-.36em\UeShou{A}\kern-.15em\cmrTeX
+    L\kern-.36em\上小{A}\kern-.15em\cmrTeX
   \fi}
 \def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@}
-\def\sfLaTeX{L\kern-.25em\UeShou{A}\kern-.08em\sfTeX}
+\def\sfLaTeX{L\kern-.25em\上小{A}\kern-.08em\sfTeX}
 \def\ptmTeX{%
   \ifdim \fontdimen\@ne\font >\z@
     T\kern-.12em\lower.37ex\hbox{E}\kern-.02emX\@
@@ -1464,9 +1464,9 @@
   \fi}
 \def\ptmLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.2em\UeShou{A}\kern-.1em\ptmTeX
+    L\kern-.2em\上小{A}\kern-.1em\ptmTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.1em\ptmTeX
+    L\kern-.3em\上小{A}\kern-.1em\ptmTeX
   \fi}
 \def\pncTeX{%
   \ifdim \fontdimen\@ne\font >\z@
@@ -1476,9 +1476,9 @@
   \fi}
 \def\pncLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+    L\kern-.3em\上小{A}\kern-.1em\pncTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+    L\kern-.3em\上小{A}\kern-.1em\pncTeX
   \fi}
 \def\pplTeX{%
   \ifdim \fontdimen\@ne\font >\z@
@@ -1488,9 +1488,9 @@
   \fi}
 \def\pplLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.27em\UeShou{A}\kern-.12em\pplTeX
+    L\kern-.27em\上小{A}\kern-.12em\pplTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.15em\pplTeX
+    L\kern-.3em\上小{A}\kern-.15em\pplTeX
   \fi}
 \def\ugmTeX{%
   \ifdim \fontdimen\@ne\font >\z@
@@ -1500,9 +1500,9 @@
   \fi}
 \def\ugmLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.2em\UeShou{A}\kern-.13em\ugmTeX
+    L\kern-.2em\上小{A}\kern-.13em\ugmTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.13em\ugmTeX
+    L\kern-.3em\上小{A}\kern-.13em\ugmTeX
   \fi}
 \DeclareRobustCommand{\TeX}{%
   \def\@tempa{cmr}%
@@ -1562,10 +1562,10 @@
 \def\pLaTeX{p\LaTeX}
 \def\pLaTeXe{p\LaTeXe}
 \def\AmSTeX{\protect\AmS-\protect\TeX{}}
-\DeclareRobustCommand{\BibTeX}{B\kern-.05em\Shou{I\kern-.025em B}%
+\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}%
   \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
 \DeclareRobustCommand{\SliTeX}{%
-  S\kern-.06emL\kern-.18em\UeShou{I}\kern -.03em\TeX}
+  S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX}
 \newcommand{\prepartname}{\if@english Part~\else 第\fi}
 \newcommand{\postpartname}{\if@english\else 部\fi}
 \newcommand{\prechaptername}{\if@english Chapter~\else 第\fi}
@@ -1581,9 +1581,9 @@
 \newcommand{\figurename}{\if@english Fig.~\else 図\fi}
 \newcommand{\tablename}{\if@english Table.~\else 表\fi}
 \newcommand{\appendixname}{\if@english Appendix~\else 付録\fi}
-\newif\ifSeireki \Seirekitrue
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦true
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{%
   \if@english
@@ -1592,7 +1592,7 @@
       July\or August\or September\or October\or November\or December\fi
       \space\number\day, \number\year
   \else
-    \ifSeireki
+    \if西暦
       \number\year 年
       \number\month 月
       \number\day 日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjskiyou.cls
index 4c2fe3c880c..4c751425a02 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjskiyou.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjskiyou.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjskiyou}
-  [2012/04/24]
+  [2012/05/08 ]
 \RequirePackage{luatexja}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -1348,12 +1348,12 @@
     \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
     \inhibitglue \ignorespaces
   \fi}
-\def\Shou#1{\hbox{$\m@th$%
+\def\小#1{\hbox{$\m@th$%
   \csname S@\f@size\endcsname
   \fontsize\sf@size\z@
   \math@fontsfalse\selectfont
   #1}}
-\def\UeShou#1{{\sbox\z@ T\vbox to\ht0{\Shou{#1}\vss}}}
+\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}}
 \def\cmrTeX{%
   \ifdim \fontdimen\@ne\font >\z@
     T\kern-.25em\lower.5ex\hbox{E}\kern-.125emX\@
@@ -1362,12 +1362,12 @@
   \fi}
 \def\cmrLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.32em\UeShou{A}\kern-.22em\cmrTeX
+    L\kern-.32em\上小{A}\kern-.22em\cmrTeX
   \else
-    L\kern-.36em\UeShou{A}\kern-.15em\cmrTeX
+    L\kern-.36em\上小{A}\kern-.15em\cmrTeX
   \fi}
 \def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@}
-\def\sfLaTeX{L\kern-.25em\UeShou{A}\kern-.08em\sfTeX}
+\def\sfLaTeX{L\kern-.25em\上小{A}\kern-.08em\sfTeX}
 \def\ptmTeX{%
   \ifdim \fontdimen\@ne\font >\z@
     T\kern-.12em\lower.37ex\hbox{E}\kern-.02emX\@
@@ -1376,9 +1376,9 @@
   \fi}
 \def\ptmLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.2em\UeShou{A}\kern-.1em\ptmTeX
+    L\kern-.2em\上小{A}\kern-.1em\ptmTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.1em\ptmTeX
+    L\kern-.3em\上小{A}\kern-.1em\ptmTeX
   \fi}
 \def\pncTeX{%
   \ifdim \fontdimen\@ne\font >\z@
@@ -1388,9 +1388,9 @@
   \fi}
 \def\pncLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+    L\kern-.3em\上小{A}\kern-.1em\pncTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+    L\kern-.3em\上小{A}\kern-.1em\pncTeX
   \fi}
 \def\pplTeX{%
   \ifdim \fontdimen\@ne\font >\z@
@@ -1400,9 +1400,9 @@
   \fi}
 \def\pplLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.27em\UeShou{A}\kern-.12em\pplTeX
+    L\kern-.27em\上小{A}\kern-.12em\pplTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.15em\pplTeX
+    L\kern-.3em\上小{A}\kern-.15em\pplTeX
   \fi}
 \def\ugmTeX{%
   \ifdim \fontdimen\@ne\font >\z@
@@ -1412,9 +1412,9 @@
   \fi}
 \def\ugmLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.2em\UeShou{A}\kern-.13em\ugmTeX
+    L\kern-.2em\上小{A}\kern-.13em\ugmTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.13em\ugmTeX
+    L\kern-.3em\上小{A}\kern-.13em\ugmTeX
   \fi}
 \DeclareRobustCommand{\TeX}{%
   \def\@tempa{cmr}%
@@ -1474,10 +1474,10 @@
 \def\pLaTeX{p\LaTeX}
 \def\pLaTeXe{p\LaTeXe}
 \def\AmSTeX{\protect\AmS-\protect\TeX{}}
-\DeclareRobustCommand{\BibTeX}{B\kern-.05em\Shou{I\kern-.025em B}%
+\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}%
   \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
 \DeclareRobustCommand{\SliTeX}{%
-  S\kern-.06emL\kern-.18em\UeShou{I}\kern -.03em\TeX}
+  S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX}
 \newcommand{\prepartname}{\if@english Part~\else 第\fi}
 \newcommand{\postpartname}{\if@english\else 部\fi}
 \newcommand{\presectionname}{}%  第
@@ -1492,9 +1492,9 @@
 \newcommand{\tablename}{\if@english Table.~\else 表\fi}
 \newcommand{\appendixname}{\if@english Appendix~\else 付録\fi}
 \newcommand{\abstractname}{\if@english Abstract\else 概要\fi}
-\newif\ifSeireki \Seirekitrue
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦true
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{%
   \if@english
@@ -1503,7 +1503,7 @@
       July\or August\or September\or October\or November\or December\fi
       \space\number\day, \number\year
   \else
-    \ifSeireki
+    \if西暦
       \number\year 年
       \number\month 月
       \number\day 日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjspf.cls
index 5a9e2b260ed..a7d0439b83e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjspf.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjspf.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjspf}
-  [2012/04/24]
+  [2012/05/08 ]
 \RequirePackage{luatexja}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -1244,12 +1244,12 @@
     \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
     \inhibitglue \ignorespaces
   \fi}
-\def\Shou#1{\hbox{$\m@th$%
+\def\小#1{\hbox{$\m@th$%
   \csname S@\f@size\endcsname
   \fontsize\sf@size\z@
   \math@fontsfalse\selectfont
   #1}}
-\def\UeShou#1{{\sbox\z@ T\vbox to\ht0{\Shou{#1}\vss}}}
+\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}}
 \def\cmrTeX{%
   \ifdim \fontdimen\@ne\font >\z@
     T\kern-.25em\lower.5ex\hbox{E}\kern-.125emX\@
@@ -1258,12 +1258,12 @@
   \fi}
 \def\cmrLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.32em\UeShou{A}\kern-.22em\cmrTeX
+    L\kern-.32em\上小{A}\kern-.22em\cmrTeX
   \else
-    L\kern-.36em\UeShou{A}\kern-.15em\cmrTeX
+    L\kern-.36em\上小{A}\kern-.15em\cmrTeX
   \fi}
 \def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@}
-\def\sfLaTeX{L\kern-.25em\UeShou{A}\kern-.08em\sfTeX}
+\def\sfLaTeX{L\kern-.25em\上小{A}\kern-.08em\sfTeX}
 \def\ptmTeX{%
   \ifdim \fontdimen\@ne\font >\z@
     T\kern-.12em\lower.37ex\hbox{E}\kern-.02emX\@
@@ -1272,9 +1272,9 @@
   \fi}
 \def\ptmLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.2em\UeShou{A}\kern-.1em\ptmTeX
+    L\kern-.2em\上小{A}\kern-.1em\ptmTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.1em\ptmTeX
+    L\kern-.3em\上小{A}\kern-.1em\ptmTeX
   \fi}
 \def\pncTeX{%
   \ifdim \fontdimen\@ne\font >\z@
@@ -1284,9 +1284,9 @@
   \fi}
 \def\pncLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+    L\kern-.3em\上小{A}\kern-.1em\pncTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+    L\kern-.3em\上小{A}\kern-.1em\pncTeX
   \fi}
 \def\pplTeX{%
   \ifdim \fontdimen\@ne\font >\z@
@@ -1296,9 +1296,9 @@
   \fi}
 \def\pplLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.27em\UeShou{A}\kern-.12em\pplTeX
+    L\kern-.27em\上小{A}\kern-.12em\pplTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.15em\pplTeX
+    L\kern-.3em\上小{A}\kern-.15em\pplTeX
   \fi}
 \def\ugmTeX{%
   \ifdim \fontdimen\@ne\font >\z@
@@ -1308,9 +1308,9 @@
   \fi}
 \def\ugmLaTeX{%
   \ifdim \fontdimen\@ne\font >\z@
-    L\kern-.2em\UeShou{A}\kern-.13em\ugmTeX
+    L\kern-.2em\上小{A}\kern-.13em\ugmTeX
   \else
-    L\kern-.3em\UeShou{A}\kern-.13em\ugmTeX
+    L\kern-.3em\上小{A}\kern-.13em\ugmTeX
   \fi}
 \DeclareRobustCommand{\TeX}{%
   \def\@tempa{cmr}%
@@ -1370,10 +1370,10 @@
 \def\pLaTeX{p\LaTeX}
 \def\pLaTeXe{p\LaTeXe}
 \def\AmSTeX{\protect\AmS-\protect\TeX{}}
-\DeclareRobustCommand{\BibTeX}{B\kern-.05em\Shou{I\kern-.025em B}%
+\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}%
   \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
 \DeclareRobustCommand{\SliTeX}{%
-  S\kern-.06emL\kern-.18em\UeShou{I}\kern -.03em\TeX}
+  S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX}
 \newcommand{\prepartname}{\if@english Part~\else 第\fi}
 \newcommand{\postpartname}{\if@english\else 部\fi}
 \newcommand{\presectionname}{}%  第
@@ -1388,9 +1388,9 @@
 \newcommand{\tablename}{Table~}
 \newcommand{\appendixname}{\if@english Appendix~\else 付録\fi}
 \newcommand{\abstractname}{\if@english Abstract\else 概要\fi}
-\newif\ifSeireki \Seirekitrue
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦true
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{%
   \if@english
@@ -1399,7 +1399,7 @@
       July\or August\or September\or October\or November\or December\fi
       \space\number\day, \number\year
   \else
-    \ifSeireki
+    \if西暦
       \number\year 年
       \number\month 月
       \number\day 日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
index bef3b2dcf5a..74df57bc2c7 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-xunicode}[2012/4/18 Patch to xunicode for LuaLaTeX-ja]
+\ProvidesPackage{lltjp-xunicode}[2012/04/18 Patch to xunicode for LuaLaTeX-ja]
 
 \def\UTFencname{EU2}\def\XeTeXpicfile{}
 \RequirePackage{xunicode,luatexja}