\ltj@stdyokojfm and \ltj@stdtatejfm (setting standard JFM)

diff --git a/src/addons/luatexja-fontspec-25c.sty b/src/addons/luatexja-fontspec-25c.sty
index b4d08cd..2c57d7c 100644 (file)
--- a/src/addons/luatexja-fontspec-25c.sty
+++ b/src/addons/luatexja-fontspec-25c.sty
@@ -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/src/addons/luatexja-fontspec-26h.sty b/src/addons/luatexja-fontspec-26h.sty
index ac6757f..d134875 100644 (file)
--- a/src/addons/luatexja-fontspec-26h.sty
+++ b/src/addons/luatexja-fontspec-26h.sty
@@ -166,7 +166,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_kanji_default_fontopts_clist
   }

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index 6910446..a5ec990 100644 (file)
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -79,9 +79,9 @@
 
 % JFM
 \tl_new:N \ltjpreset_use_jfm_yoko_tl % 使用する JFM（横）
-\tl_set:Nn \ltjpreset_use_jfm_yoko_tl {ujis}
+\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 {ujisv}
+\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
 

diff --git a/src/ltj-plain.sty b/src/ltj-plain.sty
index 2707a0e..c980d43 100644 (file)
--- a/src/ltj-plain.sty
+++ b/src/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 at 9.62216pt
+\jfont\sevenmin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm at 6.73551pt
+\jfont\fivemin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm at 4.81108pt
+\jfont\tengt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm at 9.62216pt
+\jfont\sevengt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm at 6.73551pt
+\jfont\fivegt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm 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 at 9.62216pt
+\tfont\seventmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm at 6.73551pt
+\tfont\fivetmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm at 4.81108pt
+\tfont\tentgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm at 9.62216pt
+\tfont\seventgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm at 6.73551pt
+\tfont\fivetgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm at 4.81108pt
 
 \def\mc{\tenmin\tentmin}
 \def\gt{\tengt\tentgt}

diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty
index a4a457f..02dceaf 100644 (file)
--- a/src/patches/lltjdefs.sty
+++ b/src/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}{}