diff options
author | Karl Berry <karl@freefriends.org> | 2017-05-05 22:50:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-05-05 22:50:45 +0000 |
commit | a99860c7820133400dc5b3c3e7e165627f2c6298 (patch) | |
tree | 2aeec817f4184ab0e11145731771dbff492c89cd /Master/texmf-dist/tex/luatex/luatexja/addons | |
parent | af94f399b2a355396d222eb693423beb6294a683 (diff) |
luatexja (5may17)
git-svn-id: svn://tug.org/texlive/trunk@44217 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons')
8 files changed, 31 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty index be15fbba183..0416a3ebd77 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty @@ -64,14 +64,14 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-adjust}[2016/05/15] + \ProvidesPackage{luatexja-adjust}[2017/05/05] \fi %</LaTeX> % Load core module if not yet. % xkeyval.sty is already required in luatexja.sty. \ifx\luatexjacoreLoaded\@undefined \ifltj@in@latex %<*LaTeX> - \RequirePackage{luatexja}[2016/05/15] + \RequirePackage{luatexja} \else %<*!LaTeX> \input luatexja.sty % \fi %</LaTeX> diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty index e7cb900ac9b..8ca804f8a11 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty @@ -68,7 +68,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-ajmacros}[2014/07/02] + \ProvidesPackage{luatexja-ajmacros}[2017/05/05] \fi %</LaTeX> %%------------------ diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty index 38ca8eedaca..dd6bd5b284c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec-24}[2016/01/30 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec-24}[2017/04/19 fontspec support of LuaTeX-ja] \RequirePackage{l3keys2e,luatexja} \ExplSyntaxOn @@ -138,7 +138,7 @@ } \clist_set:Nx \g__fontspec_default_fontopts_clist { YokoFeatures = { JFM=ujis }, TateFeatures = { JFM=ujisv }, - Scale=\fp_use:N \g_ltj_fontspec_scale_fp, Kerning=Off, + Scale=\fp_use:N \g_ltj_fontspec_scale_fp, Kerning=Off, Script=CJK, \g__ltj_fontspec_default_fontopts_clist } \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop 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 4403f4ec20f..edb8da8f3ed 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}[2017/01/23 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec-25c}[2017/05/05 fontspec support of LuaTeX-ja] \RequirePackage{l3keys2e,luatexja} \ExplSyntaxOn @@ -140,7 +140,7 @@ } \clist_set:Nx \g__fontspec_default_fontopts_clist { YokoFeatures = { JFM=ujis }, TateFeatures = { JFM=ujisv }, - Scale=\fp_use:N \g_ltj_fontspec_scale_fp, Kerning=Off, + Scale=\fp_use:N \g_ltj_fontspec_scale_fp, Kerning=Off, Script=CJK, \g__ltj_fontspec_default_fontopts_clist } \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop 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 5ca4c48662b..c3ae22a79f2 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}[2017/01/23 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec}[2017/05/05 fontspec support of LuaTeX-ja] \RequirePackage{l3keys2e,luatexja} \ExplSyntaxOn diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty index defef8e1cef..845b1a2aa74 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty @@ -64,13 +64,13 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-otf}[2016/05/15] + \ProvidesPackage{luatexja-otf}[2017/05/05] \fi %</LaTeX> % Load core module if not yet. \ifx\luatexjacoreLoaded\@undefined \ifltj@in@latex %<*LaTeX> - \RequirePackage{luatexja}[2016/05/15] + \RequirePackage{luatexja} \else %<*!LaTeX> \input luatexja.sty % \fi %</LaTeX> @@ -94,7 +94,7 @@ %% Load ajmacros \ifltj@in@latex %<*LaTeX> - \RequirePackage{luatexja-ajmacros}[2014/07/02] + \RequirePackage{luatexja-ajmacros} \else %<*!LaTeX> \input luatexja-ajmacros.sty % \fi %</LaTeX> 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 41ba2361467..6a71e23d24f 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}[2017/03/21 Japanese font presets] +\ProvidesPackage{luatexja-preset}[2017/05/05 Japanese font presets] \RequirePackage{expl3,l3keys2e} \RequirePackage{luatexja} @@ -227,6 +227,19 @@ } } +% Source Han {Serif,Sans} +\ltjpreset_declare_option:nn{sourcehan}{ + \ltjpreset_set_multi:n { + Source~Han~Serif~Regular, % mc/m + Source~Han~Serif~Bold, % mc/bx + Source~Han~Sans~Normal, % gt/m (multi) + Source~Han~Sans~Bold, % gt/bx + Source~Han~Sans~Medium, % gt/m (uni) + Source~Han~Sans~Heavy, % gt/eb + Source~Han~Sans~Heavy % mg/m + } +} + % ipa, ipaex, ms \ltjpreset_declare_option:nn{ipa}{ @@ -379,23 +392,23 @@ \DeclareFontShape{JY3}{#1}{#2}{n}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp] {\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3" : jfm=\tl_use:N \ltjpreset_use_jfm_yoko_tl ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl - ; script=latn \bool_if:NT \l_ltjpreset_expert_bool { ;+hkna }} + ; script=cjk \bool_if:NT \l_ltjpreset_expert_bool { ;+hkna }} } {} \DeclareFontShape{JT3}{#1}{#2}{n}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp] {\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3" : jfm=\tl_use:N \ltjpreset_use_jfm_tate_tl ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl; - ; script=latn \bool_if:NT \l_ltjpreset_expert_bool { ;+vkna }} + ; script=cjk \bool_if:NT \l_ltjpreset_expert_bool { ;+vkna }} } {} \bool_if:NT \l_ltjpreset_expert_bool { \DeclareFontShape{JY3}{#1}{#2}{rb}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp] {\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3" : jfm=\tl_use:N \ltjpreset_use_jfm_yoko_tl ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl ;+ruby - ; script=kana} + ; script=kana } } {} \DeclareFontShape{JT3}{#1}{#2}{rb}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp] {\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3" : jfm=\tl_use:N \ltjpreset_use_jfm_tate_tl ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl ;+ruby - ; script=kana} + ; script=kana } } {} } } @@ -463,6 +476,7 @@ \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 \l_ltjpreset_expert_bool { diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty index 2da6d5974dc..813ab31a430 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty @@ -4,7 +4,7 @@ % LaTeX only! \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-ruby}[2015/12/29 v0.23] +\ProvidesPackage{luatexja-ruby}[2017/05/05 v0.23] \RequirePackage{luatexja} %%------------------ |