From 9c72c3d5e99ece4c7f13bb7f5734102bf57855a4 Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Wed, 30 Dec 2015 16:25:49 +0900 Subject: [PATCH] luatexja-preset: moga-mobo with 90jis/jis2004 option --- src/addons/luatexja-preset.sty | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty index 917ba78..f66d0e0 100644 --- a/src/addons/luatexja-preset.sty +++ b/src/addons/luatexja-preset.sty @@ -223,14 +223,22 @@ \bool_new:N \l_ltjpreset_shape_nlck_bool %% KozMinPr6N, HiraMinProN-W3 の場合はjp04 feature がないので,nlck にする \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 } -\tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { +\tl_if_eq:NNTF \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { \clist_if_in:NnT \l_ltjpreset_font_list { KozMinPr6N-Regular } { \bool_set_true:N \l_ltjpreset_shape_nlck_bool } \clist_if_in:NnT \l_ltjpreset_font_list { HiraMinProN-W3 } { \bool_set_true:N \l_ltjpreset_shape_nlck_bool } \clist_if_in:NnT \l_ltjpreset_font_list { Moga90Mincho } - { \tl_remove_all:Nn \l_ltjpreset_font_list {90} }%%% これでいいのか? - + { + \tl_remove_all:Nn \l_ltjpreset_font_list {90} + \tl_clear:N \l_ltjpreset_kanji_shape_tl + } +}{ + \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 } + \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { + \clist_if_in:NnT \l_ltjpreset_font_list { Moga90Mincho } + { \tl_clear:N \l_ltjpreset_kanji_shape_tl } + } } %%%% リストからの展開 -- 2.11.0