summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/addons
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-09-09 23:19:04 +0000
committerKarl Berry <karl@freefriends.org>2013-09-09 23:19:04 +0000
commit7a4f2bc6dacee73c333eb5850b1787694ffbd91f (patch)
tree65f31f898574e7ebb281eff01e700ca8cd01e5c2 /Master/texmf-dist/tex/luatex/luatexja/addons
parente59944f2d778471ea57755902fcca2d19b205e21 (diff)
luatexja (9sep13)
git-svn-id: svn://tug.org/texlive/trunk@31609 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty25
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty19
2 files changed, 34 insertions, 10 deletions
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 c368215ffec..b1a9b4aa5c0 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}[2013/05/14 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[2013/08/17 fontspec support of LuaTeX-ja]
\RequirePackage{fontspec,luatexja}
\ExplSyntaxOn
@@ -81,6 +81,7 @@
}
\tl_set:Nx \g_fontspec_default_fontopts_tl
{JFM=ujis,Scale=\fp_use:N \g_ltj_fontspec_scale_fp,Kerning=Off,\g_ltj_fontspec_default_fontopts_tl}
+ \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop
\cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily
\fontspec_select:nn{#1}{#2}
\group_end:
@@ -127,11 +128,25 @@
\newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3}
}
-\DeclareDocumentCommand \defaultjfontfeatures {m} {
+\tl_new:N \g_ltj_fontspec_default_fontopts_tl
+\prop_new:N \g__ltj_fontspec_fontopts_prop
+\DeclareDocumentCommand \defaultjfontfeatures { o m }
+ {
+ \IfNoValueTF {#1}
+ { \__ltj_fontspec_set_default_features:n {#2} }
+ { \__ltj_fontspec_set_font_default_features:nn {#1} {#2} }
+ }
+\cs_new:Nn \__ltj_fontspec_set_default_features:n
+ {
\tl_set:Nn \g_ltj_fontspec_default_fontopts_tl {#1,}
-}
-
-\tl_clear:N \g_ltj_fontspec_default_fontopts_tl
+ }
+\cs_new:Nn \__ltj_fontspec_set_font_default_features:nn
+ {
+ \__fontspec_sanitise_fontname:Nn \l__fontspec_tmp_tl {#1}
+ \tl_if_empty:nTF {#2}
+ { \prop_gremove:NV \g__ltj_fontspec_fontopts_prop \l__fontspec_tmp_tl }
+ { \prop_gput:NVn \g__ltj_fontspec_fontopts_prop \l__fontspec_tmp_tl {#2} }
+ }
\DeclareDocumentCommand \addjfontfeatures {m} {
\ifcsname zf@family@fontdef\k@family\endcsname
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 d3b32e0419a..0134a784564 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -6,7 +6,6 @@
\RequirePackage{luatexja-fontspec}
\ExplSyntaxOn
-%%%% message
\bool_new:N \l_ltjpreset_bold_bool % bold
\bool_set_false:N \l_ltjpreset_bold_bool
@@ -20,7 +19,7 @@
\int_new:N \l_ltjpreset_deluxe_int % expert
\int_set:Nn \l_ltjpreset_deluxe_int { 0 }
-\DeclareOption{deluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 2 }} % 7 fonts
+\DeclareOption{deluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 2 }} % 6 fonts
\DeclareOption{nodeluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 0 }} % 2 fonts
% scale
@@ -38,8 +37,12 @@
% 漢字字形
\tl_new:N \l_ltjpreset_kanji_shape_tl
-\DeclareOption{90jis}{ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }} % 90jis
-\DeclareOption{jis2004}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }} % jis2004
+\DeclareOption{90jis}{
+ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }
+} % 90jis
+\DeclareOption{jis2004}{
+ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }
+} % jis2004
% font preset
\bool_new:N \l_ltjpreset_office_bool % MS Office の HG 系フォントを使っているか
@@ -304,16 +307,22 @@
%%%% (丸)ゴシック体の設定: bold option もここで
\int_compare:nTF { \l_ltjpreset_deluxe_int == 2 } {
+%%% mg
\newjfontfamily \mgfamily [
+ BoldFont = \ltjpreset_font_mg:,
\tl_use:N \l_ltjpreset_add_features_tl
\bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed },
\tl_use:N \l_ltjpreset_add_features_tl
] { \ltjpreset_font_mg: }
+ \DeclareTextFontCommand{\textmg}{\mgfamily}
+%%% gteb
\newjfontfamily \gtebfamily [
+ BoldFont = \ltjpreset_font_gt_eb:,
\tl_use:N \l_ltjpreset_add_features_tl
\bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed },
\tl_use:N \l_ltjpreset_add_features_tl
] { \ltjpreset_font_gt_eb: }
+ \DeclareTextFontCommand{\textgteb}{\gtebfamily}
\bool_if:NT \l_ltjpreset_bold_bool {
\cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_bx:
}
@@ -331,7 +340,6 @@
%%%% 実際の fontspec の呼びだし
\defaultjfontfeatures{ Kerning=Off }
-
\setmainjfont [
BoldFont = \ltjpreset_font_mc_bx:
\bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed },
@@ -343,5 +351,6 @@
\tl_use:N \l_ltjpreset_add_features_tl
] { \ltjpreset_font_gt_m: }
+
\ExplSyntaxOff
\endinput \ No newline at end of file