luatexja (28mar19)

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

12 files changed, 507 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index 1ff6d7be542..06fbe0a1e51 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/README
+++ b/Master/texmf-dist/doc/luatex/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20190225.0
+The LuaTeX-ja Package 20190328.0
 --------------------------------
 Copyright (c) 2011--2019 The LuaTeX-ja project
 License: modified BSD (see COPYING)
@@ -40,9 +40,9 @@ Installation
 2. If you must/want to install manually:
 
    a. Download the source archive from CTAN,
-      or tagged as 20190225.0 in the Git repository by
+      or tagged as 20190328.0 in the Git repository by
       <http://git.osdn.jp/view?p=luatex-ja/luatexja.git
-                              ;a=snapshot;h=refs/tags/20190225.0;sf=tgz>
+                              ;a=snapshot;h=refs/tags/20190328.0;sf=tgz>
 
    b. Extract the archive and process following three files by LuaLaTeX
       to generate classes for Japanese typesetting:
@@ -87,4 +87,4 @@ Notes
 
 * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
 
-Last commit date: Mon Feb 25 19:41:42 2019 +0900
+Last commit date: Thu Mar 28 17:45:21 2019 +0900
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
index 94327a49edf..f51f0d27578 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
index fa703cbe715..12e6c4a3fd6 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
index f32190fedc8..4e3117a012b 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
@@ -1656,7 +1656,7 @@ The following presets are defined:
   \hyphenchar\font=-1 \exhyphenchar=-1
   hiragino-pro, hiragino-pron, ipa, ipa-hg, ipaex, ipaex-hg,
   kozuka-pr6, kozuka-pr6n, kozuka-pro, moga-mobo, moga-mobo-ex,
-  morisawa-pr6n, morisawa-pro, ms, ms-hg, noembed, noto-otc, noto-otf,
+  bizud, morisawa-pr6n, morisawa-pro, ms, ms-hg, noembed, noto-otc, noto-otf,
   sourcehan, sourcehan-jp, ume, yu-osx, yu-win, yu-win10
 \end{quote}
 
@@ -7804,13 +7804,13 @@ We didn't taken account of when more than one options among them are specified.
 \label{sssec:ltjpreset-multi}
 
 %<*en>
-Besides \texttt{morisawa-pro}~and~\texttt{morisawa-pr6n} presets,
+Besides \texttt{bizud}, \texttt{morisawa-pro},~and~\texttt{morisawa-pr6n} presets,
 fonts are specified by font name, not by file name.
 In following tables, starred fonts (e.g.~KozGo\dots-Regular) are used for medium series of \textit{gothic},
 \emph{if and only if \texttt{deluxe} option is specified}.
 %</en>
 %<*ja>
-\texttt{morisawa-pro}, \texttt{morisawa-pr6n}以外はフォントの指定は
+\texttt{bizud}, \texttt{morisawa-pro}, \texttt{morisawa-pr6n}以外はフォントの指定は
 （ファイル名でなく）フォント名で行われる．
 以下の表において，*\,つきのフォント(e.g.,~KozGo\dots-Regular)は，\emph{\texttt{deluxe}オプション指定時に}
 ゴシック体中字として用いられるものを示している．
@@ -7857,7 +7857,6 @@ There is not rounded gothic family in Kozuka fonts.
 \end{tabular}
 \end{center}
 
-%<en>\newpage
  \item[hiragino-pro]  Hiragino Pro (Adobe-Japan1-5) fonts.
 %<en>    \\*[-\dimexpr\medskipamount+\baselineskip\relax]
  \item[hiragino-pron] Hiragino ProN (Adobe-Japan1-5, JIS04-savvy) fonts.
@@ -7904,6 +7903,34 @@ Std/StdNフォントであり，その他はAdobe-Japan1-5対応である．
 \end{tabular}
 \end{center}
 
+%<ja>\newpage
+\item[bizud] BIZ UD fonts (by Morisawa Inc.) bundled with
+  Windows~10 October 2018 Update.
+\begin{center}\small
+\begin{tabular}{ll>{\ttfamily}l}
+\toprule
+\textbf{family}&\textbf{series}\\
+\midrule
+%<en>\textit{mincho}
+%<ja>\textgt{明朝}%
+ &&BIZ-UDMinchoM.ttc\\
+\midrule
+ &medium&BIZ-UDGothicR.ttc\\
+\cmidrule(l){2-3}
+%<en>\textit{gothic}%
+%<ja>\gt ゴシック
+ &bold&BIZ-UDGothicB.ttc\\
+ &extra bold&BIZ-UDGothicB.ttc\\
+\midrule
+%<en>\textit{rounded gothic}
+%<ja>\gt 丸ゴシック
+&&BIZ-UDGothicB.ttc\\
+\bottomrule
+\end{tabular}
+\end{center}
+
+%<en>\newpage
+
  \item[morisawa-pro]  Morisawa Pro (Adobe-Japan1-4) fonts.
 %<en>    \\*[-\dimexpr\medskipamount+\baselineskip\relax]
  \item[morisawa-pr6n]  Morisawa Pr6N (Adobe-Japan1-6, JIS04-savvy) fonts.
@@ -8022,6 +8049,7 @@ Std/StdNフォントであり，その他はAdobe-Japan1-5対応である．
 \end{tabular}
 \end{center}
 
+%<en>\newpage
  \item[sourcehan]  Source Han Serif and Source Han Sans fonts (Language-specific OTF \textit{or} OTC)
 %<en>    \\*[-\dimexpr\medskipamount+\baselineskip\relax]
  \item[sourcehan-jp]  Source Han Serif JP and Source Han Sans JP fonts (Region-specific Subset OTF)
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
new file mode 100644
index 00000000000..82266eec370
--- /dev/null
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-27c.sty
@@ -0,0 +1,406 @@
+%
+% luatexja-fontspec-27c.sty
+%
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{luatexja-fontspec-27c}[2019/03/20 fontspec support of LuaTeX-ja]
+\RequirePackage{l3keys2e,luatexja}
+\ExplSyntaxOn
+
+%%%%%%%% Change Japanese font family by \rmfamily or not
+\cs_new:Npn \__ltj_fontspec_match_cmd {
+  \renewcommand\jttdefault{\gtdefault}
+  \@ltj@match@familytrue
+  \DeclareDocumentCommand \setmonojfont { O{} m } {
+    \__ltj_fontspec_set_family:Nnn \jttdefault {##1}{##2}
+    \normalfont
+  }
+}
+\bool_if:NT  \__ltj_fontspec_match_bool \__ltj_fontspec_match_cmd
+
+%%%%%%%% Messages
+\msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}
+{
+  \string\addjfontfeature (s)~ ignored;\\
+  it~ cannot~ be~ used~ with~ a~ font~ that~ wasn't~ selected~ by~ luatexja-fontspec.
+}
+
+\msg_new:nnn {luatexja-fontspec} {altfont-ignored-by-norange}
+{
+  ignored~ sublist~ `#1'~ in~ AltFont~ (no~ range~ is~ specified).
+}
+
+\msg_new:nnn {luatexja-fontspec} {altfont-ignored-by-rangeonly}
+{
+  ignored~ sublist~ `#1'~ in~ AltFont~ (only~ range~ is~ specified).
+}
+
+\cs_generate_variant:Nn \prg_new_conditional:Nnn {Nnx}
+
+%%%%%%%% Internal control sequences
+%% Each CS is ltj_fontspec version that corresponds to original CS of fontspec.
+\cs_new:Nn \__ltj_fontspec_define_option:nn {
+  \__fontspec_keys_define_code:nnn {fontspec} {#1} {#2}
+}
+\cs_new:Nn \__ltj_fontspec_define_preparse_external:nn {
+  \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {#1} {#2}
+}
+\cs_new:Nn \__ltj_fontspec_define_altfont_option:nn {
+  \__fontspec_keys_define_code:nnn {fontspec-ltjaltfont} {#1} {#2}
+}
+
+%% Alternate Fonts
+%% Spec: AltFont = {
+%%   ...
+%%   { Range = <range>, <font features> },
+%%   { Range = <range>, Font = <font name>, <font features> },
+%%   { Range = <range>, Font = <font name> },
+%%   ...
+%% }
+\tl_new:N  \l__ltj_fontspec_altname_tl
+\tl_new:N  \l__ltj_fontspec_altrange_tl
+\clist_new:N  \l__ltj_fontspec_altfont_clist
+\clist_new:N  \l__ltj_fontspec_altfont_leftover_clist
+\int_new:N \g__ltj_fontspec_altnumber_int
+
+\__ltj_fontspec_define_altfont_option:nn {Range} {
+  \tl_set:Nn \l__ltj_fontspec_altrange_tl {#1}
+}
+\__ltj_fontspec_define_altfont_option:nn {Font} {
+  \fontspec_complete_fontname:Nn \l__ltj_fontspec_altname_tl {#1}
+}
+\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {AltFont} {
+  \clist_put_right:Nn \l__ltj_fontspec_altfont_clist  { #1 }
+}
+\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {YokoFeatures} {
+  \clist_put_right:Nn \l__ltj_fontspec_fontfeat_yoko_clist { #1 }
+}
+\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFeatures} {
+  \clist_put_right:Nn \l__ltj_fontspec_fontfeat_tate_clist { #1 }
+}
+\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFont} {
+  \tl_if_empty:nF {#1} {
+    \fontspec_complete_fontname:Nn \l__ltj_fontspec_fontname_tate_tl {#1}
+  }
+}
+%%
+\clist_new:N \l__ltj_fontspec_fontfeat_yoko_clist
+\clist_new:N \l__ltj_fontspec_fontfeat_tate_clist
+\tl_new:N    \l__ltj_fontspec_fontname_tate_tl
+
+\cs_new:Npn \__ltj_fontspec_DeclareFontFamily #1 #2 #3 {
+  \DeclareKanjiFamily {JY3} {#2} {#3}
+  \DeclareKanjiFamily {JT3} {#2} {#3}
+}
+
+%% save and restore global variable
+\tl_new:N \g__ltj_fontspec_kanji_nfss_family_tl
+\tl_new:N \g__ltj_fontspec_orig_nfss_family_tl
+\seq_new:N \g__ltj_fontspec_kanji_bf_series_seq
+\seq_new:N \g__ltj_fontspec_orig_bf_series_seq
+\clist_new:N \g__ltj_fontspec_kanji_default_fontopts_clist
+\clist_new:N \g__ltj_fontspec_orig_default_fontopts_clist
+
+\cs_new:Nn \__ltj_set_global_variable_for_kanji: {
+  \tl_gset_eq:NN \g__ltj_fontspec_orig_nfss_family_tl \g__fontspec_nfss_family_tl
+  \tl_gset_eq:NN \g__fontspec_nfss_family_tl \g__ltj_fontspec_kanji_nfss_family_tl
+  \seq_gset_eq:NN \g__ltj_fontspec_orig_bf_series_seq \g__fontspec_bf_series_seq
+  \seq_gset_eq:NN \g__fontspec_bf_series_seq \g__ltj_fontspec_kanji_bf_series_seq
+  %\seq_gclear:N \g__fontspec_bf_series_seq
+  \clist_set_eq:NN \g__ltj_fontspec_orig_default_fontopts_clist \g__fontspec_default_fontopts_clist
+  \clist_set_eq:NN \g__fontspec_default_fontopts_clist \g__ltj_fontspec_kanji_default_fontopts_clist
+}
+
+\cs_new:Nn \__ltj_restore_global_variable: {
+  \tl_gset_eq:NN \g__ltj_fontspec_kanji_nfss_family_tl \g__fontspec_nfss_family_tl
+  \tl_gset_eq:NN \g__fontspec_nfss_family_tl \g__ltj_fontspec_orig_nfss_family_tl
+  \seq_gset_eq:NN \g__ltj_fontspec_kanji_bf_series_seq \g__fontspec_bf_series_seq
+  \seq_gset_eq:NN \g__fontspec_bf_series_seq \g__ltj_fontspec_orig_bf_series_seq
+  \clist_set_eq:NN \g__ltj_fontspec_kanji_default_fontopts_clist \g__fontspec_default_fontopts_clist
+  \clist_set_eq:NN \g__fontspec_default_fontopts_clist \g__ltj_fontspec_orig_default_fontopts_clist
+}
+
+\cs_set_eq:NN \__ltj_orig_fontspec_select_font_family:nn \__fontspec_select_font_family:nn
+\cs_new_protected:Nn \__ltj_fontspec_select_font_family:nn {
+  \group_begin:
+  \__ltj_fontspec_define_option:nn {NoEmbed} {}
+  \__ltj_fontspec_define_option:nn {AltFont} {
+    \clist_put_right:Nn \l__ltj_fontspec_altfont_clist { ##1 }
+  }
+  \__ltj_fontspec_define_option:nn {CID} {
+    \__fontspec_update_featstr:n {cid=##1}
+  }
+  \__ltj_fontspec_define_option:nn {Kanjiskip} {
+    \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
+      \__fontspec_update_featstr:n {-ltjksp}
+    } {
+      \__fontspec_update_featstr:n {+ltjksp}
+    }
+  }
+  \__ltj_fontspec_define_option:nn {JFM} {
+    \__fontspec_update_featstr:n {jfm=##1}
+  }
+  % vary by shape
+  \__ltj_fontspec_define_option:nn {YokoFeatures} {
+    \clist_put_right:Nn \l__ltj_fontspec_fontfeat_yoko_clist { ##1 }
+  }
+  \__ltj_fontspec_define_option:nn {TateFeatures} {
+    \clist_put_right:Nn \l__ltj_fontspec_fontfeat_tate_clist { ##1 }
+  }
+  \__ltj_fontspec_define_option:nn {TateFont}
+  {
+    \tl_if_empty:nF {##1} {
+      \fontspec_complete_fontname:Nn \l__ltj_fontspec_fontname_tate_tl {##1}
+    }
+  }
+  \__ltj_fontspec_define_option:nn {JFM-var} {
+    \__fontspec_update_featstr:n {jfmvar=##1}
+  }
+  \__ltj_fontspec_define_preparse_external:nn {NoEmbed} {
+    \cs_set:Npn \__fontspec_fontname_wrap:n ##1 {psft:##1}
+  }
+
+  %% Omit the warning message
+  %% "OpenType feature 'Kerning=Off' (-kern) not available ..."
+  \keys_define:nn {fontspec-opentype} {
+    Kerning/Off.code:n=\__fontspec_update_featstr:n {-kern}
+  }
+  \clist_set:Nx \g__fontspec_default_fontopts_clist {
+    YokoFeatures = { JFM=\ltj@stdyokojfm }, TateFeatures = { JFM=\ltj@stdtatejfm },
+    Scale=\Cjascale, Kerning=Off, Script=CJK,
+    \g__ltj_fontspec_kanji_default_fontopts_clist
+  }
+  \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop
+  \cs_set_eq:NN \__fontspec_make_font_shapes:Nnnnn \__ltj_fontspec_make_font_shapes:Nnnnn
+  \cs_set_eq:NN \DeclareFontFamily \__ltj_fontspec_DeclareFontFamily
+  \tl_set:Nn \g_fontspec_encoding_tl {JY3}
+  \__ltj_orig_fontspec_select_font_family:nn{#1}{#2}
+
+  \cs_gset:Npx \__ltj_fontspec_aftergroup {
+    \exp_not:N \tl_set:Nn \exp_not:N \l_fontspec_family_tl { \l_fontspec_family_tl }
+  }
+  \aftergroup \__ltj_fontspec_aftergroup
+  \group_end:
+}
+
+%% declare_shape
+
+\cs_new:Nn \__ltj_fontspec_declare_shape_yoko:nnnn {
+  \__ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JY3 } { \l__ltj_fontspec_fontfeat_yoko_clist }
+}
+\cs_new:Nn \__ltj_fontspec_declare_shape_tate:nnnn {
+  \__ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JT3 } { \l__ltj_fontspec_fontfeat_tate_clist }
+}
+\cs_new:Nn \__ltj_fontspec_declare_shape:nnnn {
+  \__ltj_fontspec_declare_shape_yoko:nnnn {#1} {#2} {#3} {#4}
+  \__ltj_fontspec_declare_shape_tate:nnnn {#1} {#2} {#3} {#4}
+}
+\cs_generate_variant:Nn \__ltj_fontspec_declare_shape:nnnn {nnxx}
+\cs_generate_variant:Nn \__ltj_fontspec_declare_shape_yoko:nnnn {nnxx}
+\cs_generate_variant:Nn \__ltj_fontspec_declare_shape_tate:nnnn {nnxx}
+
+\cs_new:Nn \__ltj_fontspec_declare_shape_aux:nnnnnn
+{
+  \tl_build_begin:N \l__fontspec_nfss_tl
+  \tl_build_begin:N \l__fontspec_nfss_sc_tl
+  \tl_set_eq:NN \l__fontspec_saved_fontname_tl \l_fontspec_fontname_tl
+
+  \tl_set:Nn \g_fontspec_encoding_tl {#5}
+  \tl_set:Nn \g__fontspec_nfss_enc_tl {#5}
+  \exp_args:Nx \clist_map_inline:nn {#4}
+    { \__ltj_fontspec_setup_single_size:nnn {#3} {#6} {##1} }
+  \tl_build_end:N \l__fontspec_nfss_tl
+  \tl_build_end:N \l__fontspec_nfss_sc_tl
+
+  \bool_set_true:N \l__fontspec_nosc_bool
+  \__fontspec_declare_shapes_normal:nn  {#1} {#2}
+  \__fontspec_declare_shape_slanted:nn  {#1} {#2}
+}
+
+\cs_new:Nn \__ltj_fontspec_setup_single_size:nnn
+{
+    \tl_clear:N \l__fontspec_size_tl
+    \tl_set_eq:NN \l__fontspec_sizedfont_tl \l__fontspec_saved_fontname_tl % in case not spec'ed
+
+    \keys_set_known:nxN {fontspec-sizing} { \exp_after:wN \use:n #3 }
+      \l__fontspec_sizing_leftover_clist
+    \tl_if_empty:NT \l__fontspec_size_tl { \__fontspec_error:n {no-size-info} }
+
+	\str_if_eq:nnTF { \g__fontspec_nfss_enc_tl } { JY3 } {
+      % "normal"
+      \__fontspec_load_fontname:Nn \l_fontspec_fontname_tl {\l__fontspec_sizedfont_tl}
+    } {
+      \tl_if_empty:NTF \l__ltj_fontspec_fontname_tate_tl
+        { \__fontspec_load_fontname:Nn \l_fontspec_fontname_tl  {\l__fontspec_sizedfont_tl} }
+        { \__fontspec_load_fontname:Nn \l_fontspec_fontname_tl  {\l__ltj_fontspec_fontname_tate_tl} }
+    }
+    \__fontspec_setup_nfss:Nnnn \l__fontspec_nfss_tl {#1} {#2} {}
+}
+
+\cs_new:Nn \__ltj_fontspec_set_family:Nnn {
+  \__ltj_set_global_variable_for_kanji:
+  \cs_set_eq:NN \__fontspec_select_font_family:nn \__ltj_fontspec_select_font_family:nn
+  \__ltj_orig_fontspec_set_family:Nnn #1 {#2} {#3}
+  \cs_set_eq:NN \__fontspec_select_font_family:nn \__ltj_orig_fontspec_select_font_family:nn
+  \__ltj_restore_global_variable:
+}
+\cs_set_eq:NN \__ltj_orig_fontspec_set_family:Nnn \fontspec_set_family:Nnn
+\cs_set_eq:NN \__ltj_orig_fontspec_make_font_shapes:Nnnnn \__fontspec_make_font_shapes:Nnnnn
+\cs_set_eq:NN \__ltj_fontspec_orig_DeclareFontShape \DeclareFontShape
+
+\cs_new:Nn \__ltj_fontspec_make_font_shapes:Nnnnn {
+  \group_begin:
+    %% 基底フォント
+    \cs_set_eq:NN \__fontspec_font_set:Nnn \use_none:nnn
+    \cs_set_eq:NN \__fontspec_font_if_null:NT \use_none:nn
+    \cs_set_eq:NN \__fontspec_declare_shape:nnxx \__ltj_fontspec_declare_shape:nnxx
+    \__ltj_orig_fontspec_make_font_shapes:Nnnnn {#1} {#2} {#3} {#4} {#5}
+    %%
+    \__ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3}
+     {#4, \l__ltj_fontspec_fontfeat_yoko_clist}{#5} {JY3 }
+    \__ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3}
+     {#4, \l__ltj_fontspec_fontfeat_tate_clist}{#5} {JT3}
+  \group_end:
+ }
+
+%%% Altfont 内部処理部
+\cs_new:Nn \__ltj_fontspec_make_font_shapes_alt:Nnnnnn {
+  \group_begin:
+    \str_if_eq:nnTF { #6 } { JY3 } {
+      \cs_set_eq:NN \__fontspec_declare_shape:nnxx \__ltj_fontspec_declare_shape_yoko:nnxx
+    }{
+      \cs_set_eq:NN \__fontspec_declare_shape:nnxx \__ltj_fontspec_declare_shape_tate:nnxx
+    }
+    \keys_set_known:nn {fontspec-ltjaltfont-reparse} { #4 }
+    \clist_if_empty:NF \l__ltj_fontspec_altfont_clist {
+      \int_gzero:N \g__ltj_fontspec_altnumber_int
+      \clist_map_inline:Nn \l__ltj_fontspec_altfont_clist {
+        \tl_clear:N  \l__ltj_fontspec_altrange_tl
+        \tl_set:Nn \l__ltj_fontspec_altname_tl { #1 }
+        \tl_set:Nn \l_tmpa_tl { #1 }
+
+        \keys_set_known:nxN {fontspec-ltjaltfont} { \exp_after:wN \use:n ##1 }
+          \l__ltj_fontspec_altfont_leftover_clist
+        \keys_set_known:nn {fontspec-ltjaltfont-reparse} { \exp_after:wN \use:n ##1 }
+
+        \tl_if_empty:NT \l__ltj_fontspec_altrange_tl {
+          \msg_warning:nnn  {luatexja-fontspec} {altfont-ignored-by-norange} { ##1 }
+        } {
+          \bool_if:nTF {
+            \tl_if_eq_p:NN \l__ltj_fontspec_altname_tl \l_tmpa_tl
+            &&
+            \tl_if_empty_p:N \l__ltj_fontspec_altfont_leftover_clist
+          } {
+            \msg_warning:nnn  {luatexja-fontspec} {altfont-ignored-by-rangeonly} { ##1 }
+          } {
+            \__ltj_orig_fontspec_make_font_shapes:Nnnnn
+                { \l__ltj_fontspec_altname_tl } {#2}
+                {#3 _ alt \int_use:N \g__ltj_fontspec_altnumber_int }
+                {#4, \l__ltj_fontspec_altfont_leftover_clist }
+                {#5}
+            \DeclareAlternateKanjiFont
+              { #6 }{ \g__fontspec_nfss_family_tl }{#2}{#3}%
+              { #6 }{ \g__fontspec_nfss_family_tl }{#2}
+              { #3 _alt \int_use:N \g__ltj_fontspec_altnumber_int }
+              { \l__ltj_fontspec_altrange_tl }
+            \int_gincr:N \g__ltj_fontspec_altnumber_int
+          }
+        }
+      }
+    }
+  \group_end:
+}
+
+
+%%%%%%%% User commands
+\DeclareDocumentCommand \jfontspec { O{} m O{} } {
+  \__ltj_fontspec_set_family:Nnn \k@family {#1,#3}{#2}
+  \selectfont
+  \ignorespaces
+}
+
+\DeclareDocumentCommand \setmainjfont { O{} m O{} } {
+  \__ltj_fontspec_set_family:Nnn \mcdefault {#1,#3}{#2}
+  \unless\ifltj@disablejfam
+    \DeclareSymbolFont{mincho}{JY3}{\mcdefault}{\mddefault}{n}
+    \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{\bfdefault}{n}
+  \fi
+  \normalfont
+}
+
+\DeclareDocumentCommand \setsansjfont { O{} m O{} } {
+  \__ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2}
+  \unless\ifltj@disablejfam
+    \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{\mddefault}{n}
+  \fi
+  \normalfont
+}
+
+\DeclareDocumentCommand \newjfontfamily { m O{} m O{} } {
+  \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
+  \newfontfamily #1 [#2,#4] {#3}
+  \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
+}
+\DeclareDocumentCommand \renewjfontfamily { m O{} m O{} } {
+  \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
+  \renewfontfamily #1 [#2,#4] {#3}
+  \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
+}
+\DeclareDocumentCommand \setjfontfamily { m O{} m O{} } {
+  \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
+  \setfontfamily #1 [#2,#4] {#3}
+  \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
+}
+
+\DeclareDocumentCommand \newjfontface { m O{} m O{} } {
+  \newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
+}
+
+\prop_new:N \g__ltj_fontspec_fontopts_prop
+\DeclareDocumentCommand \defaultjfontfeatures { t+ o m }
+ {
+  \IfNoValueTF {#2}
+   { \__ltj_fontspec_set_default_features:nn {#1} {#3} }
+   { \__ltj_fontspec_set_font_default_features:nnn {#1} {#2} {#3} }
+  \ignorespaces
+ }
+\cs_new:Nn \__ltj_fontspec_set_default_features:nn
+ {
+   \__ltj_set_global_variable_for_kanji:
+   \__fontspec_set_default_features:nn {#1} {#2}
+   \__ltj_restore_global_variable:
+ }
+\cs_new:Nn \__ltj_fontspec_set_font_default_features:nnn
+ {
+   \prop_set_eq:NN \l__ltj_fontspec_tmp_prop \g__fontspec_fontopts_prop
+   \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop
+   \__fontspec_set_font_default_features:nnn {#1} {#2} {#3}
+   \prop_set_eq:NN \g__ltj_fontspec_fontopts_prop \g__fontspec_fontopts_prop
+   \prop_set_eq:NN \g__fontspec_fontopts_prop \l__ltj_fontspec_tmp_prop
+ }
+
+\DeclareDocumentCommand \addjfontfeatures {m} {
+  \__ltj_fontspec_if_fontspec_font:TF
+   {
+    \__ltj_set_global_variable_for_kanji:
+    \group_begin:
+      \tl_set_eq:NN \f@family \k@family
+      \cs_set_eq:NN \__fontspec_select_font_family:nn \__ltj_fontspec_select_font_family:nn
+      \addfontfeatures {#1}
+    \group_end:
+    \kanjifamily\g__fontspec_nfss_family_tl\selectfont
+    \__ltj_restore_global_variable:
+   }{
+    \msg_warning:nn  {luatexja-fontspec} {addjfontfeatures-ignored}
+   }
+  \ignorespaces
+}
+
+\cs_set_eq:NN \addjfontfeature \addjfontfeatures
+
+\prg_new_conditional:Nnn \__ltj_fontspec_if_fontspec_font: {TF,T,F}
+{
+  \cs_if_exist:cTF {g__fontspec_fontinfo_ \k@family _prop} \prg_return_true: \prg_return_false:
+}
+
+\endinput
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 b7b2b74fee2..e98fbc7b952 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2019/01/28 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[2019/03/20 fontspec support of LuaTeX-ja]
 \RequirePackage{l3keys2e,luatexja}
 \ExplSyntaxOn
 
@@ -29,8 +29,10 @@
 
 \RequirePackage{fontspec}[2017/01/01]% v2.5c
 \@ifpackagelater{fontspec}{2018/07/29}%
-  {\RequirePackage{luatexja-fontspec-26h}}% v2.6h
-  {\RequirePackage{luatexja-fontspec-25c}}% v2.5c
+  {\@ifpackagelater{fontspec}{2019/03/15}%
+    {\RequirePackage{luatexja-fontspec-27c}} % v2.7c
+    {\RequirePackage{luatexja-fontspec-26h}}}% v2.6h
+  {\RequirePackage{luatexja-fontspec-25c}}   % v2.5c
 
 \ExplSyntaxOff
 %%%%%%%% Now we completely ignore kanjifont definition file.
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 4b81aed1bd3..2eb38c83842 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}[2019/02/25 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2019/03/26 Japanese font presets]
 
 \RequirePackage{expl3,l3keys2e}
 \RequirePackage{luatexja}
@@ -192,6 +192,13 @@
 }
 
 % モリサワ
+\ltjpreset_declare_preset:nx{bizud}{
+    mc =   BIZ-UDMinchoM.ttc,
+    gt-d = BIZ-UDGothicR.ttc, gt-bx = BIZ-UDGothicB.ttc,
+    gt-u = BIZ-UDGothicR.ttc, gt-eb = BIZ-UDGothicB.ttc,
+    mg-m = BIZ-UDGothicB.ttc,
+    __custom = false, __office = false, __noembed = false,
+}
 \ltjpreset_declare_preset:nx{morisawa-pro}{
     mc =   A-OTF-RyuminPro-Light.otf,      mc-bx = A-OTF-FutoMinA101Pro-Bold.otf,
     gt-d = A-OTF-GothicBBBPro-Medium.otf , gt-bx = A-OTF-FutoGoB101Pro-Bold.otf,
@@ -417,12 +424,31 @@
   }
 }
 
+%%%%%%%% フォント名を \l__ltjpreset_font_name: に格納
+\clist_new:N \l__ltjpreset_extensions_clist
+\clist_set:Nn \l__ltjpreset_extensions_clist {.otf,.ttf,.OTF,.TTF,.ttc,.TTC}
+\prg_new_conditional:Nnn \__ltjpreset_if_detect_external:n {TF} {
+  \clist_map_inline:Nn \l__ltjpreset_extensions_clist {
+    \bool_set_false:N \l_tmpa_bool
+    \tl_if_in:nnT {#1 <= end_of_string} {##1 <= end_of_string}
+      { \bool_set_true:N \l_tmpa_bool \clist_map_break: }
+  }
+  \bool_if:NTF \l_tmpa_bool \prg_return_true: \prg_return_false:
+}
+\cs_new:Nn \__ltjpreset_wrap_fontname:n {
+  \__ltjpreset_if_detect_external:nTF { #1 }
+    { \cs_set:Nn \l__ltjpreset_font_name: { [#1] } }
+    { \cs_set:Nn \l__ltjpreset_font_name: { "#1" } }
+}
+\cs_generate_variant:Nn \__ltjpreset_wrap_fontname:n { e }
+
 %%%%%%%% 存在判定
 \cs_new:Nn \__ltjpreset_substitute:nnnn {
   \group_begin:
     \suppressfontnotfounderror=1
     \cs_if_exist:cT {ltjpreset_font_#1_#2:} {
-      \font \g__ltjpreset_font_test: = "\cs:w ltjpreset_font_#1_#2: \cs_end:"\relax
+	  \__ltjpreset_wrap_fontname:e { \cs:w ltjpreset_font_#1_#2: \cs_end: }
+      \font \g__ltjpreset_font_test: = \l__preset_font_name:\relax
       \ifx \g__ltjpreset_font_test: \nullfont
         \msg_warning:nnxxxx { luatexja-preset }{ no-font }
           { \cs:w ltjpreset_font_#1_#2: \cs_end: }{ #1/#2 }
@@ -470,24 +496,25 @@
       ;-kern \tl_use:N \l__ltjpreset_kanji_shape_tl; #6 } {}
   }
   \cs_new:Nn \__ltjpreset_define_family:nnn {
+	\__ltjpreset_wrap_fontname:e { #3 }
     \__ltjpreset_declare_font_shape:nnnnnnn { JY3 }
       { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n }
-      { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_yoko_tl }
+      { \l__ltjpreset_font_name: : jfm=\tl_use:N \__ltjpreset_use_jfm_yoko_tl }
       { script=hani \bool_if:NT \g__ltjpreset_expert_bool { ;+hkna } }
 	  { \Cjascale }
     \__ltjpreset_declare_font_shape:nnnnnnn { JT3 }
       { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n }
-      { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_tate_tl }
+      { \l__ltjpreset_font_name:  : jfm=\tl_use:N \__ltjpreset_use_jfm_tate_tl }
       { script=hani \bool_if:NT \g__ltjpreset_expert_bool { ;+vkna } }
 	  { \Cjascale }
     \bool_if:NT \g__ltjpreset_expert_bool {
       \__ltjpreset_declare_font_shape:nnnnnnn { JY3 }
         { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { rb }
-        { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_yoko_tl } { script=kana; +ruby }
+        { \l__ltjpreset_font_name:  : jfm=\tl_use:N \__ltjpreset_use_jfm_yoko_tl } { script=kana; +ruby }
 	    { \Cjascale }
       \__ltjpreset_declare_font_shape:nnnnnnn { JT3 }
         { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { rb }
-        { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_tate_tl } { script=kana; +ruby }
+        { \l__ltjpreset_font_name:  : jfm=\tl_use:N \__ltjpreset_use_jfm_tate_tl } { script=kana; +ruby }
 	    { \Cjascale }
     }
     \cs_if_exist:NT \ltjpreset_define_family_hook_nfssonly:nnn
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
index 6b8fa81b904..446707bd692 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
@@ -81,6 +81,7 @@
 \ltj@pkgpatch{array}    %% at \begin{document}
 \ltj@pkgpatch@im{unicode-math}
 \ltj@pkgpatch@im{siunitx}
+\ltj@pkgpatch@im{microtype}
 
 \RequirePackage{lltjp-geometry}
 
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index 02be45ee1b3..43d5d727917 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
@@ -35,13 +35,13 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja}[2019/01/28 Japanese Typesetting with Lua(La)TeX]
+  \ProvidesPackage{luatexja}[2019/03/28 Japanese Typesetting with Lua(La)TeX]
   \DeclareOption{disablejfam}{\ltj@disablejfamtrue}
   \DeclareOption*{}
   \ProcessOptions\relax
 \fi                             %</LaTeX>
 %%%% VERSION
-\def\LuaTeXjaversion{20190225.0}
+\def\LuaTeXjaversion{20190328.0}
 
 \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
 
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
index 2c975eea395..100a1c2b7eb 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
@@ -316,7 +316,7 @@
   \edef\@preamble{%
     \@preamble{%
       \ifcase\@chnum
-        \hfil\ltj@sharp\hfil
+        \hfil\hskip1sp\ltj@sharp\hfil
       \or
         \hskip1sp\ltj@sharp\hfil
       \or
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
index 1b4a4a50948..6c25efadc42 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
@@ -689,7 +689,7 @@
 \def\extract@jfont{%
 	\get@external@font
     \ltj@@does@alt@set{\f@encoding/\f@family/\f@series/\f@shape}{%
-      \edef\external@font{\expandafter\ltj@@patch@external@font\romannumeral-`0\external@font}%
+      \edef\external@font{\expandafter\ltj@@patch@external@font\external@font}%
     }%
     \expandafter\globaljfont\font@name\external@font\relax\font@name% ここで時間がかかる
     \csname \f@encoding+\f@family\endcsname
@@ -743,12 +743,15 @@
 
 \let\ltj@@al@getanddefine@fonts=\getanddefine@fonts
 \def\ltj@@ja@getanddefine@fonts#1#2{%
+  \csletcs{if@ltj@tempif}{ifltjselectfont@force@define}%
+  \ltjselectfont@force@definetrue
   \xdef\font@name{\csname \string#2/\tf@size\endcsname}%
   \pickup@jfont\let\textfont@name\font@name
   \xdef\font@name{\csname \string#2/\sf@size\endcsname}%
   \pickup@jfont\let\scriptfont@name\font@name
   \xdef\font@name{\csname \string#2/\ssf@size\endcsname}%
   \pickup@jfont
+  \csletcs{ifltjselectfont@force@define}{if@ltj@tempif}%
   \edef\math@fonts{\math@fonts\ltj@setpar@global%
     \ltj@@set@stackfont#1,\textfont@name:{MJT}%
     \ltj@@set@stackfont#1,\scriptfont@name:{MJS}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty
new file mode 100644
index 00000000000..aacde2f22a0
--- /dev/null
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-microtype.sty
@@ -0,0 +1,19 @@
+%
+% lltjp-microtype.sty 2019-03-28
+%
+% (Work in Progress)
+% 
+\NeedsTeXFormat{LaTeX2e}
+
+\RequirePackage{etoolbox}
+\RequirePackage{luatexja}
+\makeatletter
+
+\def\MT@register@font{%
+  \xdef\MT@font@list{\expandonce{\MT@font@list}\MT@font,}%
+}
+\def\MT@register@subst@font{\MT@exp@one@n\MT@in@clist\font@name\MT@font@list
+  \ifMT@inlist@\else
+	\xdef\MT@font@list{\expandonce{\MT@font@list}\font@name,}%
+  \fi}
+\endinput