luatexja (28jan19)

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

15 files changed, 473 insertions, 385 deletions

diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index f8ff7a69640..720756d0793 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 20190107.0
+The LuaTeX-ja Package 20190128.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 20190107.0 in the Git repository by
+      or tagged as 20190128.0 in the Git repository by
       <http://git.osdn.jp/view?p=luatex-ja/luatexja.git
-                              ;a=snapshot;h=refs/tags/20190107.0;sf=tgz>
+                              ;a=snapshot;h=refs/tags/20190128.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 Jan 7 17:43:21 2019 +0900
+Last commit date: Mon Jan 28 17:51:48 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 c91da6367d8..6563638364f 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 4b62b39883d..d41522d100d 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 f00243bc811..1d7748dbb7a 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
@@ -196,6 +196,15 @@
 \def\cs#1{\texttt{\upshape
   \texorpdfstring{\textbackslash\hbox{\ltjsetparameter{autoxspacing=false}#1}}{\textbackslash#1}}}
 \ltjsetparameter{alxspmode={`\\,allow}}
+\def\text@#1{%
+  \ifnum\mathstyle<\scriptstyle
+	\mbox{#1}
+  \else\ifnum\mathstyle<\scriptscriptstyle
+	\mbox{\let\f@size\sf@size\selectfont#1}
+  \else
+	\mbox{\let\f@size\ssf@size\selectfont#1}
+  \fi\fi
+}
 %%%%%%%%
 \makeatother
 %%%%%%%%
@@ -917,12 +926,14 @@ and finally delete the temporary directory.
 %</ja>
 \begin{itemize}
 %<*en>
-\item With \texttt{luatexja.cfg}, one can use other fonts
-as ``default'' Japanese fonts (Subsection~\ref{ssec:cfg}).
+\item The ``default'' Japanese fonts (and~JFMs for them) can be 
+  modified by defining \cs{ltj@stdmcfont} etc.\ \emph{before}
+  one inputs \texttt{luatexja.sty} (Subsection~\ref{ssec:cfg}).
 %</en>
 %<*ja>
-\item \texttt{luatexja.cfg} を用いることによって，標準和文フォントを
-IPAexフォントから別のフォントに置き換えることができる．\ref{ssec:cfg}節を参照．
+\item 標準和文フォントやJFMをIPAexフォントから別のものに置き換えるには，
+  \cs{ltj@stdmcfont}等を\texttt{luatexja.sty}読み込み\emph{前}に定義すればよい．
+  \ref{ssec:cfg}節を参照．
 %</ja>
 
 %<*en>
@@ -1703,60 +1714,6 @@ as an external package \Pkg{luatexja-otf}.
 \ref{ssec:fontspec}節 (\Pkg{fontspec}) の方法で手動で指定する必要がある．
 %</ja>
 
-%<en>\subsection{Changing default Japanese fonts}
-%<ja>\subsection{標準和文フォントの変更}
-\label{ssec:cfg}
-%<*en>
-If \texttt{luatexja.cfg} can be seen from \LuaTeX, \LuaTeX-ja automatically reads it.
-The main use of \texttt{luatexja.cfg} is for changing default Japanese fonts,
-when IPAex fonts cannot be installed in \TeX~system.
-One should not overuse this \texttt{luatexja.cfg}; fonts which will be used in
-a document should be specified in its source.
-
-For example,
-\begin{lstlisting}
-\def\ltj@stdmcfont{IPAMincho}
-\def\ltj@stdgtfont{IPAGothic}
-\end{lstlisting}
-makes that IPA~Mincho and IPA~Gothic will be used as default Japanese fonts, instead of
-IPAex~Mincho and IPAex~Gothic.
-
-For another example, the following two lines makes that
-non-embedded fonts Ryumin-Light~and~GothicBBB-Medium as default Japanese fonts
-(as the earlier version of \LuaTeX-ja):
-\begin{lstlisting}
-\def\ltj@stdmcfont{psft:Ryumin-Light}
-\def\ltj@stdgtfont{psft:GothicBBB-Medium}
-\end{lstlisting}
-%</en>
-%<*ja>
-\LuaTeX から見える位置に \texttt{luatexja.cfg} があれば，\LuaTeX-jaはそれを読み込む．
-このファイルを用いるとplain~\TeX, \LaTeXe における標準和文フォントを
-IPAex明朝・IPAexゴシックから変更することができる．
-しかし，基本的には\emph{文章中で用いるフォントは（例えば \Pkg{luatexja-preset} などで）
-文書ソース内で指定するべき}であり，この \texttt{luatexja.cfg} は，
-「IPAexフォントがインストールできない」など，IPAexフォントが使用できない場合にのみ
-応急処置的に用いるべきである．
-
-例えば
-\begin{lstlisting}
-\def\ltj@stdmcfont{IPAMincho}
-\def\ltj@stdgtfont{IPAGothic}
-\end{lstlisting}
-と記述しておけば，標準和文フォントがIPA明朝・IPAゴシックへと変
-更される．
-
-
-なお，20140906.0以前のバージョンのように，
-Ryumin-Light, GothicBBB-Mediumという名前の非埋込フォントを用いる場合は
-\begin{lstlisting}
-\def\ltj@stdmcfont{psft:Ryumin-Light}
-\def\ltj@stdgtfont{psft:GothicBBB-Medium}
-\end{lstlisting}
-と記述すればよい．
-%</ja>
-
-
 %<en>\section{Changing Internal Parameters}
 %<ja>\section{パラメータの変更}
 
@@ -3815,6 +3772,77 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont
 ト・縦組用和文フォントの定義が可能であったが，\LuaTeX-jaではそうでないので注意．
 %</ja>
 
+%<en>\subsection{Default Japanese fonts and JFMs}
+%<ja>\subsection{標準和文フォント・JFMの変更}
+\label{ssec:cfg}
+%<*en>
+If following commands are defined at loading \LuaTeX-ja package, these change
+default Japanese fonts and JFMs for them:
+%</en>
+%<*ja>
+\LuaTeX-jaが読み込まれる前に以下の命令が定義されていた場合は，
+それらが標準和文フォントやそれらに用いるJFMとして使われる．
+%</ja>
+
+\begin{cslist}[style=standard]
+  \item[\cs{ltj@stdmcfont}] 
+%<en>The default Japanese font for the mincho family.
+%<ja>明朝体として用いるフォント．
+  \item[\cs{ltj@stdgtfont}]
+%<en>The default Japanese font for the gothic family.
+%<ja>ゴシック体として用いるフォント．
+  \item[\cs{ltj@stdyokojfm}]
+%<en>The default JFM for horizontal direction.
+%<ja>標準で用いる横組用JFM．
+  \item[\cs{ltj@stdyokojfm}]
+%<en>The default JFM for vertical direction.
+%<ja>標準で用いる縦組用JFM．
+\end{cslist}
+
+%<*en>
+For example,
+\begin{lstlisting}
+\def\ltj@stdmcfont{IPAMincho}
+\def\ltj@stdgtfont{IPAGothic}
+\end{lstlisting}
+makes that IPA~Mincho and IPA~Gothic will be used as default Japanese fonts, instead of
+IPAex~Mincho and IPAex~Gothic.
+
+This feature is intended for classes which use special JFMs
+\footnote{This is because commands has \texttt{@} in their names.}.
+It is recommended to use \cs{luatexja-preset}~or~\cs{luatexja-fontspec} package
+to select standard fonts in ordinary \LaTeX\ sources.
+%</en>
+%<*ja>
+例えば
+\begin{lstlisting}
+\def\ltj@stdmcfont{IPAMincho}
+\def\ltj@stdgtfont{IPAGothic}
+\end{lstlisting}
+と記述しておけば，標準和文フォントがIPA明朝・IPAゴシックへと変
+更される．
+
+この機能は，特別のJFMを用いるクラス
+\footnote{例えば阿部紀行氏によるjlreqがそれにあたる．}%
+などでの使用を意図しており，命令名に\texttt{@}が含まれることから
+通常の\TeX/\LaTeX 文書での使用は意図していない．
+通常の\LaTeX 文書では\Pkg{luatexja-preset}や\Pkg{luatexja-fontspec}などで
+使用フォントを選択することを推奨する．
+%</ja>
+
+%<*en>
+For compatibility with earlier versions,
+\LuaTeX-ja reads  \texttt{luatexja.cfg} automatically if it is found by \LuaTeX.
+One should not overuse this \texttt{luatexja.cfg}; it will overwrite
+the definition of \cs{ltj@stdmcfont} and others.
+%</en>
+%<*ja>
+旧バージョンとの互換性のため，
+\LuaTeX から見える位置に\texttt{luatexja.cfg}があれば，\LuaTeX-jaはそれを読み込む．
+しかし，\texttt{luatexja.cfg}内で\cs{ltj@stdmcfont}等が定義されていた場合はそちらが
+優先されるので，もはや\texttt{luatexja.cfg}は使わないほうが良いだろう．
+%</ja>
+
 %<en>\subsection{Prefix \texttt{psft}}
 %<ja>\subsection{\texttt{psft}プリフィックス}
 \label{ssec:psft}
@@ -5060,8 +5088,6 @@ Then, the position of glyphs is shifted up by
 \]
 \end{description}
 
-
-
 %<en>\section{Parameters}
 %<ja>\section{パラメータ}
 \subsection{\cs{ltjsetparameter}}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty
index b4d08cdce1e..0fbe4783165 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-25c}[2018/10/08 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-25c}[2019/01/28 fontspec support of LuaTeX-ja]
 \RequirePackage{l3keys2e,luatexja}
 \ExplSyntaxOn
 
@@ -16,7 +16,7 @@
     \normalfont
   }
 }
-\bool_if:NT  \ltj_fontspec_match_bool \ltj_fontspec_match_cmd
+\bool_if:NT  \__ltj_fontspec_match_bool \ltj_fontspec_match_cmd
 
 %%%%%%%% Messages
 \msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}
@@ -139,7 +139,7 @@
     Kerning/Off.code:n=\__fontspec_update_featstr:n {-kern}
   }
   \clist_set:Nx \g__fontspec_default_fontopts_clist {
-    YokoFeatures = { JFM=ujis }, TateFeatures = { JFM=ujisv },
+    YokoFeatures = { JFM=\ltj@stdyokojfm }, TateFeatures = { JFM=\ltj@stdtatejfm },
     Scale=\Cjascale, Kerning=Off, Script=CJK,
     \g__ltj_fontspec_default_fontopts_clist
   }
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
index ac6757f7bff..a86fb8a3085 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
@@ -3,20 +3,20 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-26h}[2018/10/08 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-26h}[2019/01/28 fontspec support of LuaTeX-ja]
 \RequirePackage{l3keys2e,luatexja}
 \ExplSyntaxOn
 
 %%%%%%%% Change Japanese font family by \rmfamily or not
-\cs_new:Npn \ltj_fontspec_match_cmd {
+\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}
+    \__ltj_fontspec_set_family:Nnn \jttdefault {##1}{##2}
     \normalfont
   }
 }
-\bool_if:NT  \ltj_fontspec_match_bool \ltj_fontspec_match_cmd
+\bool_if:NT  \__ltj_fontspec_match_bool \__ltj_fontspec_match_cmd
 
 %%%%%%%% Messages
 \msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}
@@ -39,13 +39,13 @@
 
 %%%%%%%% Internal control sequences
 %% Each CS is ltj_fontspec version that corresponds to original CS of fontspec.
-\cs_new:Nn \ltj_fontspec_define_option:nn {
+\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 {
+\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 {
+\cs_new:Nn \__ltj_fontspec_define_altfont_option:nn {
   \__fontspec_keys_define_code:nnn {fontspec-ltjaltfont} {#1} {#2}
 }
 
@@ -57,38 +57,38 @@
 %%   { 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}
+\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}
+\__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 }
+  \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 }
+  \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 }
+  \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}
+    \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
+\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 {
+\cs_new:Npn \__ltj_fontspec_DeclareFontFamily #1 #2 #3 {
   \DeclareKanjiFamily {JY3} {#2} {#3}
   \DeclareKanjiFamily {JT3} {#2} {#3}
 }
@@ -121,42 +121,42 @@
 }
 
 \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 {
+\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 {NoEmbed} {}
+  \__ltj_fontspec_define_option:nn {AltFont} {
+    \clist_put_right:Nn \l__ltj_fontspec_altfont_clist { ##1 }
   }
-  \ltj_fontspec_define_option:nn {CID} {
+  \__ltj_fontspec_define_option:nn {CID} {
     \__fontspec_update_featstr:n {cid=##1}
   }
-  \ltj_fontspec_define_option:nn {Kanjiskip} {
+  \__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} {
+  \__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 {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 {TateFeatures} {
+    \clist_put_right:Nn \l__ltj_fontspec_fontfeat_tate_clist { ##1 }
   }
-  \ltj_fontspec_define_option:nn {TateFont}
+  \__ltj_fontspec_define_option:nn {TateFont}
   {
     \tl_if_empty:nF {##1} {
-      \fontspec_complete_fontname:Nn \l_ltj_fontspec_fontname_tate_tl {##1}
+      \fontspec_complete_fontname:Nn \l__ltj_fontspec_fontname_tate_tl {##1}
     }
   }
-  \ltj_fontspec_define_option:nn {JFM-var} {
+  \__ltj_fontspec_define_option:nn {JFM-var} {
     \__fontspec_update_featstr:n {jfmvar=##1}
   }
-  \ltj_fontspec_define_preparse_external:nn {NoEmbed} {
+  \__ltj_fontspec_define_preparse_external:nn {NoEmbed} {
     \cs_set:Npn \__fontspec_fontname_wrap:n ##1 {psft:##1}
   }
 
@@ -166,13 +166,13 @@
     Kerning/Off.code:n=\__fontspec_update_featstr:n {-kern}
   }
   \clist_set:Nx \g__fontspec_default_fontopts_clist {
-    YokoFeatures = { JFM=ujis }, TateFeatures = { JFM=ujisv },
+    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
+  \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}
 
@@ -185,21 +185,21 @@
 
 %% 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_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_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_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_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
+\cs_new:Nn \__ltj_fontspec_declare_shape_aux:nnnnnn
  {
   \tl_clear:N \l__fontspec_nfss_tl
   \tl_clear:N \l__fontspec_nfss_sc_tl
@@ -216,14 +216,26 @@
       \l__fontspec_sizing_leftover_clist
     \tl_if_empty:NT \l__fontspec_size_tl { \__fontspec_error:n {no-size-info} }
 
-    \str_if_eq:nnTF { #5 } { JY3 } {
-      % "normal"
-      \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl}
-    } {
-      \tl_if_empty:NTF \l_ltj_fontspec_fontname_tate_tl
-        { \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl} }
-        { \__fontspec_load_fontname:n {\l_ltj_fontspec_fontname_tate_tl} }
-    }
+    \cs_if_exist:NTF \__fontspec_load_fontname:Nn
+	{ %% >= v2.7
+	  \str_if_eq:nnTF { #5 } { 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} }
+      }
+	} { %% < v2.7
+	  \str_if_eq:nnTF { #5 } { JY3 } {
+        % "normal"
+        \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl}
+      } {
+        \tl_if_empty:NTF \l__ltj_fontspec_fontname_tate_tl
+          { \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl} }
+          { \__fontspec_load_fontname:n {\l__ltj_fontspec_fontname_tate_tl} }
+      }
+	}
     \__fontspec_setup_nfss:Nnnn \l__fontspec_nfss_tl {#3} {#6} {}
    }
   \bool_set_true:N \l__fontspec_nosc_bool
@@ -231,9 +243,9 @@
   \__fontspec_declare_shape_slanted:nn  {#1} {#2}
  }
 
-\cs_new:Nn \ltj_fontspec_set_family:Nnn {
+\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
+  \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:
@@ -242,62 +254,62 @@
 \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 {
+\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
+    \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}
+    \__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 {
+\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_yoko:nnxx
     }{
-      \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape_tate: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 }
+    \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
+          \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 {
+        \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_eq_p:NN \l__ltj_fontspec_altname_tl \l_tmpa_tl
             &&
-            \tl_if_empty_p:N \l_ltj_fontspec_altfont_leftover_clist
+            \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 }
+                { \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
+              { #3 _alt \int_use:N \g__ltj_fontspec_altnumber_int }
+              { \l__ltj_fontspec_altrange_tl }
+            \int_gincr:N \g__ltj_fontspec_altnumber_int
           }
         }
       }
@@ -308,13 +320,13 @@
 
 %%%%%%%% User commands
 \DeclareDocumentCommand \jfontspec { O{} m O{} } {
-  \ltj_fontspec_set_family:Nnn \k@family {#1,#3}{#2}
+  \__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}
+  \__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}
@@ -323,7 +335,7 @@
 }
 
 \DeclareDocumentCommand \setsansjfont { O{} m O{} } {
-  \ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2}
+  \__ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2}
   \unless\ifltj@disablejfam
     \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{\mddefault}{n}
   \fi
@@ -331,17 +343,17 @@
 }
 
 \DeclareDocumentCommand \newjfontfamily { m O{} m O{} } {
-  \cs_set_eq:NN \fontspec_set_family:Nnn \ltj_fontspec_set_family:Nnn
+  \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
+  \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
+  \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
 }
@@ -374,12 +386,12 @@
  }
 
 \DeclareDocumentCommand \addjfontfeatures {m} {
-  \ltj_fontspec_if_fontspec_font:TF
+  \__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
+      \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
@@ -392,7 +404,7 @@
 
 \cs_set_eq:NN \addjfontfeature \addjfontfeatures
 
-\prg_new_conditional:Nnn \ltj_fontspec_if_fontspec_font: {TF,T,F}
+\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:
 }
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 a121b55bd4d..b7b2b74fee2 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}[2018/09/01 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[2019/01/28 fontspec support of LuaTeX-ja]
 \RequirePackage{l3keys2e,luatexja}
 \ExplSyntaxOn
 
@@ -15,10 +15,10 @@
   \group_end:
 }
 
-\bool_new:N \ltj_fontspec_match_bool
+\bool_new:N \__ltj_fontspec_match_bool
 \keys_define:nn { luatexja-fontspec }
   {
-    match .bool_set:N = \ltj_fontspec_match_bool,
+    match .bool_set:N = \__ltj_fontspec_match_bool,
     match .default:n  = true,
     pass .code:n = \PassOptionsToPackage{#1} {fontspec},
       % 互換性のために残したオプション
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 69104467507..e3054d3e504 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}[2018/10/08 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2019/01/28 Japanese font presets]
 
 \RequirePackage{expl3,l3keys2e}
 \RequirePackage{luatexja}
@@ -30,7 +30,7 @@
   since~ the~ luatexja-preset~ package~ an~ option~ with~ the~ same~ name.
 }
 
-\seq_new:N \g_ltjpreset_presets_seq
+\seq_new:N \g__ltjpreset_presets_seq
 
 \keys_define:nn { luatexja-preset }{
   unknown .code:n =
@@ -43,11 +43,11 @@
     \renewcommand\jttdefault{\gtdefault}\@ltj@match@familytrue
     \PassOptionsToPackage { match } { luatexja-fontspec },
   match .value_forbidden:n = true,
-  __custom  .bool_set:N = \g_ltjpreset_custom_bool,  __custom  .groups:n = { preset },
-  __office  .bool_set:N = \g_ltjpreset_office_bool,  __office  .groups:n = { preset },
-  __noembed .bool_set:N = \g_ltjpreset_noembed_bool, __noembed .groups:n = { preset },
+  __custom  .bool_set:N = \g__ltjpreset_custom_bool,  __custom  .groups:n = { preset },
+  __office  .bool_set:N = \g__ltjpreset_office_bool,  __office  .groups:n = { preset },
+  __noembed .bool_set:N = \g__ltjpreset_noembed_bool, __noembed .groups:n = { preset },
 }
-\cs_new:Nn \ltjpreset_declare_option:nn {
+\cs_new:Nn \__ltjpreset_declare_option:nn {
   \keys_define:nn { luatexja-preset }{
     #1 .code:n = { #2 },
     #1 .value_forbidden:n = true
@@ -58,81 +58,81 @@
     #1 .meta:n = { #2 },
     #1 .value_forbidden:n = true, #1 .groups:n = { preset },
   }
-  \seq_put_right:Nn \g_ltjpreset_presets_seq { #1 }
+  \seq_put_right:Nn \g__ltjpreset_presets_seq { #1 }
 }
 \cs_generate_variant:Nn \ltjpreset_declare_preset:nn {nx}
-\cs_new:Nn \ltjpreset_declare_bool_option:nn {
-  \bool_new:c { g_ltjpreset_#1_bool }
-  \bool_set_false:c { g_ltjpreset_#1_bool }
+\cs_new:Nn \__ltjpreset_declare_bool_option:nn {
+  \bool_new:c { g__ltjpreset_#1_bool }
+  \bool_set_false:c { g__ltjpreset_#1_bool }
   \keys_define:nn { luatexja-preset }{
-    #1 .bool_set:c =  { g_ltjpreset_#1_bool },
-    #2 .bool_set_inverse:c =  { g_ltjpreset_#1_bool },
+    #1 .bool_set:c =  { g__ltjpreset_#1_bool },
+    #2 .bool_set_inverse:c =  { g__ltjpreset_#1_bool },
     #1 .default:n =  true, #2 .default:n =  true,
   }
 }
 
 %%%%%%%% bool options
-\ltjpreset_declare_bool_option:nn { nfssonly }{ fontspec }
-\ltjpreset_declare_bool_option:nn { bold }{ nobold }
-\ltjpreset_declare_bool_option:nn { expert }{ noexpert }
-\ltjpreset_declare_bool_option:nn { deluxe }{ nodeluxe }
+\__ltjpreset_declare_bool_option:nn { nfssonly }{ fontspec }
+\__ltjpreset_declare_bool_option:nn { bold }{ nobold }
+\__ltjpreset_declare_bool_option:nn { expert }{ noexpert }
+\__ltjpreset_declare_bool_option:nn { deluxe }{ nodeluxe }
 
 % JFM
-\tl_new:N \ltjpreset_use_jfm_yoko_tl % 使用する JFM（横）
-\tl_set:Nn \ltjpreset_use_jfm_yoko_tl {ujis}
-\tl_new:N \ltjpreset_use_jfm_tate_tl % 使用する JFM（縦）
-\tl_set:Nn \ltjpreset_use_jfm_tate_tl {ujisv}
-\ltjpreset_declare_option:nn{jis}{\tl_set:Nn  \ltjpreset_use_jfm_yoko_tl {jis}}     % jis
-\ltjpreset_declare_option:nn{ujis}{\tl_set:Nn  \ltjpreset_use_jfm_yoko_tl {ujis}}   % ujis
+\tl_new:N \__ltjpreset_use_jfm_yoko_tl % 使用する JFM（横）
+\tl_set:Nn \__ltjpreset_use_jfm_yoko_tl {\ltj@stdyokojfm}
+\tl_new:N \__ltjpreset_use_jfm_tate_tl % 使用する JFM（縦）
+\tl_set:Nn \__ltjpreset_use_jfm_tate_tl {\ltj@stdtatejfm}
+\__ltjpreset_declare_option:nn{jis}{\tl_set:Nn  \__ltjpreset_use_jfm_yoko_tl {jis}}     % jis
+\__ltjpreset_declare_option:nn{ujis}{\tl_set:Nn  \__ltjpreset_use_jfm_yoko_tl {ujis}}   % ujis
 
 % 漢字字形
-\tl_new:N \l_ltjpreset_kanji_shape_tl
-\ltjpreset_declare_option:nn{90jis}{  \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }} % 90jis
-\ltjpreset_declare_option:nn{jis90}{  \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }} % 90jis
-\ltjpreset_declare_option:nn{jis2004}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }} % jis2004
-\ltjpreset_declare_option:nn{2004jis}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }} % jis2004
+\tl_new:N \l__ltjpreset_kanji_shape_tl
+\__ltjpreset_declare_option:nn{90jis}{  \tl_set:Nn \l__ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }} % 90jis
+\__ltjpreset_declare_option:nn{jis90}{  \tl_set:Nn \l__ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }} % 90jis
+\__ltjpreset_declare_option:nn{jis2004}{\tl_set:Nn \l__ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }} % jis2004
+\__ltjpreset_declare_option:nn{2004jis}{\tl_set:Nn \l__ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }} % jis2004
 
 % font preset
-\prop_new:N \g_ltjpreset_font_prop
+\prop_new:N \g__ltjpreset_font_prop
 \keys_define:nn { luatexja-preset } {
   mc .code:n =
-     \prop_put:Nnn \g_ltjpreset_font_prop { mc-l } {#1}
-     \prop_put:Nnn \g_ltjpreset_font_prop { mc-m } {#1}
-     \prop_put:Nnn \g_ltjpreset_font_prop { mc-bx } {#1},
+     \prop_put:Nnn \g__ltjpreset_font_prop { mc-l } {#1}
+     \prop_put:Nnn \g__ltjpreset_font_prop { mc-m } {#1}
+     \prop_put:Nnn \g__ltjpreset_font_prop { mc-bx } {#1},
   mc .groups:n = { preset }, mc .value_required:n = true,
   gt .code:n =
-     \prop_put:Nnn \g_ltjpreset_font_prop { gt-u } {#1}
-     \prop_put:Nnn \g_ltjpreset_font_prop { gt-d } {#1}
-     \prop_put:Nnn \g_ltjpreset_font_prop { gt-bx } {#1}
-     \prop_put:Nnn \g_ltjpreset_font_prop { gt-eb } {#1},
+     \prop_put:Nnn \g__ltjpreset_font_prop { gt-u } {#1}
+     \prop_put:Nnn \g__ltjpreset_font_prop { gt-d } {#1}
+     \prop_put:Nnn \g__ltjpreset_font_prop { gt-bx } {#1}
+     \prop_put:Nnn \g__ltjpreset_font_prop { gt-eb } {#1},
   gt-m .code:n = % gtfamily , medium series
-     \prop_put:Nnn \g_ltjpreset_font_prop { gt-u } {#1}
-     \prop_put:Nnn \g_ltjpreset_font_prop { gt-d } {#1},
+     \prop_put:Nnn \g__ltjpreset_font_prop { gt-u } {#1}
+     \prop_put:Nnn \g__ltjpreset_font_prop { gt-d } {#1},
   % gt-d, gt-u は隠し
   gt .groups:n = { preset },   gt .value_required:n = true,
   gt-m .groups:n = { preset }, gt-m .value_required:n = true,
 }
-\cs_set:Nn \g_ltjpreset_tmp_cs:n {
+\cs_set:Nn \g__ltjpreset_tmp_cs:n {
   \keys_define:nn { luatexja-preset } {
-    #1 .code:n = \prop_put:Non \g_ltjpreset_font_prop { #1 } { ##1 },
+    #1 .code:n = \prop_put:Non \g__ltjpreset_font_prop { #1 } { ##1 },
     #1 .groups:n = { preset }, #1 .value_required:n = true,
   }
 }
-\g_ltjpreset_tmp_cs:n { mc-l }
-\g_ltjpreset_tmp_cs:n { mc-m }
-\g_ltjpreset_tmp_cs:n { mc-bx }
-\g_ltjpreset_tmp_cs:n { gt-u }
-\g_ltjpreset_tmp_cs:n { gt-d }
-\g_ltjpreset_tmp_cs:n { gt-bx }
-\g_ltjpreset_tmp_cs:n { gt-eb}
-\g_ltjpreset_tmp_cs:n { mg-m }
-\cs_undefine:N \g_ltjpreset_tmp_cs:n
-
-\cs_new:Nn \ltjpreset_set_uni:nn {
+\g__ltjpreset_tmp_cs:n { mc-l }
+\g__ltjpreset_tmp_cs:n { mc-m }
+\g__ltjpreset_tmp_cs:n { mc-bx }
+\g__ltjpreset_tmp_cs:n { gt-u }
+\g__ltjpreset_tmp_cs:n { gt-d }
+\g__ltjpreset_tmp_cs:n { gt-bx }
+\g__ltjpreset_tmp_cs:n { gt-eb}
+\g__ltjpreset_tmp_cs:n { mg-m }
+\cs_undefine:N \g__ltjpreset_tmp_cs:n
+
+\cs_new:Nn \__ltjpreset_set_uni:nn {
   mc = #1, gt = #2, mc-bx = #2, mg-m = #2,
   __custom = false, __office = false, __noembed = false,
 }
-\cs_new:Npn \ltjpreset_set_office:nn #1 #2{
+\cs_new:Npn \__ltjpreset_set_office:nn #1 #2{
   mc   = #1,         mc-bx = HGMinchoE ,
   gt-d = HGGothicM , gt-bx = HGGothicE ,
   gt-u = #2 ,        gt-eb = HGSoeiKakugothicUB ,
@@ -146,8 +146,8 @@
  \keys_define:nn { luatexja-preset }{
     custom .meta:n = { #1, __custom = true, }, 
     custom .value_required:n = true,
-    jfm_yoko .tl_set:N = \ltjpreset_use_jfm_yoko_tl,
-    jfm_tate .tl_set:N = \ltjpreset_use_jfm_tate_tl,
+    jfm_yoko .tl_set:N = \__ltjpreset_use_jfm_yoko_tl,
+    jfm_tate .tl_set:N = \__ltjpreset_use_jfm_tate_tl,
 }
 
 % 小塚 (Adobe)
@@ -309,135 +309,137 @@
 
 % ipa, ipaex, ms
 \ltjpreset_declare_preset:nx{ipa}{
-  \ltjpreset_set_uni:nn { IPAMincho } { IPAGothic }
+  \__ltjpreset_set_uni:nn { IPAMincho } { IPAGothic }
 }
 \ltjpreset_declare_preset:nx{ipaex}{
-  \ltjpreset_set_uni:nn { IPAExMincho } { IPAExGothic }
+  \__ltjpreset_set_uni:nn { IPAExMincho } { IPAExGothic }
 }
 \ltjpreset_declare_preset:nx{ms}{
-  \ltjpreset_set_uni:nn { MS-Mincho } { MS-Gothic }
+  \__ltjpreset_set_uni:nn { MS-Mincho } { MS-Gothic }
 }
 
 % {ipa,ipaex,ms}-dx % Office 付属フォントを利用
 \ltjpreset_declare_preset:nx{ipaex-hg}{
-  \ltjpreset_set_office:nn { IPAExMincho } { IPAExGothic }
+  \__ltjpreset_set_office:nn { IPAExMincho } { IPAExGothic }
 }
 \ltjpreset_declare_preset:nx{ipa-hg}{
-  \ltjpreset_set_office:nn { IPAMincho } { IPAGothic }
+  \__ltjpreset_set_office:nn { IPAMincho } { IPAGothic }
 }
 \ltjpreset_declare_preset:nx{ms-hg}{
-  \ltjpreset_set_office:nn { MS-Mincho } { MS-Gothic }
+  \__ltjpreset_set_office:nn { MS-Mincho } { MS-Gothic }
 }
 
 
 % 非埋込
 \ltjpreset_declare_preset:nx{noembed}{
-  \ltjpreset_set_uni:nn { Ryumin-Light } { GothicBBB-Medium },
+  \__ltjpreset_set_uni:nn { Ryumin-Light } { GothicBBB-Medium },
   __custom = false, __office = false, __noembed = true,
 }
 
 \keys_set:nn {luatexja-preset} { ipaex }
 \ProcessKeysOptions { luatexja-preset }
 \@ifpackageloaded{luatexja-fontspec}{
-  \bool_if:NT \g_ltjpreset_nfssonly_bool
+  \bool_if:NT \g__ltjpreset_nfssonly_bool
     { \msg_warning:nn { luatexja-preset }{ ltj-fontspec } }
-  \bool_set_false:N \g_ltjpreset_nfssonly_bool
+  \bool_set_false:N \g__ltjpreset_nfssonly_bool
 }{}
 
 %%%%%%%% main routine
 
-\cs_new:Nn \ltjpreset_extract_fonts: {
+\cs_new:Nn \__ltjpreset_extract_fonts: {
   %% MogaMincho の場合は 90 をつける/はずす
-  \bool_if:NF \g_ltjpreset_custom_bool {
+  \bool_if:NF \g__ltjpreset_custom_bool {
     \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
-    \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
-      \tl_set:Nx \l_tmpb_tl { \prop_item:Nn \g_ltjpreset_font_prop { mc-m } }
+    \tl_if_eq:NNT \l__ltjpreset_kanji_shape_tl \l_tmpa_tl {
+      \tl_set:Nx \l_tmpb_tl { \prop_item:Nn \g__ltjpreset_font_prop { mc-m } }
       \tl_if_in:NnT  \l_tmpb_tl { Moga90Mincho } {
         \prop_clear:N \l_tmpa_prop
-        \prop_map_inline:Nn \g_ltjpreset_font_prop {
+        \prop_map_inline:Nn \g__ltjpreset_font_prop {
            \tl_set:Nn \l_tmpb_tl { ##2 } \tl_remove_all:Nn \l_tmpb_tl {90}
           \prop_put:Nnx \l_tmpa_prop { ##1 } { \tl_use:N \l_tmpb_tl }
          } 
-         \prop_set_eq:NN \g_ltjpreset_font_prop \l_tmpa_prop
+         \prop_set_eq:NN \g__ltjpreset_font_prop \l_tmpa_prop
        }
        \tl_if_in:NnT  \l_tmpb_tl { MogaEx90Mincho } {
          \prop_clear:N \l_tmpa_prop
-         \prop_map_inline:Nn \g_ltjpreset_font_prop {
+         \prop_map_inline:Nn \g__ltjpreset_font_prop {
            \tl_set:Nn \l_tmpb_tl { ##2 } \tl_remove_all:Nn \l_tmpb_tl {90}
            \prop_put:Nnx \l_tmpa_prop { ##1 } { \tl_use:N \l_tmpb_tl }
          }
-         \prop_set_eq:NN \g_ltjpreset_font_prop \l_tmpa_prop
+         \prop_set_eq:NN \g__ltjpreset_font_prop \l_tmpa_prop
        }
     }
   }
   %%%%  リストからの展開
-  \cs_set:Nx \ltjpreset_font_mc_l:  { \prop_item:Nn \g_ltjpreset_font_prop { mc-l } }
-  \cs_set:Nx \ltjpreset_font_mc_m:  { \prop_item:Nn \g_ltjpreset_font_prop { mc-m } }
-  \cs_set:Nx \ltjpreset_font_mc_bx: { \prop_item:Nn \g_ltjpreset_font_prop { mc-bx } }
-  \cs_set:Nx \ltjpreset_font_gt_m:  { \prop_item:Nn \g_ltjpreset_font_prop { gt-d } }
-  \cs_set:Nx \ltjpreset_font_gt_u:  { \prop_item:Nn \g_ltjpreset_font_prop { gt-u } }
-  \cs_set:Nx \ltjpreset_font_gt_bx: { \prop_item:Nn \g_ltjpreset_font_prop { gt-bx } }
-  \cs_set:Nx \ltjpreset_font_gt_eb: { \prop_item:Nn \g_ltjpreset_font_prop { gt-eb } }
-  \cs_set:Nx \ltjpreset_font_mg_m:  { \prop_item:Nn \g_ltjpreset_font_prop { mg-m } }
+  \cs_set:Nx \__ltjpreset_font_mc_l:  { \prop_item:Nn \g__ltjpreset_font_prop { mc-l } }
+  \cs_set:Nx \__ltjpreset_font_mc_m:  { \prop_item:Nn \g__ltjpreset_font_prop { mc-m } }
+  \cs_set:Nx \__ltjpreset_font_mc_bx: { \prop_item:Nn \g__ltjpreset_font_prop { mc-bx } }
+  \cs_set:Nx \__ltjpreset_font_gt_m:  { \prop_item:Nn \g__ltjpreset_font_prop { gt-d } }
+  \cs_set:Nx \__ltjpreset_font_gt_u:  { \prop_item:Nn \g__ltjpreset_font_prop { gt-u } }
+  \cs_set:Nx \__ltjpreset_font_gt_bx: { \prop_item:Nn \g__ltjpreset_font_prop { gt-bx } }
+  \cs_set:Nx \__ltjpreset_font_gt_eb: { \prop_item:Nn \g__ltjpreset_font_prop { gt-eb } }
+  \cs_set:Nx \__ltjpreset_font_mg_m:  { \prop_item:Nn \g__ltjpreset_font_prop { mg-m } }
   %% HG 系フォント + JIS2004/90JIS のときはフォント名を置換
-  \bool_if:nT { !\g_ltjpreset_custom_bool && \g_ltjpreset_office_bool } {
+  \bool_if:nT { !\g__ltjpreset_custom_bool && \g__ltjpreset_office_bool } {
     \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
-    \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
-      \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme04.ttc }
-      \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge04.ttc }
-      \cs_set:Nx \ltjpreset_font_gt_eb: { hgrsgu04.ttc }
-      \cs_set:Nx \ltjpreset_font_mg_m:  { hgrsmp04.ttf }
-      \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_u:
+    \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_m:  { hgrsmp04.ttf }
+      \cs_set_eq:NN \__ltjpreset_font_gt_m: \__ltjpreset_font_gt_u:
       % HG ゴシックM のときはそうはいかないので 1 ウェイト時のゴシック体を使う
     }
     \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 }
-    \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
-      \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme.ttc }
-      \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge.ttc }
-      \cs_set:Nx \ltjpreset_font_gt_eb: { hgrsgu.ttc }
-      \cs_set:Nx \ltjpreset_font_mg_m:  { hgrsmp.ttf }
+    \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_m:  { hgrsmp.ttf }
     }
   }
   % mc/l
-  \tl_set:Nx \l_tmpa_tl { \ltjpreset_font_mc_l: }
+  \tl_set:Nx \l_tmpa_tl { \__ltjpreset_font_mc_l: }
   \tl_if_empty:NT \l_tmpa_tl {\tl_set:Nn \l_tmpa_tl {~}}
-  \cs_set:Nx \ltjpreset_font_mc_l: {
-    \tl_if_blank:nTF \l_tmpa_tl { \ltjpreset_font_mc_m: } {\tl_use:N \l_tmpa_tl }
+  \cs_set:Nx \__ltjpreset_font_mc_l: {
+    \tl_if_blank:nTF \l_tmpa_tl { \__ltjpreset_font_mc_m: } {\tl_use:N \l_tmpa_tl }
   }
   %% bold オプションの処理
-  \bool_if:NTF \g_ltjpreset_deluxe_bool {
-    \bool_if:NT \g_ltjpreset_bold_bool {
-      \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_bx:
+  \bool_if:NTF \g__ltjpreset_deluxe_bool {
+    \bool_if:NT \g__ltjpreset_bold_bool {
+      \cs_set_eq:NN \__ltjpreset_font_mc_bx: \__ltjpreset_font_gt_bx:
     }
   }{
-    \bool_if:NTF \g_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_u: }
-    \cs_set_eq:NN \ltjpreset_font_gt_bx: \ltjpreset_font_gt_m:
-    \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_m:
+    \bool_if:NTF \g__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_u: }
+    \cs_set_eq:NN \__ltjpreset_font_gt_bx: \__ltjpreset_font_gt_m:
+    \cs_set_eq:NN \__ltjpreset_font_mc_bx: \__ltjpreset_font_gt_m:
   }
 }
 
 %%%%%%%% 存在判定
-\cs_new:Nn \ltjpreset_substitute:nnnn {
+\cs_new:Nn \__ltjpreset_substitute:nnnn {
   \group_begin:
     \suppressfontnotfounderror=1
-    \font \g_ltjpreset_font_test: = "\cs:w ltjpreset_font_#1_#2: \cs_end:"\relax
-    \ifx \g_ltjpreset_font_test: \nullfont
-      \msg_warning:nnxxxx { luatexja-preset }{ no-font }
-        { \cs:w ltjpreset_font_#1_#2: \cs_end: }{ #1/#2 }
-        { \cs:w ltjpreset_font_#3_#4: \cs_end: }{ #3/#4 }
-      \cs_gset_eq:cc { ltjpreset_font_#1_#2: } { ltjpreset_font_#3_#4: }
-    \fi
+    \cs_if_exist:cT {ltjpreset_font_#1_#2:} {
+      \font \g__ltjpreset_font_test: = "\cs:w ltjpreset_font_#1_#2: \cs_end:"\relax
+      \ifx \g__ltjpreset_font_test: \nullfont
+        \msg_warning:nnxxxx { luatexja-preset }{ no-font }
+          { \cs:w ltjpreset_font_#1_#2: \cs_end: }{ #1/#2 }
+          { \cs:w ltjpreset_font_#3_#4: \cs_end: }{ #3/#4 }
+        \cs_gset_eq:cc { ltjpreset_font_#1_#2: } { ltjpreset_font_#3_#4: }
+      \fi
+    } { \cs_gset_eq:cc { ltjpreset_font_#1_#2: } { ltjpreset_font_#3_#4: } }
   \group_end:
 }
 
 %%%%%%%% deluxe (\mgfamily はあとで定義）
-\bool_if:NTF \g_ltjpreset_deluxe_bool {
-  \cs_new:Nn \ltjpreset_check_deluxe_existence: {
-    \ltjpreset_substitute:nnnn { gt } { eb } { gt } { bx }
-    \ltjpreset_substitute:nnnn { mg } { m  } { gt } { bx }
-    \ltjpreset_substitute:nnnn { mc } { l  } { mc } { m  }
+\bool_if:NTF \g__ltjpreset_deluxe_bool {
+  \cs_new:Nn \__ltjpreset_check_deluxe_existence: {
+    \__ltjpreset_substitute:nnnn { gt } { eb } { gt } { bx }
+    \__ltjpreset_substitute:nnnn { mg } { m  } { gt } { bx }
+    \__ltjpreset_substitute:nnnn { mc } { l  } { mc } { m  }
   }
   \def\ltdefault{l}
   \DeclareRobustCommand\ltseries { \not@math@alphabet\ltseries\relax\fontseries\ltdefault\selectfont }
@@ -445,12 +447,12 @@
   \DeclareRobustCommand\ebseries { \not@math@alphabet\ebseries\relax\fontseries\ebdefault\selectfont }
   \DeclareRobustCommand\gtebfamily { \gtfamily\fontseries{\ebdefault}\selectfont }
 } {
-  \cs_set_eq:NN \ltjpreset_check_deluxe_existence: \prg_do_nothing:
+  \cs_set_eq:NN \__ltjpreset_check_deluxe_existence: \prg_do_nothing:
 }
 
-\int_new:N \g_ltjpreset_applycount_int
+\int_new:N \g__ltjpreset_applycount_int
 
-\bool_if:NTF \g_ltjpreset_nfssonly_bool {
+\bool_if:NTF \g__ltjpreset_nfssonly_bool {
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%% nfss only
   \cs_if_exist:NF \Cjascale {
@@ -464,43 +466,43 @@
 
   \cs_new:Nn \ltj_preset_declare_font_shape:nnnnnn {
     \DeclareFontShape{#1}{#2}{#3}{#4}{ <-> s*[\Cjascale]
-      { \bool_if:NT \g_ltjpreset_noembed_bool {psft:} #5
-    ;-kern \tl_use:N \l_ltjpreset_kanji_shape_tl; #6 } } {}
+      { \bool_if:NT \g__ltjpreset_noembed_bool {psft:} #5
+    ;-kern \tl_use:N \l__ltjpreset_kanji_shape_tl; #6 } } {}
   }
   \cs_new:Nn \ltj_preset_define_family:nnn {
     \ltj_preset_declare_font_shape:nnnnnn { JY3 }
-      { #1 \int_to_arabic:n { \g_ltjpreset_applycount_int }} { #2 } { n }
-      { "#3" : jfm=\tl_use:N \ltjpreset_use_jfm_yoko_tl }
-      { script=hani \bool_if:NT \g_ltjpreset_expert_bool { ;+hkna } }
+      { #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n }
+      { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_yoko_tl }
+      { script=hani \bool_if:NT \g__ltjpreset_expert_bool { ;+hkna } }
     \ltj_preset_declare_font_shape:nnnnnn { JT3 }
-      { #1 \int_to_arabic:n { \g_ltjpreset_applycount_int }} { #2 } { n }
-      { "#3" : jfm=\tl_use:N \ltjpreset_use_jfm_tate_tl }
-      { script=hani \bool_if:NT \g_ltjpreset_expert_bool { ;+vkna } }
-    \bool_if:NT \g_ltjpreset_expert_bool {
+      { #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n }
+      { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_tate_tl }
+      { script=hani \bool_if:NT \g__ltjpreset_expert_bool { ;+vkna } }
+    \bool_if:NT \g__ltjpreset_expert_bool {
       \ltj_preset_declare_font_shape:nnnnnn { JY3 }
-        { #1 \int_to_arabic:n { \g_ltjpreset_applycount_int }} { #2 } { rb }
-        { "#3" : jfm=\tl_use:N \ltjpreset_use_jfm_yoko_tl } { script=kana; +ruby }
+        { #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { rb }
+        { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_yoko_tl } { script=kana; +ruby }
       \ltj_preset_declare_font_shape:nnnnnn { JT3 }
-        { #1 \int_to_arabic:n { \g_ltjpreset_applycount_int }} { #2 } { rb }
-        { "#3" : jfm=\tl_use:N \ltjpreset_use_jfm_tate_tl } { script=kana; +ruby }
+        { #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { rb }
+        { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_tate_tl } { script=kana; +ruby }
     }
   }
-  \bool_if:NT \g_ltjpreset_deluxe_bool {
+  \bool_if:NT \g__ltjpreset_deluxe_bool {
     \let\mgfamily\undefined
     \DeclareRobustCommand\mgfamily {
       \not@math@alphabet\mgfamily\relax
-      \kanjifamily{ltjpmg \int_to_arabic:n { \g_ltjpreset_applycount_int }}\selectfont
+      \kanjifamily{ltjpmg \int_to_arabic:n { \g__ltjpreset_applycount_int }}\selectfont
     }
     \DeclareTextFontCommand{\textmg}{\mgfamily}
   }
-  \bool_if:NT \g_ltjpreset_expert_bool {
+  \bool_if:NT \g__ltjpreset_expert_bool {
     \DeclareRobustCommand\rubyfamily { \kanjishape{rb}\selectfont }
   }
   %
-  \cs_new:Nn \ltjpreset_do_fontset: { \group_begin:
+  \cs_new:Nn \__ltjpreset_do_fontset: { \group_begin:
     % ======
-    \xdef\mcdefault{ltjpm \int_to_arabic:n { \g_ltjpreset_applycount_int }}
-    \xdef\gtdefault{ltjpg \int_to_arabic:n { \g_ltjpreset_applycount_int }}
+    \xdef\mcdefault{ltjpm \int_to_arabic:n { \g__ltjpreset_applycount_int }}
+    \xdef\gtdefault{ltjpg \int_to_arabic:n { \g__ltjpreset_applycount_int }}
     \DeclareKanjiFamily{JY3}{\mcdefault}{}
     \DeclareKanjiFamily{JT3}{\mcdefault}{}
     \DeclareKanjiFamily{JY3}{\gtdefault}{}
@@ -510,30 +512,30 @@
       \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{bx}{n}
       \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{m}{n}
     \fi
-    \bool_if:NT \g_ltjpreset_deluxe_bool {
-      \DeclareKanjiFamily{JY3}{ltjpmg \int_to_arabic:n { \g_ltjpreset_applycount_int }}{}
-      \DeclareKanjiFamily{JT3}{ltjpmg \int_to_arabic:n { \g_ltjpreset_applycount_int }}{}
+    \bool_if:NT \g__ltjpreset_deluxe_bool {
+      \DeclareKanjiFamily{JY3}{ltjpmg \int_to_arabic:n { \g__ltjpreset_applycount_int }}{}
+      \DeclareKanjiFamily{JT3}{ltjpmg \int_to_arabic:n { \g__ltjpreset_applycount_int }}{}
     }
     % ======
     \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 }
-    \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
-      \tl_set:Nn \l_ltjpreset_kanji_shape_tl { ;+jp90 }
+    \tl_if_eq:NNT \l__ltjpreset_kanji_shape_tl \l_tmpa_tl {
+      \tl_set:Nn \l__ltjpreset_kanji_shape_tl { ;+jp90 }
     }
     \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
-    \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
-      \tl_set:Nx \l_ltjpreset_kanji_shape_tl { ;+jp04 }
+    \tl_if_eq:NNT \l__ltjpreset_kanji_shape_tl \l_tmpa_tl {
+      \tl_set:Nx \l__ltjpreset_kanji_shape_tl { ;+jp04 }
     }
-    \ltj_preset_define_family:nnn {ltjpm} {m}  {\ltjpreset_font_mc_m:}
-    \ltj_preset_define_family:nnn {ltjpm} {bx} {\ltjpreset_font_mc_bx:}
-    \ltj_preset_define_family:nnn {ltjpm} {b}  {\ltjpreset_font_mc_bx:}
-    \ltj_preset_define_family:nnn {ltjpg} {m}  {\ltjpreset_font_gt_m:}
-    \ltj_preset_define_family:nnn {ltjpg} {bx} {\ltjpreset_font_gt_bx:}
-    \ltj_preset_define_family:nnn {ltjpg} {b}  {\ltjpreset_font_gt_bx:}
+    \ltj_preset_define_family:nnn {ltjpm} {m}  {\__ltjpreset_font_mc_m:}
+    \ltj_preset_define_family:nnn {ltjpm} {bx} {\__ltjpreset_font_mc_bx:}
+    \ltj_preset_define_family:nnn {ltjpm} {b}  {\__ltjpreset_font_mc_bx:}
+    \ltj_preset_define_family:nnn {ltjpg} {m}  {\__ltjpreset_font_gt_m:}
+    \ltj_preset_define_family:nnn {ltjpg} {bx} {\__ltjpreset_font_gt_bx:}
+    \ltj_preset_define_family:nnn {ltjpg} {b}  {\__ltjpreset_font_gt_bx:}
     \normalfont
-    \bool_if:NT \g_ltjpreset_deluxe_bool {
-      \ltj_preset_define_family:nnn {ltjpm}  {l} {\ltjpreset_font_mc_l:}
-      \ltj_preset_define_family:nnn {ltjpg}  {eb} {\ltjpreset_font_gt_eb:}
-      \ltj_preset_define_family:nnn {ltjpmg} {m}  {\ltjpreset_font_mg_m:}
+    \bool_if:NT \g__ltjpreset_deluxe_bool {
+      \ltj_preset_define_family:nnn {ltjpm}  {l} {\__ltjpreset_font_mc_l:}
+      \ltj_preset_define_family:nnn {ltjpg}  {eb} {\__ltjpreset_font_gt_eb:}
+      \ltj_preset_define_family:nnn {ltjpmg} {m}  {\__ltjpreset_font_mg_m:}
     }
     \group_end:
   }
@@ -543,46 +545,46 @@
   \RequirePackage{luatexja-fontspec}
   % scale
   \msg_warning:nnx { luatexja-preset }{ scale }{ \Cjascale }
-  \tl_new:N \l_ltjpreset_add_features_tl
+  \tl_new:N \l__ltjpreset_add_features_tl
 
-  \bool_if:NT \g_ltjpreset_expert_bool {
+  \bool_if:NT \g__ltjpreset_expert_bool {
     \cs_set:Npn \rubyfamily { \addjfontfeatures {
       Style=Ruby , YokoFeatures={RawFeature=-hkna} , TateFeatures={RawFeature=-vkna}
     } }
   }
   \addjfontfeature{ Kerning=Off }
   % 実際の fontspec の呼びだし
-  \cs_new:Nn \ltjpreset_do_fontset: { \group_begin:
-      \tl_gset:Nx \l_ltjpreset_add_features_tl {
-        \tl_use:N \l_ltjpreset_kanji_shape_tl,
-        YokoFeatures = { JFM = \tl_use:N \ltjpreset_use_jfm_yoko_tl },
-        TateFeatures = { JFM = \tl_use:N \ltjpreset_use_jfm_tate_tl },
-        Script=CJK, \bool_if:NT \g_ltjpreset_noembed_bool { , NoEmbed }
+  \cs_new:Nn \__ltjpreset_do_fontset: { \group_begin:
+      \tl_gset:Nx \l__ltjpreset_add_features_tl {
+        \tl_use:N \l__ltjpreset_kanji_shape_tl,
+        YokoFeatures = { JFM = \tl_use:N \__ltjpreset_use_jfm_yoko_tl },
+        TateFeatures = { JFM = \tl_use:N \__ltjpreset_use_jfm_tate_tl },
+        Script=CJK, \bool_if:NT \g__ltjpreset_noembed_bool { , NoEmbed }
       }
     \group_end:
-    \bool_if:NT \g_ltjpreset_expert_bool {
-      \tl_put_left:Nn \l_ltjpreset_add_features_tl {
+    \bool_if:NT \g__ltjpreset_expert_bool {
+      \tl_put_left:Nn \l__ltjpreset_add_features_tl {
         , YokoFeatures = {Style = HorizontalKana}, TateFeatures = {Style = VerticalKana}
       }
     }
     \setmainjfont [
-      \bool_if:NT \g_ltjpreset_deluxe_bool { FontFace={l}{n}{\ltjpreset_font_mc_l:}, }
-      BoldFont = \ltjpreset_font_mc_bx: \tl_use:N \l_ltjpreset_add_features_tl
-    ] { \ltjpreset_font_mc_m: }
+      \bool_if:NT \g__ltjpreset_deluxe_bool { FontFace={l}{n}{\__ltjpreset_font_mc_l:}, }
+      BoldFont = \__ltjpreset_font_mc_bx: \tl_use:N \l__ltjpreset_add_features_tl
+    ] { \__ltjpreset_font_mc_m: }
     \setsansjfont [
-      \bool_if:NT \g_ltjpreset_deluxe_bool { FontFace={eb}{n}{\ltjpreset_font_gt_eb:}, }
-      BoldFont = \ltjpreset_font_gt_bx: \tl_use:N \l_ltjpreset_add_features_tl
-    ] { \ltjpreset_font_gt_m: }
-    \bool_if:NT \g_ltjpreset_deluxe_bool {
+      \bool_if:NT \g__ltjpreset_deluxe_bool { FontFace={eb}{n}{\__ltjpreset_font_gt_eb:}, }
+      BoldFont = \__ltjpreset_font_gt_bx: \tl_use:N \l__ltjpreset_add_features_tl
+    ] { \__ltjpreset_font_gt_m: }
+    \bool_if:NT \g__ltjpreset_deluxe_bool {
       %% mg
       \bool_if_exist:NTF \setfontfamily {
         \setjfontfamily \mgfamily [
-          BoldFont = \ltjpreset_font_mg_m: \tl_use:N \l_ltjpreset_add_features_tl
-        ] { \ltjpreset_font_mg_m: }
+          BoldFont = \__ltjpreset_font_mg_m: \tl_use:N \l__ltjpreset_add_features_tl
+        ] { \__ltjpreset_font_mg_m: }
       } {
         \newjfontfamily \mgfamily [
-          BoldFont = \ltjpreset_font_mg_m: \tl_use:N \l_ltjpreset_add_features_tl
-        ] { \ltjpreset_font_mg_m: }
+          BoldFont = \__ltjpreset_font_mg_m: \tl_use:N \l__ltjpreset_add_features_tl
+        ] { \__ltjpreset_font_mg_m: }
       }
       \DeclareTextFontCommand{\textmg}{\mgfamily}
     }
@@ -591,10 +593,10 @@
 }
 
 \def\ltjnewpreset{
-    \@ifstar{\ltjpreset_new_preset:nnn{ true }}{\ltjpreset_new_preset:nnn{ false }}}
-\cs_set:Nn \ltjpreset_new_preset:nnn {
+    \@ifstar{\__ltjpreset_new_preset:nnn{ true }}{\__ltjpreset_new_preset:nnn{ false }}}
+\cs_set:Nn \__ltjpreset_new_preset:nnn {
   \keys_if_exist:nnTF { luatexja-preset } { #2 } {
-    \seq_if_in:NnTF \g_ltjpreset_presets_seq { #2 } {
+    \seq_if_in:NnTF \g__ltjpreset_presets_seq { #2 } {
       \bool_if:cTF { c_ #1 _bool } {
         \msg_warning:nnn { luatexja-preset }{ exist-preset-overwrite } { #2 }
         \keys_define:nn { luatexja-preset } {
@@ -612,18 +614,18 @@
       #2 .meta:n = { #3, __custom = true, __noembed = false, __office = false, },
       #2 .value_forbidden:n = true, #2 .groups:n = { preset },
     }
-    \seq_put_right:Nn \g_ltjpreset_presets_seq { #2 }
+    \seq_put_right:Nn \g__ltjpreset_presets_seq { #2 }
   }
 }
 
 
 \cs_set:Npn \ltjapplypreset #1 {
-  \int_gincr:N \g_ltjpreset_applycount_int
+  \int_gincr:N \g__ltjpreset_applycount_int
   \keys_set_groups:nnn { luatexja-preset } { preset } { #1 }
-  % \prop_map_inline:Nn \g_ltjpreset_font_prop {\typeout{ [##1] = "##2" } }
-  \ltjpreset_extract_fonts:
-  \ltjpreset_check_deluxe_existence:
-  \ltjpreset_do_fontset:
+  % \prop_map_inline:Nn \g__ltjpreset_font_prop {\typeout{ [##1] = "##2" } }
+  \__ltjpreset_extract_fonts:
+  \__ltjpreset_check_deluxe_existence:
+  \__ltjpreset_do_fontset:
   \normalfont
 }
 
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
index 70250485083..5b864ff77c1 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
@@ -609,9 +609,11 @@ do
 	 local f = (lig ==1) and nullfunc or node_tail
          local xc, xs = getcomponents(x), getsubtype(x)
 	 while xc and xs and xs%4>=2 do
-	    x = f(xc); xc, xs = getcomponents(x), getsubtype(x)
+	    x = f(xc);
+	    if getid(x)==id_disc then x, xc, xs = nil, getfield(x,'replace'), 2
+	    else xc, xs = getcomponents(x), getsubtype(x) end
 	 end
-	 c = getchar(x)
+	 c = x and getchar(x) or c
 	 Nx.pre  = table_current_stack[PRE + c]  or 0
 	 Nx.post = table_current_stack[POST + c] or 0
       else
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
index 76ec21262a2..e6f5bfe627e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.jfont',
-  date = '2018/12/15',
+  date = '2019/01/28',
   description = 'Loader for Japanese fonts',
 })
 
@@ -340,8 +340,8 @@ do
                         chars_cbcache = {},
                         vert_activated = is_vert_enabled,
       }
+      local t = identifiers[fn]
       if auto_enable_vrt2 then
-         local t = identifiers[fn]
          local lang, scr = t.properties.language, t.properties.script
          local vrt2_exist = provides_feature(
            fn, t.properties.script, t.properties.language, 'vrt2'
@@ -1168,6 +1168,7 @@ do
    local node_write = node.direct.write
    local font = font
    local new_ic_kern
+   local dir_tate = luatexja.dir_table.dir_tate
    if status.luatex_version>=89 then
        new_ic_kern = function(g)  return node_new(id_kern,3) end
    else
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty
index 2707a0e71c6..fa8d6f8f853 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty
@@ -23,8 +23,10 @@
 %! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
 % LuaTeX-ja macros against plain TeX
 
-\def\ltj@stdmcfont{IPAExMincho}
-\def\ltj@stdgtfont{IPAExGothic}
+\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi
+\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi
+\ifdefined\ltj@stdyokojfm\else\def\ltj@stdyokojfm{ujis}\fi
+\ifdefined\ltj@stdtatejfm\else\def\ltj@stdtatejfm{ujisv}\fi
 \newread\ltj@@cfgread
 \openin\ltj@@cfgread{luatexja.cfg}%
 \ifeof\ltj@@cfgread
@@ -35,19 +37,19 @@
 \fi
 \let\ltj@@cfgread\relax\advance\count16\m@ne\relax
 
-\jfont\tenmin=\ltj@stdmcfont:jfm=ujis at 9.62216pt
-\jfont\sevenmin=\ltj@stdmcfont:jfm=ujis at 6.73551pt
-\jfont\fivemin=\ltj@stdmcfont:jfm=ujis at 4.81108pt
-\jfont\tengt=\ltj@stdgtfont:jfm=ujis at 9.62216pt
-\jfont\sevengt=\ltj@stdgtfont:jfm=ujis at 6.73551pt
-\jfont\fivegt=\ltj@stdgtfont:jfm=ujis at 4.81108pt
+\jfont\tenmin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm\space at 9.62216pt
+\jfont\sevenmin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm\space at 6.73551pt
+\jfont\fivemin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm\space at 4.81108pt
+\jfont\tengt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm\space at 9.62216pt
+\jfont\sevengt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm\space at 6.73551pt
+\jfont\fivegt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm\space at 4.81108pt
 
-\tfont\tentmin=\ltj@stdmcfont:jfm=ujisv at 9.62216pt
-\tfont\seventmin=\ltj@stdmcfont:jfm=ujisv at 6.73551pt
-\tfont\fivetmin=\ltj@stdmcfont:jfm=ujisv at 4.81108pt
-\tfont\tentgt=\ltj@stdgtfont:jfm=ujisv at 9.62216pt
-\tfont\seventgt=\ltj@stdgtfont:jfm=ujisv at 6.73551pt
-\tfont\fivetgt=\ltj@stdgtfont:jfm=ujisv at 4.81108pt
+\tfont\tentmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm\space at 9.62216pt
+\tfont\seventmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm\space at 6.73551pt
+\tfont\fivetmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm\space at 4.81108pt
+\tfont\tentgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm\space at 9.62216pt
+\tfont\seventgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm\space at 6.73551pt
+\tfont\fivetgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm\space at 4.81108pt
 
 \def\mc{\tenmin\tentmin}
 \def\gt{\tengt\tentgt}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
index a0505c52626..cf32261805d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua
@@ -5,7 +5,7 @@ luatexja.load_module('base');      local ltjb = luatexja.base
 
 local cidfont_data = {}
 local cache_chars = {}
-local cache_ver = 6
+local cache_ver = 7
 local identifiers = fonts.hashes.identifiers
 
 local cid_reg, cid_order, cid_supp, cid_name
@@ -106,6 +106,13 @@ do
    local function entry(a)
       return {index = a}
    end
+   local feat_dummy_vert = { gsub={vert={dflt={dflt=true}}} }
+   local seq_dummy_vert={{
+     features={vert={dflt={dflt=true}}},
+     --flags={false,false,false,false},
+     --index=1, name="s_s_0", skiphash=false, steps={coverage={},index=1},
+     ["type"]="gsub_single", order='vert',
+   }}
    make_cid_font = function ()
       local kx = cid_replace[cid_name]
       if not kx then return end
@@ -146,11 +153,17 @@ do
             cidinfo= k.cidinfo, verbose = false,
             shared = { featuredata = {}, },
          },
-         dynamics = {}, features = {}, processes = {},
-         --rawdata = { descriptions = {} },
-     }
-      k.resources = { unicodes = ttu, }
+         dynamics = {}, processes = {},
+         rawdata = {}, features={},
+      }
+      k.resources = {
+         unicodes = ttu,
+	 features = feat_dummy_vert,
+	 sequences = seq_dummy_vert,
+      }
       k.descriptions = {}
+      k.shared.rawdata.resources=k.resources
+      k.shared.rawdata.descriptions=k.descriptions
       cache_chars[cid_name]  = { [655360] = k.characters }
 
       -- 縦書用字形
@@ -196,16 +209,21 @@ end
 --
 local cidf_vert_processor
 do
-   local traverse_id = node.traverse_id
+   local traverse_id, is_node = node.direct.traverse_id, node.is_node
+   local to_direct = node.direct.todirect
    local id_glyph = node.id('glyph')
+   local getfont = node.direct.getfont
+   local getchar = node.direct.getchar
+   local setchar = node.direct.setchar
    cidf_vert_processor = {
       function (head, fnum)
          local fontdata = identifiers[fnum]
-         if luatexja.jfont.font_metric_table[fnum].vert_activated then
-            local vt = fontdata.shared.ltj_vert_table
+         if head and luatexja.jfont.font_metric_table[fnum].vert_activated then
+	    local vt = fontdata.shared.ltj_vert_table
+	    local nh = is_node(head) and to_direct(head) or head 
             for n in traverse_id(id_glyph, head) do
-               if n.font==fnum then
-                  n.char = vt[n.char] or n.char
+               if getfont(n)==fnum then
+		 local c = getchar(n); setchar(n, vt[c] or c)
                end
             end
             return head, false
@@ -249,7 +267,12 @@ local function mk_rml(name, size, id)
    local specification = definers.analyze(name,size)
    --specification = definers.resolve(specification) (not needed)
    specification.detail = specification.detail or ''
-
+   do
+      local n = specification.name
+      if n:sub(1,1)=="{" then n=n:sub(2) end
+      if n:sub(-1)=="}" then  n=n:sub(1,-2) end
+      specification.name=n
+   end
    local fontdata = {}
    local cachedata = {}
    local s = cidfont_data[cid_name]
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
index 59204dfdef0..8fb24a80121 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua
@@ -458,6 +458,24 @@ local function debug_show_node_X(p,print_fn, limit)
          .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
 	 .. ', dir=' .. tostring(node.has_attribute(p, attr_dir))
       print_fn(s)
+   elseif pt=='disc' then
+      print_fn(s)
+      local bid = inner_depth
+      if inner_depth < limit then
+         prefix, inner_depth = k.. 'p.', inner_depth + 1
+	 for q in node.traverse(p.pre) do
+	    debug_show_node_X(q, print_fn, limit)
+	 end
+         prefix = k.. 'P.'
+	 for q in node.traverse(p.post) do
+	    debug_show_node_X(q, print_fn, limit)
+	 end
+         prefix = k.. 'R.'
+	 for q in node.traverse(p.replace) do
+	    debug_show_node_X(q, print_fn, limit)
+	 end
+      end
+      prefix=k
    elseif pt == 'glue' then
       s = base .. ' ' ..  print_spec(p)
       if get_attr_icflag(p)>icflag_table.KINSOKU
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
index 0ce05322b59..a854a02d234 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/07 Japanese Typesetting with Lua(La)TeX]
+  \ProvidesPackage{luatexja}[2019/01/28 Japanese Typesetting with Lua(La)TeX]
   \DeclareOption{disablejfam}{\ltj@disablejfamtrue}
   \DeclareOption*{}
   \ProcessOptions\relax
 \fi                             %</LaTeX>
 %%%% VERSION
-\def\LuaTeXjaversion{20190107.0}
+\def\LuaTeXjaversion{20190128.0}
 
 \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
 
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
index a4a457f906b..02dceafd11e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
@@ -7,6 +7,8 @@
 
 \ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi
 \ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi
+\ifdefined\ltj@stdyokojfm\else\def\ltj@stdyokojfm{ujis}\fi
+\ifdefined\ltj@stdtatejfm\else\def\ltj@stdtatejfm{ujisv}\fi
 \InputIfFileExists{luatexja.cfg}{%
   \typeout{*************************^^J%
            * Loading luatexja.cfg.^^J%
@@ -29,18 +31,18 @@
 \newcommand\kanjishapedefault{\updefault}
 
 \DeclareKanjiFamily{JY3}{mc}{}
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdmcfont:jfm=ujis}{}
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdmcfont:jfm=\ltj@stdyokojfm}{}
 \DeclareKanjiFamily{JY3}{gt}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdgtfont:jfm=ujis}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdgtfont:jfm=\ltj@stdyokojfm}{}
 \DeclareFontShape{JY3}{mc}{bx}{n}{<-> ssub*gt/m/n}{}
 \DeclareFontShape{JY3}{gt}{bx}{n}{<-> ssub*gt/m/n}{}
 \DeclareFontShape{JY3}{mc}{b}{n}{<-> ssub*mc/bx/n}{}
 \DeclareFontShape{JY3}{gt}{b}{n}{<-> ssub*gt/bx/n}{}
 
 \DeclareKanjiFamily{JT3}{mc}{}
-\DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdmcfont:jfm=ujisv}{}
+\DeclareFontShape{JT3}{mc}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdmcfont:jfm=\ltj@stdtatejfm}{}
 \DeclareKanjiFamily{JT3}{gt}{}
-\DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdgtfont:jfm=ujisv}{}
+\DeclareFontShape{JT3}{gt}{m}{n}{<-> s*[\ifdefined\Cjascale\Cjascale\else 0.962216\fi] \ltj@stdgtfont:jfm=\ltj@stdtatejfm}{}
 \DeclareFontShape{JT3}{mc}{bx}{n}{<-> ssub*gt/m/n}{}
 \DeclareFontShape{JT3}{gt}{bx}{n}{<-> ssub*gt/m/n}{}
 \DeclareFontShape{JT3}{mc}{b}{n}{<-> ssub*mc/bx/n}{}